Skip to content

Commit faf5931

Browse files
Rename 'array key' to 'composite key'. For #360
1 parent a6a3acc commit faf5931

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

index.bs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -595,14 +595,14 @@ A [=/key=] has an associated <dfn>type</dfn> which is one of:
595595
*string*,
596596
*binary*,
597597
or
598-
*array*.
598+
*composite*.
599599

600600
A [=/key=] also has an associated <dfn>value</dfn>, which will
601601
be either:
602602
an {{unrestricted double}} if type is *number* or *date*,
603603
a {{DOMString}} if type is *string*,
604604
a [=byte sequence=] if type is *binary*,
605-
or a [=/list=] of other [=/keys=] if type is *array*.
605+
or a [=/list=] of other [=/keys=] if type is *composite*.
606606

607607
</div>
608608

@@ -627,9 +627,9 @@ following the steps to [=convert a value to a key=].
627627
will fail.
628628
</aside>
629629

630-
An <dfn>array key</dfn> is a [=/key=] with [=key/type=] *array*.
631-
The <dfn>subkeys</dfn> of an [=array key=] are the [=list/items=] of the
632-
[=array key=]'s [=key/value=].
630+
An <dfn>composite key</dfn> is a [=/key=] with [=key/type=] *composite*.
631+
The <dfn>subkeys</dfn> of an [=composite key=] are the [=list/items=] of the
632+
[=composite key=]'s [=key/value=].
633633

634634
<div algorithm>
635635

@@ -641,8 +641,8 @@ To <dfn>compare two keys</dfn> |a| and |b|, run these steps:
641641

642642
1. If |ta| does not equal |tb|, then run these steps:
643643

644-
1. If |ta| is *array*, then return 1.
645-
1. If |tb| is *array*, then return -1.
644+
1. If |ta| is *composite*, then return 1.
645+
1. If |tb| is *composite*, then return -1.
646646
1. If |ta| is *binary*, then return 1.
647647
1. If |tb| is *binary*, then return -1.
648648
1. If |ta| is *string*, then return 1.
@@ -677,7 +677,7 @@ To <dfn>compare two keys</dfn> |a| and |b|, run these steps:
677677
1. If |vb| is [=byte less than=] |va|, then return 1.
678678
1. Return 0.
679679

680-
: *array*
680+
: *composite*
681681
::
682682
1. Let |length| be the lesser of |va|'s [=list/size=] and |vb|'s [=list/size=].
683683
1. Let |i| be 0.
@@ -712,9 +712,9 @@ of [=/comparing two keys=] with |a| and |b| is 0.
712712
*Number* keys are less than *date* keys.
713713
*Date* keys are less than *string* keys.
714714
*String* keys are less than *binary* keys.
715-
*Binary* keys are less than *array* keys.
715+
*Binary* keys are less than *composite* keys.
716716
There is no highest possible [=/key=] value.
717-
This is because an array of any candidate highest [=/key=]
717+
This is because a *composite* key of any candidate highest [=/key=]
718718
followed by another [=/key=] is even higher.
719719
</aside>
720720

@@ -838,8 +838,8 @@ object store fails.
838838

839839
An [=/index=] has a <dfn>multiEntry flag</dfn>. This flag affects how
840840
the index behaves when the result of evaluating the index's
841-
[=index/key path=] yields an [=array key=]. If its [=index/multiEntry flag=]
842-
is false, then a single [=object-store/record=] whose [=/key=] is an [=array key=]
841+
[=index/key path=] yields an [=composite key=]. If its [=index/multiEntry flag=]
842+
is false, then a single [=object-store/record=] whose [=/key=] is an [=composite key=]
843843
is added to the index. If its [=index/multiEntry flag=] is true, then
844844
one [=object-store/record=] is added to the index for each of the [=subkeys=].
845845

@@ -1582,7 +1582,7 @@ be updated.
15821582

