@rocicorp/zero 0.20.2025051501 → 0.20.2025051600

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.
Files changed (93) hide show
  1. package/out/{chunk-A64L6YZK.js → chunk-DN6AE4Z6.js} +5 -5
  2. package/out/{chunk-P3G5C3ZW.js → chunk-IKN2MNWU.js} +2 -2
  3. package/out/{chunk-ILWAR46C.js → chunk-MIYN75UK.js} +203 -274
  4. package/out/chunk-MIYN75UK.js.map +7 -0
  5. package/out/{inspector-B2ZMZ35Y.js → inspector-2QLL7CGJ.js} +3 -3
  6. package/out/otel/src/log-options.d.ts +0 -12
  7. package/out/otel/src/log-options.d.ts.map +1 -1
  8. package/out/otel/src/log-options.js +0 -21
  9. package/out/otel/src/log-options.js.map +1 -1
  10. package/out/react.js +1 -1
  11. package/out/solid.js +3 -3
  12. package/out/zero/src/zero-cache-dev.js +5 -1
  13. package/out/zero/src/zero-cache-dev.js.map +1 -1
  14. package/out/zero-cache/src/auth/read-authorizer.d.ts.map +1 -1
  15. package/out/zero-cache/src/auth/read-authorizer.js +2 -2
  16. package/out/zero-cache/src/auth/read-authorizer.js.map +1 -1
  17. package/out/zero-cache/src/auth/write-authorizer.d.ts.map +1 -1
  18. package/out/zero-cache/src/auth/write-authorizer.js +2 -2
  19. package/out/zero-cache/src/auth/write-authorizer.js.map +1 -1
  20. package/out/zero-cache/src/config/zero-config.d.ts +8 -24
  21. package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
  22. package/out/zero-cache/src/config/zero-config.js +11 -3
  23. package/out/zero-cache/src/config/zero-config.js.map +1 -1
  24. package/out/zero-cache/src/scripts/permissions.d.ts +0 -12
  25. package/out/zero-cache/src/scripts/permissions.d.ts.map +1 -1
  26. package/out/zero-cache/src/server/logging.d.ts.map +1 -1
  27. package/out/zero-cache/src/server/logging.js +2 -2
  28. package/out/zero-cache/src/server/logging.js.map +1 -1
  29. package/out/zero-cache/src/server/otel-log-sink.d.ts +1 -2
  30. package/out/zero-cache/src/server/otel-log-sink.d.ts.map +1 -1
  31. package/out/zero-cache/src/server/otel-log-sink.js +4 -5
  32. package/out/zero-cache/src/server/otel-log-sink.js.map +1 -1
  33. package/out/zero-cache/src/server/otel-start.d.ts +1 -6
  34. package/out/zero-cache/src/server/otel-start.d.ts.map +1 -1
  35. package/out/zero-cache/src/server/otel-start.js +54 -45
  36. package/out/zero-cache/src/server/otel-start.js.map +1 -1
  37. package/out/zero-cache/src/server/syncer.js +2 -2
  38. package/out/zero-cache/src/server/syncer.js.map +1 -1
  39. package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts +1 -0
  40. package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts.map +1 -1
  41. package/out/zero-cache/src/services/change-source/pg/initial-sync.js +61 -56
  42. package/out/zero-cache/src/services/change-source/pg/initial-sync.js.map +1 -1
  43. package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts.map +1 -1
  44. package/out/zero-cache/src/services/view-syncer/cvr-store.js +5 -4
  45. package/out/zero-cache/src/services/view-syncer/cvr-store.js.map +1 -1
  46. package/out/zero-cache/src/services/view-syncer/cvr.d.ts.map +1 -1
  47. package/out/zero-cache/src/services/view-syncer/cvr.js +6 -5
  48. package/out/zero-cache/src/services/view-syncer/cvr.js.map +1 -1
  49. package/out/zero-cache/src/services/view-syncer/schema/types.d.ts +8 -8
  50. package/out/zero-cache/src/services/view-syncer/schema/types.js +2 -2
  51. package/out/zero-cache/src/services/view-syncer/schema/types.js.map +1 -1
  52. package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts.map +1 -1
  53. package/out/zero-cache/src/services/view-syncer/view-syncer.js +5 -5
  54. package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
  55. package/out/zero-cache/src/types/lite.d.ts +2 -3
  56. package/out/zero-cache/src/types/lite.d.ts.map +1 -1
  57. package/out/zero-cache/src/types/lite.js +2 -3
  58. package/out/zero-cache/src/types/lite.js.map +1 -1
  59. package/out/zero.js +3 -3
  60. package/out/zql/src/builder/builder.d.ts.map +1 -1
  61. package/out/zql/src/builder/builder.js +19 -38
  62. package/out/zql/src/builder/builder.js.map +1 -1
  63. package/out/zql/src/builder/filter.d.ts.map +1 -1
  64. package/out/zql/src/builder/filter.js +12 -30
  65. package/out/zql/src/builder/filter.js.map +1 -1
  66. package/out/zql/src/query/expression.d.ts +2 -1
  67. package/out/zql/src/query/expression.d.ts.map +1 -1
  68. package/out/zql/src/query/expression.js +19 -0
  69. package/out/zql/src/query/expression.js.map +1 -1
  70. package/out/zql/src/query/query-impl.d.ts.map +1 -1
  71. package/out/zql/src/query/query-impl.js +2 -3
  72. package/out/zql/src/query/query-impl.js.map +1 -1
  73. package/package.json +2 -1
  74. package/out/chunk-ILWAR46C.js.map +0 -7
  75. package/out/otel/src/noop-metric-exporter.d.ts +0 -8
  76. package/out/otel/src/noop-metric-exporter.d.ts.map +0 -1
  77. package/out/otel/src/noop-metric-exporter.js +0 -11
  78. package/out/otel/src/noop-metric-exporter.js.map +0 -1
  79. package/out/otel/src/noop-span-exporter.d.ts +0 -8
  80. package/out/otel/src/noop-span-exporter.d.ts.map +0 -1
  81. package/out/otel/src/noop-span-exporter.js +0 -14
  82. package/out/otel/src/noop-span-exporter.js.map +0 -1
  83. package/out/zero-cache/src/db/pg-copy.d.ts +0 -26
  84. package/out/zero-cache/src/db/pg-copy.d.ts.map +0 -1
  85. package/out/zero-cache/src/db/pg-copy.js +0 -115
  86. package/out/zero-cache/src/db/pg-copy.js.map +0 -1
  87. package/out/zql/src/query/dnf.d.ts +0 -10
  88. package/out/zql/src/query/dnf.d.ts.map +0 -1
  89. package/out/zql/src/query/dnf.js +0 -57
  90. package/out/zql/src/query/dnf.js.map +0 -1
  91. /package/out/{chunk-A64L6YZK.js.map → chunk-DN6AE4Z6.js.map} +0 -0
  92. /package/out/{chunk-P3G5C3ZW.js.map → chunk-IKN2MNWU.js.map} +0 -0
  93. /package/out/{inspector-B2ZMZ35Y.js.map → inspector-2QLL7CGJ.js.map} +0 -0
