@rocicorp/zero 0.20.2025052001 → 0.21.2025052100
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/out/{chunk-IKN2MNWU.js → chunk-7QSGQEHF.js} +2 -2
- package/out/{chunk-MIYN75UK.js → chunk-L22FDJBI.js} +1 -1
- package/out/chunk-L22FDJBI.js.map +7 -0
- package/out/{chunk-WXHHKJ4O.js → chunk-VYZSMCAK.js} +19 -14
- package/out/{chunk-WXHHKJ4O.js.map → chunk-VYZSMCAK.js.map} +2 -2
- package/out/{inspector-2QLL7CGJ.js → inspector-OEIX26PB.js} +3 -3
- package/out/react.js +1 -1
- package/out/solid.js +3 -3
- package/out/z2s/src/compiler.d.ts +4 -4
- package/out/z2s/src/compiler.d.ts.map +1 -1
- package/out/z2s/src/compiler.js +9 -5
- package/out/z2s/src/compiler.js.map +1 -1
- package/out/z2s/src/schema.d.ts +1 -0
- package/out/z2s/src/schema.d.ts.map +1 -1
- package/out/z2s/src/sql.d.ts.map +1 -1
- package/out/z2s/src/sql.js +2 -2
- package/out/z2s/src/sql.js.map +1 -1
- package/out/zero-cache/src/config/zero-config.d.ts +0 -8
- package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
- package/out/zero-cache/src/config/zero-config.js +4 -11
- package/out/zero-cache/src/config/zero-config.js.map +1 -1
- package/out/zero-cache/src/db/create.d.ts.map +1 -1
- package/out/zero-cache/src/db/create.js +8 -5
- package/out/zero-cache/src/db/create.js.map +1 -1
- package/out/zero-cache/src/db/lite-tables.d.ts.map +1 -1
- package/out/zero-cache/src/db/lite-tables.js +8 -1
- package/out/zero-cache/src/db/lite-tables.js.map +1 -1
- package/out/zero-cache/src/db/pg-copy.d.ts +18 -0
- package/out/zero-cache/src/db/pg-copy.d.ts.map +1 -0
- package/out/zero-cache/src/db/pg-copy.js +81 -0
- package/out/zero-cache/src/db/pg-copy.js.map +1 -0
- package/out/zero-cache/src/db/pg-to-lite.d.ts.map +1 -1
- package/out/zero-cache/src/db/pg-to-lite.js +4 -2
- package/out/zero-cache/src/db/pg-to-lite.js.map +1 -1
- package/out/zero-cache/src/db/specs.d.ts +5 -0
- package/out/zero-cache/src/db/specs.d.ts.map +1 -1
- package/out/zero-cache/src/db/specs.js +4 -0
- package/out/zero-cache/src/db/specs.js.map +1 -1
- package/out/zero-cache/src/server/change-streamer.d.ts.map +1 -1
- package/out/zero-cache/src/server/change-streamer.js +1 -14
- package/out/zero-cache/src/server/change-streamer.js.map +1 -1
- package/out/zero-cache/src/server/main.d.ts.map +1 -1
- package/out/zero-cache/src/server/main.js +6 -1
- package/out/zero-cache/src/server/main.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/copy-runner.d.ts +23 -0
- package/out/zero-cache/src/services/change-source/pg/copy-runner.d.ts.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/copy-runner.js +98 -0
- package/out/zero-cache/src/services/change-source/pg/copy-runner.js.map +1 -0
- package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts +0 -1
- package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/initial-sync.js +123 -82
- package/out/zero-cache/src/services/change-source/pg/initial-sync.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/ddl.d.ts +10 -0
- package/out/zero-cache/src/services/change-source/pg/schema/ddl.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/published.d.ts +4 -0
- package/out/zero-cache/src/services/change-source/pg/schema/published.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/published.js +4 -1
- package/out/zero-cache/src/services/change-source/pg/schema/published.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts +2 -0
- package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/protocol/current/data.d.ts +8 -0
- package/out/zero-cache/src/services/change-source/protocol/current/data.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/protocol/current/downstream.d.ts +12 -0
- package/out/zero-cache/src/services/change-source/protocol/current/downstream.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.d.ts +1 -3
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.js +5 -16
- package/out/zero-cache/src/services/change-streamer/change-streamer-http.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer.d.ts +4 -0
- package/out/zero-cache/src/services/change-streamer/change-streamer.d.ts.map +1 -1
- package/out/zero-cache/src/services/http-service.d.ts.map +1 -1
- package/out/zero-cache/src/services/http-service.js +5 -18
- package/out/zero-cache/src/services/http-service.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.js +4 -0
- package/out/zero-cache/src/services/view-syncer/cvr-store.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/cvr.d.ts +3 -1
- package/out/zero-cache/src/services/view-syncer/schema/cvr.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/cvr.js +4 -2
- package/out/zero-cache/src/services/view-syncer/schema/cvr.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/init.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/init.js +11 -0
- package/out/zero-cache/src/services/view-syncer/schema/init.js.map +1 -1
- package/out/zero-cache/src/types/lite.d.ts +6 -2
- package/out/zero-cache/src/types/lite.d.ts.map +1 -1
- package/out/zero-cache/src/types/lite.js +12 -5
- package/out/zero-cache/src/types/lite.js.map +1 -1
- package/out/zero-cache/src/types/pg.d.ts +1 -1
- package/out/zero-cache/src/types/pg.d.ts.map +1 -1
- package/out/zero-cache/src/types/pg.js +23 -8
- package/out/zero-cache/src/types/pg.js.map +1 -1
- package/out/zero-cache/src/types/timeout.d.ts +11 -0
- package/out/zero-cache/src/types/timeout.d.ts.map +1 -0
- package/out/zero-cache/src/types/timeout.js +23 -0
- package/out/zero-cache/src/types/timeout.js.map +1 -0
- package/out/zero-pg/src/schema.d.ts +0 -11
- package/out/zero-pg/src/schema.d.ts.map +1 -1
- package/out/zero-pg/src/schema.js +19 -8
- package/out/zero-pg/src/schema.js.map +1 -1
- package/out/zero-schema/src/table-schema.d.ts +1 -1
- package/out/zero-schema/src/table-schema.d.ts.map +1 -1
- package/out/zero-schema/src/table-schema.js.map +1 -1
- package/out/zero.js +3 -3
- package/out/zql/src/ivm/memory-source.d.ts.map +1 -1
- package/out/zql/src/ivm/memory-source.js +17 -10
- package/out/zql/src/ivm/memory-source.js.map +1 -1
- package/out/zql/src/query/expression.d.ts +3 -3
- package/out/zql/src/query/expression.d.ts.map +1 -1
- package/out/zql/src/query/expression.js.map +1 -1
- package/out/zql/src/query/query.d.ts +8 -5
- package/out/zql/src/query/query.d.ts.map +1 -1
- package/out/zql/src/query/query.js.map +1 -1
- package/package.json +1 -1
- package/out/chunk-MIYN75UK.js.map +0 -7
- /package/out/{chunk-IKN2MNWU.js.map → chunk-7QSGQEHF.js.map} +0 -0
- /package/out/{inspector-2QLL7CGJ.js.map → inspector-OEIX26PB.js.map} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lite.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/lite.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EACX,SAAS,EACV,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAElD,OAAO,
|
|
1
|
+
{"version":3,"file":"lite.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/lite.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EACX,SAAS,EACV,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,cAAc,CAAC;AAE3C,0DAA0D;AAC1D,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,CAAC;AAEzE,MAAM,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;AAC9D,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC;AAQjC,eAAO,MAAM,gBAAgB,MAAM,CAAC;AACpC,eAAO,MAAM,WAAW,MAAM,CAAC;AAE/B,MAAM,MAAM,UAAU,GAAG,OAAO,gBAAgB,GAAG,OAAO,WAAW,CAAC;AAEtE;;;GAGG;AACH,wBAAgB,OAAO,CACrB,GAAG,EAAE,QAAQ,EACb,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU,GACrB;IAAC,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAwBjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,aAAa,CAef;AAwBD,wBAAgB,+BAA+B,CAC7C,YAAY,EAAE,cAAc,GAC3B,WAAW,CAEb;AAeD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC;;GAEG;AACH,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,EACnC,QAAQ,EAAE,OAAO,EACjB,SAAS,EAAE,OAAO,GACjB,cAAc,CAYhB;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,cAAc,UAG9D;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,cAAc,WAE9D;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,cAAc,GAC7B,SAAS,GAAG,SAAS,CAMvB;AAED,wBAAgB,MAAM,CAAC,cAAc,EAAE,cAAc,WAEpD;AAED,wBAAgB,OAAO,CAAC,cAAc,EAAE,cAAc,WAErD"}
|
|
@@ -36,9 +36,6 @@ export function liteRow(row, table, jsonFormat) {
|
|
|
36
36
|
}
|
|
37
37
|
return { row: converted, numCols };
|
|
38
38
|
}
|
|
39
|
-
export function liteValues(row, table, jsonFormat) {
|
|
40
|
-
return Object.entries(row).map(([col, val]) => liteValue(val, columnType(col, table), jsonFormat));
|
|
41
|
-
}
|
|
42
39
|
/**
|
|
43
40
|
* Postgres values types that are supported by SQLite are stored as-is.
|
|
44
41
|
* This includes Uint8Arrays for the `bytea` / `BLOB` type.
|
|
@@ -96,10 +93,11 @@ function mapLiteDataTypeToZqlValueType(dataType) {
|
|
|
96
93
|
// Note: Includes the "TEXT" substring for SQLite type affinity
|
|
97
94
|
const TEXT_ENUM_ATTRIBUTE = '|TEXT_ENUM';
|
|
98
95
|
const NOT_NULL_ATTRIBUTE = '|NOT_NULL';
|
|
96
|
+
const TEXT_ARRAY_ATTRIBUTE = '|TEXT_ARRAY';
|
|
99
97
|
/**
|
|
100
98
|
* Formats a {@link LiteTypeString}.
|
|
101
99
|
*/
|
|
102
|
-
export function liteTypeString(upstreamDataType, notNull, textEnum) {
|
|
100
|
+
export function liteTypeString(upstreamDataType, notNull, textEnum, textArray) {
|
|
103
101
|
let typeString = upstreamDataType;
|
|
104
102
|
if (notNull) {
|
|
105
103
|
typeString += NOT_NULL_ATTRIBUTE;
|
|
@@ -107,6 +105,9 @@ export function liteTypeString(upstreamDataType, notNull, textEnum) {
|
|
|
107
105
|
if (textEnum) {
|
|
108
106
|
typeString += TEXT_ENUM_ATTRIBUTE;
|
|
109
107
|
}
|
|
108
|
+
if (textArray) {
|
|
109
|
+
typeString += TEXT_ARRAY_ATTRIBUTE;
|
|
110
|
+
}
|
|
110
111
|
return typeString;
|
|
111
112
|
}
|
|
112
113
|
export function upstreamDataType(liteTypeString) {
|
|
@@ -123,6 +124,12 @@ export function nullableUpstream(liteTypeString) {
|
|
|
123
124
|
* For types not supported by ZQL, returns `undefined`.
|
|
124
125
|
*/
|
|
125
126
|
export function dataTypeToZqlValueType(liteTypeString) {
|
|
126
|
-
return upstreamDataTypeToZqlValueType(upstreamDataType(liteTypeString).toLowerCase(), liteTypeString.includes(TEXT_ENUM_ATTRIBUTE));
|
|
127
|
+
return upstreamDataTypeToZqlValueType(upstreamDataType(liteTypeString).toLowerCase(), liteTypeString.includes(TEXT_ENUM_ATTRIBUTE), liteTypeString.includes(TEXT_ARRAY_ATTRIBUTE));
|
|
128
|
+
}
|
|
129
|
+
export function isEnum(liteTypeString) {
|
|
130
|
+
return liteTypeString.includes(TEXT_ENUM_ATTRIBUTE);
|
|
131
|
+
}
|
|
132
|
+
export function isArray(liteTypeString) {
|
|
133
|
+
return liteTypeString.includes(TEXT_ARRAY_ATTRIBUTE);
|
|
127
134
|
}
|
|
128
135
|
//# sourceMappingURL=lite.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lite.js","sourceRoot":"","sources":["../../../../../zero-cache/src/types/lite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAMtD,OAAO,EAAC,SAAS,EAAiB,MAAM,kBAAkB,CAAC;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"lite.js","sourceRoot":"","sources":["../../../../../zero-cache/src/types/lite.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,6 +132,6 @@ export declare const pgToZqlTypeMap: Readonly<{
|
|
|
132
132
|
float4: "number";
|
|
133
133
|
float8: "number";
|
|
134
134
|
}>;
|
|
135
|
-
export declare function dataTypeToZqlValueType(pgType: string, isEnum: boolean): ValueType | undefined;
|
|
135
|
+
export declare function dataTypeToZqlValueType(pgType: string, isEnum: boolean, isArray: boolean): ValueType | undefined;
|
|
136
136
|
export {};
|
|
137
137
|
//# sourceMappingURL=pg.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/pg.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,QAAQ,EAAE,EAAc,KAAK,YAAY,EAAC,MAAM,UAAU,CAAC;AAElE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAa,KAAK,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAW5D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAqC7D;AAED,iBAAS,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAuBhD;AAED,iBAAS,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG/C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,UAAU,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,eAAe,gBAAgB,GAAG,SAAS;;;;;;;;;;;;;;;;;;2BAuBxB,MAAM,GAAG,IAAI;;;;;;2BAUb,MAAM;uBACV,MAAM,GAAG,MAAM;;;CAG9B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,cAAc,CAAC;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAEH,wBAAgB,QAAQ,CACtB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC;IACzB,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;CAC/B,CAAC,EACF,YAAY,CAAC,EAAE,gBAAgB,GAC9B,UAAU,
|
|
1
|
+
{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/pg.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,QAAQ,EAAE,EAAc,KAAK,YAAY,EAAC,MAAM,UAAU,CAAC;AAElE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAa,KAAK,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAW5D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAqC7D;AAED,iBAAS,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAuBhD;AAED,iBAAS,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG/C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,UAAU,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,eAAe,gBAAgB,GAAG,SAAS;;;;;;;;;;;;;;;;;;2BAuBxB,MAAM,GAAG,IAAI;;;;;;2BAUb,MAAM;uBACV,MAAM,GAAG,MAAM;;;CAG9B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,cAAc,CAAC;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAEH,wBAAgB,QAAQ,CACtB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC;IACzB,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;CAC/B,CAAC,EACF,YAAY,CAAC,EAAE,gBAAgB,GAC9B,UAAU,CAyCZ;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAOhD,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;EAqBhC,CAAC;AAEH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,WAE5C;AAED,eAAO,MAAM,oBAAoB;;;;;;;EAO/B,CAAC;AAEH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,WAE5C;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuBzB,CAAC;AAEH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,OAAO,GACf,SAAS,GAAG,SAAS,CAevB"}
|
|
@@ -128,22 +128,31 @@ export function pgClient(lc, connectionURI, options, jsonAsString) {
|
|
|
128
128
|
}
|
|
129
129
|
};
|
|
130
130
|
const url = new URL(connectionURI);
|
|
131
|
-
const
|
|
131
|
+
const sslFlag = url.searchParams.get('ssl') ?? url.searchParams.get('sslmode') ?? 'prefer';
|
|
132
|
+
let ssl;
|
|
133
|
+
if (sslFlag === 'disable' || sslFlag === 'false') {
|
|
134
|
+
ssl = false;
|
|
135
|
+
}
|
|
136
|
+
else if (sslFlag === 'no-verify') {
|
|
137
|
+
ssl = { rejectUnauthorized: false };
|
|
138
|
+
}
|
|
139
|
+
else {
|
|
140
|
+
ssl = sslFlag;
|
|
141
|
+
}
|
|
132
142
|
// Set connections to expire between 5 and 10 minutes to free up state on PG.
|
|
133
143
|
const maxLifetimeSeconds = randInt(5 * 60, 10 * 60);
|
|
134
144
|
return postgres(connectionURI, {
|
|
135
145
|
...postgresTypeConfig(jsonAsString),
|
|
136
146
|
onnotice,
|
|
137
147
|
['max_lifetime']: maxLifetimeSeconds,
|
|
138
|
-
ssl
|
|
148
|
+
ssl,
|
|
139
149
|
...options,
|
|
140
150
|
});
|
|
141
151
|
}
|
|
142
|
-
export const typeNameByOID = Object.fromEntries(Object.entries(OID).map(([name, oid]) => [
|
|
152
|
+
export const typeNameByOID = Object.freeze(Object.fromEntries(Object.entries(OID).map(([name, oid]) => [
|
|
143
153
|
oid,
|
|
144
154
|
name.startsWith('_') ? `${name.substring(1)}[]` : name,
|
|
145
|
-
]));
|
|
146
|
-
Object.freeze(typeNameByOID);
|
|
155
|
+
])));
|
|
147
156
|
export const pgToZqlNumericTypeMap = Object.freeze({
|
|
148
157
|
'smallint': 'number',
|
|
149
158
|
'integer': 'number',
|
|
@@ -199,10 +208,16 @@ export const pgToZqlTypeMap = Object.freeze({
|
|
|
199
208
|
// TODO: Add support for these.
|
|
200
209
|
// 'bytea':
|
|
201
210
|
});
|
|
202
|
-
export function dataTypeToZqlValueType(pgType, isEnum) {
|
|
211
|
+
export function dataTypeToZqlValueType(pgType, isEnum, isArray) {
|
|
212
|
+
// We treat pg arrays as JSON values.
|
|
213
|
+
if (isArray) {
|
|
214
|
+
return 'json';
|
|
215
|
+
}
|
|
203
216
|
const valueType = pgToZqlTypeMap[formatTypeForLookup(pgType)];
|
|
204
|
-
if (valueType === undefined
|
|
205
|
-
|
|
217
|
+
if (valueType === undefined) {
|
|
218
|
+
if (isEnum) {
|
|
219
|
+
return 'string';
|
|
220
|
+
}
|
|
206
221
|
}
|
|
207
222
|
return valueType;
|
|
208
223
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg.js","sourceRoot":"","sources":["../../../../../zero-cache/src/types/pg.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pg.js","sourceRoot":"","sources":["../../../../../zero-cache/src/types/pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolves to the the string `"timed-out"` if `timeoutMs` elapses before
|
|
3
|
+
* the specified `promise` resolves.
|
|
4
|
+
*/
|
|
5
|
+
export declare function orTimeout<T>(promise: Promise<T>, timeoutMs: number): Promise<T | 'timed-out'>;
|
|
6
|
+
/**
|
|
7
|
+
* Resolves to the specified `timeoutValue` if `timeoutMs` elapses before
|
|
8
|
+
* the specified `promise` resolves.
|
|
9
|
+
*/
|
|
10
|
+
export declare function orTimeoutWith<T, U>(promise: Promise<T>, timeoutMs: number, timeoutValue: U): Promise<T | U>;
|
|
11
|
+
//# sourceMappingURL=timeout.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/timeout.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,SAAS,CAAC,CAAC,EACzB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,CAE1B;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,CAAC,EAAE,CAAC,EACtC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,CAAC,GACd,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAQhB"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { sleepWithAbort } from "../../../shared/src/sleep.js";
|
|
2
|
+
/**
|
|
3
|
+
* Resolves to the the string `"timed-out"` if `timeoutMs` elapses before
|
|
4
|
+
* the specified `promise` resolves.
|
|
5
|
+
*/
|
|
6
|
+
export function orTimeout(promise, timeoutMs) {
|
|
7
|
+
return orTimeoutWith(promise, timeoutMs, 'timed-out');
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Resolves to the specified `timeoutValue` if `timeoutMs` elapses before
|
|
11
|
+
* the specified `promise` resolves.
|
|
12
|
+
*/
|
|
13
|
+
export async function orTimeoutWith(promise, timeoutMs, timeoutValue) {
|
|
14
|
+
const ac = new AbortController();
|
|
15
|
+
const [timeout] = sleepWithAbort(timeoutMs, ac.signal);
|
|
16
|
+
try {
|
|
17
|
+
return await Promise.race([promise, timeout.then(() => timeoutValue)]);
|
|
18
|
+
}
|
|
19
|
+
finally {
|
|
20
|
+
ac.abort();
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=timeout.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../../zero-cache/src/types/timeout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAE5D;;;GAGG;AACH,MAAM,UAAU,SAAS,CACvB,OAAmB,EACnB,SAAiB;IAEjB,OAAO,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACxD,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAmB,EACnB,SAAiB,EACjB,YAAe;IAEf,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAC;IACjC,MAAM,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC"}
|
|
@@ -1,17 +1,6 @@
|
|
|
1
1
|
import type { ServerSchema } from '../../z2s/src/schema.ts';
|
|
2
2
|
import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
|
|
3
3
|
import type { DBTransaction } from '../../zql/src/mutate/custom.ts';
|
|
4
|
-
export type ServerSchemaRow = {
|
|
5
|
-
schema: string;
|
|
6
|
-
table: string;
|
|
7
|
-
column: string;
|
|
8
|
-
type: string;
|
|
9
|
-
length: string | null;
|
|
10
|
-
precision: string | null;
|
|
11
|
-
scale: string | null;
|
|
12
|
-
enum: string;
|
|
13
|
-
enumtype: string;
|
|
14
|
-
};
|
|
15
4
|
export declare function getServerSchema<S extends Schema>(dbTransaction: DBTransaction<unknown>, schema: S): Promise<ServerSchema>;
|
|
16
5
|
export type SchemaIncompatibilityError = {
|
|
17
6
|
type: 'typeError';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAI1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAkBlE,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,YAAY,CAAC,CAwGvB;AAwCD,MAAM,MAAM,0BAA0B,GAClC;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,0BAA0B,EAAE,CAkD9B"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { assert } from "../../shared/src/asserts.js";
|
|
2
|
+
import { must } from "../../shared/src/must.js";
|
|
2
3
|
import { formatPg, sql } from "../../z2s/src/sql.js";
|
|
4
|
+
import * as PostgresTypeClass from "../../zero-cache/src/db/postgres-type-class-enum.js";
|
|
3
5
|
import { dataTypeToZqlValueType } from "../../zero-cache/src/types/pg.js";
|
|
4
6
|
export async function getServerSchema(dbTransaction, schema) {
|
|
5
7
|
const schemaTablePairs = Object.values(schema.tables).map(({ name, serverName }) => {
|
|
@@ -26,16 +28,20 @@ export async function getServerSchema(dbTransaction, schema) {
|
|
|
26
28
|
c.table_schema::text AS schema,
|
|
27
29
|
c.table_name::text AS table,
|
|
28
30
|
c.column_name::text AS column,
|
|
29
|
-
c.data_type::text AS
|
|
31
|
+
c.data_type::text AS "dataType",
|
|
30
32
|
c.character_maximum_length AS length,
|
|
31
33
|
c.numeric_precision AS precision,
|
|
32
34
|
c.numeric_scale AS scale,
|
|
33
|
-
|
|
34
|
-
t.typname::text AS
|
|
35
|
+
t.typtype::text AS typtype,
|
|
36
|
+
t.typname::text AS typename,
|
|
37
|
+
CASE WHEN t.typelem <> 0 THEN et.typtype::text ELSE NULL END AS "elemTyptype",
|
|
38
|
+
CASE WHEN t.typelem <> 0 THEN et.typname::text ELSE NULL END AS "elemTypname"
|
|
35
39
|
FROM
|
|
36
40
|
information_schema.columns c
|
|
37
41
|
JOIN
|
|
38
42
|
pg_catalog.pg_type t ON c.udt_name = t.typname
|
|
43
|
+
LEFT JOIN
|
|
44
|
+
pg_catalog.pg_type et ON t.typelem = et.oid
|
|
39
45
|
JOIN
|
|
40
46
|
pg_catalog.pg_namespace n ON t.typnamespace = n.oid
|
|
41
47
|
WHERE
|
|
@@ -51,10 +57,14 @@ export async function getServerSchema(dbTransaction, schema) {
|
|
|
51
57
|
tableSchema = {};
|
|
52
58
|
serverSchema[tableName] = tableSchema;
|
|
53
59
|
}
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
60
|
+
const isArray = row.elemTyptype !== null;
|
|
61
|
+
const isEnum = (row.elemTyptype ?? row.typtype) === PostgresTypeClass.Enum;
|
|
62
|
+
let type = row.dataType.toLowerCase();
|
|
63
|
+
if (isArray) {
|
|
64
|
+
type = must(row.elemTypname);
|
|
65
|
+
}
|
|
66
|
+
else if (isEnum) {
|
|
67
|
+
type = row.typename;
|
|
58
68
|
}
|
|
59
69
|
if ((type === 'bpchar' ||
|
|
60
70
|
type === 'character' ||
|
|
@@ -71,6 +81,7 @@ export async function getServerSchema(dbTransaction, schema) {
|
|
|
71
81
|
tableSchema[row.column] = {
|
|
72
82
|
type,
|
|
73
83
|
isEnum,
|
|
84
|
+
isArray,
|
|
74
85
|
};
|
|
75
86
|
}
|
|
76
87
|
const errors = checkSchemasAreCompatible(schema, serverSchema);
|
|
@@ -130,7 +141,7 @@ export function checkSchemasAreCompatible(schema, serverSchema) {
|
|
|
130
141
|
const serverColumn = serverSchema[serverTableName][serverColumnName];
|
|
131
142
|
const declaredType = column.type;
|
|
132
143
|
const pgType = serverColumn.type;
|
|
133
|
-
const requiredType = dataTypeToZqlValueType(pgType, serverColumn.isEnum);
|
|
144
|
+
const requiredType = dataTypeToZqlValueType(pgType, serverColumn.isEnum, serverColumn.isArray);
|
|
134
145
|
if (requiredType !== declaredType) {
|
|
135
146
|
errors.push({
|
|
136
147
|
type: 'typeError',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAEnD,OAAO,EAAC,QAAQ,EAAE,GAAG,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,sBAAsB,EAAC,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../zero-pg/src/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export type { ValueType } from '../../zero-protocol/src/client-schema.ts';
|
|
2
1
|
import type { ValueType } from '../../zero-protocol/src/client-schema.ts';
|
|
3
2
|
import type { PrimaryKey } from '../../zero-protocol/src/primary-key.ts';
|
|
3
|
+
export type { ValueType } from '../../zero-protocol/src/client-schema.ts';
|
|
4
4
|
/**
|
|
5
5
|
* `related` calls need to know what the available relationships are.
|
|
6
6
|
* The `schema` type encodes this information.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-schema.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/table-schema.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"table-schema.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/table-schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/table-schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"table-schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/table-schema.ts"],"names":[],"mappings":"AA4GA,MAAM,UAAU,UAAU,CAAI,GAAiB;IAC7C,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,GAAoB,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,CAAe;IACtC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,CAAe;IAEf,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACxB,CAAC"}
|
package/out/zero.js
CHANGED
|
@@ -21,11 +21,11 @@ import {
|
|
|
21
21
|
string,
|
|
22
22
|
table,
|
|
23
23
|
update_needed_reason_type_enum_exports
|
|
24
|
-
} from "./chunk-
|
|
25
|
-
import "./chunk-
|
|
24
|
+
} from "./chunk-VYZSMCAK.js";
|
|
25
|
+
import "./chunk-7QSGQEHF.js";
|
|
26
26
|
import {
|
|
27
27
|
DEFAULT_TTL
|
|
28
|
-
} from "./chunk-
|
|
28
|
+
} from "./chunk-L22FDJBI.js";
|
|
29
29
|
import {
|
|
30
30
|
applyChange
|
|
31
31
|
} from "./chunk-SKR5JO2A.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAE1D,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EAET,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;AAE1E,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,IAAI,EACV,MAAM,WAAW,CAAC;AAEnB,OAAO,EAEL,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,KAAK,EACX,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EACZ,eAAe,EACf,WAAW,EACZ,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGxC,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IACrB,MAAM,EAAE,GAAG,GAAG,SAAS,CAAC;CACzB,CAAC;AAQF,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,IAAI,EAAE,QAAQ,CAAC;IACf,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IACvC,WAAW,EAAE,UAAU,CAAC;IACxB,OAAO,EACH;QACE,SAAS,EAAE,mBAAmB,CAAC;QAC/B,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;KAClC,GACD,SAAS,CAAC;CACf,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,YAAa,YAAW,MAAM;;gBAYvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACpC,UAAU,EAAE,UAAU,EACtB,gBAAgB,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS;IAgB9C,aAAa;;;;;IAQb,IAAI;IAUJ,IAAI,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,CAExB;IAeD,OAAO,CACL,IAAI,EAAE,QAAQ,EACd,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,EAC/B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS,GACtC,WAAW;IAwFd,YAAY,IAAI,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -152,11 +152,11 @@ export class MemorySource {
|
|
|
152
152
|
const pkConstraint = primaryKeyConstraintFromFilters(conn.filters?.condition, this.#primaryKey);
|
|
153
153
|
// The primary key constraint will be more limiting than the constraint
|
|
154
154
|
// so swap out to that if it exists.
|
|
155
|
-
const
|
|
155
|
+
const fetchOrPkConstraint = pkConstraint ?? req.constraint;
|
|
156
156
|
// If there is a constraint, we need an index sorted by it first.
|
|
157
157
|
const indexSort = [];
|
|
158
|
-
if (
|
|
159
|
-
for (const key of Object.keys(
|
|
158
|
+
if (fetchOrPkConstraint) {
|
|
159
|
+
for (const key of Object.keys(fetchOrPkConstraint)) {
|
|
160
160
|
indexSort.push([key, 'asc']);
|
|
161
161
|
}
|
|
162
162
|
}
|
|
@@ -164,8 +164,8 @@ export class MemorySource {
|
|
|
164
164
|
// any requested sort since there can only be one result. Otherwise we also
|
|
165
165
|
// need the index sorted by the requested sort.
|
|
166
166
|
if (this.#primaryKey.length > 1 ||
|
|
167
|
-
!
|
|
168
|
-
!constraintMatchesPrimaryKey(
|
|
167
|
+
!fetchOrPkConstraint ||
|
|
168
|
+
!constraintMatchesPrimaryKey(fetchOrPkConstraint, this.#primaryKey)) {
|
|
169
169
|
indexSort.push(...requestedSort);
|
|
170
170
|
}
|
|
171
171
|
const index = this.#getOrCreateIndex(indexSort, from);
|
|
@@ -183,11 +183,11 @@ export class MemorySource {
|
|
|
183
183
|
// comparator accomplishes this. The right thing is probably to teach the
|
|
184
184
|
// btree library to support this concept.
|
|
185
185
|
let scanStart;
|
|
186
|
-
if (
|
|
186
|
+
if (fetchOrPkConstraint) {
|
|
187
187
|
scanStart = {};
|
|
188
188
|
for (const [key, dir] of indexSort) {
|
|
189
|
-
if (hasOwn(
|
|
190
|
-
scanStart[key] =
|
|
189
|
+
if (hasOwn(fetchOrPkConstraint, key)) {
|
|
190
|
+
scanStart[key] = fetchOrPkConstraint[key];
|
|
191
191
|
}
|
|
192
192
|
else {
|
|
193
193
|
if (req.reverse) {
|
|
@@ -203,8 +203,15 @@ export class MemorySource {
|
|
|
203
203
|
scanStart = startAt;
|
|
204
204
|
}
|
|
205
205
|
const rowsIterable = generateRows(data, scanStart, req.reverse);
|
|
206
|
-
const withOverlay = generateWithOverlay(startAt, pkConstraint ? once(rowsIterable) : rowsIterable,
|
|
207
|
-
|
|
206
|
+
const withOverlay = generateWithOverlay(startAt, pkConstraint ? once(rowsIterable) : rowsIterable,
|
|
207
|
+
// use `req.constraint` here and not `fetchOrPkConstraint` since `fetchOrPkConstraint` could be the
|
|
208
|
+
// primary key constraint. The primary key constraint comes from filters and is acting as a filter
|
|
209
|
+
// rather than as the fetch constraint.
|
|
210
|
+
req.constraint, this.#overlay, this.#splitEditOverlay, callingConnectionIndex, comparator, conn.filters?.predicate);
|
|
211
|
+
const withConstraint = generateWithConstraint(generateWithStart(withOverlay, req.start, comparator),
|
|
212
|
+
// we use `req.constraint` and not `fetchOrPkConstraint` here because we need to
|
|
213
|
+
// AND the constraint with what could have been the primary key constraint
|
|
214
|
+
req.constraint);
|
|
208
215
|
yield* conn.filters
|
|
209
216
|
? generateWithFilter(withConstraint, conn.filters.predicate)
|
|
210
217
|
: withConstraint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-source.js","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAStD,OAAO,EAAC,wBAAwB,EAAC,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EACL,eAAe,EACf,gBAAgB,GAEjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,2BAA2B,EAC3B,oBAAoB,EACpB,+BAA+B,GAEhC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,aAAa,EACb,WAAW,EACX,cAAc,GAGf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAKN,MAAM,eAAe,CAAC;AASvB,OAAO,EAAC,IAAI,EAAC,MAAM,kCAAkC,CAAC;AAgCtD;;;;;;GAMG;AACH,MAAM,OAAO,YAAY;IACd,UAAU,CAAS;IACnB,QAAQ,CAA8B;IACtC,WAAW,CAAa;IACxB,iBAAiB,CAAW;IAC5B,QAAQ,GAAuB,IAAI,GAAG,EAAE,CAAC;IACzC,YAAY,GAAiB,EAAE,CAAC;IAEzC,QAAQ,CAAsB;IAC9B,iBAAiB,CAAsB;IAEvC,YACE,SAAiB,EACjB,OAAoC,EACpC,UAAsB,EACtB,gBAA4C;QAE5C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,mBAAmB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE;YACxD,UAAU;YACV,IAAI,EAAE,gBAAgB,IAAI,IAAI,QAAQ,CAAM,UAAU,CAAC;YACvD,MAAM,EAAE,IAAI,GAAG,EAAE;SAClB,CAAC,CAAC;QACH,wBAAwB,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACrE,CAAC;IAED,oBAAoB;IACpB,aAAa;QACX,OAAO;YACL,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,UAAU,EAAE,IAAI,CAAC,WAAW;SAC7B,CAAC;IACJ,CAAC;IAED,IAAI;QACF,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC7C,OAAO,IAAI,YAAY,CACrB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,WAAW,EAChB,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,CAC1B,CAAC;IACJ,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC;IACtC,CAAC;IAED,UAAU,CAAC,UAAsB;QAC/B,OAAO;YACL,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,UAAU,EAAE,IAAI,CAAC,WAAW;YAC5B,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,MAAM,EAAE,QAAQ;YAChB,aAAa,EAAE,EAAE;YACjB,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,UAAU,CAAC,WAAW;SACpC,CAAC;IACJ,CAAC;IAED,OAAO,CACL,IAAc,EACd,OAA+B,EAC/B,aAAuC;QAEvC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAErD,MAAM,KAAK,GAAgB;YACzB,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM;YACvB,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC;YAC1C,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC;YAC9C,SAAS,EAAE,MAAM,CAAC,EAAE;gBAClB,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;YAC7B,CAAC;YACD,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC;YACD,mBAAmB,EAAE,CAAC,kBAAkB,CAAC,iBAAiB;SAC3D,CAAC;QAEF,MAAM,UAAU,GAAe;YAC7B,KAAK;YACL,MAAM,EAAE,SAAS;YACjB,IAAI;YACJ,aAAa;YACb,WAAW,EAAE,cAAc,CAAC,IAAI,CAAC;YACjC,OAAO,EAAE,kBAAkB,CAAC,OAAO;gBACjC,CAAC,CAAC;oBACE,SAAS,EAAE,kBAAkB,CAAC,OAAO;oBACrC,SAAS,EAAE,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC;iBACvD;gBACH,CAAC,CAAC,SAAS;SACd,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC3C,wBAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,WAAW,CAAC,KAAY;QACtB,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QAChE,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC;QAC3C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAEjC,wEAAwE;QACxE,mEAAmE;QACnE,mCAAmC;QACnC,EAAE;QACF,wEAAwE;QACxE,sEAAsE;QACtE,qBAAqB;IACvB,CAAC;IAED,gBAAgB;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;QACzC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,iBAAiB,CAAC,IAAc,EAAE,MAAkB;QAClD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,4EAA4E;QAC5E,wBAAwB;QACxB,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,sEAAsE;QACtE,oDAAoD;QACpD,6EAA6E;QAC7E,8EAA8E;QAC9E,wBAAwB;QACxB,+EAA+E;QAC/E,WAAW;QACX,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAM,UAAU,CAAC,CAAC;QAE3C,qEAAqE;QACrE,2EAA2E;QAC3E,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAG,EAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACjC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,uDAAuD;IACvD,YAAY;QACV,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,CAAC,MAAM,CAAC,GAAiB,EAAE,IAAgB;QACzC,MAAM,sBAAsB,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/D,MAAM,CAAC,sBAAsB,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC;QACvD,MAAM,EAAC,IAAI,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC;QAEnC,MAAM,YAAY,GAAG,+BAA+B,CAClD,IAAI,CAAC,OAAO,EAAE,SAAS,EACvB,IAAI,CAAC,WAAW,CACjB,CAAC;QACF,uEAAuE;QACvE,oCAAoC;QACpC,MAAM,UAAU,GAAG,YAAY,IAAI,GAAG,CAAC,UAAU,CAAC;QAElD,iEAAiE;QACjE,MAAM,SAAS,GAAgB,EAAE,CAAC;QAClC,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1C,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QAED,2EAA2E;QAC3E,2EAA2E;QAC3E,+CAA+C;QAC/C,IACE,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;YAC3B,CAAC,UAAU;YACX,CAAC,2BAA2B,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,EAC1D,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACtD,MAAM,EAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAC,GAAG,KAAK,CAAC;QAC1C,MAAM,UAAU,GAAG,CAAC,EAAO,EAAE,EAAO,EAAE,EAAE,CACtC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC;QAE/B,4EAA4E;QAC5E,wEAAwE;QACxE,qEAAqE;QACrE,mEAAmE;QACnE,4EAA4E;QAC5E,wEAAwE;QACxE,4EAA4E;QAC5E,4EAA4E;QAC5E,yEAAyE;QACzE,yCAAyC;QACzC,IAAI,SAA+B,CAAC;QAEpC,IAAI,UAAU,EAAE,CAAC;YACf,SAAS,GAAG,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,SAAS,EAAE,CAAC;gBACnC,IAAI,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC;oBAC5B,SAAS,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;gBACnC,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;wBAChB,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;oBACvD,CAAC;yBAAM,CAAC;wBACN,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;oBACvD,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,OAAO,CAAC;QACtB,CAAC;QAED,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,WAAW,GAAG,mBAAmB,CACrC,OAAO,EACP,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,EAChD,UAAU,EACV,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,iBAAiB,EACtB,sBAAsB,EACtB,UAAU,EACV,IAAI,CAAC,OAAO,EAAE,SAAS,CACxB,CAAC;QAEF,MAAM,cAAc,GAAG,sBAAsB,CAC3C,iBAAiB,CAAC,WAAW,EAAE,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,EACrD,UAAU,CACX,CAAC;QAEF,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO;YACjB,CAAC,CAAC,kBAAkB,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YAC5D,CAAC,CAAC,cAAc,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,GAAiB,EAAE,UAAsB;QAChD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,CAAC,MAAsC;QACzC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,iBAAiB;QACnB,CAAC;IACH,CAAC;IAED,CAAC,OAAO,CAAC,MAAsC;QAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC7C,MAAM,EAAC,IAAI,EAAC,GAAG,YAAY,CAAC;QAC5B,MAAM,MAAM,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;QACnE,MAAM,mBAAmB,GAAG,CAAC,CAAsB,EAAE,EAAE,CACrD,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC;QAE/B,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,MAAM,GAAG;oBACP,IAAI,EAAE,MAAM;oBACZ,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,MAAM,EAAE,QAAQ;iBACjB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG;oBACP,IAAI,EAAE,KAAK;oBACX,GAAG,EAAE,MAAM,CAAC,GAAG;iBAChB,CAAC;YACJ,CAAC;QACH,CAAC;QAED,KAAK,MAAM,CAAC,IAAI,OAAO,CACrB,MAAM,EACN,MAAM,EACN,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAC3B,UAAU,EACV,mBAAmB,CACpB,EAAE,CAAC;YACF,MAAM,CAAC,CAAC;QACV,CAAC;QAED,KAAK,MAAM,EAAC,IAAI,EAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC5C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;gBACpB,KAAK,KAAK,CAAC,CAAC,CAAC;oBACX,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACnC,6CAA6C;oBAC7C,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,MAAM;gBACR,CAAC;gBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACd,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACxC,6CAA6C;oBAC7C,MAAM,CAAC,OAAO,CAAC,CAAC;oBAChB,MAAM;gBACR,CAAC;gBACD,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,mEAAmE;oBACnE,uCAAuC;oBAEvC,sEAAsE;oBACtE,iEAAiE;oBACjE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBAC3C,6CAA6C;oBAC7C,MAAM,CAAC,OAAO,CAAC,CAAC;oBAChB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACrB,MAAM;gBACR,CAAC;gBACD;oBACE,WAAW,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,QAAQ,CAAC,CAAC,sBAAsB,CAC9B,EAAgB,EAChB,UAAkC;IAElC,KAAK,MAAM,IAAI,IAAI,EAAE,EAAE,CAAC;QACtB,IAAI,UAAU,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9D,MAAM;QACR,CAAC;QACD,MAAM,IAAI,CAAC;IACb,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,kBAAkB,CAAC,EAAgB,EAAE,MAA6B;IAC1E,KAAK,MAAM,IAAI,IAAI,EAAE,EAAE,CAAC;QACtB,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC;QACb,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,OAAO,CACtB,MAAoB,EACpB,MAA6B,EAC7B,WAA2C,EAC3C,UAA4C,EAC5C,mBAAqD;IAErD,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,KAAK;YACR,MAAM,CACJ,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EACnB,GAAG,EAAE,CAAC,sBAAsB,SAAS,CAAC,MAAM,CAAC,EAAE,CAChD,CAAC;YACF,MAAM;QACR,KAAK,QAAQ;YACX,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,iBAAiB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACvE,MAAM;QACR,KAAK,MAAM;YACT,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,iBAAiB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1E,MAAM;QACR;YACE,WAAW,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IAED,KAAK,MAAM,CAAC,WAAW,EAAE,EAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAC,CAAC,IAAI,WAAW,EAAE,CAAC;QAC1E,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,SAAS,GAAG,KAAK,CAAC;YACtB,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,aAAa,EAAE,CAAC;gBAC5C,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;oBAChC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;wBACtD,SAAS,GAAG,IAAI,CAAC;wBACjB,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;gBAC/B,mBAAmB,CAAC;oBAClB,WAAW;oBACX,MAAM,EAAE;wBACN,IAAI,EAAE,QAAQ;wBACd,GAAG,EAAE,MAAM,CAAC,MAAM;qBACnB;iBACF,CAAC,CAAC;gBACH,MAAM,YAAY,GAAiB;oBACjC,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE;wBACJ,GAAG,EAAE,MAAM,CAAC,MAAM;wBAClB,aAAa,EAAE,EAAE;qBAClB;iBACF,CAAC;gBACF,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;gBACrD,KAAK,CAAC;gBACN,mBAAmB,CAAC,SAAS,CAAC,CAAC;gBAC/B,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;gBAClC,MAAM,SAAS,GAAc;oBAC3B,IAAI,EAAE,KAAK;oBACX,IAAI,EAAE;wBACJ,GAAG,EAAE,MAAM,CAAC,GAAG;wBACf,aAAa,EAAE,EAAE;qBAClB;iBACF,CAAC;gBACF,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;gBAClD,KAAK,CAAC;YACR,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;gBAClC,MAAM,YAAY,GAChB,MAAM,CAAC,IAAI,KAAK,MAAM;oBACpB,CAAC,CAAC;wBACE,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,OAAO,EAAE;4BACP,GAAG,EAAE,MAAM,CAAC,MAAM;4BAClB,aAAa,EAAE,EAAE;yBAClB;wBACD,IAAI,EAAE;4BACJ,GAAG,EAAE,MAAM,CAAC,GAAG;4BACf,aAAa,EAAE,EAAE;yBAClB;qBACF;oBACH,CAAC,CAAC;wBACE,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,IAAI,EAAE;4BACJ,GAAG,EAAE,MAAM,CAAC,GAAG;4BACf,aAAa,EAAE,EAAE;yBAClB;qBACF,CAAC;gBACR,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;gBACrD,KAAK,CAAC;YACR,CAAC;QACH,CAAC;IACH,CAAC;IACD,UAAU,CAAC,SAAS,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,iBAAiB,CAChC,KAAqB,EACrB,KAAwB,EACxB,OAAqC;IAErC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,CAAC,CAAC,KAAK,CAAC;QACb,OAAO;IACT,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBACzB,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;oBACtC,OAAO,GAAG,IAAI,CAAC;gBACjB,CAAC;YACH,CAAC;iBAAM,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;gBACnC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrC,OAAO,GAAG,IAAI,CAAC;gBACjB,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,CAAC;QACb,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,SAAS,CAAC,CAAC,mBAAmB,CAClC,OAAwB,EACxB,IAAmB,EACnB,UAAkC,EAClC,OAA4B,EAC5B,gBAAqC,EACrC,eAAuB,EACvB,OAAmB,EACnB,eAAmD;IAEnD,IAAI,cAAc,GAAwB,SAAS,CAAC;IACpD,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,WAAW,KAAK,eAAe,EAAE,CAAC;QACzE,cAAc,GAAG,gBAAgB,CAAC;IACpC,CAAC;SAAM,IAAI,OAAO,IAAI,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QAC7D,cAAc,GAAG,OAAO,CAAC;IAC3B,CAAC;IACD,MAAM,QAAQ,GAAG,eAAe,CAC9B,OAAO,EACP,UAAU,EACV,cAAc,EACd,OAAO,EACP,eAAe,CAChB,CAAC;IACF,KAAK,CAAC,CAAC,wBAAwB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,eAAe,CACtB,OAAwB,EACxB,UAAkC,EAClC,OAA4B,EAC5B,OAAmB,EACnB,eAAmD;IAEnD,IAAI,QAAQ,GAAa;QACvB,GAAG,EAAE,SAAS;QACd,MAAM,EAAE,SAAS;KAClB,CAAC;IACF,QAAQ,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7B,KAAK,KAAK;YACR,QAAQ,GAAG;gBACT,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG;gBACvB,MAAM,EAAE,SAAS;aAClB,CAAC;YACF,MAAM;QACR,KAAK,QAAQ;YACX,QAAQ,GAAG;gBACT,GAAG,EAAE,SAAS;gBACd,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG;aAC3B,CAAC;YACF,MAAM;QACR,KAAK,MAAM;YACT,QAAQ,GAAG;gBACT,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG;gBACvB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM;aAC9B,CAAC;YACF,MAAM;IACV,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,qBAAqB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACpB,QAAQ,GAAG,0BAA0B,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,OAAO,EAAC,kBAAkB,IAAI,yBAAyB,EAAC,CAAC;AAEzD,SAAS,kBAAkB,CACzB,EAAC,GAAG,EAAE,MAAM,EAAW,EACvB,OAAY,EACZ,OAAmB;IAEnB,MAAM,wBAAwB,GAAG,CAAC,GAAoB,EAAE,EAAE,CACxD,GAAG,KAAK,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;IACnE,OAAO;QACL,GAAG,EAAE,wBAAwB,CAAC,GAAG,CAAC;QAClC,MAAM,EAAE,wBAAwB,CAAC,MAAM,CAAC;KACzC,CAAC;AACJ,CAAC;AAED,OAAO,EAAC,qBAAqB,IAAI,4BAA4B,EAAC,CAAC;AAE/D,SAAS,qBAAqB,CAC5B,EAAC,GAAG,EAAE,MAAM,EAAW,EACvB,UAAsB;IAEtB,MAAM,gCAAgC,GAAG,CAAC,GAAoB,EAAE,EAAE,CAChE,GAAG,KAAK,SAAS,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,GAAG,CAAC;QACzD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,GAAG,CAAC;IAEV,OAAO;QACL,GAAG,EAAE,gCAAgC,CAAC,GAAG,CAAC;QAC1C,MAAM,EAAE,gCAAgC,CAAC,MAAM,CAAC;KACjD,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,EAAC,GAAG,EAAE,MAAM,EAAW,EACvB,eAAkD;IAElD,MAAM,4BAA4B,GAAG,CAAC,GAAoB,EAAE,EAAE,CAC5D,GAAG,KAAK,SAAS,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;IAE/D,OAAO;QACL,GAAG,EAAE,4BAA4B,CAAC,GAAG,CAAC;QACtC,MAAM,EAAE,4BAA4B,CAAC,MAAM,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,wBAAwB,CACvC,WAA0B,EAC1B,QAAkB,EAClB,OAAqC;IAErC,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,oBAAoB,GAAG,KAAK,CAAC;IACjC,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,IAAI,CAAC,iBAAiB,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACvC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACZ,iBAAiB,GAAG,IAAI,CAAC;gBACzB,MAAM,EAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,oBAAoB,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC1C,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;gBACd,oBAAoB,GAAG,IAAI,CAAC;gBAC5B,SAAS;YACX,CAAC;QACH,CAAC;QACD,MAAM,EAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,iBAAiB,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;QACvC,MAAM,EAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AASD,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAErC,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAGrC,SAAS,mBAAmB,CAAC,IAAc;IACzC,OAAO,CAAC,CAAW,EAAE,CAAW,EAAE,EAAE;QAClC,gCAAgC;QAChC,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;YACzB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1C,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;gBACd,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YACzC,CAAC;QACH,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,CAAQ,EAAE,CAAQ;IACvC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACZ,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnB,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnB,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnB,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnB,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IACD,OAAO,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7B,CAAC;AAED,QAAQ,CAAC,CAAC,YAAY,CACpB,IAAmB,EACnB,SAA+B,EAC/B,OAA4B;IAE5B,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,YAAY,CAAC,CACxD,SAA4B,CAC7B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAoB;IAC5C,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACrC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CACzC,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"memory-source.js","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { toStaticParam, type Condition, type LiteralValue, type Parameter, type SimpleOperator } from '../../../zero-protocol/src/ast.ts';
|
|
2
2
|
import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
|
|
3
|
-
import type { AvailableRelationships, DestTableName, GetFilterType,
|
|
3
|
+
import type { AvailableRelationships, DestTableName, GetFilterType, NoCompoundTypeSelector, PullTableSchema, Query } from './query.ts';
|
|
4
4
|
export type ParameterReference = {
|
|
5
5
|
[toStaticParam](): Parameter;
|
|
6
6
|
};
|
|
@@ -27,8 +27,8 @@ export declare class ExpressionBuilder<TSchema extends Schema, TTable extends ke
|
|
|
27
27
|
#private;
|
|
28
28
|
constructor(exists: (relationship: string, cb?: (query: Query<TSchema, TTable>) => Query<TSchema, any>) => Condition);
|
|
29
29
|
get eb(): this;
|
|
30
|
-
cmp<TSelector extends
|
|
31
|
-
cmp<TSelector extends
|
|
30
|
+
cmp<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>, TOperator extends SimpleOperator>(field: TSelector, op: TOperator, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, TOperator> | ParameterReference): Condition;
|
|
31
|
+
cmp<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>>(field: TSelector, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, '='> | ParameterReference): Condition;
|
|
32
32
|
cmpLit(left: ParameterReference | LiteralValue, op: SimpleOperator, right: ParameterReference | LiteralValue): Condition;
|
|
33
33
|
and: typeof and;
|
|
34
34
|
or: typeof or;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/expression.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,cAAc,EACpB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oDAAoD,CAAC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EACtB,aAAa,EACb,aAAa,EACb,
|
|
1
|
+
{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/expression.ts"],"names":[],"mappings":"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"}
|