@@ -614,14 +614,14 @@ A [=/key=] has an associated <dfn>type</dfn> which is one of:
614
614
*string*,
615
615
*binary*,
616
616
or
617
- *array *.
617
+ *composite *.
618
618
619
619
A [=/key=] also has an associated <dfn>value</dfn> , which will
620
620
be either:
621
621
an {{unrestricted double}} if type is *number* or *date*,
622
622
a {{DOMString}} if type is *string*,
623
623
a [=byte sequence=] if type is *binary*,
624
- or a [=/list=] of other [=/keys=] if type is *array *.
624
+ or a [=/list=] of other [=/keys=] if type is *composite *.
625
625
626
626
</div>
627
627
@@ -646,9 +646,9 @@ following the steps to [=convert a value to a key=].
646
646
will fail.
647
647
</aside>
648
648
649
- An <dfn>array key</dfn> is a [=/key=] with [=key/type=] *array *.
650
- The <dfn>subkeys</dfn> of an [=array key=] are the [=list/items=] of the
651
- [=array key=] 's [=key/value=] .
649
+ An <dfn>composite key</dfn> is a [=/key=] with [=key/type=] *composite *.
650
+ The <dfn>subkeys</dfn> of an [=composite key=] are the [=list/items=] of the
651
+ [=composite key=] 's [=key/value=] .
652
652
653
653
<div algorithm>
654
654
@@ -660,8 +660,8 @@ To <dfn>compare two keys</dfn> |a| and |b|, run these steps:
660
660
661
661
1. If |ta| does not equal |tb|, then run these steps:
662
662
663
- 1. If |ta| is *array *, then return 1.
664
- 1. If |tb| is *array *, then return -1.
663
+ 1. If |ta| is *composite *, then return 1.
664
+ 1. If |tb| is *composite *, then return -1.
665
665
1. If |ta| is *binary*, then return 1.
666
666
1. If |tb| is *binary*, then return -1.
667
667
1. If |ta| is *string*, then return 1.
@@ -696,7 +696,7 @@ To <dfn>compare two keys</dfn> |a| and |b|, run these steps:
696
696
1. If |vb| is [=byte less than=] |va|, then return 1.
697
697
1. Return 0.
698
698
699
- : *array *
699
+ : *composite *
700
700
::
701
701
1. Let |length| be the lesser of |va|'s [=list/size=] and |vb|' s [=list/size=] .
702
702
1. Let |i| be 0.
@@ -731,9 +731,9 @@ of [=/comparing two keys=] with |a| and |b| is 0.
731
731
*Number* keys are less than *date* keys.
732
732
*Date* keys are less than *string* keys.
733
733
*String* keys are less than *binary* keys.
734
- *Binary* keys are less than *array * keys.
734
+ *Binary* keys are less than *composite * keys.
735
735
There is no highest possible [=/key=] value.
736
- This is because an array of any candidate highest [=/key=]
736
+ This is because a *composite* key of any candidate highest [=/key=]
737
737
followed by another [=/key=] is even higher.
738
738
</aside>
739
739
@@ -857,8 +857,8 @@ object store fails.
857
857
858
858
An [=/index=] has a <dfn>multiEntry flag</dfn> . This flag affects how
859
859
the index behaves when the result of evaluating the index's
860
- [=index/key path=] yields an [=array key=] . If its [=index/multiEntry flag=]
861
- is false, then a single [=object-store/record=] whose [=/key=] is an [=array key=]
860
+ [=index/key path=] yields an [=composite key=] . If its [=index/multiEntry flag=]
861
+ is false, then a single [=object-store/record=] whose [=/key=] is an [=composite key=]
862
862
is added to the index. If its [=index/multiEntry flag=] is true, then
863
863
one [=object-store/record=] is added to the index for each of the [=subkeys=] .
864
864
@@ -1601,7 +1601,7 @@ be updated.
1601
1601
1602
1602
Only specified keys of [=key/type=] *number* can affect the
1603
1603
[=key generator/current number=] of the key generator. Keys of [=key/type=]
1604
- *date*, *array * (regardless of the other keys they
1604
+ *date*, *composite * (regardless of the other keys they
1605
1605
contain), *binary*, or *string* (regardless of whether
1606
1606
they could be parsed as numbers) have no effect on the [=key generator/current
1607
1607
number=] of the key generator. Keys of [=key/type=]
@@ -5667,29 +5667,29 @@ To <dfn>store a record into an object store</dfn> with
5667
5667
</aside>
5668
5668
5669
5669
1. If |index|'s [=index/multiEntry flag=] is false, or if |index key|
5670
- is not an [=array key=] , and if |index| already contains a
5670
+ is not an [=composite key=] , and if |index| already contains a
5671
5671
[=object-store/record=] with [=/key=] [=equal to=] |index
5672
5672
key|, and |index|'s [=index/unique flag=] is true, then this
5673
5673
operation failed with a "{{ConstraintError}} " {{DOMException}} . Abort this
5674
5674
algorithm without taking any further steps.
5675
5675
5676
5676
1. If |index|'s [=index/multiEntry flag=] is true and |index key| is
5677
- an [=array key=] , and if |index| already contains a
5677
+ an [=composite key=] , and if |index| already contains a
5678
5678
[=object-store/record=] with [=/key=] [=equal to=] any of the
5679
5679
[=subkeys=] of |index key|, and |index|'s [=index/unique
5680
5680
flag=] is true, then this operation failed with a
5681
5681
"{{ConstraintError}} " {{DOMException}} . Abort this algorithm without taking any
5682
5682
further steps.
5683
5683
5684
5684
1. If |index|'s [=index/multiEntry flag=] is false, or if |index key|
5685
- is not an [=array key=] then store a record in |index|
5685
+ is not an [=composite key=] then store a record in |index|
5686
5686
containing |index key| as its key and |key| as its value. The
5687
5687
record is stored in |index|'s [=index/list of records=]
5688
5688
such that the list is sorted primarily on the records keys,
5689
5689
and secondarily on the records values, in [=ascending=] order.
5690
5690
5691
5691
1. If |index|'s [=index/multiEntry flag=] is true and |index key| is
5692
- an [=array key=] , then for each |subkey| of the
5692
+ an [=composite key=] , then for each |subkey| of the
5693
5693
[=subkeys=] of |index key| store a record in |index|
5694
5694
containing |subkey| as its key and |key| as its value. The
5695
5695
records are stored in |index|'s [=index/list of
@@ -5703,10 +5703,10 @@ To <dfn>store a record into an object store</dfn> with
5703
5703
</aside>
5704
5704
5705
5705
<aside class=note>
5706
- Even if any member of [=subkeys=] is itself an [=array key=] ,
5706
+ Even if any member of [=subkeys=] is itself an [=composite key=] ,
5707
5707
the member is used directly as the key for the index record.
5708
- Nested [=array keys=] are not flattened or "unpacked" to
5709
- produce multiple rows; only the outer-most [=array key=] is.
5708
+ Nested [=composite keys=] are not flattened or "unpacked" to
5709
+ produce multiple rows; only the outer-most [=composite key=] is.
5710
5710
</aside>
5711
5711
5712
5712
1. Return |key|.
@@ -6379,7 +6379,7 @@ The steps return an ECMAScript value.
6379
6379
in |value|.
6380
6380
1. Return |buffer|.
6381
6381
6382
- : *array *
6382
+ : *composite *
6383
6383
::
6384
6384
1. Let |array| be the result of executing the ECMAScript Array
6385
6385
constructor with no arguments.
@@ -6457,7 +6457,7 @@ steps may throw an exception.
6457
6457
1. Return a new [=/key=] with [=key/type=]
6458
6458
*binary* and [=key/value=] |bytes|.
6459
6459
6460
- <!-- Array -->
6460
+ <!-- Composite ( Array) -->
6461
6461
: If |input| is an [=ECMAScript/Array exotic object=]
6462
6462
::
6463
6463
1. Let |len| be [=ECMAScript/?=] [=ECMAScript/ToLength=] ( [=ECMAScript/?=] [=ECMAScript/Get=] (|input|,
@@ -6486,7 +6486,7 @@ steps may throw an exception.
6486
6486
6487
6487
1. Increase |index| by 1.
6488
6488
6489
- 1. Return a new [=array key=] with [=key/value=]
6489
+ 1. Return a new [=composite key=] with [=key/value=]
6490
6490
|keys|.
6491
6491
6492
6492
@@ -6530,7 +6530,7 @@ steps may throw an exception.
6530
6530
6531
6531
1. Increase |index| by 1.
6532
6532
6533
- 1. Return a new [=array key=] with [=key/value=] set to |keys|.
6533
+ 1. Return a new [=composite key=] with [=key/value=] set to |keys|.
6534
6534
6535
6535
1. Otherwise, return the result of [=/converting a
6536
6536
value to a key=] with argument |input|.
@@ -6544,7 +6544,7 @@ steps may throw an exception.
6544
6544
not be converted to keys are ignored, and duplicates are removed.
6545
6545
6546
6546
For example, the value `[10, 20, null, 30, 20] ` is
6547
- converted to an [=array key=] with [=subkeys=] 10, 20, 30.
6547
+ converted to an [=composite key=] with [=subkeys=] 10, 20, 30.
6548
6548
</aside>
6549
6549
6550
6550
0 commit comments