@rocicorp/zero 0.7.2024120108 → 0.7.2024120400

package/out/advanced.js

@@ -1,7 +1,7 @@
 import "./chunk-ULOTOBTC.js";
 import {
   applyChange
-} from "./chunk-C7M3BJ3Z.js";
+} from "./chunk-6HXO6VMP.js";
 import "./chunk-F5QR3K72.js";
 export {
   applyChange

package/out/{chunk-C7M3BJ3Z.js → chunk-6HXO6VMP.js}

@@ -1,7 +1,8 @@
 // ../shared/src/asserts.ts
 function assert(b, msg = "Assertion failed") {
   if (!b) {
-    throw new Error(msg);
+    const msgStr = typeof msg === "string" ? msg : msg();
+    throw new Error(msgStr);
   }
 }
 function assertString(v) {
@@ -182,16 +183,16 @@ function applyChange(parentEntry, change, schema, relationship, format) {
       const childSchema = must(
         schema.relationships[change.child.relationshipName]
       );
-      const childFormat = must(
-        format.relationships[change.child.relationshipName]
-      );
-      applyChange(
-        existing,
-        change.child.change,
-        childSchema,
-        change.child.relationshipName,
-        childFormat
-      );
+      const childFormat = format.relationships[change.child.relationshipName];
+      if (childFormat !== void 0) {
+        applyChange(
+          existing,
+          change.child.change,
+          childSchema,
+          change.child.relationshipName,
+          childFormat
+        );
+      }
       break;
     }
     case "edit": {
@@ -296,4 +297,4 @@ export {
   must,
   applyChange
 };
-//# sourceMappingURL=chunk-C7M3BJ3Z.js.map
+//# sourceMappingURL=chunk-6HXO6VMP.js.map

package/out/chunk-6HXO6VMP.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../shared/src/asserts.ts", "../../shared/src/must.ts", "../../zql/src/ivm/view-apply-change.ts"],
+  "sourcesContent": ["export function assert(\n  b: unknown,\n  msg: string | (() => string) = 'Assertion failed',\n): asserts b {\n  if (!b) {\n    const msgStr = typeof msg === 'string' ? msg : msg();\n    throw new Error(msgStr);\n  }\n}\n\nexport function assertString(v: unknown): asserts v is string {\n  assertType(v, 'string');\n}\n\nexport function assertNumber(v: unknown): asserts v is number {\n  assertType(v, 'number');\n}\n\nexport function assertBoolean(v: unknown): asserts v is boolean {\n  assertType(v, 'boolean');\n}\n\nfunction assertType(v: unknown, t: string) {\n  if (typeof v !== t) {\n    throwInvalidType(v, t);\n  }\n}\n\nexport function assertObject(v: unknown): asserts v is Record<string, unknown> {\n  if (v === null) {\n    throwInvalidType(v, 'object');\n  }\n  assertType(v, 'object');\n}\n\nexport function assertArray(v: unknown): asserts v is unknown[] {\n  if (!Array.isArray(v)) {\n    throwInvalidType(v, 'array');\n  }\n}\n\nexport function invalidType(v: unknown, t: string): string {\n  let s = 'Invalid type: ';\n  if (v === null || v === undefined) {\n    s += v;\n  } else {\n    s += `${typeof v} \\`${v}\\``;\n  }\n  return s + `, expected ${t}`;\n}\n\nexport function throwInvalidType(v: unknown, t: string): never {\n  throw new Error(invalidType(v, t));\n}\n\nexport function assertNotNull<T>(v: T | null): asserts v is T {\n  if (v === null) {\n    throw new Error('Expected non-null value');\n  }\n}\n\nexport function assertUndefined<T>(\n  v: T | undefined,\n  msg = 'Expected undefined value',\n): asserts v is T {\n  if (v !== undefined) {\n    throw new Error(msg);\n  }\n}\n\nexport function assertNotUndefined<T>(\n  v: T | undefined,\n  msg = 'Expected non undefined value',\n): asserts v is T {\n  if (v === undefined) {\n    throw new Error(msg);\n  }\n}\n\nexport function assertInstanceof<T>(\n  v: unknown,\n  t: new (...args: unknown[]) => T,\n): asserts v is T {\n  if (!(v instanceof t)) {\n    throw new Error(`Expected instanceof ${t.name}`);\n  }\n}\n\nexport function assertUint8Array(v: unknown): asserts v is Uint8Array {\n  assertInstanceof(v, Uint8Array);\n}\n\nexport function unreachable(): never;\nexport function unreachable(v: never): never;\nexport function unreachable(_?: never): never {\n  throw new Error('Unreachable');\n}\n\nexport function notImplemented(): never {\n  throw new Error('Not implemented');\n}\n", "export function must<T>(v: T | undefined | null, msg?: string): T {\n  // eslint-disable-next-line eqeqeq\n  if (v == null) {\n    throw new Error(msg ?? `Unexpected ${v} value`);\n  }\n  return v;\n}\n", "import {\n  assert,\n  assertArray,\n  assertObject,\n  assertUndefined,\n  unreachable,\n} from '../../../shared/src/asserts.js';\nimport {must} from '../../../shared/src/must.js';\nimport type {Row} from '../../../zero-protocol/src/data.js';\nimport type {Change} from './change.js';\nimport type {Node, Comparator} from './data.js';\nimport type {SourceSchema} from './schema.js';\nimport type {Entry, EntryList, Format} from './view.js';\n\nexport function applyChange(\n  parentEntry: Entry,\n  change: Change,\n  schema: SourceSchema,\n  relationship: string,\n  format: Format,\n) {\n  if (schema.isHidden) {\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n        for (const [relationship, children] of Object.entries(\n          change.node.relationships,\n        )) {\n          const childSchema = must(schema.relationships[relationship]);\n          for (const node of children) {\n            applyChange(\n              parentEntry,\n              {type: change.type, node},\n              childSchema,\n              relationship,\n              format,\n            );\n          }\n        }\n        return;\n      case 'edit':\n        // If hidden at this level it means that the hidden row was changed. If\n        // the row was changed in such a way that it would change the\n        // relationships then the edit would have been split into remove and\n        // add.\n        return;\n      case 'child': {\n        const childSchema = must(\n          schema.relationships[change.child.relationshipName],\n        );\n        applyChange(\n          parentEntry,\n          change.child.change,\n          childSchema,\n          relationship,\n          format,\n        );\n        return;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n\n  const {singular, relationships: childFormats} = format;\n  switch (change.type) {\n    case 'add': {\n      // TODO: Only create a new entry if we need to mutate the existing one.\n      const newEntry: Entry = {\n        ...change.node.row,\n      };\n      if (singular) {\n        assertUndefined(\n          parentEntry[relationship],\n          'single output already exists',\n        );\n        parentEntry[relationship] = newEntry;\n      } else {\n        const view = parentEntry[relationship];\n        assertArray(view);\n        const {pos, found} = binarySearch(view, newEntry, schema.compareRows);\n        assert(!found, 'node already exists');\n        view.splice(pos, 0, newEntry);\n      }\n      for (const [relationship, children] of Object.entries(\n        change.node.relationships,\n      )) {\n        // TODO: Is there a flag to make TypeScript complain that dictionary access might be undefined?\n        const childSchema = must(schema.relationships[relationship]);\n        const childFormat = childFormats[relationship];\n        if (childFormat === undefined) {\n          continue;\n        }\n\n        const newView = childFormat.singular ? undefined : ([] as EntryList);\n        newEntry[relationship] = newView;\n        for (const node of children) {\n          applyChange(\n            newEntry,\n            {type: 'add', node},\n            childSchema,\n            relationship,\n            childFormat,\n          );\n        }\n      }\n      break;\n    }\n    case 'remove': {\n      if (singular) {\n        assertObject(parentEntry[relationship]);\n        parentEntry[relationship] = undefined;\n      } else {\n        assertArray(parentEntry[relationship]);\n        const view = parentEntry[relationship];\n        const {pos, found} = binarySearch(\n          view,\n          change.node.row,\n          schema.compareRows,\n        );\n        assert(found, 'node does not exist');\n        view.splice(pos, 1);\n      }\n      // Needed to ensure cleanup of operator state is fully done.\n      drainStreams(change.node);\n      break;\n    }\n    case 'child': {\n      let existing: Entry;\n      if (singular) {\n        assertObject(parentEntry[relationship]);\n        existing = parentEntry[relationship];\n      } else {\n        assertArray(parentEntry[relationship]);\n        const list = parentEntry[relationship];\n        const {pos, found} = binarySearch(list, change.row, schema.compareRows);\n        assert(found, 'node does not exist');\n        existing = list[pos];\n      }\n\n      const childSchema = must(\n        schema.relationships[change.child.relationshipName],\n      );\n      const childFormat = format.relationships[change.child.relationshipName];\n      if (childFormat !== undefined) {\n        applyChange(\n          existing,\n          change.child.change,\n          childSchema,\n          change.child.relationshipName,\n          childFormat,\n        );\n      }\n      break;\n    }\n    case 'edit': {\n      if (singular) {\n        assertObject(parentEntry[relationship]);\n        parentEntry[relationship] = {\n          ...parentEntry[relationship],\n          ...change.node.row,\n        };\n      } else {\n        assertArray(parentEntry[relationship]);\n        const view = parentEntry[relationship];\n        // If the order changed due to the edit, we need to remove and reinsert.\n        if (schema.compareRows(change.oldNode.row, change.node.row) === 0) {\n          const {pos, found} = binarySearch(\n            view,\n            change.oldNode.row,\n            schema.compareRows,\n          );\n          assert(found, 'node does not exists');\n          view[pos] = makeEntryPreserveRelationships(\n            change.node.row,\n            view[pos],\n            schema.relationships,\n          );\n        } else {\n          // Remove\n          const {pos, found} = binarySearch(\n            view,\n            change.oldNode.row,\n            schema.compareRows,\n          );\n          assert(found, 'node does not exists');\n          const oldEntry = view[pos];\n          view.splice(pos, 1);\n\n          // Insert\n          {\n            const {pos, found} = binarySearch(\n              view,\n              change.node.row,\n              schema.compareRows,\n            );\n            assert(!found, 'node already exists');\n            view.splice(\n              pos,\n              0,\n              makeEntryPreserveRelationships(\n                change.node.row,\n                oldEntry,\n                schema.relationships,\n              ),\n            );\n          }\n        }\n      }\n      break;\n    }\n    default:\n      unreachable(change);\n  }\n}\n\n// TODO: Do not return an object. It puts unnecessary pressure on the GC.\nfunction binarySearch(view: EntryList, target: Entry, comparator: Comparator) {\n  let low = 0;\n  let high = view.length - 1;\n  while (low <= high) {\n    const mid = (low + high) >>> 1;\n    const comparison = comparator(view[mid] as Row, target as Row);\n    if (comparison < 0) {\n      low = mid + 1;\n    } else if (comparison > 0) {\n      high = mid - 1;\n    } else {\n      return {pos: mid, found: true};\n    }\n  }\n  return {pos: low, found: false};\n}\n\nfunction makeEntryPreserveRelationships(\n  row: Row,\n  entry: Entry,\n  relationships: {[key: string]: SourceSchema},\n): Entry {\n  const result: Entry = {...row};\n  for (const relationship in relationships) {\n    assert(!(relationship in row), 'Relationship already exists');\n    result[relationship] = entry[relationship];\n  }\n  return result;\n}\n\nfunction drainStreams(node: Node) {\n  for (const stream of Object.values(node.relationships)) {\n    for (const node of stream) {\n      drainStreams(node);\n    }\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["relationship", "pos", "found", "node"]
+}

package/out/{chunk-YQFIGL5R.js → chunk-WJCWI5I4.js}

@@ -14,7 +14,7 @@ import {
   must,
   throwInvalidType,
   unreachable
-} from "./chunk-C7M3BJ3Z.js";
+} from "./chunk-6HXO6VMP.js";
 import {
   __export,
   __reExport
@@ -9344,28 +9344,36 @@ function assertNoDuplicates(arr) {
     "Primary key must not contain duplicates"
   );
 }
-function normalizePrimaryKey(arr) {
-  assertNoDuplicates(arr);
-  return arr;
+function normalizePrimaryKey(primaryKey) {
+  if (typeof primaryKey === "string") {
+    return [primaryKey];
+  }
+  assertNoDuplicates(primaryKey);
+  return primaryKey;
 }
 function normalizeColumns(columns, primaryKey) {
   const rv = {};
   for (const pk of primaryKey) {
     const schemaValue = columns[pk];
     assert(schemaValue, `Primary key column "${pk}" not found`);
-    const { type, optional } = schemaValue;
-    assert(!optional, `Primary key column "${pk}" cannot be optional`);
-    assert(
-      type === "string" || type === "number" || type === "boolean",
-      `Primary key column "${pk}" must be a string, number, or boolean. Got ${type}`
-    );
+    if (typeof schemaValue !== "string") {
+      const { type, optional } = schemaValue;
+      assert(!optional, `Primary key column "${pk}" cannot be optional`);
+      assert(
+        type === "string" || type === "number" || type === "boolean",
+        `Primary key column "${pk}" must be a string, number, or boolean. Got ${type}`
+      );
+    }
   }
   for (const [name, column] of sortedEntries(columns)) {
-    rv[name] = normalizeSchemaValue(column);
+    rv[name] = normalizeColumn(column);
   }
   return rv;
 }
-function normalizeSchemaValue(value) {
+function normalizeColumn(value) {
+  if (typeof value === "string") {
+    return { type: value, optional: false };
+  }
   return {
     type: value.type,
     optional: value.optional ?? false
@@ -9373,8 +9381,10 @@ function normalizeSchemaValue(value) {
 }
 function normalizeRelationships(relationships, tableSchemaCache) {
   const rv = {};
-  for (const [name, relationship] of sortedEntries(relationships)) {
-    rv[name] = normalizeRelationship(relationship, tableSchemaCache);
+  if (relationships) {
+    for (const [name, relationship] of sortedEntries(relationships)) {
+      rv[name] = normalizeRelationship(relationship, tableSchemaCache);
+    }
   }
   return rv;
 }
@@ -9385,13 +9395,15 @@ function normalizeRelationship(relationship, tableSchemaCache) {
   return normalizeJunctionRelationship(relationship, tableSchemaCache);
 }
 function normalizeFieldRelationship(relationship, tableSchemaCache) {
+  const sourceField = normalizeFieldName(relationship.sourceField);
+  const destField = normalizeFieldName(relationship.destField);
   assert(
-    relationship.sourceField.length === relationship.destField.length,
+    sourceField.length === destField.length,
     "Source and destination fields must have the same length"
   );
   return {
-    sourceField: relationship.sourceField,
-    destField: relationship.destField,
+    sourceField,
+    destField,
     destSchema: normalizeLazyTableSchema(
       relationship.destSchema,
       tableSchemaCache
@@ -9413,6 +9425,20 @@ function normalizeLazyTableSchema(tableSchema, buildCache) {
     buildCache
   );
 }
+function normalizeFieldName(sourceField) {
+  if (typeof sourceField === "string") {
+    return [sourceField];
+  }
+  assert(sourceField.length > 0, "Expected at least one field");
+  return sourceField;
+}
+function normalizeTables(tables) {
+  const result = {};
+  for (const [name, table] of sortedEntries(tables)) {
+    result[name] = normalizeTableSchemaWithCache(table, name, /* @__PURE__ */ new Map());
+  }
+  return result;
+}
 
 // ../zero-schema/src/normalized-schema.ts
 function normalizeSchema(schema) {
@@ -9426,10 +9452,10 @@ var NormalizedSchema = class {
   tables;
   constructor(schema) {
     this.version = schema.version;
-    this.tables = normalizeTables(schema.tables);
+    this.tables = normalizeTables2(schema.tables);
   }
 };
-function normalizeTables(tables) {
+function normalizeTables2(tables) {
   const rv = {};
   const tableSchemaCache = /* @__PURE__ */ new Map();
   for (const [name, table] of sortedEntries(tables)) {
@@ -9657,7 +9683,7 @@ var simpleOperatorSchema = valita_exports.union(
   likeOpsSchema,
   inOpsSchema
 );
-var literalReferenceSchema = valita_exports.object({
+var literalReferenceSchema = readonlyObject({
   type: valita_exports.literal("literal"),
   value: valita_exports.union(
     valita_exports.string(),
@@ -9667,11 +9693,11 @@ var literalReferenceSchema = valita_exports.object({
     readonlyArray(valita_exports.union(valita_exports.string(), valita_exports.number(), valita_exports.boolean()))
   )
 });
-var columnReferenceSchema = valita_exports.object({
+var columnReferenceSchema = readonlyObject({
   type: valita_exports.literal("column"),
   name: valita_exports.string()
 });
-var parameterReferenceSchema = valita_exports.object({
+var parameterReferenceSchema = readonlyObject({
   type: valita_exports.literal("static"),
   anchor: valita_exports.union(valita_exports.literal("authData"), valita_exports.literal("preMutationRow")),
   field: valita_exports.string()
@@ -9681,16 +9707,13 @@ var conditionValueSchema = valita_exports.union(
   columnReferenceSchema,
   parameterReferenceSchema
 );
-var simpleConditionSchema = valita_exports.object({
+var simpleConditionSchema = readonlyObject({
   type: valita_exports.literal("simple"),
   op: simpleOperatorSchema,
   left: conditionValueSchema,
   right: valita_exports.union(parameterReferenceSchema, literalReferenceSchema)
 });
-var correlatedSubqueryConditionOperatorSchema = valita_exports.union(
-  valita_exports.literal("EXISTS"),
-  valita_exports.literal("NOT EXISTS")
-);
+var correlatedSubqueryConditionOperatorSchema = valita_exports.union(valita_exports.literal("EXISTS"), valita_exports.literal("NOT EXISTS"));
 var correlatedSubqueryConditionSchema = readonlyObject({
   type: valita_exports.literal("correlatedSubquery"),
   related: valita_exports.lazy(() => correlatedSubquerySchema),
@@ -9710,7 +9733,9 @@ var disjunctionSchema = readonlyObject({
   type: valita_exports.literal("or"),
   conditions: readonlyArray(conditionSchema)
 });
-var compoundKeySchema = valita_exports.tuple([valita_exports.string()]).concat(valita_exports.array(valita_exports.string()));
+var compoundKeySchema = readonly(
+  valita_exports.tuple([valita_exports.string()]).concat(valita_exports.array(valita_exports.string()))
+);
 var correlationSchema = readonlyObject({
   parentField: compoundKeySchema,
   childField: compoundKeySchema
@@ -9722,7 +9747,7 @@ var correlatedSubquerySchemaOmitSubquery = readonlyObject({
 var correlatedSubquerySchema = correlatedSubquerySchemaOmitSubquery.extend({
   subquery: valita_exports.lazy(() => astSchema)
 });
-var astSchema = valita_exports.object({
+var astSchema = readonlyObject({
   schema: valita_exports.string().optional(),
   table: valita_exports.string(),
   alias: valita_exports.string().optional(),
@@ -9813,7 +9838,7 @@ function compareValuePosition(a, b) {
   switch (a.type) {
     case "literal":
       assert(b.type === "literal");
-      return compareUTF8MaybeNull(String(a.value), String(b.value));
+      return compareUTF83(String(a.value), String(b.value));
     case "column":
       assert(b.type === "column");
       return compareUTF83(a.name, b.name);
@@ -14349,23 +14374,30 @@ var MemorySource = class {
     return this.#fetch(req, connection);
   }
   push(change) {
+    for (const _ of this.genPush(change)) {
+    }
+  }
+  *genPush(change) {
     const primaryIndex = this.#getPrimaryIndex();
     const { data } = primaryIndex;
     switch (change.type) {
       case "add":
-        if (data.has(change.row)) {
-          throw new Error(`Row already exists ${JSON.stringify(change)}`);
-        }
+        assert(
+          !data.has(change.row),
+          () => `Row already exists ${JSON.stringify(change)}`
+        );
         break;
       case "remove":
-        if (!data.has(change.row)) {
-          throw new Error(`Row not found ${JSON.stringify(change)}`);
-        }
+        assert(
+          data.has(change.row),
+          () => `Row not found ${JSON.stringify(change)}`
+        );
         break;
       case "edit":
-        if (!data.has(change.oldRow)) {
-          throw new Error(`Row not found ${JSON.stringify(change)}`);
-        }
+        assert(
+          data.has(change.oldRow),
+          () => `Row not found ${JSON.stringify(change)}`
+        );
         break;
       default:
         unreachable(change);
@@ -14391,6 +14423,7 @@ var MemorySource = class {
       if (output) {
         this.#overlay = { outputIndex, change };
         output.push(outputChange);
+        yield;
       }
     }
     this.#overlay = void 0;
@@ -14668,7 +14701,7 @@ var ZeroContext = class {
   #commitListeners = /* @__PURE__ */ new Set();
   staticQueryParameters = void 0;
   constructor(tables, addQuery, batchViewUpdates) {
-    this.#tables = tables;
+    this.#tables = normalizeTables(tables);
     this.#addQuery = addQuery;
     this.#batchViewUpdates = batchViewUpdates;
   }
@@ -15219,7 +15252,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.7.2024120108+6d0413";
+var version2 = "0.7.2024120400+c18ae6";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -16873,7 +16906,7 @@ var Zero = class {
   }
   async #updateAuthToken(lc, error) {
     const { auth: authOption } = this.#options;
-    const auth = await (typeof authOption === "function" ? authOption(error) : authOption);
+    const auth = await authOption?.(error);
     if (auth) {
       lc.debug?.("Got auth token");
       this.#rep.auth = auth;
@@ -17209,4 +17242,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-YQFIGL5R.js.map
+//# sourceMappingURL=chunk-WJCWI5I4.js.map