package/out/zql/src/builder/builder.js CHANGED
@@ -103,7 +103,9 @@ function buildPipelineInternal(ast, delegate, name, partitionKey) {
103
103
  const splitEditKeys = partitionKey
104
104
  ? new Set(partitionKey)
105
105
  : new Set();
106
+ const aliases = new Set();
106
107
  for (const csq of csqsFromCondition) {
108
+ aliases.add(csq.subquery.alias || '');
107
109
  for (const key of csq.correlation.parentField) {
108
110
  splitEditKeys.add(key);
109
111
  }
@@ -196,11 +198,10 @@ export function isNotAndDoesNotContainSubquery(condition) {
196
198
  if (condition.type === 'correlatedSubquery') {
197
199
  return false;
198
200
  }
199
- if (condition.type === 'and') {
200
- return condition.conditions.every(isNotAndDoesNotContainSubquery);
201
+ if (condition.type === 'simple') {
202
+ return true;
201
203
  }
202
- assert(condition.type !== 'or', 'where conditions are expected to be in DNF');
203
- return true;
204
+ return condition.conditions.every(isNotAndDoesNotContainSubquery);
204
205
  }
205
206
  function applySimpleCondition(input, condition) {
206
207
  return new Filter(input, createPredicate(condition));
@@ -286,46 +287,26 @@ function uniquifyCorrelatedSubqueryConditionAliases(ast) {
286
287
  },
287
288
  },
288
289
  });
289
- const uniquifyAnd = (and) => {
290
- const conds = [];
291
- for (const cond of and.conditions) {
292
- if (cond.type === 'correlatedSubquery') {
293
- conds.push(uniquifyCorrelatedSubquery(cond));
294
- }
295
- else {
296
- conds.push(cond);
297
- }
298
- }
299
- return {
300
- ...and,
301
- conditions: conds,
302
- };
303
- };
304
- if (where.type === 'and') {
305
- return {
306
- ...ast,
307
- where: uniquifyAnd(where),
308
- };
309
- }
310
- // or
311
- const conds = [];
312
- for (const cond of where.conditions) {
290
+ const uniquify = (cond) => {
313
291
  if (cond.type === 'simple') {
314
- conds.push(cond);
292
+ return cond;
315
293
  }
316
294
  else if (cond.type === 'correlatedSubquery') {
317
- conds.push(uniquifyCorrelatedSubquery(cond));
295
+ return uniquifyCorrelatedSubquery(cond);
318
296
  }
319
- else if (cond.type === 'and') {
320
- conds.push(uniquifyAnd(cond));
297
+ const conditions = [];
298
+ for (const c of cond.conditions) {
299
+ conditions.push(uniquify(c));
321
300
  }
322
- }
323
- return {
301
+ return {
302
+ type: cond.type,
303
+ conditions,
304
+ };
305
+ };
306
+ const result = {
324
307
  ...ast,
325
- where: {
326
- ...where,
327
- conditions: conds,
328
- },
308
+ where: uniquify(where),
329
309
  };
310
+ return result;
330
311
  }
331
312
  //# sourceMappingURL=builder.js.map
package/out/zql/src/builder/builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../zql/src/builder/builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../zql/src/builder/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAEtD,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AAkBjD,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAC,KAAK,EAAC,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EACL,mBAAmB,GAEpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,eAAe,EAA2B,MAAM,aAAa,CAAC;AAsCtE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,aAAa,CAAC,GAAQ,EAAE,QAAyB;IAC/D,OAAO,qBAAqB,CAC1B,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAC5C,QAAQ,EACR,EAAE,CACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,GAAQ,EACR,qBAAwD;IAExD,MAAM,KAAK,GAAG,CAAC,IAAS,EAAO,EAAE,CAAC,CAAC;QACjC,GAAG,IAAI;QACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzD,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAChC,GAAG,EAAE;YACL,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC;SAC7B,CAAC,CAAC;KACJ,CAAC,CAAC;IAEH,SAAS,aAAa,CAAC,SAAoB;QACzC,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO;gBACL,GAAG,SAAS;gBACZ,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC/B,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,CAG/B;aACF,CAAC;QACJ,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YAC5C,OAAO;gBACL,GAAG,SAAS;gBACZ,OAAO,EAAE;oBACP,GAAG,SAAS,CAAC,OAAO;oBACpB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;iBAC5C;aACF,CAAC;QACJ,CAAC;QACD,OAAO;YACL,GAAG,SAAS;YACZ,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC;SACpD,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,KAAoB,EAAiB,EAAE;QACxD,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CACjB,qBAAqB,EACrB,kCAAkC,CACnC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YACxD,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,aAA6B;aACrC,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;AACpB,CAAC;AAED,SAAS,YAAY,CACnB,MAAmD,EACnD,KAAwB;IAExB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,8DAA8D;QAC9D,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAE,GAAW,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC;IACrE,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;AAC/B,CAAC;AAED,SAAS,WAAW,CAAC,KAAoB;IACvC,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AACjC,CAAC;AAED,SAAS,qBAAqB,CAC5B,GAAQ,EACR,QAAyB,EACzB,IAAY,EACZ,YAAsC;IAEtC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,GAAG,GAAG,0CAA0C,CAAC,GAAG,CAAC,CAAC;IAEtD,MAAM,iBAAiB,GAAG,4CAA4C,CACpE,GAAG,CAAC,KAAK,CACV,CAAC;IACF,MAAM,aAAa,GAAgB,YAAY;QAC7C,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC;QACvB,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;IACd,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACtC,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;YAC9C,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IACD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAC9B,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;gBAC9C,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IACzE,IAAI,GAAG,GAAU,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,IAAI,WAAW,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;IAC9E,MAAM,EAAC,mBAAmB,EAAC,GAAG,IAAI,CAAC;IAEnC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,QAAQ,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACpC,GAAG,GAAG,uBAAuB,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACtC,GAAG,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,GAAG,IAAI,OAAO,CAAC;QAChC,GAAG,GAAG,QAAQ,CAAC,aAAa,CAC1B,IAAI,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,EACxE,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAC9B,GAAG,GAAG,uBAAuB,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,UAAU,CACjB,KAAY,EACZ,SAAoB,EACpB,QAAyB,EACzB,IAAY;IAEZ,OAAO,mBAAmB,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,CAC9C,WAAW,CAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CACpD,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAClB,KAAkB,EAClB,SAAoB,EACpB,QAAyB,EACzB,IAAY;IAEZ,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,KAAK;YACR,OAAO,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACpD,KAAK,IAAI;YACP,OAAO,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnD,KAAK,oBAAoB;YACvB,OAAO,gCAAgC,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC5E,KAAK,QAAQ;YACX,OAAO,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAClD,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CACf,KAAkB,EAClB,SAAsB,EACtB,QAAyB,EACzB,IAAY;IAEZ,KAAK,MAAM,YAAY,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QAChD,KAAK,GAAG,WAAW,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,OAAO,CACrB,KAAkB,EAClB,SAAsB,EACtB,QAAyB,EACzB,IAAY;IAEZ,MAAM,CAAC,kBAAkB,EAAE,eAAe,CAAC,GACzC,uBAAuB,CAAC,SAAS,CAAC,CAAC;IACrC,qEAAqE;IACrE,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,IAAI,MAAM,CACf,KAAK,EACL,eAAe,CAAC;YACd,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,eAAe;SAC5B,CAAC,CACH,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CACrD,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,CAClD,CAAC;IACF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,QAAQ,CAAC,IAAI,CACX,IAAI,MAAM,CACR,MAAM,EACN,eAAe,CAAC;YACd,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,eAAe;SAC5B,CAAC,CACH,CACF,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACrB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,SAAsB;IAC5D,MAAM,WAAW,GAGb,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACb,KAAK,MAAM,YAAY,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QAChD,IAAI,8BAA8B,CAAC,YAAY,CAAC,EAAE,CAAC;YACjD,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,SAAoB;IAEpB,IAAI,SAAS,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,oBAAoB,CAC3B,KAAkB,EAClB,SAA0B;IAE1B,OAAO,IAAI,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,uBAAuB,CAC9B,EAAsB,EACtB,QAAyB,EACzB,GAAU,EACV,IAAY;IAEZ,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,qBAAqB,CACjC,EAAE,CAAC,QAAQ,EACX,QAAQ,EACR,GAAG,IAAI,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,EAC9B,EAAE,CAAC,WAAW,CAAC,UAAU,CAC1B,CAAC;IACF,MAAM,QAAQ,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC;IACtD,GAAG,GAAG,IAAI,IAAI,CAAC;QACb,MAAM,EAAE,GAAG;QACX,KAAK;QACL,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC;QACzC,SAAS,EAAE,EAAE,CAAC,WAAW,CAAC,WAAW;QACrC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU;QACnC,gBAAgB,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK;QACnC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,KAAK;QAC1B,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,QAAQ;KAC9B,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,gCAAgC,CACvC,KAAkB,EAClB,SAAsC,EACtC,QAAyB,EACzB,IAAY;IAEZ,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,QAAQ,IAAI,SAAS,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;IACnE,MAAM,UAAU,GAAG,GAAG,IAAI,WAAW,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC;IACzE,OAAO,QAAQ,CAAC,mBAAmB,CACjC,IAAI,MAAM,CACR,KAAK,EACL,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,EAClC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EACtC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EACzC,SAAS,CAAC,EAAE,CACb,EACD,UAAU,CACX,CAAC;AACJ,CAAC;AAED,SAAS,4CAA4C,CACnD,SAAgC;IAEhC,MAAM,IAAI,GAAyB,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,CAAC,SAAoB,EAAE,EAAE;QACtC,IAAI,SAAS,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YAC5C,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,QAAQ,IAAI,SAAS,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;YACnE,IAAI,CAAC,IAAI,CAAC;gBACR,GAAG,SAAS,CAAC,OAAO;gBACpB,QAAQ,EAAE;oBACR,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ;oBAC7B,KAAK,EACH,SAAS,CAAC,OAAO,CAAC,MAAM,KAAK,aAAa;wBACxC,CAAC,CAAC,wBAAwB;wBAC1B,CAAC,CAAC,YAAY;iBACnB;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,KAAK,KAAK,IAAI,SAAS,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACxD,KAAK,MAAM,CAAC,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;gBACrC,MAAM,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC;YACD,OAAO;QACT,CAAC;IACH,CAAC,CAAC;IACF,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,CAAC,SAAS,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAEnC,MAAM,UAAU,wBAAwB,CACtC,QAAkB,EAClB,EAAc;IAEd,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAE9E,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,0DAA0D,aAAa,CAAC,IAAI,CAC1E,IAAI,CACL;;;;qEAI8D,CAChE,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,0CAA0C,CAAC,GAAQ;IAC1D,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACf,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,EAAC,KAAK,EAAC,GAAG,GAAG,CAAC;IACpB,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,0BAA0B,GAAG,CAAC,IAAiC,EAAE,EAAE,CAAC,CAAC;QACzE,GAAG,IAAI;QACP,OAAO,EAAE;YACP,GAAG,IAAI,CAAC,OAAO;YACf,QAAQ,EAAE;gBACR,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ;gBACxB,KAAK,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,GAAG,GAAG,KAAK,EAAE;aAC3D;SACF;KACF,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,CAAC,IAAe,EAAa,EAAE;QAC9C,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YAC9C,OAAO,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC;QACD,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAChC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,UAAU;SACX,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG;QACb,GAAG,GAAG;QACN,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;KACvB,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}
package/out/zql/src/builder/filter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/filter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EAEhB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,oCAAoC,CAAC;AAGnE,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,SAAS,CAAC,CAAC;AAC5D,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC;AACtD,MAAM,MAAM,qBAAqB,GAAG,CAAC,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC;AAEnE,MAAM,MAAM,mBAAmB,GAC3B,eAAe,GACf;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAC5C,GACD;IACE,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAC5C,CAAC;AAEN,wBAAgB,eAAe,CAC7B,SAAS,EAAE,mBAAmB,GAC7B,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAkEvB;AA2DD;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG;IAChE,OAAO,EAAE,mBAAmB,GAAG,SAAS,CAAC;IACzC,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAwDA"}
1
+ {"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/filter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EAEhB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,oCAAoC,CAAC;AAInE,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,SAAS,CAAC,CAAC;AAC5D,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC;AACtD,MAAM,MAAM,qBAAqB,GAAG,CAAC,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC;AAEnE,MAAM,MAAM,mBAAmB,GAC3B,eAAe,GACf;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAC5C,GACD;IACE,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAC5C,CAAC;AAEN,wBAAgB,eAAe,CAC7B,SAAS,EAAE,mBAAmB,GAC7B,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAkEvB;AA2DD;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG;IAChE,OAAO,EAAE,mBAAmB,GAAG,SAAS,CAAC;IACzC,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAoCA"}
package/out/zql/src/builder/filter.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { assert, unreachable } from "../../../shared/src/asserts.js";
2
+ import { simplifyCondition } from "../query/expression.js";
2
3
  import { getLikePredicate } from "./like.js";
3
4
  export function createPredicate(condition) {
4
5
  if (condition.type !== 'simple') {
@@ -126,46 +127,27 @@ export function transformFilters(filters) {
126
127
  return { filters, conditionsRemoved: false };
127
128
  case 'correlatedSubquery':
128
129
  return { filters: undefined, conditionsRemoved: true };
129
- case 'and': {
130
- const transformedConditions = [];
131
- for (const cond of filters.conditions) {
132
- assert(cond.type === 'simple' || cond.type === 'correlatedSubquery');
133
- if (cond.type === 'simple') {
134
- transformedConditions.push(cond);
135
- }
136
- }
137
- const conditionsRemoved = transformedConditions.length !== filters.conditions.length;
138
- if (transformedConditions.length === 0) {
139
- return { filters: undefined, conditionsRemoved };
140
- }
141
- if (transformedConditions.length === 1) {
142
- return {
143
- filters: transformedConditions[0],
144
- conditionsRemoved,
145
- };
146
- }
147
- return {
148
- filters: {
149
- type: 'and',
150
- conditions: transformedConditions,
151
- },
152
- conditionsRemoved,
153
- };
154
- }
130
+ case 'and':
155
131
  case 'or': {
156
132
  const transformedConditions = [];
157
133
  let conditionsRemoved = false;
158
134
  for (const cond of filters.conditions) {
159
- assert(cond.type !== 'or');
160
135
  const transformed = transformFilters(cond);
161
- if (transformed.filters === undefined) {
136
+ // If any branch of the OR ends up empty, the entire OR needs
137
+ // to be removed.
138
+ if (transformed.filters === undefined && filters.type === 'or') {
162
139
  return { filters: undefined, conditionsRemoved: true };
163
140
  }
164
141
  conditionsRemoved = conditionsRemoved || transformed.conditionsRemoved;
165
- transformedConditions.push(transformed.filters);
142
+ if (transformed.filters) {
143
+ transformedConditions.push(transformed.filters);
144
+ }
166
145
  }
167
146
  return {
168
- filters: { type: 'or', conditions: transformedConditions },
147
+ filters: simplifyCondition({
148
+ type: filters.type,
149
+ conditions: transformedConditions,
150
+ }),
169
151
  conditionsRemoved,
170
152
  };
171
153
  }
package/out/zql/src/builder/filter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../zql/src/builder/filter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../zql/src/builder/filter.ts"],"names":[],"mappings":"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"}
package/out/zql/src/query/expression.d.ts CHANGED
@@ -40,7 +40,8 @@ export declare function or(...conditions: (Condition | undefined)[]): Condition;
40
40
  export declare function not(expression: Condition): Condition;
41
41
  export declare function cmp(field: string, opOrValue: SimpleOperator | ParameterReference | LiteralValue, value?: ParameterReference | LiteralValue): Condition;
42
42
  export declare const TRUE: Condition;
43
- export declare function flatten(type: 'and' | 'or', conditions: Condition[]): Condition[];
43
+ export declare function simplifyCondition(c: Condition): Condition;
44
+ export declare function flatten(type: 'and' | 'or', conditions: readonly Condition[]): Condition[];
44
45
  declare const negateOperatorMap: {
45
46
  readonly EXISTS: "NOT EXISTS";
46
47
  readonly "NOT EXISTS": "EXISTS";
package/out/zql/src/query/expression.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/expression.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/expression.ts"],"names":[],"mappings":"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"}
package/out/zql/src/query/expression.js CHANGED
@@ -112,6 +112,25 @@ function isAlwaysTrue(condition) {
112
112
  function isAlwaysFalse(condition) {
113
113
  return condition.type === 'or' && condition.conditions.length === 0;
114
114
  }
115
+ export function simplifyCondition(c) {
116
+ if (c.type === 'simple' || c.type === 'correlatedSubquery') {
117
+ return c;
118
+ }
119
+ if (c.conditions.length === 1) {
120
+ return simplifyCondition(c.conditions[0]);
121
+ }
122
+ const conditions = flatten(c.type, c.conditions.map(simplifyCondition));
123
+ if (c.type === 'and' && conditions.some(isAlwaysFalse)) {
124
+ return FALSE;
125
+ }
126
+ if (c.type === 'or' && conditions.some(isAlwaysTrue)) {
127
+ return TRUE;
128
+ }
129
+ return {
130
+ type: c.type,
131
+ conditions,
132
+ };
133
+ }
115
134
  export function flatten(type, conditions) {
116
135
  const flattened = [];
117
136
  for (const c of conditions) {
package/out/zql/src/query/expression.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../../../zql/src/query/expression.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EACL,aAAa,GAKd,MAAM,mCAAmC,CAAC;AAsC3C,MAAM,OAAO,iBAAiB;IAInB,OAAO,CAGD;IAEf,YACE,MAGc;QAEd,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC;IACd,CAAC;IAkBD,GAAG,CACD,KAAa,EACb,SAA6D,EAC7D,KAAyC;QAEzC,OAAO,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,CACJ,IAAuC,EACvC,EAAkB,EAClB,KAAwC;QAExC,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC;gBAC9B,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;gBACvB,CAAC,CAAC,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAC;YAClC,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC;gBAChC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;gBACxB,CAAC,CAAC,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAC;YACnC,EAAE;SACH,CAAC;IACJ,CAAC;IAED,GAAG,GAAG,GAAG,CAAC;IACV,EAAE,GAAG,EAAE,CAAC;IACR,GAAG,GAAG,GAAG,CAAC;IAEV,MAAM,GAAG,CACP,YAA2B,EAC3B,EAEwB,EACb,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;CAChD;AAED,MAAM,UAAU,GAAG,CAAC,GAAG,UAAqC;IAC1D,MAAM,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAE5D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,EAAE,CAAC,GAAG,UAAqC;IACzD,MAAM,WAAW,GAAG,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAE7D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,UAAqB;IACvC,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,KAAK;YACR,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;aAC3C,CAAC;QACJ,KAAK,IAAI;YACP,OAAO;gBACL,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;aAC3C,CAAC;QACJ,KAAK,oBAAoB;YACvB,OAAO;gBACL,IAAI,EAAE,oBAAoB;gBAC1B,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,EAAE,EAAE,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;aAClC,CAAC;QACJ,KAAK,QAAQ;YACX,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,EAAE,EAAE,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;gBACjC,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,KAAK,EAAE,UAAU,CAAC,KAAK;aACxB,CAAC;IACN,CAAC;AACH,CAAC;AAED,MAAM,UAAU,GAAG,CACjB,KAAa,EACb,SAA6D,EAC7D,KAAyC;IAEzC,IAAI,EAAkB,CAAC;IACvB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,KAAK,GAAG,SAAS,CAAC;QAClB,EAAE,GAAG,GAAG,CAAC;IACX,CAAC;SAAM,CAAC;QACN,EAAE,GAAG,SAA2B,CAAC;IACnC,CAAC;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAC;QACnC,KAAK,EAAE,oBAAoB,CAAC,KAAK,CAAC;YAChC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;YACxB,CAAC,CAAC,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAC;QAC5B,EAAE;KACH,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,KAA+C;IAE/C,OAAO,CACL,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAa,CAAC,aAAa,CAAC,CAC7E,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,IAAI,GAAc;IAC7B,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,EAAE;CACf,CAAC;AAEF,MAAM,KAAK,GAAc;IACvB,IAAI,EAAE,IAAI;IACV,UAAU,EAAE,EAAE;CACf,CAAC;AAEF,SAAS,YAAY,CAAC,SAAoB;IACxC,OAAO,SAAS,CAAC,IAAI,KAAK,KAAK,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,aAAa,CAAC,SAAoB;IACzC,OAAO,SAAS,CAAC,IAAI,KAAK,IAAI,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,OAAO,CACrB,IAAkB,EAClB,UAAuB;IAEvB,MAAM,SAAS,GAAgB,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACpB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,uBAAuB,GAAG;IAC9B,CAAC,GAAG,CAAC,EAAE,IAAI;IACX,CAAC,IAAI,CAAC,EAAE,GAAG;IACX,CAAC,GAAG,CAAC,EAAE,IAAI;IACX,CAAC,GAAG,CAAC,EAAE,IAAI;IACX,CAAC,IAAI,CAAC,EAAE,GAAG;IACX,CAAC,IAAI,CAAC,EAAE,GAAG;IACX,CAAC,IAAI,CAAC,EAAE,QAAQ;IAChB,CAAC,QAAQ,CAAC,EAAE,IAAI;IAChB,CAAC,MAAM,CAAC,EAAE,UAAU;IACpB,CAAC,UAAU,CAAC,EAAE,MAAM;IACpB,CAAC,OAAO,CAAC,EAAE,WAAW;IACtB,CAAC,WAAW,CAAC,EAAE,OAAO;IACtB,CAAC,IAAI,CAAC,EAAE,QAAQ;IAChB,CAAC,QAAQ,CAAC,EAAE,IAAI;CACR,CAAC;AAEX,MAAM,iBAAiB,GAAG;IACxB,GAAG,uBAAuB;IAC1B,CAAC,QAAQ,CAAC,EAAE,YAAY;IACxB,CAAC,YAAY,CAAC,EAAE,QAAQ;CAChB,CAAC;AAEX,MAAM,UAAU,cAAc,CAC5B,EAAM;IAEN,OAAO,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,eAAe,CAAI,KAAwB;IAClD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,UAAU,CAAC,UAAuB;IACzC,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,WAAW,CAAC,UAAuB;IAC1C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC"}
1
+ {"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../../../zql/src/query/expression.ts"],"names":[],"mappings":"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"}
package/out/zql/src/query/query-impl.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"query-impl.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/query-impl.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,GAAG,EAEH,SAAS,EAET,SAAS,EACT,cAAc,EACd,MAAM,EACP,MAAM,mCAAmC,CAAC;AAE3C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oDAAoD,CAAC;AAM/E,OAAO,EAAgB,KAAK,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAG1E,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAGxD,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAc,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE/C,KAAK,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AAE3C,QAAA,MAAM,SAAS,eAAW,CAAC;AAE3B,wBAAgB,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAE1D;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAE/C,QAAQ,EAAE,aAAa,EACvB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,MAAM,GACZ,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAExB;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CACN,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,GACb,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,cAAc,CACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,GACpC,MAAM,IAAI,CAAC;IACd,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC;IAC5C,mBAAmB,CAAC,EAAE,EAAE,cAAc,GAAG,MAAM,IAAI,CAAC;IACpD,gBAAgB,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAClD,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpE;;;;OAIG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAElD;;;;;;OAMG;IACH,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC;CACxC;AAED,wBAAgB,WAAW,CACzB,WAAW,EAAE,UAAU,GAAG,gBAAgB,EAC1C,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GACvB,SAAS,CAOX;AAED,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,aAAa;;;CAAgD,CAAC;AAE3E,eAAO,MAAM,cAAc,eAAW,CAAC;AAEvC,8BAAsB,aAAa,CACjC,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAClC,YAAW,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;;IAK1C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAKtB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM;IAShB,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,CAErB;IAED,IAAI,IAAI,MAAM;IAQd,SAAS,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,CACjC,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,GACb,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;IAE1C,GAAG,QAAO,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAYjD;IAEJ,WAAW,GACT,cAAc,MAAM,EACpB,KAAK,CAAC,CAAC,EAAE,QAAQ,KAAK,QAAQ,KAC7B,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CACmB;IAErD,OAAO,GACL,cAAc,MAAM,EACpB,KAAK,CAAC,CAAC,EAAE,QAAQ,KAAK,QAAQ,KAC7B,QAAQ,CAgJT;IAEF,KAAK,GACH,0BAA0B,MAAM,GAAG,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,EACrE,YAAY,cAAc,GAAG,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,EACrE,QAAQ,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,KAC/C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAqChC;IAEF,KAAK,GACH,KAAK,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACtC,OAAO;QAAC,SAAS,EAAE,OAAO,CAAA;KAAC,GAAG,SAAS,KACtC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAY9B;IAEJ,KAAK,GAAI,OAAO,MAAM,KAAG,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAiBtD;IAEF,OAAO,GAAI,SAAS,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EACrE,OAAO,SAAS,EAChB,WAAW,KAAK,GAAG,MAAM,KACxB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAS9B;IAEJ,SAAS,CAAC,OAAO,GACf,cAAc,MAAM,EACpB,KAAI,CAAC,KAAK,EAAE,QAAQ,KAAK,QAAiB,KACzC,SAAS,CA+FV;IAIF,SAAS,CAAC,YAAY,IAAI,GAAG;IAiC7B,IAAI,CAAC,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,KAAK,EACtD,WAAW,CAAC,EACR,CAAC,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GACrE,SAAS,GACT,IAAI,EACR,UAAU,CAAC,EACP,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GACnD,SAAS,GACT,IAAI,GACP,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAInC,QAAQ,CAAC,WAAW,IAAI,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACzD,QAAQ,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC;IAE7E,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAEnE,QAAQ,CAAC,OAAO,IAAI;QAClB,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;KACzB;CACF;AAED,QAAA,MAAM,kBAAkB,eAAW,CAAC;AAEpC,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,OAEzD;AAED,qBAAa,SAAS,CACpB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAClC,SAAQ,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;;gBAK7C,QAAQ,EAAE,aAAa,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAiB;IAO3B,IAAI,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAE9B;IAED,SAAS,CAAC,CAAC,cAAc,CAAC,CACxB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,EACrB,OAAO,EAEP,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,GACb,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;IAWtC,WAAW,CAAC,CAAC,EACX,YAAY,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,GAAG,EAC7D,GAAG,GAAE,GAAiB,GACrB,CAAC;IAkDJ,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAqB1D,OAAO,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG;QACjC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;KACzB;CAiBF"}
1
+ {"version":3,"file":"query-impl.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/query-impl.ts"],"names":[],"mappings":"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"}
package/out/zql/src/query/query-impl.js CHANGED
@@ -7,8 +7,7 @@ import { isOneHop, isTwoHop, } from "../../../zero-schema/src/table-schema.js";
7
7
  import { buildPipeline } from "../builder/builder.js";
8
8
  import { ArrayView } from "../ivm/array-view.js";
9
9
  import { assertNoNotExists } from "./assert-no-not-exists.js";
10
- import { dnf } from "./dnf.js";
11
- import { and, cmp, ExpressionBuilder, } from "./expression.js";
10
+ import { and, cmp, ExpressionBuilder, simplifyCondition, } from "./expression.js";
12
11
  import {} from "./query.js";
13
12
  import { DEFAULT_TTL } from "./ttl.js";
14
13
  const astSymbol = Symbol();
@@ -170,7 +169,7 @@ export class AbstractQuery {
170
169
  if (existingWhere) {
171
170
  cond = and(existingWhere, cond);
172
171
  }
173
- const where = dnf(cond);
172
+ const where = simplifyCondition(cond);
174
173
  if (this.#system === 'client') {
175
174
  // We need to do this after the DNF since the DNF conversion might change
176
175
  // an EXISTS to a NOT EXISTS condition (and vice versa).
package/out/zql/src/query/query-impl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"query-impl.js","sourceRoot":"","sources":["../../../../../zql/src/query/query-impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"query-impl.js","sourceRoot":"","sources":["../../../../../zql/src/query/query-impl.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rocicorp/zero",
3
- "version": "0.20.2025051501",
3
+ "version": "0.20.2025051600",
4
4
  "description": "Zero is a web framework for serverless web development.",
5
5
  "author": "Rocicorp, Inc.",
6
6
  "repository": {
@@ -37,6 +37,7 @@
37
37
  "@google-cloud/precise-date": "^4.0.0",
38
38
  "@opentelemetry/api": "^1.9.0",
39
39
  "@opentelemetry/api-logs": "^0.200.0",
40
+ "@opentelemetry/auto-instrumentations-node": "^0.58.1",
40
41
  "@opentelemetry/exporter-logs-otlp-http": "^0.200.0",
41
42
  "@opentelemetry/exporter-metrics-otlp-http": "^0.200.0",
42
43
  "@opentelemetry/exporter-trace-otlp-http": "^0.200.0",