@rocicorp/zero 0.4.2024103000 → 0.5.2024110200

package/out/{chunk-4UHYW2B5.js → chunk-INJ4WJHS.js}

@@ -14,7 +14,7 @@ import {
   must,
   throwInvalidType,
   unreachable
-} from "./chunk-RCVGGCMG.js";
+} from "./chunk-YCMA66NH.js";
 import {
   __export,
   __reExport
@@ -1351,10 +1351,6 @@ function* mergeIterables(iterables, comparator, distinct = false) {
       lastYielded = min[0];
       yield min[0];
     }
-  } catch (e) {
-    for (const it of iterators) {
-      it.throw?.(e);
-    }
   } finally {
     for (const it of iterators) {
       it.return?.();
@@ -1481,13 +1477,15 @@ function randomUint64() {
 var valita_exports = {};
 __export(valita_exports, {
   assert: () => assert2,
+  instanceOfAbstractType: () => instanceOfAbstractType,
   is: () => is,
   parse: () => parse,
   readonly: () => readonly,
   readonlyArray: () => readonlyArray,
   readonlyObject: () => readonlyObject,
   readonlyRecord: () => readonlyRecord,
-  test: () => test
+  test: () => test,
+  testOptional: () => testOptional
 });
 __reExport(valita_exports, valita_star);
 import * as v from "@badrap/valita";
@@ -1597,6 +1595,22 @@ function test(value, schema, mode) {
   }
   return res;
 }
+function testOptional(value, schema, mode) {
+  let flags = 1;
+  if (mode === "passthrough") {
+    flags = 0;
+  } else if (mode === "strip") {
+    flags = 2;
+  }
+  const res = schema.func(value, flags);
+  if (res === void 0) {
+    return { ok: true, value };
+  } else if (res.ok) {
+    return res;
+  }
+  const err2 = new v.ValitaError(res);
+  return { ok: false, error: getMessage(err2, value) };
+}
 function readonly(t2) {
   return t2;
 }
@@ -1609,6 +1623,12 @@ function readonlyArray(t2) {
 function readonlyRecord(t2) {
   return v.record(t2);
 }
+var AbstractType = Object.getPrototypeOf(
+  Object.getPrototypeOf(v.string().optional())
+).constructor;
+function instanceOfAbstractType(obj) {
+  return obj instanceof AbstractType;
+}
 
 // ../replicache/src/hash.ts
 var STRING_LENGTH = 22;
@@ -9216,18 +9236,7 @@ function getKVStoreProvider(lc, kvStore) {
 // ../replicache/src/mod.ts
 import { consoleLogSink as consoleLogSink3 } from "@rocicorp/logger";
 
-// ../zql/src/zql/query/schema.ts
-function createTableSchema(schema) {
-  return schema;
-}
-function isFieldRelationship(relationship) {
-  return relationship.junction === void 0;
-}
-function isJunctionRelationship(relationship) {
-  return !isFieldRelationship(relationship);
-}
-
-// ../zql/src/zql/query/expression.ts
+// ../zql/src/query/expression.ts
 function cmp(field, opOrValue, value) {
   let op;
   if (value === void 0) {
@@ -9244,6 +9253,9 @@ function cmp(field, opOrValue, value) {
   };
 }
 function and(...conditions) {
+  if (conditions.length === 1) {
+    return conditions[0];
+  }
   const ands = conditions.flatMap((c) => {
     if (c.type === "and") {
       return c.conditions;
@@ -9272,6 +9284,9 @@ function and(...conditions) {
   };
 }
 function or(...conditions) {
+  if (conditions.length === 1) {
+    return conditions[0];
+  }
   return flatten("or", conditions);
 }
 function not(expr) {
@@ -9338,7 +9353,7 @@ function negateOperator(op) {
   }
 }
 
-// ../zql/src/zql/query/query-impl.ts
+// ../zql/src/query/query-impl.ts
 import { resolver as resolver7 } from "@rocicorp/resolver";
 
 // ../shared/src/xxhash.ts
@@ -9364,6 +9379,10 @@ function defined(arr) {
   return defined2;
 }
 
+// ../zero-protocol/src/data.ts
+var valueSchema = valita_exports.union(jsonSchema, valita_exports.undefined());
+var rowSchema = valita_exports.record(valueSchema);
+
 // ../zero-protocol/src/ast.ts
 var selectorSchema = valita_exports.string();
 var orderingElementSchema = readonly(
@@ -9445,9 +9464,7 @@ var astSchema = valita_exports.object({
   limit: valita_exports.number().optional(),
   orderBy: orderingSchema.optional(),
   start: valita_exports.object({
-    row: valita_exports.record(
-      valita_exports.union(valita_exports.string(), valita_exports.number(), valita_exports.boolean(), valita_exports.null(), valita_exports.undefined())
-    ),
+    row: rowSchema,
     exclusive: valita_exports.boolean()
   }).optional()
 });
@@ -9573,7 +9590,7 @@ function hashOfAST(ast) {
   return hash;
 }
 
-// ../zql/src/zql/ivm/fan-in.ts
+// ../zql/src/ivm/fan-in.ts
 var FanIn = class {
   #inputs;
   #fanOut;
@@ -9585,13 +9602,7 @@ var FanIn = class {
     this.#fanOut = fanOut;
     for (const input of inputs) {
       input.setOutput(this);
-      assert(
-        deepEqual(
-          this.#schema,
-          input.getSchema()
-        ),
-        `Schema mismatch in fan-in`
-      );
+      assert(this.#schema === input.getSchema(), `Schema mismatch in fan-in`);
     }
   }
   setOutput(output) {
@@ -9605,18 +9616,19 @@ var FanIn = class {
   getSchema() {
     return this.#inputs[0].getSchema();
   }
-  *fetch(req) {
-    const iterables = this.#inputs.map((input) => input.fetch(req));
-    for (const node of mergeIterables(
+  fetch(req) {
+    return this.#fetchOrCleanup((input) => input.fetch(req));
+  }
+  cleanup(req) {
+    return this.#fetchOrCleanup((input) => input.cleanup(req));
+  }
+  *#fetchOrCleanup(streamProvider) {
+    const iterables = this.#inputs.map((input) => streamProvider(input));
+    yield* mergeIterables(
       iterables,
       (l, r) => must(this.#schema).compareRows(l.row, r.row),
       true
-    )) {
-      yield node;
-    }
-  }
-  cleanup(req) {
-    return this.fetch(req);
+    );
   }
   push(change) {
     this.#fanOut.onFanInReceivedPush();
@@ -9624,10 +9636,14 @@ var FanIn = class {
   }
 };
 
-// ../zql/src/zql/ivm/fan-out.ts
+// ../zql/src/ivm/fan-out.ts
 var FanOut = class {
   #input;
   #outputs;
+  // FanOut is paired with a FanIn.
+  // Once FanIn has received a push from FanOut along
+  // any branch, FanOut no longer needs to push that value
+  // across the rest of its outputs..
   #fanInReceivedPush;
   #destroyCount;
   constructor(input) {
@@ -9653,13 +9669,11 @@ var FanOut = class {
   getSchema() {
     return this.#input.getSchema();
   }
-  *fetch(req) {
-    for (const node of this.#input.fetch(req)) {
-      yield node;
-    }
+  fetch(req) {
+    return this.#input.fetch(req);
   }
   cleanup(req) {
-    return this.fetch(req);
+    return this.#input.cleanup(req);
   }
   onFanInReceivedPush() {
     this.#fanInReceivedPush = true;
@@ -9675,7 +9689,7 @@ var FanOut = class {
   }
 };
 
-// ../zql/src/zql/ivm/maybe-split-and-push-edit-change.ts
+// ../zql/src/ivm/maybe-split-and-push-edit-change.ts
 function maybeSplitAndPushEditChange(change, predicate, output) {
   const oldWasPresent = predicate(change.oldRow);
   const newIsPresent = predicate(change.row);
@@ -9700,7 +9714,7 @@ function maybeSplitAndPushEditChange(change, predicate, output) {
   }
 }
 
-// ../zql/src/zql/ivm/filter.ts
+// ../zql/src/ivm/filter.ts
 var Filter = class {
   #input;
   #mode;
@@ -9721,16 +9735,19 @@ var Filter = class {
   getSchema() {
     return this.#input.getSchema();
   }
-  *fetch(req) {
-    for (const node of this.#input.fetch(req)) {
+  fetch(req) {
+    return this.#filter(this.#input.fetch(req));
+  }
+  cleanup(req) {
+    return this.#filter(this.#input.cleanup(req));
+  }
+  *#filter(stream) {
+    for (const node of stream) {
       if (this.#mode === "push-only" || this.#predicate(node.row)) {
         yield node;
       }
     }
   }
-  cleanup(req) {
-    return this.fetch(req);
-  }
   push(change) {
     assert(this.#output, "Output not set");
     switch (change.type) {
@@ -9754,7 +9771,7 @@ var Filter = class {
   }
 };
 
-// ../zql/src/zql/ivm/data.ts
+// ../zql/src/ivm/data.ts
 import { compareUTF8 as compareUTF84 } from "compare-utf8";
 function compareValues(a, b) {
   a = normalizeUndefined(a);
@@ -9806,7 +9823,7 @@ function valuesEqual(a, b) {
   return a === b;
 }
 
-// ../zql/src/zql/ivm/stream.ts
+// ../zql/src/ivm/stream.ts
 function* take(stream, limit) {
   if (limit < 1) {
     return;
@@ -9826,7 +9843,7 @@ function first(stream) {
   return value;
 }
 
-// ../zql/src/zql/ivm/join.ts
+// ../zql/src/ivm/join.ts
 var Join = class {
   #parent;
   #child;
@@ -10112,7 +10129,7 @@ function makeStorageKey(keyValue, primaryKey, row) {
   return createPrimaryKeySetStorageKey(parentPrimaryKey);
 }
 
-// ../zql/src/zql/ivm/skip.ts
+// ../zql/src/ivm/skip.ts
 var Skip = class {
   #input;
   #bound;
@@ -10198,7 +10215,7 @@ var Skip = class {
   }
 };
 
-// ../zql/src/zql/ivm/take.ts
+// ../zql/src/ivm/take.ts
 var MAX_BOUND_KEY = "maxBound";
 var Take = class {
   #input;
@@ -10651,11 +10668,11 @@ function getTakeStateKey(partitionValue) {
   return JSON.stringify(["take", normalizeUndefined(partitionValue)]);
 }
 
-// ../zql/src/zql/builder/error.ts
+// ../zql/src/builder/error.ts
 var MissingParameterError = class extends Error {
 };
 
-// ../zql/src/zql/builder/like.ts
+// ../zql/src/builder/like.ts
 function getLikePredicate(pattern, flags) {
   const op = getLikeOp(String(pattern), flags);
   return (lhs) => {
@@ -10703,7 +10720,7 @@ function patternToRegExp(source, flags = "") {
   return new RegExp(pattern + "$", flags + "m");
 }
 
-// ../zql/src/zql/builder/filter.ts
+// ../zql/src/builder/filter.ts
 function createPredicate(condition) {
   const impl = createPredicateImpl(
     condition.value,
@@ -10758,7 +10775,7 @@ function not2(f) {
   return (lhs) => !f(lhs);
 }
 
-// ../zql/src/zql/builder/builder.ts
+// ../zql/src/builder/builder.ts
 function buildPipeline(ast, delegate, staticQueryParameters) {
   return buildPipelineInternal(
     bindStaticParameters(ast, staticQueryParameters),
@@ -10887,12 +10904,16 @@ function assertOrderingIncludesPK(ordering, pk) {
     throw new Error(
       `Ordering must include all primary key fields. Missing: ${missingFields.join(
         ", "
-      )}`
+      )}. ZQL automatically appends primary key fields to the ordering if they are missing 
+      so a common cause of this error is a casing mismatch between Postgres and ZQL.
+      E.g., "userid" vs "userID".
+      You may want to add double-quotes around your Postgres column names to prevent Postgres from lower-casing them:
+      https://www.postgresql.org/docs/current/sql-syntax-lexical.htm`
     );
   }
 }
 
-// ../zql/src/zql/ivm/array-view.ts
+// ../zql/src/ivm/array-view.ts
 var ArrayView = class {
   #input;
   #listeners = /* @__PURE__ */ new Set();
@@ -10961,7 +10982,15 @@ function sortedEntries(object16) {
   return Object.entries(object16).sort((a, b) => stringCompare(a[0], b[0]));
 }
 
-// ../zql/src/zql/query/normalize-table-schema.ts
+// ../zero-schema/src/table-schema.ts
+function isFieldRelationship(relationship) {
+  return relationship.junction === void 0;
+}
+function isJunctionRelationship(relationship) {
+  return !isFieldRelationship(relationship);
+}
+
+// ../zero-schema/src/normalize-table-schema.ts
 var NormalizedTableSchema = class {
   tableName;
   primaryKey;
@@ -11103,7 +11132,7 @@ function normalizeLazyTableSchema(tableSchema, buildCache) {
   );
 }
 
-// ../zql/src/zql/query/query-impl.ts
+// ../zql/src/query/query-impl.ts
 function newQuery(delegate, tableSchema) {
   return new QueryImpl(delegate, normalizeTableSchema(tableSchema));
 }
@@ -11415,7 +11444,7 @@ function arrayViewFactory(_query, input, format, onDestroy, onTransactionCommit)
   return v2;
 }
 
-// ../zql/src/zql/query/escape-like.ts
+// ../zql/src/query/escape-like.ts
 function escapeLike(val) {
   return val.replace(/[%_]/g, "\\$&");
 }
@@ -11511,16 +11540,6 @@ var errorMessageSchema = valita_exports.tuple([
   valita_exports.string()
 ]);
 
-// ../zero-protocol/src/data.ts
-var valueSchema = valita_exports.union(
-  valita_exports.null(),
-  valita_exports.boolean(),
-  valita_exports.number(),
-  valita_exports.string(),
-  valita_exports.undefined()
-);
-var rowSchema = valita_exports.record(valueSchema);
-
 // ../zero-protocol/src/primary-key.ts
 var primaryKeySchema = readonly(
   valita_exports.tuple([valita_exports.string()]).concat(valita_exports.array(valita_exports.string()))
@@ -13380,7 +13399,7 @@ var EmptyBTree = (() => {
   return t2;
 })();
 
-// ../zql/src/zql/ivm/lookahead-iterator.ts
+// ../zql/src/ivm/lookahead-iterator.ts
 var LookaheadIterator = class {
   #iter;
   #buffer;
@@ -13421,7 +13440,7 @@ var LookaheadIterator = class {
   }
 };
 
-// ../zql/src/zql/ivm/memory-source.ts
+// ../zql/src/ivm/memory-source.ts
 var MemorySource = class {
   #tableName;
   #columns;
@@ -13464,7 +13483,7 @@ var MemorySource = class {
   }
   connect(sort, optionalFilters) {
     const input = {
-      getSchema: () => this.#getSchema(connection),
+      getSchema: () => schema,
       fetch: (req) => this.#fetch(req, connection),
       cleanup: (req) => this.#cleanup(req, connection),
       setOutput: (output) => {
@@ -13485,6 +13504,7 @@ var MemorySource = class {
       compareRows: makeComparator(sort),
       optionalFilters: predicates
     };
+    const schema = this.#getSchema(connection);
     assertOrderingIncludesPK(sort, this.#primaryKey);
     this.#connections.push(connection);
     return input;
@@ -13848,10 +13868,6 @@ function compareBounds(a, b) {
   return compareValues(a, b);
 }
 function filteredOptionalFilters(optionalFilters) {
-  let ret = {
-    filters: [],
-    allApplied: false
-  };
   if (optionalFilters) {
     if (optionalFilters.type === "or" && optionalFilters.conditions.length === 1) {
       optionalFilters = optionalFilters.conditions[0];
@@ -13860,25 +13876,26 @@ function filteredOptionalFilters(optionalFilters) {
       const filters = optionalFilters.conditions.filter(
         (c) => c.type === "simple"
       );
-      ret = {
+      return {
         filters,
         allApplied: filters.length === optionalFilters.conditions.length
       };
-    } else if (optionalFilters.type === "simple") {
-      ret = {
+    }
+    if (optionalFilters.type === "simple") {
+      return {
         filters: [optionalFilters],
         allApplied: true
       };
-    } else {
-      return { filters: [], allApplied: false };
     }
-  } else {
-    ret.allApplied = true;
+    return { filters: [], allApplied: false };
   }
-  return ret;
+  return {
+    filters: [],
+    allApplied: true
+  };
 }
 
-// ../zql/src/zql/ivm/memory-storage.ts
+// ../zql/src/ivm/memory-storage.ts
 var MemoryStorage = class {
   #data = new BTree();
   set(key, value) {
@@ -14486,7 +14503,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.4.2024103000+b2617e";
+var version2 = "0.5.2024110200+4ba53b";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -15290,9 +15307,6 @@ function rowsPatchOpToReplicachePatchOp(op, schema) {
 }
 
 // ../zero-client/src/client/zero.ts
-function createSchema(schema) {
-  return schema;
-}
 var onSetConnectionStateSymbol = Symbol();
 var exposedToTestingSymbol = Symbol();
 var createLogOptionsSymbol = Symbol();
@@ -16470,14 +16484,12 @@ export {
   makeIDBName,
   dropDatabase,
   dropAllDatabases,
-  createTableSchema,
   cmp,
   and,
   or,
   not,
   QueryImpl,
   escapeLike,
-  createSchema,
   Zero
 };
-//# sourceMappingURL=chunk-4UHYW2B5.js.map
+//# sourceMappingURL=chunk-INJ4WJHS.js.map