@rocicorp/zero 0.10.2025010800 → 0.10.2025011100

package/out/zero-schema/src/normalize-table-schema.js

@@ -6,28 +6,29 @@ export class NormalizedTableSchema {
     primaryKey;
     columns;
     relationships;
-    constructor(tableSchema, tableSchemaCache) {
+    constructor(tableSchema, tableSchemaCache, assertFieldRelation) {
         this.tableName = tableSchema.tableName;
         const primaryKey = normalizePrimaryKey(tableSchema.primaryKey);
         this.primaryKey = primaryKey;
         this.columns = normalizeColumns(tableSchema.columns, primaryKey);
         tableSchemaCache.set(tableSchema, this);
-        this.relationships = normalizeRelationships(tableSchema.relationships, tableSchemaCache);
+        this.relationships = normalizeRelationships(this.tableName, tableSchema.relationships, tableSchemaCache, assertFieldRelation);
     }
 }
+const noop = () => { };
 export function normalizeTableSchema(tableSchema) {
-    return normalizeTableSchemaWithCache(tableSchema, tableSchema.tableName, new Map());
+    return normalizeTableSchemaWithCache(tableSchema, tableSchema.tableName, new Map(), noop);
 }
-export function normalizeTableSchemaWithCache(tableSchema, expectedName, tableSchemaCache) {
+export function normalizeTableSchemaWithCache(tableSchema, expectedTableName, tableSchemaCache, assertFieldRelation) {
     if (tableSchema instanceof NormalizedTableSchema) {
         return tableSchema;
     }
-    assert(tableSchema.tableName === expectedName, `Table name mismatch: "${tableSchema.tableName}" !== "${expectedName}"`);
+    assert(tableSchema.tableName === expectedTableName, `Table name mismatch: "${tableSchema.tableName}" !== "${expectedTableName}"`);
     let normalizedTableSchema = tableSchemaCache.get(tableSchema);
     if (normalizedTableSchema) {
         return normalizedTableSchema;
     }
-    normalizedTableSchema = new NormalizedTableSchema(tableSchema, tableSchemaCache);
+    normalizedTableSchema = new NormalizedTableSchema(tableSchema, tableSchemaCache, assertFieldRelation);
     return normalizedTableSchema;
 }
 function assertNoDuplicates(arr) {
@@ -65,41 +66,43 @@ function normalizeColumn(value) {
         optional: value.optional ?? false,
     };
 }
-function normalizeRelationships(relationships, tableSchemaCache) {
+function normalizeRelationships(tableName, relationships, tableSchemaCache, assertFieldRelation) {
     const rv = {};
     if (relationships) {
-        for (const [name, relationship] of sortedEntries(relationships)) {
-            rv[name] = normalizeRelationship(relationship, tableSchemaCache);
+        for (const [relationshipName, relationship] of sortedEntries(relationships)) {
+            rv[relationshipName] = normalizeRelationship(tableName, relationshipName, relationship, tableSchemaCache, assertFieldRelation);
         }
     }
     return rv;
 }
-function normalizeRelationship(relationship, tableSchemaCache) {
+function normalizeRelationship(tableName, relationshipName, relationship, tableSchemaCache, assertFieldRelation) {
     if (isFieldRelationship(relationship)) {
-        return normalizeFieldRelationship(relationship, tableSchemaCache);
+        return normalizeFieldRelationship(tableName, relationshipName, relationship, tableSchemaCache, assertFieldRelation);
     }
-    return normalizeJunctionRelationship(relationship, tableSchemaCache);
+    return normalizeJunctionRelationship(tableName, relationshipName, relationship, tableSchemaCache, assertFieldRelation);
 }
-function normalizeFieldRelationship(relationship, tableSchemaCache) {
+function normalizeFieldRelationship(tableName, relationshipName, relationship, tableSchemaCache, assertFieldRelation) {
     const sourceField = normalizeFieldName(relationship.sourceField);
     const destField = normalizeFieldName(relationship.destField);
     assert(sourceField.length === destField.length, 'Source and destination fields must have the same length');
-    return {
+    const destSchema = normalizeLazyTableSchema(relationship.destSchema, tableSchemaCache, assertFieldRelation);
+    const normalized = {
         sourceField,
         destField,
-        destSchema: normalizeLazyTableSchema(relationship.destSchema, tableSchemaCache),
+        destSchema,
     };
+    assertFieldRelation(tableName, relationshipName, normalized);
+    return normalized;
 }
-function normalizeJunctionRelationship(relationship, tableSchemaCache) {
-    return [
-        normalizeFieldRelationship(relationship[0], tableSchemaCache),
-        normalizeFieldRelationship(relationship[1], tableSchemaCache),
-    ];
+function normalizeJunctionRelationship(tableName, relationshipName, relationship, tableSchemaCache, assertFieldRelation) {
+    const first = normalizeFieldRelationship(tableName, relationshipName, relationship[0], tableSchemaCache, assertFieldRelation);
+    const second = normalizeFieldRelationship(first.destSchema.tableName, relationshipName, relationship[1], tableSchemaCache, assertFieldRelation);
+    return [first, second];
 }
-function normalizeLazyTableSchema(tableSchema, buildCache) {
+function normalizeLazyTableSchema(tableSchema, buildCache, assertFieldRelation) {
     const tableSchemaInstance = typeof tableSchema === 'function' ? tableSchema() : tableSchema;
     return normalizeTableSchemaWithCache(tableSchemaInstance, tableSchemaInstance.tableName, // Don't care about name here.
-    buildCache);
+    buildCache, assertFieldRelation);
 }
 function normalizeFieldName(sourceField) {
     if (typeof sourceField === 'string') {
@@ -110,8 +113,9 @@ function normalizeFieldName(sourceField) {
 }
 export function normalizeTables(tables) {
     const result = {};
+    const assertFieldRelation = tableName => tableName in tables;
     for (const [name, table] of sortedEntries(tables)) {
-        result[name] = normalizeTableSchemaWithCache(table, name, new Map());
+        result[name] = normalizeTableSchemaWithCache(table, name, new Map(), assertFieldRelation);
     }
     return result;
 }

package/out/zero-schema/src/normalize-table-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-table-schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/normalize-table-schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"normalize-table-schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/normalize-table-schema.ts"],"names":[],"mappings":"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"}

package/out/zero-schema/src/normalized-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalized-schema.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/normalized-schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,6BAA6B,EAClC,KAAK,qBAAqB,EAE3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAKhE;AAED,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE;QACf,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAC;KACjD,CAAC;gBAEU,MAAM,EAAE,MAAM;CAI3B;AAED,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,GAAG;IACxE,QAAQ,CAAC,MAAM,EAAE;QACf,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,6BAA6B,CAAC;KACzD,CAAC;CACH,CAAC"}
+{"version":3,"file":"normalized-schema.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/normalized-schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,6BAA6B,EAElC,KAAK,qBAAqB,EAE3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAKxC;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAUhE;AAED,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE;QACf,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAC;KACjD,CAAC;gBAEU,MAAM,EAAE,MAAM;CAI3B;AAED,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,GAAG;IACxE,QAAQ,CAAC,MAAM,EAAE;QACf,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,6BAA6B,CAAC;KACzD,CAAC;CACH,CAAC"}

package/out/zero-schema/src/normalized-schema.js

@@ -1,5 +1,7 @@
+import { assert } from '../../shared/src/asserts.js';
 import { sortedEntries } from '../../shared/src/sorted-entries.js';
 import { normalizeTableSchemaWithCache, } from './normalize-table-schema.js';
+const normalizedCache = new WeakMap();
 /**
  * Creates a normalized schema from a schema.
  *
@@ -10,7 +12,11 @@ export function normalizeSchema(schema) {
     if (schema instanceof NormalizedSchema) {
         return schema;
     }
-    return new NormalizedSchema(schema);
+    let s;
+    if (!(s = normalizedCache.get(schema))) {
+        normalizedCache.set(schema, (s = new NormalizedSchema(schema)));
+    }
+    return s;
 }
 export class NormalizedSchema {
     version;
@@ -23,8 +29,19 @@ export class NormalizedSchema {
 function normalizeTables(tables) {
     const rv = {};
     const tableSchemaCache = new Map();
+    function assertFieldRelation(tableName, relationShipName, relation) {
+        const destTableName = relation.destSchema.tableName;
+        assert(destTableName in tables, `Relationship "${tableName}"."${relationShipName}" destination "${destTableName}" is missing in schema`);
+        assertColumns(relation.sourceField, tables[tableName]);
+        assertColumns(relation.destField, tables[destTableName]);
+    }
+    function assertColumns(columnNames, table) {
+        for (const columnName of columnNames) {
+            assert(columnName in table.columns, `Column "${columnName}" is missing in table "${table.tableName}"`);
+        }
+    }
     for (const [name, table] of sortedEntries(tables)) {
-        rv[name] = normalizeTableSchemaWithCache(table, name, tableSchemaCache);
+        rv[name] = normalizeTableSchemaWithCache(table, name, tableSchemaCache, assertFieldRelation);
     }
     return rv;
 }

package/out/zero-schema/src/normalized-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalized-schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/normalized-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,oCAAoC,CAAC;AAEjE,OAAO,EACL,6BAA6B,GAI9B,MAAM,6BAA6B,CAAC;AAGrC;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,IAAI,MAAM,YAAY,gBAAgB,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,OAAO,gBAAgB;IAClB,OAAO,CAAS;IAChB,MAAM,CAEb;IAEF,YAAY,MAAc;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;CACF;AAQD,SAAS,eAAe,CAAC,MAAwB;IAG/C,MAAM,EAAE,GAEH,EAAE,CAAC;IACR,MAAM,gBAAgB,GAAqB,IAAI,GAAG,EAAE,CAAC;IACrD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,EAAE,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,KAAK,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
+{"version":3,"file":"normalized-schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/normalized-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,oCAAoC,CAAC;AAGjE,OAAO,EACL,6BAA6B,GAK9B,MAAM,6BAA6B,CAAC;AAIrC,MAAM,eAAe,GAAG,IAAI,OAAO,EAA4B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,IAAI,MAAM,YAAY,gBAAgB,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,CAAC;IACN,IAAI,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACvC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,OAAO,gBAAgB;IAClB,OAAO,CAAS;IAChB,MAAM,CAEb;IAEF,YAAY,MAAc;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;CACF;AAQD,SAAS,eAAe,CAAC,MAAwB;IAG/C,MAAM,EAAE,GAEH,EAAE,CAAC;IACR,MAAM,gBAAgB,GAAqB,IAAI,GAAG,EAAE,CAAC;IAErD,SAAS,mBAAmB,CAC1B,SAAiB,EACjB,gBAAwB,EACxB,QAAqC;QAErC,MAAM,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;QACpD,MAAM,CACJ,aAAa,IAAI,MAAM,EACvB,iBAAiB,SAAS,MAAM,gBAAgB,kBAAkB,aAAa,wBAAwB,CACxG,CAAC;QACF,aAAa,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QACvD,aAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,SAAS,aAAa,CAAC,WAAwB,EAAE,KAAkB;QACjE,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,CACJ,UAAU,IAAI,KAAK,CAAC,OAAO,EAC3B,WAAW,UAAU,0BAA0B,KAAK,CAAC,SAAS,GAAG,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,EAAE,CAAC,IAAI,CAAC,GAAG,6BAA6B,CACtC,KAAK,EACL,IAAI,EACJ,gBAAgB,EAChB,mBAAmB,CACpB,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}

package/out/zero-schema/src/schema.d.ts

@@ -1,4 +1,4 @@
-import type { TableSchema } from './table-schema.js';
+import { type TableSchema } from './table-schema.js';
 export type Schema = {
     readonly version: number;
     readonly tables: {

package/out/zero-schema/src/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE;QAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAAA;KAAC,CAAC;CAC1D,CAAC;AAEF,wBAAgB,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAQjE"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE;QAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAAA;KAAC,CAAC;CAC1D,CAAC;AAEF,wBAAgB,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAKjE"}

package/out/zero-schema/src/schema.js

@@ -1,8 +1,9 @@
-import { assert } from '../../shared/src/asserts.js';
+import { normalizeSchema } from './normalized-schema.js';
+import {} from './table-schema.js';
 export function createSchema(schema) {
-    for (const [tableName, table] of Object.entries(schema.tables)) {
-        assert(tableName === table.tableName, `createSchema tableName mismatch, expected ${tableName} === ${table.tableName}`);
-    }
+    // normalizeSchema will throw if the schema is invalid.
+    normalizeSchema(schema);
+    // We still want to return s to cause less surprises.
     return schema;
 }
 //# sourceMappingURL=schema.js.map

package/out/zero-schema/src/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAQnD,MAAM,UAAU,YAAY,CAAyB,MAAS;IAC5D,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/D,MAAM,CACJ,SAAS,KAAK,KAAK,CAAC,SAAS,EAC7B,6CAA6C,SAAS,QAAQ,KAAK,CAAC,SAAS,EAAE,CAChF,CAAC;IACJ,CAAC;IACD,OAAO,MAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAkB,MAAM,mBAAmB,CAAC;AAOnD,MAAM,UAAU,YAAY,CAAyB,MAAS;IAC5D,uDAAuD;IACvD,eAAe,CAAC,MAAM,CAAC,CAAC;IACxB,qDAAqD;IACrD,OAAO,MAAW,CAAC;AACrB,CAAC"}

package/out/zero-solid/src/solid-view.d.ts

@@ -1,10 +1,13 @@
 import { type Change, type Format, type Input, type Output, type Query, type QueryType, type Smash, type TableSchema, type View } from '../../zero-advanced/src/mod.js';
 import type { ResultType } from '../../zql/src/query/typed-view.js';
+export type QueryResultDetails = {
+    readonly type: ResultType;
+};
 export declare class SolidView<V extends View> implements Output {
     #private;
     constructor(input: Input, format?: Format, onDestroy?: () => void, queryComplete?: true | Promise<true>);
     get data(): V;
-    get resultType(): ResultType;
+    get resultDetails(): QueryResultDetails;
     destroy(): void;
     push(change: Change): void;
 }

package/out/zero-solid/src/solid-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solid-view.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/solid-view.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,MAAM,EAEX,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,WAAW,EAChB,KAAK,IAAI,EAEV,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAElE,qBAAa,SAAS,CAAC,CAAC,SAAS,IAAI,CAAE,YAAW,MAAM;;gBAcpD,KAAK,EAAE,KAAK,EACZ,MAAM,GAAE,MAA6C,EACrD,SAAS,GAAE,MAAM,IAAe,EAChC,aAAa,GAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAQ;IAiC5C,IAAI,IAAI,IACwB,CAAC,CAChC;IAED,IAAI,UAAU,eAEb;IAED,OAAO;IAIP,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAa3B;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,SAAS,WAAW,EAC3B,OAAO,SAAS,SAAS,EAEzB,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,EAC/B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,IAAI,EACrB,oBAAoB,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,EAC9C,aAAa,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAClC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAS3B"}
+{"version":3,"file":"solid-view.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/solid-view.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,MAAM,EAEX,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,WAAW,EAChB,KAAK,IAAI,EAEV,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAElE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC3B,CAAC;AAOF,qBAAa,SAAS,CAAC,CAAC,SAAS,IAAI,CAAE,YAAW,MAAM;;gBASpD,KAAK,EAAE,KAAK,EACZ,MAAM,GAAE,MAA6C,EACrD,SAAS,GAAE,MAAM,IAAe,EAChC,aAAa,GAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAQ;IA+B5C,IAAI,IAAI,IAAI,CAAC,CAEZ;IAED,IAAI,aAAa,IAAI,kBAAkB,CAEtC;IAED,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAa3B;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,SAAS,WAAW,EAC3B,OAAO,SAAS,SAAS,EAEzB,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,EAC/B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,IAAI,EACrB,oBAAoB,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,EAC9C,aAAa,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAClC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAE3B"}

package/out/zero-solid/src/use-query.d.ts

@@ -1,12 +1,9 @@
 import { type Accessor } from 'solid-js';
 import type { Query, QueryType, Smash, TableSchema } from '../../zero-advanced/src/mod.js';
-import type { ResultType } from '../../zql/src/query/typed-view.js';
-export type QueryResultDetails = Readonly<{
-    type: ResultType;
-}>;
+import { type QueryResultDetails } from './solid-view.js';
 export type QueryResult<TReturn extends QueryType> = readonly [
-    Smash<TReturn>,
-    QueryResultDetails
+    Accessor<Smash<TReturn>>,
+    Accessor<QueryResultDetails>
 ];
-export declare function useQuery<TSchema extends TableSchema, TReturn extends QueryType>(querySignal: () => Query<TSchema, TReturn>): Accessor<QueryResult<TReturn>>;
+export declare function useQuery<TSchema extends TableSchema, TReturn extends QueryType>(querySignal: () => Query<TSchema, TReturn>): QueryResult<TReturn>;
 //# sourceMappingURL=use-query.d.ts.map

package/out/zero-solid/src/use-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,QAAQ,EAAwB,MAAM,UAAU,CAAC;AAC9D,OAAO,KAAK,EACV,KAAK,EAEL,SAAS,EACT,KAAK,EACL,WAAW,EACZ,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAElE,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACxC,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,WAAW,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS;IAC5D,KAAK,CAAC,OAAO,CAAC;IACd,kBAAkB;CACnB,CAAC;AAEF,wBAAgB,QAAQ,CACtB,OAAO,SAAS,WAAW,EAC3B,OAAO,SAAS,SAAS,EACzB,WAAW,EAAE,MAAM,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAa5E"}
+{"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,QAAQ,EAAC,MAAM,UAAU,CAAC;AAC9D,OAAO,KAAK,EAEV,KAAK,EACL,SAAS,EACT,KAAK,EACL,WAAW,EACZ,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAmB,KAAK,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAE1E,MAAM,MAAM,WAAW,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS;IAC5D,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxB,QAAQ,CAAC,kBAAkB,CAAC;CAC7B,CAAC;AAEF,wBAAgB,QAAQ,CACtB,OAAO,SAAS,WAAW,EAC3B,OAAO,SAAS,SAAS,EACzB,WAAW,EAAE,MAAM,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,CAelE"}

package/out/zero.js

@@ -13,9 +13,10 @@ import {
   escapeLike,
   getDefaultPuller,
   makeIDBName
-} from "./chunk-PPRTDNXA.js";
+} from "./chunk-FEVIDCUL.js";
 import "./chunk-HARIWJ2J.js";
 import "./chunk-Y6OVFUGE.js";
+import "./chunk-ZRR54VX5.js";
 import "./chunk-F5QR3K72.js";
 export {
   ANYONE_CAN,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocicorp/zero",
-  "version": "0.10.2025010800+ca1811",
+  "version": "0.10.2025011100+4a1fd2",
   "scripts": {
     "build": "rm -rf out && npm run build-server && npm run build-client",
     "build-client": "tsc -p tsconfig.client.json && tsc-alias -p tsconfig.client.json && node tool/build.js",
@@ -11,7 +11,8 @@
     "check-types:watch": "tsc --watch",
     "format": "prettier --write .",
     "check-format": "prettier --check .",
-    "lint": "eslint --ext .ts,.tsx,.js,.jsx src/"
+    "lint": "eslint --ext .ts,.tsx,.js,.jsx src/",
+    "prepack": "cp ../zero-cache/src/services/litestream/config.yml ./out/zero-cache/src/services/litestream/"
   },
   "dependencies": {
     "@badrap/valita": "0.3.11",
@@ -36,15 +37,14 @@
     "command-line-args": "^6.0.1",
     "command-line-usage": "^7.0.3",
     "compare-utf8": "^0.1.1",
+    "defu": "^6.1.4",
     "dotenv": "^16.4.5",
     "eventemitter3": "^5.0.1",
     "fastify": "^5.0.0",
     "jose": "^5.9.3",
     "js-xxhash": "^4.0.0",
     "json-custom-numbers": "^3.1.1",
-    "lodash.kebabcase": "^4.1.1",
-    "lodash.merge": "^4.6.2",
-    "lodash.snakecase": "^4.1.1",
+    "kasi": "^1.1.0",
     "nanoid": "^5.0.8",
     "pg": "^8.11.3",
     "pg-format": "npm:pg-format-fix@^1.0.5",
@@ -90,6 +90,10 @@
     "./advanced": {
       "types": "./out/zero/src/advanced.d.ts",
       "default": "./out/advanced.js"
+    },
+    "./change-protocol": {
+      "types": "./out/zero-cache/src/services/change-source/protocol/mod.d.ts",
+      "default": "./out/change-protocol.js"
     }
   },
   "bin": {