convex-helpers 0.1.125 → 0.1.127-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/server/pagination.d.ts +2 -2
- package/server/pagination.d.ts.map +1 -1
- package/server/pagination.js +4 -2
- package/server/pagination.ts +8 -4
- package/server/stream.d.ts +2 -2
- package/server/stream.d.ts.map +1 -1
- package/server/stream.js +48 -14
- package/server/stream.ts +73 -20
package/package.json
CHANGED
package/server/pagination.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export type PageRequest<DataModel extends GenericDataModel, T extends TableNames
|
|
|
7
7
|
table: T;
|
|
8
8
|
/** Where the page starts. Default or empty array is the start of the table. */
|
|
9
9
|
startIndexKey?: IndexKey;
|
|
10
|
-
/** Whether the startIndexKey is inclusive. Default is false. */
|
|
10
|
+
/** Whether the startIndexKey is inclusive. Default is false. Ignored for an empty key. */
|
|
11
11
|
startInclusive?: boolean;
|
|
12
12
|
/** Where the page ends. If provided, all documents up to this key will be
|
|
13
13
|
* included, if possible. targetMaxRows will be ignored (but absoluteMaxRows
|
|
@@ -15,7 +15,7 @@ export type PageRequest<DataModel extends GenericDataModel, T extends TableNames
|
|
|
15
15
|
* An empty array means the end of the table.
|
|
16
16
|
*/
|
|
17
17
|
endIndexKey?: IndexKey;
|
|
18
|
-
/** Whether the endIndexKey is inclusive. Default is true
|
|
18
|
+
/** Whether the endIndexKey is inclusive. Default is true. Ignored for an empty key. */
|
|
19
19
|
endInclusive?: boolean;
|
|
20
20
|
/** Maximum number of rows to return, as long as endIndexKey is not provided.
|
|
21
21
|
* Default is 100.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pagination.d.ts","sourceRoot":"","sources":["pagination.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EACV,6BAA6B,EAC7B,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,eAAe,CAAC;AACvB,OAAO,EAEL,oBAAoB,EAGrB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC;AAE7C,MAAM,MAAM,WAAW,CACrB,SAAS,SAAS,gBAAgB,EAClC,CAAC,SAAS,qBAAqB,CAAC,SAAS,CAAC,IACxC;IACF,mDAAmD;IACnD,KAAK,EAAE,CAAC,CAAC;IACT,+EAA+E;IAC/E,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,
|
|
1
|
+
{"version":3,"file":"pagination.d.ts","sourceRoot":"","sources":["pagination.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EACV,6BAA6B,EAC7B,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,eAAe,CAAC;AACvB,OAAO,EAEL,oBAAoB,EAGrB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC;AAE7C,MAAM,MAAM,WAAW,CACrB,SAAS,SAAS,gBAAgB,EAClC,CAAC,SAAS,qBAAqB,CAAC,SAAS,CAAC,IACxC;IACF,mDAAmD;IACnD,KAAK,EAAE,CAAC,CAAC;IACT,+EAA+E;IAC/E,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,0FAA0F;IAC1F,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,uFAAuF;IACvF,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IACjD;;;;OAIG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,CACtB,SAAS,SAAS,gBAAgB,EAClC,CAAC,SAAS,qBAAqB,CAAC,SAAS,CAAC,IACxC;IACF;;OAEG;IACH,IAAI,EAAE,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC;IACrC,qEAAqE;IACrE,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,OAAO,CAC3B,SAAS,SAAS,gBAAgB,EAClC,CAAC,SAAS,qBAAqB,CAAC,SAAS,CAAC,EAE1C,GAAG,EAAE;IAAE,EAAE,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;CAAE,EAC7C,OAAO,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,GACjC,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAyBrC;AAED,wBAAuB,WAAW,CAChC,SAAS,SAAS,gBAAgB,EAClC,CAAC,SAAS,qBAAqB,CAAC,SAAS,CAAC,EAE1C,GAAG,EAAE;IAAE,EAAE,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;CAAE,EAC7C,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,eAAe,GAAG,iBAAiB,CAAC,GAC5E,cAAc,CAAC,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAuC1D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,SAAS,CAAC,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EACrE,EAAE,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC,EAChE,MAAM,EAAE,MAAM,GACb,oBAAoB,CAAC,MAAM,CAAC,CAE9B"}
|
package/server/pagination.js
CHANGED
|
@@ -37,9 +37,11 @@ export async function* streamQuery(ctx, request) {
|
|
|
37
37
|
const indexFields = getIndexFields(request.table, request.index, request.schema);
|
|
38
38
|
const startIndexKey = request.startIndexKey ?? [];
|
|
39
39
|
const endIndexKey = request.endIndexKey ?? [];
|
|
40
|
-
|
|
40
|
+
// This API uses empty keys as unbounded endpoints regardless of inclusivity.
|
|
41
|
+
// Stream bounds instead interpret an exclusive empty prefix as an empty range.
|
|
42
|
+
const startInclusive = startIndexKey.length === 0 || (request.startInclusive ?? false);
|
|
41
43
|
const order = request.order === "desc" ? "desc" : "asc";
|
|
42
|
-
const endInclusive = request.endInclusive ?? true;
|
|
44
|
+
const endInclusive = endIndexKey.length === 0 || (request.endInclusive ?? true);
|
|
43
45
|
if (indexFields.length < startIndexKey.length ||
|
|
44
46
|
indexFields.length < endIndexKey.length) {
|
|
45
47
|
throw new Error("Index key length exceeds index fields length");
|
package/server/pagination.ts
CHANGED
|
@@ -26,7 +26,7 @@ export type PageRequest<
|
|
|
26
26
|
table: T;
|
|
27
27
|
/** Where the page starts. Default or empty array is the start of the table. */
|
|
28
28
|
startIndexKey?: IndexKey;
|
|
29
|
-
/** Whether the startIndexKey is inclusive. Default is false. */
|
|
29
|
+
/** Whether the startIndexKey is inclusive. Default is false. Ignored for an empty key. */
|
|
30
30
|
startInclusive?: boolean;
|
|
31
31
|
/** Where the page ends. If provided, all documents up to this key will be
|
|
32
32
|
* included, if possible. targetMaxRows will be ignored (but absoluteMaxRows
|
|
@@ -34,7 +34,7 @@ export type PageRequest<
|
|
|
34
34
|
* An empty array means the end of the table.
|
|
35
35
|
*/
|
|
36
36
|
endIndexKey?: IndexKey;
|
|
37
|
-
/** Whether the endIndexKey is inclusive. Default is true
|
|
37
|
+
/** Whether the endIndexKey is inclusive. Default is true. Ignored for an empty key. */
|
|
38
38
|
endInclusive?: boolean;
|
|
39
39
|
/** Maximum number of rows to return, as long as endIndexKey is not provided.
|
|
40
40
|
* Default is 100.
|
|
@@ -137,9 +137,13 @@ export async function* streamQuery<
|
|
|
137
137
|
);
|
|
138
138
|
const startIndexKey = request.startIndexKey ?? [];
|
|
139
139
|
const endIndexKey = request.endIndexKey ?? [];
|
|
140
|
-
|
|
140
|
+
// This API uses empty keys as unbounded endpoints regardless of inclusivity.
|
|
141
|
+
// Stream bounds instead interpret an exclusive empty prefix as an empty range.
|
|
142
|
+
const startInclusive =
|
|
143
|
+
startIndexKey.length === 0 || (request.startInclusive ?? false);
|
|
141
144
|
const order = request.order === "desc" ? "desc" : "asc";
|
|
142
|
-
const endInclusive =
|
|
145
|
+
const endInclusive =
|
|
146
|
+
endIndexKey.length === 0 || (request.endInclusive ?? true);
|
|
143
147
|
if (
|
|
144
148
|
indexFields.length < startIndexKey.length ||
|
|
145
149
|
indexFields.length < endIndexKey.length
|
package/server/stream.d.ts
CHANGED
|
@@ -69,7 +69,7 @@ export declare abstract class QueryStream<T extends GenericStreamItem> implement
|
|
|
69
69
|
*/
|
|
70
70
|
map<U extends GenericStreamItem>(mapper: (doc: T) => Promise<U | null>): QueryStream<U>;
|
|
71
71
|
/**
|
|
72
|
-
* Similar to flatMap on an array, but iterate over a stream, and
|
|
72
|
+
* Similar to flatMap on an array, but iterate over a stream, and then for each
|
|
73
73
|
* element, iterate over the stream created by the mapper function.
|
|
74
74
|
*
|
|
75
75
|
* Ordered by the original stream order, then the mapped stream. Similar to
|
|
@@ -504,7 +504,7 @@ export declare class SingletonStream<T extends GenericStreamItem> extends QueryS
|
|
|
504
504
|
*/
|
|
505
505
|
export declare class EmptyStream<T extends GenericStreamItem> extends QueryStream<T> {
|
|
506
506
|
#private;
|
|
507
|
-
constructor(order: "asc" | "desc", indexFields: string[]);
|
|
507
|
+
constructor(order: "asc" | "desc", indexFields: string[], equalityIndexFilter?: Value[]);
|
|
508
508
|
iterWithKeys(_trackBandwidth?: boolean): StreamIterable<T>;
|
|
509
509
|
getOrder(): "asc" | "desc";
|
|
510
510
|
getIndexFields(): string[];
|
package/server/stream.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["stream.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAO3C,OAAO,KAAK,EACV,6BAA6B,EAC7B,cAAc,EACd,cAAc,EAEd,qBAAqB,EACrB,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,KAAK,EACL,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACtB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC;AAyH7C;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAC7C,CAAC,SAAS,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAE3C,KAAK,EAAE,CAAC,EACR,KAAK,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EACjD,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,EAAE,CAsBV;AAiBD;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAClE,EAAE,EAAE,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EACrC,MAAM,EAAE,MAAM,GACb,oBAAoB,CAAC,MAAM,CAAC,CAE9B;AAED,KAAK,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAE9C,KAAK,cAAc,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;AAGhF;;GAEG;AACH,8BAAsB,WAAW,CAC/B,CAAC,SAAS,iBAAiB,CAC3B,YAAW,mBAAmB,CAAC,CAAC,CAAC;IAEjC;;;;;;;OAOG;IACH,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;IACnE,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAG1D,QAAQ,CAAC,QAAQ,IAAI,KAAK,GAAG,MAAM,CAAC;IACpC,QAAQ,CAAC,cAAc,IAAI,MAAM,EAAE,CAAC;IAEpC,QAAQ,CAAC,sBAAsB,IAAI,KAAK,EAAE,CAAC;IAI3C;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAUlE;IACD;;;;;OAKG;IACH,GAAG,CAAC,CAAC,SAAS,iBAAiB,EAC7B,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GACpC,WAAW,CAAC,CAAC,CAAC,CAUhB;IACD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,CAAC,SAAS,iBAAiB,EACjC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAC3C,iBAAiB,EAAE,MAAM,EAAE,GAC1B,WAAW,CAAC,CAAC,CAAC,CAGhB;IAED;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAEtD;IAID,MAAM,CAAC,UAAU,EAAE,GAAG,GAAG,KAAK,CAI7B;IACK,QAAQ,CACZ,IAAI,EAAE,iBAAiB,GAAG;QACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,GACA,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAiG9B;IACK,OAAO,iBAEZ;IACK,IAAI,CAAC,CAAC,EAAE,MAAM,gBAYnB;IACK,MAAM,sBAMX;IACK,KAAK,sBAGV;IACD,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,EAAE,SAAS,CAAC,CAWpD;CACF;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB,CAAC,CAAC,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;IAC9D;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,cAAc,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1E;;;;;;;OAOG;IACH,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7B;;;;;;OAMG;IACH,IAAI,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnC;;;;SAIK;IACL,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAE3B;;;;;OAKG;IACH,MAAM,IAAI,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI,CAAC;CAC9B;AAED,qBAAa,oBAAoB,CAC/B,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAC7C,YAAW,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IAKnC,EAAE,EAAE,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM;IAJhB,MAAM,EAAE,qBAAqB,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,CAAC;IAEhE,YACS,EAAE,EAAE,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EACrC,MAAM,EAAE,MAAM,EAGtB;IAED,KAAK,CAAC,SAAS,SAAS,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EACvD,SAAS,EAAE,SAAS,GACnB,sBAAsB,CAAC,MAAM,EAAE,SAAS,CAAC,CAE3C;IACD,GAAG,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAEjB;IACD,WAAW,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG,CAE1C;CACF;AAED,KAAK,EAAE,CAAC,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,IACnD,6BAA6B,CAAC,MAAM,CAAC,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,QAAQ,CAAC;IACrB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,UAAU,EAAE,QAAQ,CAAC;IACrB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,eAAe,CACzB,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAC7C,CAAC,SAAS,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAC3C,SAAS,SAAS,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IACzD;IACF,EAAE,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,SAAS,CAAC;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;IACtB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,CAAC,EAAE,CACX,CAAC,EAAE,iBAAiB,CAClB,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAC7C,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CACrD,KACE,UAAU,CAAC;CACjB,CAAC;AAEF,8BAAsB,eAAe,CACnC,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAC7C,CAAC,SAAS,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAC3C,SAAS,SAAS,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAE3D,SAAQ,WAAW,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAEjE,YAAW,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAEtD,QAAQ,CAAC,OAAO,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;CAC3D;AAED,qBAAa,sBAAsB,CACjC,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAC7C,CAAC,SAAS,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAE3C,SAAQ,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,CACrD,YAAW,gBAAgB,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAGjD,MAAM,EAAE,oBAAoB,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,CAAC;IAFjB,YACS,MAAM,EAAE,oBAAoB,CAAC,MAAM,CAAC,EACpC,KAAK,EAAE,CAAC,EAGhB;IACD,aAAa,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAE1D;IACD,SAAS,CAAC,SAAS,SAAS,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EACnE,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,CACX,CAAC,EAAE,iBAAiB,CAClB,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAC7C,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CACrD,KACE,UAAU,GACd,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,CAAC,CAWnC;IACD,eAAe,CAAC,UAAU,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,GAAG,GAAG,CAExD;IACD,KAAK,+CAEJ;IACD,KAAK,CACH,KAAK,EAAE,KAAK,GAAG,MAAM,GACpB,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAEnD;IACD,OAAO;;;;;;;;;;;;;;;;;;;;YA6FD,UAAU;YACV,mBAAmB;YACnB,UAAU;YACV,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;8GAzDd,UAAU;MArCpB;IACD,YAAY,CAAC,cAAc,UAAQ;;;;;;;;;;;;8EAElC;IACD,QAAQ,IAAI,KAAK,GAAG,MAAM,CAEzB;IACD,sBAAsB,IAAI,KAAK,EAAE,CAEhC;IACD,cAAc,IAAI,MAAM,EAAE,CAEzB;IACD,MAAM,CAAC,WAAW,EAAE,WAAW;;;;;;;;;;;;8EAE9B;CACF;AAGD,qBAAa,WAAW,CACtB,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAC7C,CAAC,SAAS,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAC3C,SAAS,SAAS,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAE3D,SAAQ,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,CAC5C,YAAW,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAGtC,MAAM,EAAE,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,KAAK,EAAE,SAAS;IAChB,CAAC,EAAE,iBAAiB;IACpB,UAAU,EACb,CAAC,CACC,CAAC,EAAE,iBAAiB,CAClB,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAC7C,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CACrD,KACE,UAAU,CAAC,GAChB,SAAS;IAXf,YACS,MAAM,EAAE,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC,EACzC,KAAK,EAAE,SAAS,EAChB,CAAC,EAAE,iBAAiB,EACpB,UAAU,EACb,CAAC,CACC,CAAC,EAAE,iBAAiB,CAClB,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAC7C,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CACrD,KACE,UAAU,CAAC,GAChB,SAAS,EAGd;IACD,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,4CAE1B;IACD,KAAK,6CAEJ;IACD,OAAO;;;;;;;;;;;;;;;;;;;;YA2CD,UAAU;YACV,mBAAmB;YACnB,UAAU;YACV,mBAAmB;;yBA7Dd,iBAAiB,CAClB,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAC7C,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CACrD,KACE,UAAU;MAapB;IACD,YAAY,CAAC,cAAc,UAAQ;;;;;;;;;;;;8EAElC;IACD,QAAQ,IAAI,KAAK,GAAG,MAAM,CAEzB;IACD,sBAAsB,IAAI,KAAK,EAAE,CAEhC;IACD,cAAc,IAAI,MAAM,EAAE,CAEzB;IACD,MAAM,CAAC,WAAW,EAAE,WAAW;;;;;;;;;;;;8EAE9B;CACF;AAED,qBAAa,kBAAkB,CAC7B,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAC7C,CAAC,SAAS,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAC3C,SAAS,SAAS,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAE3D,SAAQ,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,CAC5C,YAAW,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAG7C,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,CAAC;IACzC,KAAK,EAAE,KAAK,GAAG,MAAM;IAF9B,YACS,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,CAAC,EACzC,KAAK,EAAE,KAAK,GAAG,MAAM,EAG7B;IACD,OAAO;QAEH,EAAE;;;;;;;;;;;;;QACF,MAAM;QACN,KAAK;QACL,KAAK;QACL,WAAW;QACX,KAAK;QACL,MAAM;YACJ,UAAU;YACV,mBAAmB;YACnB,UAAU;YACV,mBAAmB;;QAErB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;qGA3DH,UAAU;MA6DpB;IACD;;OAEG;IACH,KAAK,IAAI,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAGnD;IACD,YAAY,CACV,cAAc,UAAQ,GACrB,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAsB/C;IACD,QAAQ,IAAI,KAAK,GAAG,MAAM,CAEzB;IACD,sBAAsB,IAAI,KAAK,EAAE,CAEhC;IACD,cAAc,IAAI,MAAM,EAAE,CAEzB;IACD,MAAM,CAAC,WAAW,EAAE,WAAW;;;;;;;;;;;;8EAiD9B;CACF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAC7C,CAAC,SAAS,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAC3C,SAAS,SAAS,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAE3D,EAAE,EAAE,qBAAqB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EACrC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,KAAK,GAAG,MAAM,GACpB,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAiB5C;AAED,cAAM,iBAAiB;;IAOF,WAAW,EAAE,MAAM,EAAE;IALjC,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAa;IACrD,mBAAmB,EAAE,OAAO,CAAQ;IACpC,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAa;IACrD,mBAAmB,EAAE,OAAO,CAAQ;IACpC,mBAAmB,EAAE,KAAK,EAAE,CAAM;IACzC,YAAmB,WAAW,EAAE,MAAM,EAAE,EAAI;IAC5C,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,QAU7B;IACD,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,QAS7B;IACD,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,QAQ9B;IACD,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,QAS7B;IACD,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,QAQ9B;CAuCF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EACtD,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,EACzB,kBAAkB,EAAE,MAAM,EAAE,GAC3B,WAAW,CAAC,CAAC,CAAC,CAEhB;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,iBAAiB,CAAE,SAAQ,WAAW,CAAC,CAAC,CAAC;;IAK3E,YAAY,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,kBAAkB,EAAE,MAAM,EAAE,EAoBlE;IACD,YAAY,CAAC,cAAc,UAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CA6EtD;IACD,QAAQ,IAAI,KAAK,GAAG,MAAM,CAEzB;IACD,sBAAsB,IAAI,KAAK,EAAE,CAEhC;IACD,cAAc,IAAI,MAAM,EAAE,CAEzB;IACD,MAAM,CAAC,WAAW,EAAE,WAAW,mBAK9B;CACF;AAwTD,qBAAa,eAAe,CAC1B,CAAC,SAAS,iBAAiB,CAC3B,SAAQ,WAAW,CAAC,CAAC,CAAC;;IAOtB,YACE,KAAK,EAAE,CAAC,GAAG,IAAI,EACf,KAAK,EAAE,KAAK,GAAG,MAAM,YAAQ,EAC7B,WAAW,EAAE,MAAM,EAAE,EACrB,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,KAAK,EAAE,EAC5B,SAAS,SAAI,EAgBd;IACD,YAAY,CAAC,eAAe,UAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CAqBvD;IACD,QAAQ,IAAI,KAAK,GAAG,MAAM,CAEzB;IACD,cAAc,IAAI,MAAM,EAAE,CAEzB;IACD,sBAAsB,IAAI,KAAK,EAAE,CAEhC;IACD,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAgC/C;CACF;AAED;;;;;GAKG;AACH,qBAAa,WAAW,CAAC,CAAC,SAAS,iBAAiB,CAAE,SAAQ,WAAW,CAAC,CAAC,CAAC;;IAG1E,YAAY,KAAK,EAAE,KAAK,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,EAIvD;IACD,YAAY,CAAC,eAAe,UAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CAUvD;IACD,QAAQ,IAAI,KAAK,GAAG,MAAM,CAEzB;IACD,cAAc,IAAI,MAAM,EAAE,CAEzB;IACD,sBAAsB,IAAI,KAAK,EAAE,CAEhC;IACD,MAAM,CAAC,YAAY,EAAE,WAAW,QAE/B;CACF"}
|
|
1
|
+
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["stream.ts"],"names":[],"mappings":"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"}
|
package/server/stream.js
CHANGED
|
@@ -201,7 +201,7 @@ export class QueryStream {
|
|
|
201
201
|
}, []);
|
|
202
202
|
}
|
|
203
203
|
/**
|
|
204
|
-
* Similar to flatMap on an array, but iterate over a stream, and
|
|
204
|
+
* Similar to flatMap on an array, but iterate over a stream, and then for each
|
|
205
205
|
* element, iterate over the stream created by the mapper function.
|
|
206
206
|
*
|
|
207
207
|
* Ordered by the original stream order, then the mapped stream. Similar to
|
|
@@ -565,12 +565,17 @@ export class OrderedStreamQuery extends StreamableQuery {
|
|
|
565
565
|
minUpperBound = indexBounds.upperBound;
|
|
566
566
|
minUpperBoundInclusive = indexBounds.upperBoundInclusive;
|
|
567
567
|
}
|
|
568
|
-
|
|
568
|
+
const narrowed = streamIndexRange(db, schema, table, index, {
|
|
569
569
|
lowerBound: maxLowerBound,
|
|
570
570
|
lowerBoundInclusive: maxLowerBoundInclusive,
|
|
571
571
|
upperBound: minUpperBound,
|
|
572
572
|
upperBoundInclusive: minUpperBoundInclusive,
|
|
573
573
|
}, order);
|
|
574
|
+
// Keep equality metadata even when clipping removes the whole range, so
|
|
575
|
+
// merged streams can still remove the same fixed index fields.
|
|
576
|
+
return narrowed instanceof EmptyStream
|
|
577
|
+
? new EmptyStream(order, this.getIndexFields(), this.getEqualityIndexFilter())
|
|
578
|
+
: narrowed;
|
|
574
579
|
}
|
|
575
580
|
}
|
|
576
581
|
/**
|
|
@@ -578,6 +583,20 @@ export class OrderedStreamQuery extends StreamableQuery {
|
|
|
578
583
|
*/
|
|
579
584
|
export function streamIndexRange(db, schema, table, index, bounds, order) {
|
|
580
585
|
const indexFields = getIndexFields(table, index, schema);
|
|
586
|
+
// Clipping a subrange with a cursor can put its lower bound at or beyond its
|
|
587
|
+
// upper bound. Splitting that empty interval would create nonempty queries
|
|
588
|
+
// for the bound's suffixes, outside the original range.
|
|
589
|
+
// Include empty prefixes: their predecessor/successor represent -/+ infinity,
|
|
590
|
+
// so an exclusive empty bound (including the terminal cursor "[]") is empty.
|
|
591
|
+
if (compareKeys({
|
|
592
|
+
value: bounds.lowerBound,
|
|
593
|
+
kind: bounds.lowerBoundInclusive ? "predecessor" : "successor",
|
|
594
|
+
}, {
|
|
595
|
+
value: bounds.upperBound,
|
|
596
|
+
kind: bounds.upperBoundInclusive ? "successor" : "predecessor",
|
|
597
|
+
}) >= 0) {
|
|
598
|
+
return new EmptyStream(order, indexFields);
|
|
599
|
+
}
|
|
581
600
|
const splitBounds = splitRange(indexFields, order, bounds.lowerBound, bounds.upperBound, bounds.lowerBoundInclusive ? "gte" : "gt", bounds.upperBoundInclusive ? "lte" : "lt");
|
|
582
601
|
const subQueries = splitBounds.map((splitBound) => stream(db, schema)
|
|
583
602
|
.query(table)
|
|
@@ -939,7 +958,7 @@ class FlatMapStreamIterator {
|
|
|
939
958
|
innerStream = this.singletonSkipInnerStream();
|
|
940
959
|
}
|
|
941
960
|
else {
|
|
942
|
-
innerStream = await this.#mapper(t);
|
|
961
|
+
innerStream = await this.#mapper(t, indexKey);
|
|
943
962
|
if (!equalIndexFields(innerStream.getIndexFields(), this.#mappedIndexFields)) {
|
|
944
963
|
throw new Error(`FlatMapStream: inner stream has different index fields than expected: ${JSON.stringify(innerStream.getIndexFields())} vs ${JSON.stringify(this.#mappedIndexFields)}`);
|
|
945
964
|
}
|
|
@@ -1030,15 +1049,28 @@ class FlatMapStream extends QueryStream {
|
|
|
1030
1049
|
upperBound: outerUpperBound,
|
|
1031
1050
|
upperBoundInclusive: innerUpperBound.length === 0 ? indexBounds.upperBoundInclusive : true,
|
|
1032
1051
|
};
|
|
1033
|
-
|
|
1034
|
-
|
|
1035
|
-
|
|
1036
|
-
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
|
|
1040
|
-
const
|
|
1041
|
-
|
|
1052
|
+
return new FlatMapStream(this.#stream.narrow(outerIndexBounds), async (t, indexKey) => {
|
|
1053
|
+
const innerStream = await this.#mapper(t, indexKey);
|
|
1054
|
+
// An inner bound only constrains the outer item at that edge of the
|
|
1055
|
+
// range. Other outer items retain their entire inner streams. Use the
|
|
1056
|
+
// iterator's key, since map() can change or remove indexed fields.
|
|
1057
|
+
const atLowerBound = innerLowerBound.length > 0 &&
|
|
1058
|
+
compareKeys({ value: indexKey, kind: "exact" }, { value: outerLowerBound, kind: "exact" }) === 0;
|
|
1059
|
+
const atUpperBound = innerUpperBound.length > 0 &&
|
|
1060
|
+
compareKeys({ value: indexKey, kind: "exact" }, { value: outerUpperBound, kind: "exact" }) === 0;
|
|
1061
|
+
if (!atLowerBound && !atUpperBound) {
|
|
1062
|
+
return innerStream;
|
|
1063
|
+
}
|
|
1064
|
+
return innerStream.narrow({
|
|
1065
|
+
lowerBound: atLowerBound ? innerLowerBound : [],
|
|
1066
|
+
lowerBoundInclusive: atLowerBound
|
|
1067
|
+
? indexBounds.lowerBoundInclusive
|
|
1068
|
+
: true,
|
|
1069
|
+
upperBound: atUpperBound ? innerUpperBound : [],
|
|
1070
|
+
upperBoundInclusive: atUpperBound
|
|
1071
|
+
? indexBounds.upperBoundInclusive
|
|
1072
|
+
: true,
|
|
1073
|
+
});
|
|
1042
1074
|
}, this.#mappedIndexFields);
|
|
1043
1075
|
}
|
|
1044
1076
|
}
|
|
@@ -1123,10 +1155,12 @@ export class SingletonStream extends QueryStream {
|
|
|
1123
1155
|
export class EmptyStream extends QueryStream {
|
|
1124
1156
|
#order;
|
|
1125
1157
|
#indexFields;
|
|
1126
|
-
|
|
1158
|
+
#equalityIndexFilter;
|
|
1159
|
+
constructor(order, indexFields, equalityIndexFilter = []) {
|
|
1127
1160
|
super();
|
|
1128
1161
|
this.#order = order;
|
|
1129
1162
|
this.#indexFields = indexFields;
|
|
1163
|
+
this.#equalityIndexFilter = equalityIndexFilter;
|
|
1130
1164
|
}
|
|
1131
1165
|
iterWithKeys(_trackBandwidth = false) {
|
|
1132
1166
|
return {
|
|
@@ -1146,7 +1180,7 @@ export class EmptyStream extends QueryStream {
|
|
|
1146
1180
|
return this.#indexFields;
|
|
1147
1181
|
}
|
|
1148
1182
|
getEqualityIndexFilter() {
|
|
1149
|
-
return
|
|
1183
|
+
return this.#equalityIndexFilter;
|
|
1150
1184
|
}
|
|
1151
1185
|
narrow(_indexBounds) {
|
|
1152
1186
|
return this;
|
package/server/stream.ts
CHANGED
|
@@ -301,7 +301,7 @@ export abstract class QueryStream<
|
|
|
301
301
|
);
|
|
302
302
|
}
|
|
303
303
|
/**
|
|
304
|
-
* Similar to flatMap on an array, but iterate over a stream, and
|
|
304
|
+
* Similar to flatMap on an array, but iterate over a stream, and then for each
|
|
305
305
|
* element, iterate over the stream created by the mapper function.
|
|
306
306
|
*
|
|
307
307
|
* Ordered by the original stream order, then the mapped stream. Similar to
|
|
@@ -845,7 +845,7 @@ export class OrderedStreamQuery<
|
|
|
845
845
|
minUpperBound = indexBounds.upperBound;
|
|
846
846
|
minUpperBoundInclusive = indexBounds.upperBoundInclusive;
|
|
847
847
|
}
|
|
848
|
-
|
|
848
|
+
const narrowed = streamIndexRange(
|
|
849
849
|
db,
|
|
850
850
|
schema,
|
|
851
851
|
table,
|
|
@@ -858,6 +858,15 @@ export class OrderedStreamQuery<
|
|
|
858
858
|
},
|
|
859
859
|
order,
|
|
860
860
|
);
|
|
861
|
+
// Keep equality metadata even when clipping removes the whole range, so
|
|
862
|
+
// merged streams can still remove the same fixed index fields.
|
|
863
|
+
return narrowed instanceof EmptyStream
|
|
864
|
+
? new EmptyStream<DocumentByName<DM<Schema>, T>>(
|
|
865
|
+
order,
|
|
866
|
+
this.getIndexFields(),
|
|
867
|
+
this.getEqualityIndexFilter(),
|
|
868
|
+
)
|
|
869
|
+
: narrowed;
|
|
861
870
|
}
|
|
862
871
|
}
|
|
863
872
|
|
|
@@ -877,6 +886,25 @@ export function streamIndexRange<
|
|
|
877
886
|
order: "asc" | "desc",
|
|
878
887
|
): QueryStream<DocumentByName<DM<Schema>, T>> {
|
|
879
888
|
const indexFields = getIndexFields(table, index, schema);
|
|
889
|
+
// Clipping a subrange with a cursor can put its lower bound at or beyond its
|
|
890
|
+
// upper bound. Splitting that empty interval would create nonempty queries
|
|
891
|
+
// for the bound's suffixes, outside the original range.
|
|
892
|
+
// Include empty prefixes: their predecessor/successor represent -/+ infinity,
|
|
893
|
+
// so an exclusive empty bound (including the terminal cursor "[]") is empty.
|
|
894
|
+
if (
|
|
895
|
+
compareKeys(
|
|
896
|
+
{
|
|
897
|
+
value: bounds.lowerBound,
|
|
898
|
+
kind: bounds.lowerBoundInclusive ? "predecessor" : "successor",
|
|
899
|
+
},
|
|
900
|
+
{
|
|
901
|
+
value: bounds.upperBound,
|
|
902
|
+
kind: bounds.upperBoundInclusive ? "successor" : "predecessor",
|
|
903
|
+
},
|
|
904
|
+
) >= 0
|
|
905
|
+
) {
|
|
906
|
+
return new EmptyStream(order, indexFields);
|
|
907
|
+
}
|
|
880
908
|
const splitBounds = splitRange(
|
|
881
909
|
indexFields,
|
|
882
910
|
order,
|
|
@@ -1293,13 +1321,13 @@ class FlatMapStreamIterator<
|
|
|
1293
1321
|
count: number;
|
|
1294
1322
|
bandwidth: number; // bandwidth from reading outer doc
|
|
1295
1323
|
} | null = null;
|
|
1296
|
-
#mapper: (doc: T) => Promise<QueryStream<U>>;
|
|
1324
|
+
#mapper: (doc: T, indexKey: IndexKey) => Promise<QueryStream<U>>;
|
|
1297
1325
|
#mappedIndexFields: string[];
|
|
1298
1326
|
#trackBandwidth: boolean;
|
|
1299
1327
|
|
|
1300
1328
|
constructor(
|
|
1301
1329
|
outerStream: QueryStream<T>,
|
|
1302
|
-
mapper: (doc: T) => Promise<QueryStream<U>>,
|
|
1330
|
+
mapper: (doc: T, indexKey: IndexKey) => Promise<QueryStream<U>>,
|
|
1303
1331
|
mappedIndexFields: string[],
|
|
1304
1332
|
trackBandwidth: boolean,
|
|
1305
1333
|
) {
|
|
@@ -1329,7 +1357,7 @@ class FlatMapStreamIterator<
|
|
|
1329
1357
|
if (t === null) {
|
|
1330
1358
|
innerStream = this.singletonSkipInnerStream();
|
|
1331
1359
|
} else {
|
|
1332
|
-
innerStream = await this.#mapper(t);
|
|
1360
|
+
innerStream = await this.#mapper(t, indexKey);
|
|
1333
1361
|
if (
|
|
1334
1362
|
!equalIndexFields(innerStream.getIndexFields(), this.#mappedIndexFields)
|
|
1335
1363
|
) {
|
|
@@ -1393,11 +1421,11 @@ class FlatMapStream<
|
|
|
1393
1421
|
U extends GenericStreamItem,
|
|
1394
1422
|
> extends QueryStream<U> {
|
|
1395
1423
|
#stream: QueryStream<T>;
|
|
1396
|
-
#mapper: (doc: T) => Promise<QueryStream<U>>;
|
|
1424
|
+
#mapper: (doc: T, indexKey: IndexKey) => Promise<QueryStream<U>>;
|
|
1397
1425
|
#mappedIndexFields: string[];
|
|
1398
1426
|
constructor(
|
|
1399
1427
|
stream: QueryStream<T>,
|
|
1400
|
-
mapper: (doc: T) => Promise<QueryStream<U>>,
|
|
1428
|
+
mapper: (doc: T, indexKey: IndexKey) => Promise<QueryStream<U>>,
|
|
1401
1429
|
mappedIndexFields: string[],
|
|
1402
1430
|
) {
|
|
1403
1431
|
super();
|
|
@@ -1443,19 +1471,38 @@ class FlatMapStream<
|
|
|
1443
1471
|
upperBoundInclusive:
|
|
1444
1472
|
innerUpperBound.length === 0 ? indexBounds.upperBoundInclusive : true,
|
|
1445
1473
|
};
|
|
1446
|
-
const innerIndexBounds = {
|
|
1447
|
-
lowerBound: innerLowerBound,
|
|
1448
|
-
lowerBoundInclusive:
|
|
1449
|
-
innerLowerBound.length === 0 ? true : indexBounds.lowerBoundInclusive,
|
|
1450
|
-
upperBound: innerUpperBound,
|
|
1451
|
-
upperBoundInclusive:
|
|
1452
|
-
innerUpperBound.length === 0 ? true : indexBounds.upperBoundInclusive,
|
|
1453
|
-
};
|
|
1454
1474
|
return new FlatMapStream(
|
|
1455
1475
|
this.#stream.narrow(outerIndexBounds),
|
|
1456
|
-
async (t) => {
|
|
1457
|
-
const innerStream = await this.#mapper(t);
|
|
1458
|
-
|
|
1476
|
+
async (t, indexKey) => {
|
|
1477
|
+
const innerStream = await this.#mapper(t, indexKey);
|
|
1478
|
+
// An inner bound only constrains the outer item at that edge of the
|
|
1479
|
+
// range. Other outer items retain their entire inner streams. Use the
|
|
1480
|
+
// iterator's key, since map() can change or remove indexed fields.
|
|
1481
|
+
const atLowerBound =
|
|
1482
|
+
innerLowerBound.length > 0 &&
|
|
1483
|
+
compareKeys(
|
|
1484
|
+
{ value: indexKey, kind: "exact" },
|
|
1485
|
+
{ value: outerLowerBound, kind: "exact" },
|
|
1486
|
+
) === 0;
|
|
1487
|
+
const atUpperBound =
|
|
1488
|
+
innerUpperBound.length > 0 &&
|
|
1489
|
+
compareKeys(
|
|
1490
|
+
{ value: indexKey, kind: "exact" },
|
|
1491
|
+
{ value: outerUpperBound, kind: "exact" },
|
|
1492
|
+
) === 0;
|
|
1493
|
+
if (!atLowerBound && !atUpperBound) {
|
|
1494
|
+
return innerStream;
|
|
1495
|
+
}
|
|
1496
|
+
return innerStream.narrow({
|
|
1497
|
+
lowerBound: atLowerBound ? innerLowerBound : [],
|
|
1498
|
+
lowerBoundInclusive: atLowerBound
|
|
1499
|
+
? indexBounds.lowerBoundInclusive
|
|
1500
|
+
: true,
|
|
1501
|
+
upperBound: atUpperBound ? innerUpperBound : [],
|
|
1502
|
+
upperBoundInclusive: atUpperBound
|
|
1503
|
+
? indexBounds.upperBoundInclusive
|
|
1504
|
+
: true,
|
|
1505
|
+
});
|
|
1459
1506
|
},
|
|
1460
1507
|
this.#mappedIndexFields,
|
|
1461
1508
|
);
|
|
@@ -1569,10 +1616,16 @@ export class SingletonStream<
|
|
|
1569
1616
|
export class EmptyStream<T extends GenericStreamItem> extends QueryStream<T> {
|
|
1570
1617
|
#order: "asc" | "desc";
|
|
1571
1618
|
#indexFields: string[];
|
|
1572
|
-
|
|
1619
|
+
#equalityIndexFilter: Value[];
|
|
1620
|
+
constructor(
|
|
1621
|
+
order: "asc" | "desc",
|
|
1622
|
+
indexFields: string[],
|
|
1623
|
+
equalityIndexFilter: Value[] = [],
|
|
1624
|
+
) {
|
|
1573
1625
|
super();
|
|
1574
1626
|
this.#order = order;
|
|
1575
1627
|
this.#indexFields = indexFields;
|
|
1628
|
+
this.#equalityIndexFilter = equalityIndexFilter;
|
|
1576
1629
|
}
|
|
1577
1630
|
iterWithKeys(_trackBandwidth = false): StreamIterable<T> {
|
|
1578
1631
|
return {
|
|
@@ -1592,7 +1645,7 @@ export class EmptyStream<T extends GenericStreamItem> extends QueryStream<T> {
|
|
|
1592
1645
|
return this.#indexFields;
|
|
1593
1646
|
}
|
|
1594
1647
|
getEqualityIndexFilter(): Value[] {
|
|
1595
|
-
return
|
|
1648
|
+
return this.#equalityIndexFilter;
|
|
1596
1649
|
}
|
|
1597
1650
|
narrow(_indexBounds: IndexBounds) {
|
|
1598
1651
|
return this;
|