@rocicorp/zero 0.19.2025043001 → 0.19.2025050200
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/analyze-query/src/bin-analyze.js +32 -8
- package/out/analyze-query/src/bin-analyze.js.map +1 -1
- package/out/ast-to-zql/src/ast-to-zql.d.ts.map +1 -1
- package/out/ast-to-zql/src/ast-to-zql.js +7 -1
- package/out/ast-to-zql/src/ast-to-zql.js.map +1 -1
- package/out/{chunk-FIIHDLSZ.js → chunk-CS2KC2W3.js} +55 -23
- package/out/chunk-CS2KC2W3.js.map +7 -0
- package/out/{chunk-T42I73ZN.js → chunk-O6HWBJKG.js} +2 -2
- package/out/{chunk-CV5PHAED.js → chunk-ZJUS7BHH.js} +11 -8
- package/out/chunk-ZJUS7BHH.js.map +7 -0
- package/out/{inspector-RKVBTGL6.js → inspector-2LQODK6W.js} +9 -4
- package/out/inspector-2LQODK6W.js.map +7 -0
- package/out/otel/src/log-options.d.ts +4 -0
- package/out/otel/src/log-options.d.ts.map +1 -1
- package/out/otel/src/log-options.js +7 -0
- package/out/otel/src/log-options.js.map +1 -1
- package/out/react.js +1 -1
- package/out/solid.js +3 -3
- package/out/zero-cache/src/config/zero-config.d.ts +16 -7
- package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
- package/out/zero-cache/src/config/zero-config.js +1 -1
- package/out/zero-cache/src/config/zero-config.js.map +1 -1
- package/out/zero-cache/src/scripts/permissions.d.ts +4 -0
- package/out/zero-cache/src/scripts/permissions.d.ts.map +1 -1
- package/out/zero-cache/src/server/logging.d.ts +1 -0
- package/out/zero-cache/src/server/logging.d.ts.map +1 -1
- package/out/zero-cache/src/server/logging.js +19 -2
- package/out/zero-cache/src/server/logging.js.map +1 -1
- package/out/zero-cache/src/server/otel-log-sink.d.ts +8 -0
- package/out/zero-cache/src/server/otel-log-sink.d.ts.map +1 -0
- package/out/zero-cache/src/server/otel-log-sink.js +50 -0
- package/out/zero-cache/src/server/otel-log-sink.js.map +1 -0
- package/out/zero-cache/src/server/otel-start.d.ts +7 -0
- package/out/zero-cache/src/server/otel-start.d.ts.map +1 -0
- package/out/zero-cache/src/server/otel-start.js +60 -0
- package/out/zero-cache/src/server/otel-start.js.map +1 -0
- package/out/zero-cache/src/server/runner/config.d.ts +5 -3
- package/out/zero-cache/src/server/runner/config.d.ts.map +1 -1
- package/out/zero-cache/src/server/syncer.d.ts.map +1 -1
- package/out/zero-cache/src/server/syncer.js +2 -42
- package/out/zero-cache/src/server/syncer.js.map +1 -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.map +1 -1
- package/out/zero-client/src/client/custom.d.ts +2 -2
- package/out/zero-client/src/client/custom.d.ts.map +1 -1
- package/out/zero-client/src/client/mutation-tracker.d.ts.map +1 -1
- package/out/zero-pg/src/mod.d.ts +3 -3
- package/out/zero-pg/src/mod.d.ts.map +1 -1
- package/out/zero-pg/src/mod.js +2 -2
- package/out/zero-pg/src/mod.js.map +1 -1
- package/out/zero-pg/src/{zql-postgresjs-provider.d.ts → postgresjs-connection.d.ts} +6 -2
- package/out/zero-pg/src/postgresjs-connection.d.ts.map +1 -0
- package/out/zero-pg/src/{zql-postgresjs-provider.js → postgresjs-connection.js} +6 -2
- package/out/zero-pg/src/postgresjs-connection.js.map +1 -0
- package/out/zero-pg/src/push-processor.d.ts +7 -3
- package/out/zero-pg/src/push-processor.d.ts.map +1 -1
- package/out/zero-pg/src/push-processor.js.map +1 -1
- package/out/zero-pg/src/query.d.ts +2 -3
- package/out/zero-pg/src/query.d.ts.map +1 -1
- package/out/zero-pg/src/query.js +3 -4
- package/out/zero-pg/src/query.js.map +1 -1
- package/out/zero-pg/src/zql-database.d.ts +17 -0
- package/out/zero-pg/src/zql-database.d.ts.map +1 -0
- package/out/zero-pg/src/{zql-provider.js → zql-database.js} +9 -2
- package/out/zero-pg/src/zql-database.js.map +1 -0
- package/out/zero.js +3 -3
- package/out/zql/src/query/assert-no-not-exists.d.ts +17 -0
- package/out/zql/src/query/assert-no-not-exists.d.ts.map +1 -0
- package/out/zql/src/query/assert-no-not-exists.js +40 -0
- package/out/zql/src/query/assert-no-not-exists.js.map +1 -0
- package/out/zql/src/query/query-impl.d.ts +5 -5
- package/out/zql/src/query/query-impl.d.ts.map +1 -1
- package/out/zql/src/query/query-impl.js +32 -22
- package/out/zql/src/query/query-impl.js.map +1 -1
- package/out/zql/src/query/static-query.d.ts +3 -3
- package/out/zql/src/query/static-query.d.ts.map +1 -1
- package/out/zql/src/query/static-query.js +5 -3
- package/out/zql/src/query/static-query.js.map +1 -1
- package/package.json +5 -2
- package/out/chunk-CV5PHAED.js.map +0 -7
- package/out/chunk-FIIHDLSZ.js.map +0 -7
- package/out/inspector-RKVBTGL6.js.map +0 -7
- package/out/zero-pg/src/zql-postgresjs-provider.d.ts.map +0 -1
- package/out/zero-pg/src/zql-postgresjs-provider.js.map +0 -1
- package/out/zero-pg/src/zql-provider.d.ts +0 -10
- package/out/zero-pg/src/zql-provider.d.ts.map +0 -1
- package/out/zero-pg/src/zql-provider.js.map +0 -1
- /package/out/{chunk-T42I73ZN.js.map → chunk-O6HWBJKG.js.map} +0 -0
|
@@ -9,7 +9,7 @@ import { must } from "../../shared/src/must.js";
|
|
|
9
9
|
import { parseOptions } from "../../shared/src/options.js";
|
|
10
10
|
import * as v from "../../shared/src/valita.js";
|
|
11
11
|
import { transformAndHashQuery } from "../../zero-cache/src/auth/read-authorizer.js";
|
|
12
|
-
import { appOptions, shardOptions, ZERO_ENV_VAR_PREFIX, zeroOptions, } from "../../zero-cache/src/config/zero-config.js";
|
|
12
|
+
import { appOptions, normalizeZeroConfig, shardOptions, ZERO_ENV_VAR_PREFIX, zeroOptions, } from "../../zero-cache/src/config/zero-config.js";
|
|
13
13
|
import { loadSchemaAndPermissions } from "../../zero-cache/src/scripts/permissions.js";
|
|
14
14
|
import { pgClient } from "../../zero-cache/src/types/pg.js";
|
|
15
15
|
import { getShardID, upstreamSchema } from "../../zero-cache/src/types/shards.js";
|
|
@@ -68,14 +68,32 @@ const options = {
|
|
|
68
68
|
db: {
|
|
69
69
|
type: v.string().optional(),
|
|
70
70
|
desc: [
|
|
71
|
-
'Connection URL to the CVR database. Required if using a query hash.',
|
|
71
|
+
'Connection URL to the CVR database. Required if using a query hash. ',
|
|
72
|
+
'Will attempt to be set to your upstream db if this option is not specified.',
|
|
73
|
+
'If your upstream db does not have a schema for the cvr, you must provide this in ',
|
|
74
|
+
'order to use the hash option.',
|
|
72
75
|
],
|
|
73
76
|
},
|
|
74
77
|
},
|
|
75
78
|
app: appOptions,
|
|
76
79
|
shard: shardOptions,
|
|
80
|
+
// This args is hidden as it is only present to:
|
|
81
|
+
// 1. Parse it out of the env if it exists
|
|
82
|
+
// 2. Use it to default the `cvr` to `upstream` if `cvr` is not provided
|
|
83
|
+
upstream: Object.fromEntries(Object.entries(zeroOptions.upstream).map(([key, value]) => [
|
|
84
|
+
key,
|
|
85
|
+
{
|
|
86
|
+
...value,
|
|
87
|
+
type: value.type.optional(),
|
|
88
|
+
hidden: true,
|
|
89
|
+
},
|
|
90
|
+
])),
|
|
77
91
|
};
|
|
78
|
-
const config = parseOptions(options,
|
|
92
|
+
const config = normalizeZeroConfig(parseOptions(options,
|
|
93
|
+
// the command line parses drops all text after the first newline
|
|
94
|
+
// so we need to replace newlines with spaces
|
|
95
|
+
// before parsing
|
|
96
|
+
process.argv.slice(2).map(s => s.replaceAll('\n', ' ')), ZERO_ENV_VAR_PREFIX));
|
|
79
97
|
runtimeDebugFlags.trackRowsVended = true;
|
|
80
98
|
const lc = createSilentLogContext();
|
|
81
99
|
const db = new Database(lc, config.replicaFile);
|
|
@@ -124,7 +142,8 @@ const host = {
|
|
|
124
142
|
let start;
|
|
125
143
|
let end;
|
|
126
144
|
if (config.ast) {
|
|
127
|
-
|
|
145
|
+
// the user likely has a transformed AST since the wire and storage formats are the transformed AST
|
|
146
|
+
[start, end] = await runAst(JSON.parse(config.ast), true);
|
|
128
147
|
}
|
|
129
148
|
else if (config.query) {
|
|
130
149
|
[start, end] = await runQuery(config.query);
|
|
@@ -135,7 +154,7 @@ else if (config.hash) {
|
|
|
135
154
|
else {
|
|
136
155
|
throw new Error('No query or AST or hash provided');
|
|
137
156
|
}
|
|
138
|
-
async function runAst(ast) {
|
|
157
|
+
async function runAst(ast, isTransformed) {
|
|
139
158
|
if (config.applyPermissions) {
|
|
140
159
|
const authData = config.authData ? JSON.parse(config.authData) : {};
|
|
141
160
|
if (!config.authData) {
|
|
@@ -145,7 +164,12 @@ async function runAst(ast) {
|
|
|
145
164
|
console.log(chalk.blue.bold('\n\n=== Query After Permissions: ===\n'));
|
|
146
165
|
console.log(await formatOutput(ast.table + astToZQL(ast)));
|
|
147
166
|
}
|
|
148
|
-
const pipeline = buildPipeline(ast,
|
|
167
|
+
const pipeline = buildPipeline(ast, isTransformed
|
|
168
|
+
? {
|
|
169
|
+
...host,
|
|
170
|
+
mapAst: (ast) => ast,
|
|
171
|
+
}
|
|
172
|
+
: host);
|
|
149
173
|
const output = new Catch(pipeline);
|
|
150
174
|
const start = performance.now();
|
|
151
175
|
output.fetch();
|
|
@@ -162,7 +186,7 @@ function runQuery(queryString) {
|
|
|
162
186
|
const f = new Function('z', `return z.query.${queryString};`);
|
|
163
187
|
const q = f(z);
|
|
164
188
|
const ast = completedAST(q);
|
|
165
|
-
return runAst(ast);
|
|
189
|
+
return runAst(ast, false);
|
|
166
190
|
}
|
|
167
191
|
async function runHash(hash) {
|
|
168
192
|
const cvrDB = pgClient(lc, must(config.cvr.db, 'CVR DB must be provided when using the hash option'));
|
|
@@ -171,7 +195,7 @@ async function runHash(hash) {
|
|
|
171
195
|
console.log('ZQL from Hash:');
|
|
172
196
|
const ast = rows[0].clientAST;
|
|
173
197
|
console.log(await formatOutput(ast.table + astToZQL(ast)));
|
|
174
|
-
return runAst(ast);
|
|
198
|
+
return runAst(ast, true);
|
|
175
199
|
}
|
|
176
200
|
console.log(chalk.blue.bold('=== Query Stats: ===\n'));
|
|
177
201
|
showStats();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin-analyze.js","sourceRoot":"","sources":["../../../../analyze-query/src/bin-analyze.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,yBAAyB,CAAC;AACjC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,QAAQ,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,aAAa,EAAC,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAC,sBAAsB,EAAC,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAC,MAAM,8CAA8C,CAAC;AACnF,OAAO,EACL,UAAU,EACV,YAAY,EACZ,mBAAmB,EACnB,WAAW,GACZ,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,wBAAwB,EAAC,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,MAAM,sCAAsC,CAAC;AAChF,OAAO,EACL,MAAM,GAGP,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,cAAc,EACd,cAAc,GACf,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAC,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAC,KAAK,EAAC,MAAM,4BAA4B,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,qCAAqC,CAAC;AAElE,OAAO,EACL,YAAY,EACZ,QAAQ,GAET,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAA0B,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAChD,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAE7D,MAAM,OAAO,GAAG;IACd,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;IACrC,GAAG,EAAE;QACH,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE;YACJ,mFAAmF;SACpF;KACF;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE;YACJ,0EAA0E;YAC1E,gDAAgD;SACjD;KACF;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE;YACJ,uFAAuF;YACvF,gDAAgD;YAChD,iGAAiG;YACjG,8FAA8F;SAC/F;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;QACvC,IAAI,EAAE,CAAC,0BAA0B,CAAC;KACnC;IACD,gBAAgB,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;QAChC,IAAI,EAAE;YACJ,6EAA6E;SAC9E;KACF;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE;YACJ,wCAAwC;YACxC,wFAAwF;SACzF;KACF;IACD,GAAG,EAAE;QACH,EAAE,EAAE;YACF,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC3B,IAAI,EAAE;gBACJ,
|
|
1
|
+
{"version":3,"file":"bin-analyze.js","sourceRoot":"","sources":["../../../../analyze-query/src/bin-analyze.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,yBAAyB,CAAC;AACjC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,QAAQ,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,aAAa,EAAC,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAC,sBAAsB,EAAC,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAC,MAAM,8CAA8C,CAAC;AACnF,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,YAAY,EACZ,mBAAmB,EACnB,WAAW,GACZ,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,wBAAwB,EAAC,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,MAAM,sCAAsC,CAAC;AAChF,OAAO,EACL,MAAM,GAGP,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,cAAc,EACd,cAAc,GACf,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAC,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAC,KAAK,EAAC,MAAM,4BAA4B,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,qCAAqC,CAAC;AAElE,OAAO,EACL,YAAY,EACZ,QAAQ,GAET,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAA0B,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAChD,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAE7D,MAAM,OAAO,GAAG;IACd,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;IACrC,GAAG,EAAE;QACH,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE;YACJ,mFAAmF;SACpF;KACF;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE;YACJ,0EAA0E;YAC1E,gDAAgD;SACjD;KACF;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE;YACJ,uFAAuF;YACvF,gDAAgD;YAChD,iGAAiG;YACjG,8FAA8F;SAC/F;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;QACvC,IAAI,EAAE,CAAC,0BAA0B,CAAC;KACnC;IACD,gBAAgB,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;QAChC,IAAI,EAAE;YACJ,6EAA6E;SAC9E;KACF;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE;YACJ,wCAAwC;YACxC,wFAAwF;SACzF;KACF;IACD,GAAG,EAAE;QACH,EAAE,EAAE;YACF,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC3B,IAAI,EAAE;gBACJ,sEAAsE;gBACtE,6EAA6E;gBAC7E,mFAAmF;gBACnF,+BAA+B;aAChC;SACF;KACF;IACD,GAAG,EAAE,UAAU;IACf,KAAK,EAAE,YAAY;IAEnB,gDAAgD;IAChD,0CAA0C;IAC1C,wEAAwE;IACxE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAC1B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACzD,GAAG;QACH;YACE,GAAG,KAAK;YACR,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC3B,MAAM,EAAE,IAAI;SACb;KACF,CAAC,CACuC;CAC5C,CAAC;AAEF,MAAM,MAAM,GAAG,mBAAmB,CAChC,YAAY,CACV,OAAO;AACP,iEAAiE;AACjE,6CAA6C;AAC7C,iBAAiB;AACjB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EACvD,mBAAmB,CACpB,CACF,CAAC;AAEF,iBAAiB,CAAC,eAAe,GAAG,IAAI,CAAC;AAEzC,MAAM,EAAE,GAAG,sBAAsB,EAAE,CAAC;AAEpC,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;AAChD,MAAM,EAAC,MAAM,EAAE,WAAW,EAAC,GAAG,MAAM,wBAAwB,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAChF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAC;AAC/C,MAAM,oBAAoB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC3D,MAAM,oBAAoB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC3D,MAAM,IAAI,GAAkB;IAC1B,MAAM,CAAC,GAAQ;QACb,OAAO,MAAM,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC;IAC3C,CAAC;IACD,SAAS,EAAE,CAAC,eAAuB,EAAE,EAAE;QACrC,MAAM,eAAe,GAAG,oBAAoB,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACxE,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,GAAG,IAAI,WAAW,CACtB,EAAE,EACF,aAAa,EACb,EAAE,EACF,EAAE,EACF,eAAe,EACf,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CACxD,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;YACrB,oBAAoB,CAAC,UAAU,CAAC,eAAe,EAAE,OAAO,CAAC;YACzD,MAAM;SACP,CACF,CACF,EACD,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAClD,oBAAoB,CAAC,UAAU,CAAC,eAAe,EAAE,GAAG,CAAC,CAC5B,CAC5B,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,aAAa;QACX,wBAAwB;QACxB,OAAO,IAAI,aAAa,EAAE,CAAC;IAC7B,CAAC;IACD,aAAa,CAAC,KAAY;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,cAAc;QACZ,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IAClB,CAAC;IACD,iBAAiB,KAAI,CAAC;IACtB,mBAAmB,KAAI,CAAC;IACxB,mBAAmB;QACjB,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IAClB,CAAC;IACD,gBAAgB,CAAI,gBAAyB;QAC3C,OAAO,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IACD,qBAAqB,KAAI,CAAC;IAC1B,oBAAoB,EAAE,IAAI;CAC3B,CAAC;AAEF,IAAI,KAAa,CAAC;AAClB,IAAI,GAAW,CAAC;AAEhB,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;IACf,mGAAmG;IACnG,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;AAC5D,CAAC;KAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9C,CAAC;KAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC;KAAM,CAAC;IACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;AACtD,CAAC;AAED,KAAK,UAAU,MAAM,CACnB,GAAQ,EACR,aAAsB;IAEtB,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,MAAM,CACV,2GAA2G,CAC5G,CACF,CAAC;QACJ,CAAC;QACD,GAAG,GAAG,qBAAqB,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC;QACzE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC,CAAC;QACvE,OAAO,CAAC,GAAG,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,QAAQ,GAAG,aAAa,CAC5B,GAAG,EACH,aAAa;QACX,CAAC,CAAC;YACE,GAAG,IAAI;YACP,MAAM,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG;SAC1B;QACH,CAAC,CAAC,IAAI,CACT,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEnC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,CAAC;IACf,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAC9B,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,WAAmB;IACnC,MAAM,CAAC,GAAG;QACR,KAAK,EAAE,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YAC5C,IAAI;YACJ,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC;SAC7B,CAAC,CACH;KACF,CAAC;IAEF,MAAM,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG,EAAE,kBAAkB,WAAW,GAAG,CAAC,CAAC;IAC9D,MAAM,CAAC,GAAmD,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/D,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAC5B,OAAO,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAC5B,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,IAAY;IACjC,MAAM,KAAK,GAAG,QAAQ,CACpB,EAAE,EACF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,oDAAoD,CAAC,CAC1E,CAAC;IAEF,MAAM,IAAI,GACR,MAAM,KAAK,CAAA,uCAAuC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,kCAAkC,IAAI,CACxI,IAAI,CACL,WAAW,CAAC;IACf,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;IAElB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAgB,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAE3D,OAAO,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC3B,CAAC;AAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC;AACvD,SAAS,EAAE,CAAC;AACZ,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC;AAC3D,cAAc,EAAE,CAAC;AAEjB,SAAS,SAAS;IAChB,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAC5B,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG;YACd,GAAG,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE;gBACnE,EAAE,CAAC;SACN,CAAC;QACF,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACzE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,EACpC,mBAAmB,CAAC,mBAAmB,CAAC,CACzC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,GAAG,GAAG,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,cAAc;IACrB,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACtC,MAAM,OAAO,GACX,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACvE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;YACxC,OAAO,CAAC,GAAG,CACT,EAAE;gBACA,yDAAyD;gBACzD,iFAAiF;gBACjF,gFAAgF;iBAC/E,OAAO,CAAC,sBAAsB,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC;iBACjE,GAAG,EAAoB;iBACvB,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;iBAC5C,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,QAAgB;IACjC,IAAI,QAAQ,GAAG,GAAG,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACjD,CAAC;SAAM,IAAI,QAAQ,GAAG,IAAI,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,mBAAmB,CAAC,CAAS;IACpC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;QACb,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,YAAY,CAAC,GAAW,EAAE,CAAS;IAC1C,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-to-zql.d.ts","sourceRoot":"","sources":["../../../../ast-to-zql/src/ast-to-zql.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,GAAG,EAWJ,MAAM,gCAAgC,CAAC;AAGxC;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"ast-to-zql.d.ts","sourceRoot":"","sources":["../../../../ast-to-zql/src/ast-to-zql.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,GAAG,EAWJ,MAAM,gCAAgC,CAAC;AAGxC;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAyCzC"}
|
|
@@ -20,7 +20,13 @@ export function astToZQL(ast) {
|
|
|
20
20
|
// Handle related subqueries
|
|
21
21
|
if (ast.related && ast.related.length > 0) {
|
|
22
22
|
for (const related of ast.related) {
|
|
23
|
-
if (
|
|
23
|
+
if (related.hidden) {
|
|
24
|
+
const nestedRelated = related.subquery.related?.[0];
|
|
25
|
+
if (nestedRelated) {
|
|
26
|
+
code += transformRelated(nestedRelated);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
24
30
|
code += transformRelated(related);
|
|
25
31
|
}
|
|
26
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-to-zql.js","sourceRoot":"","sources":["../../../../ast-to-zql/src/ast-to-zql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAc9C,OAAO,EAAC,WAAW,EAAC,MAAM,mCAAmC,CAAC;AAE9D;;;;;;;;;GASG;AACH,MAAM,UAAU,QAAQ,CAAC,GAAQ;IAC/B,IAAI,IAAI,GAAG,EAAE,CAAC;IAEd,0BAA0B;IAC1B,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,IAAI,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,4BAA4B;IAC5B,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAClC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"ast-to-zql.js","sourceRoot":"","sources":["../../../../ast-to-zql/src/ast-to-zql.ts"],"names":[],"mappings":"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"}
|
|
@@ -2949,6 +2949,30 @@ var ArrayView = class {
|
|
|
2949
2949
|
}
|
|
2950
2950
|
};
|
|
2951
2951
|
|
|
2952
|
+
// ../zql/src/query/assert-no-not-exists.ts
|
|
2953
|
+
function assertNoNotExists(condition) {
|
|
2954
|
+
switch (condition.type) {
|
|
2955
|
+
case "simple":
|
|
2956
|
+
return;
|
|
2957
|
+
case "correlatedSubquery":
|
|
2958
|
+
if (condition.op === "NOT EXISTS") {
|
|
2959
|
+
throw new Error("NOT EXISTS is not supported on the client");
|
|
2960
|
+
}
|
|
2961
|
+
if (condition.related.subquery.where) {
|
|
2962
|
+
assertNoNotExists(condition.related.subquery.where);
|
|
2963
|
+
}
|
|
2964
|
+
return;
|
|
2965
|
+
case "and":
|
|
2966
|
+
case "or":
|
|
2967
|
+
for (const c of condition.conditions) {
|
|
2968
|
+
assertNoNotExists(c);
|
|
2969
|
+
}
|
|
2970
|
+
return;
|
|
2971
|
+
default:
|
|
2972
|
+
unreachable(condition);
|
|
2973
|
+
}
|
|
2974
|
+
}
|
|
2975
|
+
|
|
2952
2976
|
// ../zql/src/query/expression.ts
|
|
2953
2977
|
var ExpressionBuilder = class {
|
|
2954
2978
|
#exists;
|
|
@@ -3167,17 +3191,21 @@ function staticParam(anchorClass, field) {
|
|
|
3167
3191
|
}
|
|
3168
3192
|
var SUBQ_PREFIX = "zsubq_";
|
|
3169
3193
|
var defaultFormat = { singular: false, relationships: {} };
|
|
3194
|
+
var systemSymbol = Symbol();
|
|
3195
|
+
var newQuerySymbol = Symbol();
|
|
3170
3196
|
var AbstractQuery = class {
|
|
3171
3197
|
#schema;
|
|
3172
3198
|
#tableName;
|
|
3173
3199
|
#ast;
|
|
3174
3200
|
format;
|
|
3175
3201
|
#hash = "";
|
|
3176
|
-
|
|
3202
|
+
#system;
|
|
3203
|
+
constructor(schema, tableName, ast, format, system) {
|
|
3177
3204
|
this.#schema = schema;
|
|
3178
3205
|
this.#tableName = tableName;
|
|
3179
3206
|
this.#ast = ast;
|
|
3180
3207
|
this.format = format;
|
|
3208
|
+
this.#system = system;
|
|
3181
3209
|
}
|
|
3182
3210
|
get [astSymbol]() {
|
|
3183
3211
|
return this.#ast;
|
|
@@ -3189,7 +3217,7 @@ var AbstractQuery = class {
|
|
|
3189
3217
|
return this.#hash;
|
|
3190
3218
|
}
|
|
3191
3219
|
one() {
|
|
3192
|
-
return this
|
|
3220
|
+
return this[newQuerySymbol](
|
|
3193
3221
|
this.#schema,
|
|
3194
3222
|
this.#tableName,
|
|
3195
3223
|
{
|
|
@@ -3216,7 +3244,7 @@ var AbstractQuery = class {
|
|
|
3216
3244
|
assert(related, "Invalid relationship");
|
|
3217
3245
|
if (isOneHop(related)) {
|
|
3218
3246
|
const { destSchema, destField, sourceField, cardinality } = related[0];
|
|
3219
|
-
let q = this
|
|
3247
|
+
let q = this[newQuerySymbol](
|
|
3220
3248
|
this.#schema,
|
|
3221
3249
|
destSchema,
|
|
3222
3250
|
{
|
|
@@ -3244,7 +3272,7 @@ var AbstractQuery = class {
|
|
|
3244
3272
|
sourceField.length === destField.length,
|
|
3245
3273
|
"The source and destination of a relationship must have the same number of fields"
|
|
3246
3274
|
);
|
|
3247
|
-
return this
|
|
3275
|
+
return this[newQuerySymbol](
|
|
3248
3276
|
this.#schema,
|
|
3249
3277
|
this.#tableName,
|
|
3250
3278
|
{
|
|
@@ -3252,7 +3280,7 @@ var AbstractQuery = class {
|
|
|
3252
3280
|
related: [
|
|
3253
3281
|
...this.#ast.related ?? [],
|
|
3254
3282
|
{
|
|
3255
|
-
system: this
|
|
3283
|
+
system: this.#system,
|
|
3256
3284
|
correlation: {
|
|
3257
3285
|
parentField: sourceField,
|
|
3258
3286
|
childField: destField
|
|
@@ -3278,7 +3306,7 @@ var AbstractQuery = class {
|
|
|
3278
3306
|
const { destSchema } = secondRelation;
|
|
3279
3307
|
const junctionSchema = firstRelation.destSchema;
|
|
3280
3308
|
const sq = cb(
|
|
3281
|
-
this
|
|
3309
|
+
this[newQuerySymbol](
|
|
3282
3310
|
this.#schema,
|
|
3283
3311
|
destSchema,
|
|
3284
3312
|
{
|
|
@@ -3295,7 +3323,7 @@ var AbstractQuery = class {
|
|
|
3295
3323
|
assert(isCompoundKey(firstRelation.destField), "Invalid relationship");
|
|
3296
3324
|
assert(isCompoundKey(secondRelation.sourceField), "Invalid relationship");
|
|
3297
3325
|
assert(isCompoundKey(secondRelation.destField), "Invalid relationship");
|
|
3298
|
-
return this
|
|
3326
|
+
return this[newQuerySymbol](
|
|
3299
3327
|
this.#schema,
|
|
3300
3328
|
this.#tableName,
|
|
3301
3329
|
{
|
|
@@ -3303,7 +3331,7 @@ var AbstractQuery = class {
|
|
|
3303
3331
|
related: [
|
|
3304
3332
|
...this.#ast.related ?? [],
|
|
3305
3333
|
{
|
|
3306
|
-
system: this
|
|
3334
|
+
system: this.#system,
|
|
3307
3335
|
correlation: {
|
|
3308
3336
|
parentField: firstRelation.sourceField,
|
|
3309
3337
|
childField: firstRelation.destField
|
|
@@ -3318,7 +3346,7 @@ var AbstractQuery = class {
|
|
|
3318
3346
|
),
|
|
3319
3347
|
related: [
|
|
3320
3348
|
{
|
|
3321
|
-
system: this
|
|
3349
|
+
system: this.#system,
|
|
3322
3350
|
correlation: {
|
|
3323
3351
|
parentField: secondRelation.sourceField,
|
|
3324
3352
|
childField: secondRelation.destField
|
|
@@ -3358,18 +3386,22 @@ var AbstractQuery = class {
|
|
|
3358
3386
|
if (existingWhere) {
|
|
3359
3387
|
cond = and(existingWhere, cond);
|
|
3360
3388
|
}
|
|
3361
|
-
|
|
3389
|
+
const where = dnf(cond);
|
|
3390
|
+
if (this.#system === "client") {
|
|
3391
|
+
assertNoNotExists(where);
|
|
3392
|
+
}
|
|
3393
|
+
return this[newQuerySymbol](
|
|
3362
3394
|
this.#schema,
|
|
3363
3395
|
this.#tableName,
|
|
3364
3396
|
{
|
|
3365
3397
|
...this.#ast,
|
|
3366
|
-
where
|
|
3398
|
+
where
|
|
3367
3399
|
},
|
|
3368
3400
|
this.format
|
|
3369
3401
|
);
|
|
3370
3402
|
}
|
|
3371
3403
|
start(row, opts) {
|
|
3372
|
-
return this
|
|
3404
|
+
return this[newQuerySymbol](
|
|
3373
3405
|
this.#schema,
|
|
3374
3406
|
this.#tableName,
|
|
3375
3407
|
{
|
|
@@ -3389,7 +3421,7 @@ var AbstractQuery = class {
|
|
|
3389
3421
|
if ((limit | 0) !== limit) {
|
|
3390
3422
|
throw new Error("Limit must be an integer");
|
|
3391
3423
|
}
|
|
3392
|
-
return this
|
|
3424
|
+
return this[newQuerySymbol](
|
|
3393
3425
|
this.#schema,
|
|
3394
3426
|
this.#tableName,
|
|
3395
3427
|
{
|
|
@@ -3400,7 +3432,7 @@ var AbstractQuery = class {
|
|
|
3400
3432
|
);
|
|
3401
3433
|
}
|
|
3402
3434
|
orderBy(field, direction) {
|
|
3403
|
-
return this
|
|
3435
|
+
return this[newQuerySymbol](
|
|
3404
3436
|
this.#schema,
|
|
3405
3437
|
this.#tableName,
|
|
3406
3438
|
{
|
|
@@ -3418,7 +3450,7 @@ var AbstractQuery = class {
|
|
|
3418
3450
|
assert(isCompoundKey(sourceField), "Invalid relationship");
|
|
3419
3451
|
assert(isCompoundKey(destField), "Invalid relationship");
|
|
3420
3452
|
const sq = cb(
|
|
3421
|
-
this
|
|
3453
|
+
this[newQuerySymbol](
|
|
3422
3454
|
this.#schema,
|
|
3423
3455
|
destSchema,
|
|
3424
3456
|
{
|
|
@@ -3431,7 +3463,7 @@ var AbstractQuery = class {
|
|
|
3431
3463
|
return {
|
|
3432
3464
|
type: "correlatedSubquery",
|
|
3433
3465
|
related: {
|
|
3434
|
-
system: this
|
|
3466
|
+
system: this.#system,
|
|
3435
3467
|
correlation: {
|
|
3436
3468
|
parentField: sourceField,
|
|
3437
3469
|
childField: destField
|
|
@@ -3453,7 +3485,7 @@ var AbstractQuery = class {
|
|
|
3453
3485
|
const { destSchema } = secondRelation;
|
|
3454
3486
|
const junctionSchema = firstRelation.destSchema;
|
|
3455
3487
|
const queryToDest = cb(
|
|
3456
|
-
this
|
|
3488
|
+
this[newQuerySymbol](
|
|
3457
3489
|
this.#schema,
|
|
3458
3490
|
destSchema,
|
|
3459
3491
|
{
|
|
@@ -3466,7 +3498,7 @@ var AbstractQuery = class {
|
|
|
3466
3498
|
return {
|
|
3467
3499
|
type: "correlatedSubquery",
|
|
3468
3500
|
related: {
|
|
3469
|
-
system: this
|
|
3501
|
+
system: this.#system,
|
|
3470
3502
|
correlation: {
|
|
3471
3503
|
parentField: firstRelation.sourceField,
|
|
3472
3504
|
childField: firstRelation.destField
|
|
@@ -3481,7 +3513,7 @@ var AbstractQuery = class {
|
|
|
3481
3513
|
where: {
|
|
3482
3514
|
type: "correlatedSubquery",
|
|
3483
3515
|
related: {
|
|
3484
|
-
system: this
|
|
3516
|
+
system: this.#system,
|
|
3485
3517
|
correlation: {
|
|
3486
3518
|
parentField: secondRelation.sourceField,
|
|
3487
3519
|
childField: secondRelation.destField
|
|
@@ -3541,14 +3573,13 @@ var completedAstSymbol = Symbol();
|
|
|
3541
3573
|
var QueryImpl = class _QueryImpl extends AbstractQuery {
|
|
3542
3574
|
#delegate;
|
|
3543
3575
|
constructor(delegate, schema, tableName, ast, format) {
|
|
3544
|
-
super(schema, tableName, ast, format);
|
|
3576
|
+
super(schema, tableName, ast, format, "client");
|
|
3545
3577
|
this.#delegate = delegate;
|
|
3546
3578
|
}
|
|
3547
|
-
_system = "client";
|
|
3548
3579
|
get [completedAstSymbol]() {
|
|
3549
3580
|
return this._completeAst();
|
|
3550
3581
|
}
|
|
3551
|
-
|
|
3582
|
+
[newQuerySymbol](schema, tableName, ast, format) {
|
|
3552
3583
|
return new _QueryImpl(this.#delegate, schema, tableName, ast, format);
|
|
3553
3584
|
}
|
|
3554
3585
|
materialize(factoryOrTTL, ttl = DEFAULT_TTL) {
|
|
@@ -3709,6 +3740,7 @@ export {
|
|
|
3709
3740
|
staticParam,
|
|
3710
3741
|
SUBQ_PREFIX,
|
|
3711
3742
|
defaultFormat,
|
|
3743
|
+
newQuerySymbol,
|
|
3712
3744
|
AbstractQuery
|
|
3713
3745
|
};
|
|
3714
|
-
//# sourceMappingURL=chunk-
|
|
3746
|
+
//# sourceMappingURL=chunk-CS2KC2W3.js.map
|