15831583
Only specified keys of [=key/type=] *number* can affect the
15841584
[=key generator/current number=] of the key generator. Keys of [=key/type=]
1585-
*date*, *array* (regardless of the other keys they
1585+
*date*, *composite* (regardless of the other keys they
15861586
contain), *binary*, or *string* (regardless of whether
15871587
they could be parsed as numbers) have no effect on the [=key generator/current
15881588
number=] of the key generator. Keys of [=key/type=]
@@ -5648,29 +5648,29 @@ To <dfn>store a record into an object store</dfn> with
56485648
</aside>
56495649

56505650
1. If |index|'s [=index/multiEntry flag=] is false, or if |index key|
5651-
is not an [=array key=], and if |index| already contains a
5651+
is not an [=composite key=], and if |index| already contains a
56525652
[=object-store/record=] with [=/key=] [=equal to=] |index
56535653
key|, and |index|'s [=index/unique flag=] is true, then this
56545654
operation failed with a "{{ConstraintError}}" {{DOMException}}. Abort this
56555655
algorithm without taking any further steps.
56565656

56575657
1. If |index|'s [=index/multiEntry flag=] is true and |index key| is
5658-
an [=array key=], and if |index| already contains a
5658+
an [=composite key=], and if |index| already contains a
56595659
[=object-store/record=] with [=/key=] [=equal to=] any of the
56605660
[=subkeys=] of |index key|, and |index|'s [=index/unique
56615661
flag=] is true, then this operation failed with a
56625662
"{{ConstraintError}}" {{DOMException}}. Abort this algorithm without taking any
56635663
further steps.
56645664

56655665
1. If |index|'s [=index/multiEntry flag=] is false, or if |index key|
5666-
is not an [=array key=] then store a record in |index|
5666+
is not an [=composite key=] then store a record in |index|
56675667
containing |index key| as its key and |key| as its value. The
56685668
record is stored in |index|'s [=index/list of records=]
56695669
such that the list is sorted primarily on the records keys,
56705670
and secondarily on the records values, in [=ascending=] order.
56715671

56725672
1. If |index|'s [=index/multiEntry flag=] is true and |index key| is
5673-
an [=array key=], then for each |subkey| of the
5673+
an [=composite key=], then for each |subkey| of the
56745674
[=subkeys=] of |index key| store a record in |index|
56755675
containing |subkey| as its key and |key| as its value. The
56765676
records are stored in |index|'s [=index/list of
@@ -5684,10 +5684,10 @@ To <dfn>store a record into an object store</dfn> with
56845684
</aside>
56855685

56865686
<aside class=note>
5687-
Even if any member of [=subkeys=] is itself an [=array key=],
5687+
Even if any member of [=subkeys=] is itself an [=composite key=],
56885688
the member is used directly as the key for the index record.
5689-
Nested [=array keys=] are not flattened or "unpacked" to
5690-
produce multiple rows; only the outer-most [=array key=] is.
5689+
Nested [=composite keys=] are not flattened or "unpacked" to
5690+
produce multiple rows; only the outer-most [=composite key=] is.
56915691
</aside>
56925692

56935693
1. Return |key|.
@@ -6360,7 +6360,7 @@ The steps return an ECMAScript value.
63606360
in |value|.
63616361
1. Return |buffer|.
63626362

6363-
: *array*
6363+
: *composite*
63646364
::
63656365
1. Let |array| be the result of executing the ECMAScript Array
63666366
constructor with no arguments.
@@ -6438,7 +6438,7 @@ steps may throw an exception.
64386438
1. Return a new [=/key=] with [=key/type=]
64396439
*binary* and [=key/value=] |bytes|.
64406440

6441-
<!-- Array -->
6441+
<!-- Composite (Array) -->
64426442
: If |input| is an [=ECMAScript/Array exotic object=]
64436443
::
64446444
1. Let |len| be [=ECMAScript/?=] [$ToLength$]( [=ECMAScript/?=] [$Get$](|input|,
@@ -6467,7 +6467,7 @@ steps may throw an exception.
64676467

64686468
1. Increase |index| by 1.
64696469

6470-
1. Return a new [=array key=] with [=key/value=]
6470+
1. Return a new [=composite key=] with [=key/value=]
64716471
|keys|.
64726472

64736473

@@ -6511,7 +6511,7 @@ steps may throw an exception.
65116511

65126512
1. Increase |index| by 1.
65136513

6514-
1. Return a new [=array key=] with [=key/value=] set to |keys|.
6514+
1. Return a new [=composite key=] with [=key/value=] set to |keys|.
65156515

65166516
1. Otherwise, return the result of [=/converting a
65176517
value to a key=] with argument |input|.
@@ -6525,7 +6525,7 @@ steps may throw an exception.
65256525
not be converted to keys are ignored, and duplicates are removed.
65266526

65276527
For example, the value `[10, 20, null, 30, 20]` is
6528-
converted to an [=array key=] with [=subkeys=] 10, 20, 30.
6528+
converted to an [=composite key=] with [=subkeys=] 10, 20, 30.
65296529
</aside>
65306530

65316531

0 commit comments

Comments
 (0)