@rocicorp/zero 0.7.2024120200 → 0.7.2024120700

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

@@ -33,25 +33,33 @@ export function normalizeTableSchemaWithCache(tableSchema, expectedName, tableSc
 function assertNoDuplicates(arr) {
     assert(new Set(arr).size === arr.length, 'Primary key must not contain duplicates');
 }
-export function normalizePrimaryKey(arr) {
-    assertNoDuplicates(arr);
-    return arr;
+export 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,
@@ -59,8 +67,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;
 }
@@ -71,10 +81,12 @@ function normalizeRelationship(relationship, tableSchemaCache) {
     return normalizeJunctionRelationship(relationship, tableSchemaCache);
 }
 function normalizeFieldRelationship(relationship, tableSchemaCache) {
-    assert(relationship.sourceField.length === relationship.destField.length, 'Source and destination fields must have the same length');
+    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 {
-        sourceField: relationship.sourceField,
-        destField: relationship.destField,
+        sourceField,
+        destField,
         destSchema: normalizeLazyTableSchema(relationship.destSchema, tableSchemaCache),
     };
 }
@@ -89,4 +101,18 @@ function normalizeLazyTableSchema(tableSchema, buildCache) {
     return normalizeTableSchemaWithCache(tableSchemaInstance, tableSchemaInstance.tableName, // Don't care about name here.
     buildCache);
 }
+function normalizeFieldName(sourceField) {
+    if (typeof sourceField === 'string') {
+        return [sourceField];
+    }
+    assert(sourceField.length > 0, 'Expected at least one field');
+    return sourceField;
+}
+export function normalizeTables(tables) {
+    const result = {};
+    for (const [name, table] of sortedEntries(tables)) {
+        result[name] = normalizeTableSchemaWithCache(table, name, new Map());
+    }
+    return result;
+}
 //# sourceMappingURL=normalize-table-schema.js.map

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":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,oCAAoC,CAAC;AAIjE,OAAO,EACL,mBAAmB,GAOpB,MAAM,mBAAmB,CAAC;AAY3B,MAAM,OAAO,qBAAqB;IAEvB,SAAS,CAAS;IAClB,UAAU,CAAuB;IACjC,OAAO,CAA8B;IACrC,aAAa,CAAoD;IAE1E,YAAY,WAAwB,EAAE,gBAAkC;QACtE,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;QACvC,MAAM,UAAU,GAAG,mBAAmB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC/D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,gBAAgB,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACjE,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,GAAG,sBAAsB,CACzC,WAAW,CAAC,aAAa,EACzB,gBAAgB,CACjB,CAAC;IACJ,CAAC;CACF;AAED,MAAM,UAAU,oBAAoB,CAClC,WAAgD;IAEhD,OAAO,6BAA6B,CAClC,WAAW,EACX,WAAW,CAAC,SAAS,EACrB,IAAI,GAAG,EAAE,CACV,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,WAAgD,EAChD,YAAoB,EACpB,gBAAkC;IAElC,IAAI,WAAW,YAAY,qBAAqB,EAAE,CAAC;QACjD,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,MAAM,CACJ,WAAW,CAAC,SAAS,KAAK,YAAY,EACtC,yBAAyB,WAAW,CAAC,SAAS,UAAU,YAAY,GAAG,CACxE,CAAC;IAEF,IAAI,qBAAqB,GAAG,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAED,qBAAqB,GAAG,IAAI,qBAAqB,CAC/C,WAAW,EACX,gBAAgB,CACjB,CAAC;IACF,OAAO,qBAA8C,CAAC;AACxD,CAAC;AAID,SAAS,kBAAkB,CAAC,GAAsB;IAChD,MAAM,CACJ,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,MAAM,EAChC,yCAAyC,CAC1C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,UAA+B;IAE/B,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,CAAC,UAAU,CAAkC,CAAC;IACvD,CAAC;IACD,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC/B,OAAO,UAAkC,CAAC;AAC5C,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAgD,EAChD,UAAsB;IAEtB,MAAM,EAAE,GAA0C,EAAE,CAAC;IACrD,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,WAAW,EAAE,uBAAuB,EAAE,aAAa,CAAC,CAAC;QAC5D,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACpC,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAC,GAAG,WAAW,CAAC;YACrC,MAAM,CAAC,CAAC,QAAQ,EAAE,uBAAuB,EAAE,sBAAsB,CAAC,CAAC;YACnE,MAAM,CACJ,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,SAAS,EAC5D,uBAAuB,EAAE,+CAA+C,IAAI,EAAE,CAC/E,CAAC;QACJ,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,EAAE,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,eAAe,CAAC,KAA8B;IACrD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC;IACxC,CAAC;IACD,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;KAClC,CAAC;AACJ,CAAC;AAQD,SAAS,sBAAsB,CAC7B,aAA4B,EAC5B,gBAAkC;IAElC,MAAM,EAAE,GAAsC,EAAE,CAAC;IACjD,IAAI,aAAa,EAAE,CAAC;QAClB,KAAK,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;YAChE,EAAE,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAyBD,SAAS,qBAAqB,CAC5B,YAA0B,EAC1B,gBAAkC;IAElC,IAAI,mBAAmB,CAAC,YAAY,CAAC,EAAE,CAAC;QACtC,OAAO,0BAA0B,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,6BAA6B,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;AACvE,CAAC;AAQD,SAAS,0BAA0B,CACjC,YAA+B,EAC/B,gBAAkC;IAElC,MAAM,WAAW,GAAG,kBAAkB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,kBAAkB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC7D,MAAM,CACJ,WAAW,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EACvC,yDAAyD,CAC1D,CAAC;IACF,OAAO;QACL,WAAW;QACX,SAAS;QACT,UAAU,EAAE,wBAAwB,CAClC,YAAY,CAAC,UAAU,EACvB,gBAAgB,CACjB;KACF,CAAC;AACJ,CAAC;AAOD,SAAS,6BAA6B,CACpC,YAAkC,EAClC,gBAAkC;IAElC,OAAO;QACL,0BAA0B,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC;QAC7D,0BAA0B,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC;KAC9D,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAC/B,WAA4B,EAC5B,UAA4B;IAE5B,MAAM,mBAAmB,GACvB,OAAO,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAClE,OAAO,6BAA6B,CAClC,mBAAmB,EACnB,mBAAmB,CAAC,SAAS,EAAE,8BAA8B;IAC7D,UAAU,CACX,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAiC;IAC3D,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,6BAA6B,CAAC,CAAC;IAC9D,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,MAAmC;IAEnC,MAAM,MAAM,GAA0C,EAAE,CAAC;IACzD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

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

@@ -13,7 +13,7 @@ type AssetPermissions<TAuthDataShape, TSchema extends TableSchema> = {
     insert?: PermissionRule<TAuthDataShape, TSchema>[] | undefined;
     update?: {
         preMutation?: PermissionRule<TAuthDataShape, TSchema>[];
-        postProposedMutation?: PermissionRule<TAuthDataShape, TSchema>[];
+        postMutation?: PermissionRule<TAuthDataShape, TSchema>[];
     } | undefined;
     delete?: PermissionRule<TAuthDataShape, TSchema>[] | undefined;
 };
@@ -21,7 +21,7 @@ export type PermissionsConfig<TAuthDataShape, TSchema extends Schema> = {
     [K in keyof TSchema['tables']]?: {
         row?: AssetPermissions<TAuthDataShape, TSchema['tables'][K]> | undefined;
         cell?: {
-            [C in keyof TSchema['tables'][K]['columns']]?: AssetPermissions<TAuthDataShape, TSchema['tables'][K]>;
+            [C in keyof TSchema['tables'][K]['columns']]?: Omit<AssetPermissions<TAuthDataShape, TSchema['tables'][K]>, 'cell'>;
         } | undefined;
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,8BAA8B,CAAC;AACxD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAEV,iBAAiB,IAAI,yBAAyB,EAC/C,MAAM,2BAA2B,CAAC;AAGnC,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gCAAgC,CAAC;AAE9D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mCAAmC,CAAC;AAEzE,MAAM,MAAM,OAAO,CAAC,OAAO,SAAS,MAAM,IAAI;KAC3C,CAAC,IAAI,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5D,CAAC;AAEF,KAAK,cAAc,CAAC,cAAc,EAAE,OAAO,SAAS,WAAW,IAAI,CACjE,QAAQ,EAAE,cAAc,EACxB,EAAE,EAAE,iBAAiB,CAAC,OAAO,CAAC,KAC3B,SAAS,CAAC;AAEf,KAAK,gBAAgB,CAAC,cAAc,EAAE,OAAO,SAAS,WAAW,IAAI;IACnE,MAAM,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAC/D,MAAM,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAC/D,MAAM,CAAC,EACH;QACE,WAAW,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC;QACxD,oBAAoB,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC;KAClE,GACD,SAAS,CAAC;IACd,MAAM,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;CAChE,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,cAAc,EAAE,OAAO,SAAS,MAAM,IAAI;KACrE,CAAC,IAAI,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QAC/B,GAAG,CAAC,EAAE,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;QACzE,IAAI,CAAC,EACD;aACG,CAAC,IAAI,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAC7D,cAAc,EACd,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACrB;SACF,GACD,SAAS,CAAC;KACf;CACF,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,cAAc,EAAE,OAAO,SAAS,MAAM,EAC5E,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,MACL,OAAO,CAAC,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,GACnD,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,GAC7C,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAYhD;AAwFD,eAAO,MAAM,WAAW,IAQvB,CAAC;AAEF,eAAO,MAAM,iBAAiB,IAQ7B,CAAC"}
+{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,8BAA8B,CAAC;AACxD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAEV,iBAAiB,IAAI,yBAAyB,EAC/C,MAAM,2BAA2B,CAAC;AAGnC,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gCAAgC,CAAC;AAE9D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mCAAmC,CAAC;AAEzE,MAAM,MAAM,OAAO,CAAC,OAAO,SAAS,MAAM,IAAI;KAC3C,CAAC,IAAI,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5D,CAAC;AAEF,KAAK,cAAc,CAAC,cAAc,EAAE,OAAO,SAAS,WAAW,IAAI,CACjE,QAAQ,EAAE,cAAc,EACxB,EAAE,EAAE,iBAAiB,CAAC,OAAO,CAAC,KAC3B,SAAS,CAAC;AAEf,KAAK,gBAAgB,CAAC,cAAc,EAAE,OAAO,SAAS,WAAW,IAAI;IAEnE,MAAM,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAC/D,MAAM,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAC/D,MAAM,CAAC,EACH;QACE,WAAW,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC;QACxD,YAAY,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC;KAC1D,GACD,SAAS,CAAC;IACd,MAAM,CAAC,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;CAChE,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,cAAc,EAAE,OAAO,SAAS,MAAM,IAAI;KACrE,CAAC,IAAI,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QAC/B,GAAG,CAAC,EAAE,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;QACzE,IAAI,CAAC,EACD;aACG,CAAC,IAAI,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CACjD,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EACtD,MAAM,CACP;SACF,GACD,SAAS,CAAC;KACf;CACF,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,cAAc,EAAE,OAAO,SAAS,MAAM,EAC5E,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,MACL,OAAO,CAAC,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,GACnD,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,GAC7C,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAYhD;AA6FD,eAAO,MAAM,WAAW,IAQvB,CAAC;AAEF,eAAO,MAAM,iBAAiB,IAQ7B,CAAC"}

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

@@ -1,43 +1,29 @@
+import * as v from '../../shared/src/valita.js';
 import { type PermissionsConfig } from './compiled-permissions.js';
+import { type DecycledNormalizedSchema, type NormalizedSchema } from './normalized-schema.js';
 import type { Schema } from './schema.js';
-import * as v from '../../shared/src/valita.js';
-import type { TableSchema } from './table-schema.js';
-import type { DecycledNormalizedSchema, NormalizedSchema } from './normalized-schema.js';
+import type { Relationship, TableSchema, ValueType } from './table-schema.js';
 export type SchemaConfig = {
     schema: Schema;
     permissions: PermissionsConfig;
 };
-export declare const relationshipSchema: v.UnionType<[v.ObjectType<{
-    sourceField: v.Type<import("../../zero-protocol/src/ast.js").CompoundKey>;
-    destField: v.Type<import("../../zero-protocol/src/ast.js").CompoundKey>;
-    destSchema: v.Type<TableSchema>;
-}, undefined>, v.Type<readonly [{
-    sourceField: import("../../zero-protocol/src/ast.js").CompoundKey;
-    destField: import("../../zero-protocol/src/ast.js").CompoundKey;
-    destSchema: TableSchema;
-}, {
-    sourceField: import("../../zero-protocol/src/ast.js").CompoundKey;
-    destField: import("../../zero-protocol/src/ast.js").CompoundKey;
-    destSchema: TableSchema;
-}]>]>;
-export declare const schemaValueSchema: v.ObjectType<{
-    type: v.UnionType<[v.Type<"string">, v.Type<"number">, v.Type<"boolean">, v.Type<"null">, v.Type<"json">]>;
+export declare const relationshipSchema: v.Type<Relationship>;
+export declare const valueTypeSchema: v.Type<ValueType>;
+export declare const schemaValueSchema: v.ObjectType<Readonly<{
+    type: v.Type<ValueType>;
     optional: v.Optional<boolean>;
-}, undefined>;
-export declare const sourceOrTableSchemaSchema: v.ObjectType<{
-    tableName: v.Type<string>;
-    columns: v.Type<Record<string, {
-        optional?: boolean | undefined;
-        type: "string" | "number" | "boolean" | "null" | "json";
-    }>>;
-    primaryKey: v.Type<readonly [string, ...string[]]>;
-}, undefined>;
+}>, undefined>;
 export declare const tableSchemaSchema: v.Type<TableSchema>;
-export declare const schemaSchema: v.ObjectType<{
+export declare const schemaSchema: v.ObjectType<Readonly<{
     version: v.Type<number>;
     tables: v.Type<Record<string, TableSchema>>;
-}, undefined>;
+}>, undefined>;
 export declare function isSchemaConfig(value: any): value is SchemaConfig;
 export declare function replacePointersWithSchemaNames(schema: NormalizedSchema): DecycledNormalizedSchema;
 export declare function replaceSchemaNamesWithPointers(schema: DecycledNormalizedSchema): NormalizedSchema;
+export declare function stringifySchema(module: unknown): Promise<string>;
+export declare function parseSchema(input: string, source: string): {
+    schema: Schema;
+    permissions: PermissionsConfig;
+};
 //# sourceMappingURL=schema-config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema-config.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/schema-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,iBAAiB,EAAC,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAGhD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EACV,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAYF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;KAG9B,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;aAS5B,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;aAIpC,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAG9C,CAAC;AAEL,eAAO,MAAM,YAAY;;;aAGvB,CAAC;AAGH,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,YAAY,CAGhE;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,gBAAgB,GACvB,wBAAwB,CA8B1B;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,wBAAwB,GAC/B,gBAAgB,CAkBlB"}
+{"version":3,"file":"schema-config.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/schema-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAGhD,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,gBAAgB,EACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAGV,YAAY,EACZ,WAAW,EACX,SAAS,EACV,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAYF,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAGnD,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAM7C,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;cAG5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAKhD,CAAC;AAEH,eAAO,MAAM,YAAY;;;cAGvB,CAAC;AAGH,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,YAAY,CAGhE;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,gBAAgB,GACvB,wBAAwB,CA8B1B;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,wBAAwB,GAC/B,gBAAgB,CAkBlB;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE,OAAO,mBAwBpD;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb;IACD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAcA"}

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

@@ -1,27 +1,27 @@
-import {} from './compiled-permissions.js';
 import * as v from '../../shared/src/valita.js';
 import { compoundKeySchema } from '../../zero-protocol/src/ast.js';
 import { primaryKeySchema } from '../../zero-protocol/src/primary-key.js';
-const fieldRelationshipSchema = v.object({
-    sourceField: compoundKeySchema,
-    destField: compoundKeySchema,
+import { permissionsConfigSchema, } from './compiled-permissions.js';
+import { normalizeSchema, } from './normalized-schema.js';
+const fieldRelationshipSchema = v.readonlyObject({
+    sourceField: v.union(compoundKeySchema, v.string()),
+    destField: v.union(compoundKeySchema, v.string()),
     destSchema: v.lazy(() => tableSchemaSchema),
 });
 const junctionRelationshipSchema = v.readonly(v.tuple([fieldRelationshipSchema, fieldRelationshipSchema]));
 export const relationshipSchema = v.union(fieldRelationshipSchema, junctionRelationshipSchema);
-export const schemaValueSchema = v.object({
-    type: v.union(v.literal('string'), v.literal('number'), v.literal('boolean'), v.literal('null'), v.literal('json')),
+export const valueTypeSchema = v.union(v.literal('string'), v.literal('number'), v.literal('boolean'), v.literal('null'), v.literal('json'));
+export const schemaValueSchema = v.readonlyObject({
+    type: valueTypeSchema,
     optional: v.boolean().optional(),
 });
-export const sourceOrTableSchemaSchema = v.object({
+export const tableSchemaSchema = v.readonlyObject({
     tableName: v.string(),
-    columns: v.record(schemaValueSchema),
-    primaryKey: primaryKeySchema,
+    columns: v.record(v.union(schemaValueSchema, valueTypeSchema)),
+    primaryKey: v.union(primaryKeySchema, v.string()),
+    relationships: v.record(relationshipSchema).optional(),
 });
-export const tableSchemaSchema = sourceOrTableSchemaSchema.extend({
-    relationships: v.record(relationshipSchema),
-});
-export const schemaSchema = v.object({
+export const schemaSchema = v.readonlyObject({
     version: v.number(),
     tables: v.record(tableSchemaSchema),
 });
@@ -76,4 +76,30 @@ export function replaceSchemaNamesWithPointers(schema) {
     });
     return schema;
 }
+export async function stringifySchema(module) {
+    if (!isSchemaConfig(module)) {
+        throw new Error('Schema file must have a export `schema` and `permissions`.');
+    }
+    const schemaConfig = module;
+    const permissions = v.parse(await schemaConfig.permissions, permissionsConfigSchema);
+    const cycleFreeNormalizedSchema = replacePointersWithSchemaNames(normalizeSchema(schemaConfig.schema));
+    return JSON.stringify({
+        permissions,
+        schema: cycleFreeNormalizedSchema,
+    }, undefined, 2);
+}
+export function parseSchema(input, source) {
+    try {
+        const config = JSON.parse(input);
+        const permissions = v.parse(config.permissions, permissionsConfigSchema);
+        const normalizedSchema = normalizeSchema(replaceSchemaNamesWithPointers(config.schema));
+        return {
+            permissions,
+            schema: normalizedSchema,
+        };
+    }
+    catch (e) {
+        throw new Error(`Failed to parse schema config from ${source}: ${e}`);
+    }
+}
 //# sourceMappingURL=schema-config.js.map

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

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

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

@@ -8,55 +8,41 @@ export type SchemaValue = {
     type: ValueType;
     optional?: boolean | undefined;
 };
-export type SourceOrTableSchema = {
+export type TableSchema = {
     readonly tableName: string;
-    readonly primaryKey: PrimaryKey;
-    readonly columns: Record<string, SchemaValue>;
-};
-export type TableSchema = SourceOrTableSchema & {
-    readonly relationships: {
+    readonly columns: Record<string, SchemaValue | ValueType>;
+    readonly relationships?: {
         readonly [name: string]: Relationship;
-    };
+    } | undefined;
+    readonly primaryKey: PrimaryKey | string;
 };
 export declare function createTableSchema<const T extends TableSchema>(schema: T): T;
-export type TableSchemaToRow<T extends TableSchema> = {
-    [K in keyof T['columns']]: SchemaValueToTSType<T['columns'][K]>;
+type TypeNameToTypeMap = {
+    string: string;
+    number: number;
+    boolean: boolean;
+    null: null;
+    json: any;
 };
-/**
- * For some reason this needs to be separated out from SchemaValueToTSType in
- * order for intellisense to show `boolean`. If this gets folded into
- * SchemaValueToTSType, intellisense will show
- * SchemaValueToTSType<{type: "boolean"}> instead.
- */
-type BaseType<T extends SchemaValue> = T extends {
-    type: 'string';
-} ? string : T extends {
-    type: 'number';
-} ? number : T extends {
-    type: 'boolean';
-} ? boolean : T extends {
-    type: 'null';
-} ? null : T extends {
-    type: 'json';
-} ? any : never;
+type ColumnTypeName<T extends SchemaValue | ValueType> = T extends SchemaValue ? T['type'] : T;
 /**
  * Given a schema value, return the TypeScript type.
  *
  * This allows us to create the correct return type for a
  * query that has a selection.
  */
-export type SchemaValueToTSType<T extends SchemaValue> = T extends {
+export type SchemaValueToTSType<T extends SchemaValue | ValueType> = T extends ValueType ? TypeNameToTypeMap[T] : T extends {
     optional: true;
-} ? BaseType<T> | null : BaseType<T>;
+} ? TypeNameToTypeMap[ColumnTypeName<T>] | null : TypeNameToTypeMap[ColumnTypeName<T>];
 export type Supertype<TSchemas extends TableSchema[]> = {
     tableName: TSchemas[number]['tableName'];
     primaryKey: TSchemas[number]['primaryKey'];
     columns: {
         [K in keyof TSchemas[number]['columns']]: TSchemas[number]['columns'][K];
     };
-    relationships: {
+    relationships?: {
         [K in keyof TSchemas[number]['relationships']]: TSchemas[number]['relationships'][K];
-    };
+    } | undefined;
 };
 /**
  * A schema might have a relationship to itself.
@@ -64,15 +50,15 @@ export type Supertype<TSchemas extends TableSchema[]> = {
  * the variable, we allow use of a function to get around this.
  */
 type Lazy<T> = T | (() => T);
-export type Relationship = FieldRelationship<TableSchema, TableSchema> | JunctionRelationship<TableSchema, TableSchema, TableSchema>;
+export type Relationship = FieldRelationship | JunctionRelationship;
 export type AtLeastOne<T> = readonly [T, ...T[]];
 export declare function atLeastOne<T>(arr: readonly T[]): AtLeastOne<T>;
-type FieldName<TSchema extends TableSchema> = AtLeastOne<keyof TSchema['columns']>;
+type FieldName<TSchema extends TableSchema> = (keyof TSchema['columns'] & string) | AtLeastOne<keyof TSchema['columns'] & string>;
 /**
  * A relationship between two entities where
  * that relationship is defined via fields on both entities.
  */
-export type FieldRelationship<TSourceSchema extends TableSchema, TDestSchema extends TableSchema> = {
+export type FieldRelationship<TSourceSchema extends TableSchema = TableSchema, TDestSchema extends TableSchema = TableSchema> = {
     sourceField: FieldName<TSourceSchema>;
     destField: FieldName<TDestSchema>;
     destSchema: Lazy<TDestSchema>;
@@ -81,14 +67,14 @@ export type FieldRelationship<TSourceSchema extends TableSchema, TDestSchema ext
  * A relationship between two entities where
  * that relationship is defined via a junction table.
  */
-export type JunctionRelationship<TSourceSchema extends TableSchema, TJunctionSchema extends TableSchema, TDestSchema extends TableSchema> = readonly [
+export type JunctionRelationship<TSourceSchema extends TableSchema = TableSchema, TJunctionSchema extends TableSchema = TableSchema, TDestSchema extends TableSchema = TableSchema> = readonly [
     FieldRelationship<TSourceSchema, TJunctionSchema>,
     FieldRelationship<TJunctionSchema, TDestSchema>
 ];
-export declare function isFieldRelationship(relationship: Relationship): relationship is FieldRelationship<TableSchema, TableSchema>;
-export declare function assertFieldRelationship(relationship: Relationship): asserts relationship is FieldRelationship<TableSchema, TableSchema>;
-export declare function isJunctionRelationship(relationship: Relationship): relationship is JunctionRelationship<TableSchema, TableSchema, TableSchema>;
-export declare function assertJunctionRelationship(relationship: Relationship): asserts relationship is JunctionRelationship<TableSchema, TableSchema, TableSchema>;
+export declare function isFieldRelationship(relationship: Relationship): relationship is FieldRelationship;
+export declare function assertFieldRelationship(relationship: Relationship): asserts relationship is FieldRelationship;
+export declare function isJunctionRelationship(relationship: Relationship): relationship is JunctionRelationship;
+export declare function assertJunctionRelationship(relationship: Relationship): asserts relationship is JunctionRelationship;
 /**
  * Calling `related` on `Query` returns a new Query
  * since `related` moves through the relationship. This function takes

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"table-schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/table-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAwBnD,MAAM,UAAU,iBAAiB,CAA8B,MAAS;IACtE,OAAO,MAAW,CAAC;AACrB,CAAC;AAkED,MAAM,UAAU,UAAU,CAAI,GAAiB;IAC7C,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,GAAoB,CAAC;AAC9B,CAAC;AAgCD,MAAM,UAAU,mBAAmB,CACjC,YAA0B;IAE1B,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,YAA0B;IAE1B,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,EAAE,6BAA6B,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,YAA0B;IAE1B,OAAO,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,YAA0B;IAM1B,MAAM,CACJ,sBAAsB,CAAC,YAAY,CAAC,EACpC,gCAAgC,CACjC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"table-schema.js","sourceRoot":"","sources":["../../../../zero-schema/src/table-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAqBnD,MAAM,UAAU,iBAAiB,CAA8B,MAAS;IACtE,OAAO,MAAW,CAAC;AACrB,CAAC;AA6DD,MAAM,UAAU,UAAU,CAAI,GAAiB;IAC7C,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,GAAoB,CAAC;AAC9B,CAAC;AAgCD,MAAM,UAAU,mBAAmB,CACjC,YAA0B;IAE1B,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,YAA0B;IAE1B,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,EAAE,6BAA6B,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,YAA0B;IAE1B,OAAO,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,YAA0B;IAE1B,MAAM,CACJ,sBAAsB,CAAC,YAAY,CAAC,EACpC,gCAAgC,CACjC,CAAC;AACJ,CAAC"}

package/out/zero.js

@@ -10,9 +10,9 @@ import {
   escapeLike,
   getDefaultPuller,
   makeIDBName
-} from "./chunk-KL66XOAW.js";
+} from "./chunk-PFF4AHTF.js";
 import "./chunk-HARIWJ2J.js";
-import "./chunk-C7M3BJ3Z.js";
+import "./chunk-6HXO6VMP.js";
 import "./chunk-F5QR3K72.js";
 export {
   IDBNotFoundError,

package/out/zql/src/builder/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EACV,GAAG,EASH,QAAQ,EAIT,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAM1E,OAAO,KAAK,EAAC,KAAK,EAAE,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAI7C,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEjD;;;OAGG;IACH,aAAa,IAAI,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,eAAe,GAAG,KAAK,CAExE;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OAwDzD;AAyKD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAeN"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EACV,GAAG,EASH,QAAQ,EAIT,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAM1E,OAAO,KAAK,EAAC,KAAK,EAAE,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAI7C,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEjD;;;OAGG;IACH,aAAa,IAAI,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,eAAe,GAAG,KAAK,CAExE;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OAqDzD;AA0KD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAeN"}

package/out/zql/src/builder/builder.js

@@ -36,17 +36,14 @@ export function buildPipeline(ast, delegate) {
     return buildPipelineInternal(ast, delegate);
 }
 export function bindStaticParameters(ast, staticQueryParameters) {
-    const visit = (node) => {
-        return {
-            ...node,
-            where: node.where ? bindCondition(node.where) : undefined,
-            related: node.related?.map(sq => ({
-                ...sq,
-                subquery: visit(sq.subquery),
-            })),
-        };
-        return node;
-    };
+    const visit = (node) => ({
+        ...node,
+        where: node.where ? bindCondition(node.where) : undefined,
+        related: node.related?.map(sq => ({
+            ...sq,
+            subquery: visit(sq.subquery),
+        })),
+    });
     function bindCondition(condition) {
         if (condition.type === 'simple') {
             return {
@@ -155,6 +152,7 @@ function applyCorrelatedSubQuery(sq, delegate, end) {
         childKey: sq.correlation.childField,
         relationshipName: sq.subquery.alias,
         hidden: sq.hidden ?? false,
+        system: sq.system ?? 'client',
     });
     return end;
 }

package/out/zql/src/builder/builder.js.map

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

package/out/zql/src/ivm/array-view.d.ts

@@ -16,7 +16,7 @@ import type { Format, View } from './view.js';
 export declare class ArrayView<V extends View> implements Output, TypedView<V> {
     #private;
     onDestroy: (() => void) | undefined;
-    constructor(input: Input, format?: Format);
+    constructor(input: Input, format?: Format, queryComplete?: true | Promise<true>);
     get data(): V;
     addListener(listener: Listener<V>): () => void;
     destroy(): void;

package/out/zql/src/ivm/array-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array-view.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/array-view.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAE,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,KAAK,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAGjD,OAAO,KAAK,EAAQ,MAAM,EAAE,IAAI,EAAC,MAAM,WAAW,CAAC;AAEnD;;;;;;;;;;GAUG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,IAAI,CAAE,YAAW,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;;IAUpE,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;gBAKlC,KAAK,EAAE,KAAK,EACZ,MAAM,GAAE,MAA6C;IAWvD,IAAI,IAAI,IACmB,CAAC,CAC3B;IAED,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAiBjC,OAAO;IAkBP,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK1B,KAAK;CAON"}
+{"version":3,"file":"array-view.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/array-view.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAE,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,KAAK,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAGjD,OAAO,KAAK,EAAQ,MAAM,EAAE,IAAI,EAAC,MAAM,WAAW,CAAC;AAEnD;;;;;;;;;;GAUG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,IAAI,CAAE,YAAW,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;;IAUpE,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;gBAMlC,KAAK,EAAE,KAAK,EACZ,MAAM,GAAE,MAA6C,EACrD,aAAa,GAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAQ;IAmB5C,IAAI,IAAI,IACmB,CAAC,CAC3B;IAED,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAwBjC,OAAO;IAkBP,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK1B,KAAK;CAON"}

package/out/zql/src/ivm/array-view.js

@@ -21,12 +21,22 @@ export class ArrayView {
     #root;
     onDestroy;
     #dirty = false;
-    constructor(input, format = { singular: false, relationships: {} }) {
+    #complete = false;
+    constructor(input, format = { singular: false, relationships: {} }, queryComplete = true) {
         this.#input = input;
         this.#schema = input.getSchema();
         this.#format = format;
         this.#root = { '': format.singular ? undefined : [] };
         input.setOutput(this);
+        if (queryComplete === true) {
+            this.#complete = true;
+        }
+        else {
+            void queryComplete.then(() => {
+                this.#complete = true;
+                this.#fireListeners();
+            });
+        }
         this.#hydrate();
     }
     get data() {
@@ -35,16 +45,19 @@ export class ArrayView {
     addListener(listener) {
         assert(!this.#listeners.has(listener), 'Listener already registered');
         this.#listeners.add(listener);
-        listener(this.data);
+        this.#fireListener(listener);
         return () => {
             this.#listeners.delete(listener);
         };
     }
     #fireListeners() {
         for (const listener of this.#listeners) {
-            listener(this.data);
+            this.#fireListener(listener);
         }
     }
+    #fireListener(listener) {
+        listener(this.data, this.#complete ? 'complete' : 'unknown');
+    }
     destroy() {
         this.onDestroy?.();
     }

package/out/zql/src/ivm/array-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"array-view.js","sourceRoot":"","sources":["../../../../../zql/src/ivm/array-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAMtD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAGnD;;;;;;;;;;GAUG;AACH,MAAM,OAAO,SAAS;IACX,MAAM,CAAQ;IACd,UAAU,GAAG,IAAI,GAAG,EAAe,CAAC;IACpC,OAAO,CAAe;IACtB,OAAO,CAAS;IAEzB,2EAA2E;IAC3E,6DAA6D;IACpD,KAAK,CAAQ;IAEtB,SAAS,CAA2B;IAEpC,MAAM,GAAG,KAAK,CAAC;IAEf,YACE,KAAY,EACZ,SAAiB,EAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,EAAC;QAErD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,EAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAC,CAAC;QACpD,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAEtB,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAM,CAAC;IAC7B,CAAC;IAED,WAAW,CAAC,QAAqB;QAC/B,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,6BAA6B,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE9B,QAAQ,CAAC,IAAI,CAAC,IAAoB,CAAC,CAAC;QAEpC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC,CAAC;IACJ,CAAC;IAED,cAAc;QACZ,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACvC,QAAQ,CAAC,IAAI,CAAC,IAAoB,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;IACrB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACzC,WAAW,CACT,IAAI,CAAC,KAAK,EACV,EAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,EACnB,IAAI,CAAC,OAAO,EACZ,EAAE,EACF,IAAI,CAAC,OAAO,CACb,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;CACF"}
+{"version":3,"file":"array-view.js","sourceRoot":"","sources":["../../../../../zql/src/ivm/array-view.ts"],"names":[],"mappings":"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"}