Align Save-Impression parsing with Measure-Conversion

Author: apasel422

api.bs

@@ -1906,7 +1906,10 @@ Save-Impression: histogram-index=3, match-value=2, conversion-sites=("advertiser
 
 The following keys are defined, corresponding to the members of
 the {{AttributionImpressionOptions}} dictionary passed to
-<a method for=Attribution>saveImpression()</a>.
+<a method for=Attribution>saveImpression()</a>. Default values for omitted
+optional keys are populated the same way as the corresponding
+{{AttributionImpressionOptions}} field.
+
 
 <dl dfn-for=save-impression>
   <dt><dfn noexport><code>conversion-sites</code></dfn></dt>
@@ -1915,15 +1918,15 @@ the {{AttributionImpressionOptions}} dictionary passed to
     an [=structured header/inner list=] containing [=structured header/string|strings=].
     Each string value includes a domain name using A-labels only;
     [[RFC5890|Internationalized Domain Names]] therefore need to use [[RFC3492|punycode]].
-    This key is optional. If not supplied, an empty set is saved for [=impression/Conversion Sites=].
+    This key is optional.
   </dd>
   <dt><dfn noexport><code>conversion-callers</code></dfn></dt>
   <dd>
     Value of <a dict-member for=AttributionImpressionOptions>conversionCallers</a>,
     an [=structured header/inner list=] containing [=structured header/string|strings=].
     Each string value includes a domain name using A-labels only;
     [[RFC5890|Internationalized Domain Names]] therefore need to use [[RFC3492|punycode]].
-    This key is optional. If not supplied, an empty set is saved for [=impression/Conversion Callers=].
+    This key is optional.
   </dd>
   <dt><dfn noexport><code>histogram-index</code></dfn></dt>
   <dd>
@@ -1939,13 +1942,11 @@ the {{AttributionImpressionOptions}} dictionary passed to
   <dd>
     Value of <a dict-member for=AttributionImpressionOptions>matchValue</a>,
     a non-negative [=structured header/integer=]. This key is optional.
-    If not supplied, a value of 0 is saved for [=impression/Match Value=].
   </dd>
   <dt><dfn noexport><code>lifetime-days</code></dfn></dt>
   <dd>
     Value of <a dict-member for=AttributionImpressionOptions>lifetimeDays</a>,
     a positive [=structured header/integer=]. This key is optional.
-    If not supplied, 30 days is saved for [=impression/Lifetime=].
   </dd>
 </dl>
 
@@ -1957,34 +1958,36 @@ To <dfn noexport>parse a `Save-Impression` header</dfn> given a [=header value=]
     with <var ignore>input_bytes</var> set to |input| and
     <var ignore>field_type</var> set to "`dictionary`".
 1.  If parsing failed, return an error.
-1.  If |dict|["<code>[=save-impression/histogram-index=]</code>"] does not [=map/exist=] or
-    is not an [=structured header/integer=] or is less than 0, return an error.
-1.  Let |histogramIndex| be |dict|["<code>[=save-impression/histogram-index=]</code>"].
-1.  Let |conversionSites| be |dict|["<code>[=save-impression/conversion-sites=]</code>"]
-    [=map/with default=] an empty [=structured header/inner list=].
-1.  If |conversionSites| is not an [=structured header/inner list=], or if any of |conversionSites|' [=list/items=] is not a [=structured header/string=], return an error.
-1.  Let |conversionCallers| be |dict|["<code>[=save-impression/conversion-callers=]</code>"]
-    [=map/with default=] an empty [=structured header/inner list=].
-1.  If |conversionCallers| is not an [=structured header/inner list=], or if any of |conversionCallers|' [=list/items=] is not a [=structured header/string=], return an error.
-1.  Let |matchValue| be |dict|["<code>[=save-impression/match-value=]</code>"] [=map/with default=] 0.
-1.  If |matchValue| is not an [=structured header/integer=] or is less than 0, return an error.
-1.  Let |lifetimeDays| be |dict|["<code>[=save-impression/lifetime-days=]</code>"] [=map/with default=] 30.
-1.  If |lifetimeDays| is not an [=structured header/integer=] or is less than or equal to 0, return an error.
-1.  Let |priority| be |dict|["<code>[=save-impression/priority=]</code>"] [=map/with default=] 0.
-1.  If |priority| is not an [=structured header/integer=], return an error.
-1.  Return a new {{AttributionImpressionOptions}} with the following items:
+1.  Let |histogramIndex| be |dict|["<code>[=save-impression/histogram-index=]</code>"] [=map/with default=] `undefined`.
+1.  If |histogramIndex| is not a non-negative [=structured header/integer=], return an error.
+1.  Let |opts| be a new {{AttributionImpressionOptions}} with the following items:
      : {{AttributionImpressionOptions/histogramIndex}}
      :: |histogramIndex|
-     : {{AttributionImpressionOptions/matchValue}}
-     :: |matchValue|
-     : {{AttributionImpressionOptions/conversionSites}}
-     :: |conversionSites|
-     : {{AttributionImpressionOptions/conversionCallers}}
-     :: |conversionCallers|
-     : {{AttributionImpressionOptions/lifetimeDays}}
-     :: |lifetimeDays|
-     : {{AttributionImpressionOptions/priority}}
-     :: |priority|
+1.  If |dict|["<code>[=save-impression/conversion-sites=]</code>"] [=map/exists=]:
+     1.  Let |conversionSites| be its [=map/value=].
+     1.  If |conversionSites| is not an [=structured header/inner list=], or if any of
+         |conversionSites|' [=list/items=] is not a [=structured header/string=],
+         return an error.
+     1.  Set |opts|.{{AttributionImpressionOptions/conversionSites}} to |conversionSites|.
+1.  If |dict|["<code>[=save-impression/conversion-callers=]</code>"] [=map/exists=]:
+     1.  Let |conversionCallers| be its [=map/value=].
+     1.  If |conversionCallers| is not an [=structured header/inner list=], or if any of
+         |conversionCallers|' [=list/items=] is not a [=structured header/string=],
+         return an error.
+     1.  Set |opts|.{{AttributionImpressionOptions/conversionCallers}} to |conversionCallers|.
+1.  If |dict|["<code>[=save-impression/match-value=]</code>"] [=map/exists=]:
+     1.  Let |matchValue| be its [=map/value=].
+     1.  If |matchValue| is not a non-negative [=structured header/integer=], return an error.
+     1.  Set |opts|.{{AttributionImpressionOptions/matchValue}} to |matchValue|.
+1.  If |dict|["<code>[=save-impression/lifetime-days=]</code>"] [=map/exists=]:
+     1.  Let |lifetimeDays| be its [=map/value=].
+     1.  If |lifetimeDays| is not a positive [=structured header/integer=], return an error.
+     1.  Set |opts|.{{AttributionImpressionOptions/lifetimeDays}} to |lifetimeDays|.
+1.  If |dict|["<code>[=save-impression/priority=]</code>"] [=map/exists=]:
+     1.  Let |priority| be its [=map/value=].
+     1.  If |priority| is not an [=structured header/integer=], return an error.
+     1.  Set |opts|.{{AttributionImpressionOptions/priority}} to |priority|.
+1.  Return |opts|.
 
 </div>