@rocicorp/zero 0.3.2024102800 → 0.4.2024103000

package/out/zero-protocol/src/ast.js

@@ -8,6 +8,7 @@
 import { compareUTF8 } from 'compare-utf8';
 import { must } from '../../shared/src/must.js';
 import * as v from '../../shared/src/valita.js';
+import { defined } from '../../shared/src/arrays.js';
 export const selectorSchema = v.string();
 const orderingElementSchema = v.readonly(v.tuple([selectorSchema, v.union(v.literal('asc'), v.literal('desc'))]));
 export const orderingSchema = v.readonlyArray(orderingElementSchema);
@@ -27,14 +28,22 @@ export const simpleConditionSchema = v.object({
         field: v.string(),
     })),
 });
-export const conditionSchema = simpleConditionSchema;
+export const conditionSchema = v.union(simpleConditionSchema, v.lazy(() => conjunctionSchema), v.lazy(() => disjunctionSchema));
+const conjunctionSchema = v.readonlyObject({
+    type: v.literal('and'),
+    conditions: v.readonlyArray(conditionSchema),
+});
+const disjunctionSchema = v.readonlyObject({
+    type: v.literal('or'),
+    conditions: v.readonlyArray(conditionSchema),
+});
 // Split out so that its inferred type can be checked against
 // Omit<CorrelatedSubQuery, 'correlation'> in ast-type-test.ts.
 // The mutually-recursive reference of the 'other' field to astSchema
 // is the only thing added in v.lazy.  The v.lazy is necessary due to the
 // mutually-recursive types, but v.lazy prevents inference of the resulting
 // type.
-export const correlatedSubquerySchemaOmitSubquery = v.object({
+export const correlatedSubquerySchemaOmitSubquery = v.readonlyObject({
     correlation: v.object({
         parentField: v.string(),
         childField: v.string(),
@@ -49,7 +58,7 @@ export const astSchema = v.object({
     schema: v.string().optional(),
     table: v.string(),
     alias: v.string().optional(),
-    where: v.readonlyArray(conditionSchema).optional(),
+    where: conditionSchema.optional(),
     related: v.readonlyArray(correlatedSubquerySchema).optional(),
     limit: v.number().optional(),
     orderBy: orderingSchema.optional(),
@@ -66,11 +75,12 @@ export function normalizeAST(ast) {
     if (cached) {
         return cached;
     }
+    const where = flattened(ast.where);
     const normalized = {
         schema: ast.schema,
         table: ast.table,
         alias: ast.alias,
-        where: ast.where ? sortedWhere(ast.where) : undefined,
+        where: where ? sortedWhere(where) : undefined,
         related: ast.related
             ? sortedRelated(ast.related.map(r => ({
                 correlation: {
@@ -90,22 +100,79 @@ export function normalizeAST(ast) {
     return normalized;
 }
 function sortedWhere(where) {
-    return [...where].sort(cmpCondition);
+    if (where.type === 'simple') {
+        return where;
+    }
+    return {
+        type: where.type,
+        conditions: where.conditions.map(w => sortedWhere(w)).sort(cmpCondition),
+    };
 }
 function sortedRelated(related) {
     return related.sort(cmpRelated);
 }
 function cmpCondition(a, b) {
-    return (compareUTF8MaybeNull(a.field, b.field) ||
-        compareUTF8MaybeNull(a.op, b.op) ||
-        // Comparing the same field with the same op more than once doesn't make logical
-        // sense, but is technically possible. Assume the values are of the same type and
-        // sort by their String forms.
-        compareUTF8MaybeNull(String(a.value), String(b.value)));
+    if (a.type === 'simple') {
+        if (b.type !== 'simple') {
+            return -1; // Order SimpleConditions first to simplify logic for invalidation filtering.
+        }
+        return (compareUTF8MaybeNull(a.field, b.field) ||
+            compareUTF8MaybeNull(a.op, b.op) ||
+            // Comparing the same field with the same op more than once doesn't make logical
+            // sense, but is technically possible. Assume the values are of the same type and
+            // sort by their String forms.
+            compareUTF8MaybeNull(String(a.value), String(b.value)));
+    }
+    if (b.type === 'simple') {
+        return 1; // Order SimpleConditions first to simplify logic for invalidation filtering.
+    }
+    const val = compareUTF8MaybeNull(a.type, b.type);
+    if (val !== 0) {
+        return val;
+    }
+    for (let l = 0, r = 0; l < a.conditions.length && r < b.conditions.length; l++, r++) {
+        const val = cmpCondition(a.conditions[l], b.conditions[r]);
+        if (val !== 0) {
+            return val;
+        }
+    }
+    // prefixes first
+    return a.conditions.length - b.conditions.length;
 }
 function cmpRelated(a, b) {
     return compareUTF8(must(a.subquery.alias), must(b.subquery.alias));
 }
+/**
+ * Returns a flattened version of the Conditions in which nested Conjunctions with
+ * the same operation ('AND' or 'OR') are flattened to the same level. e.g.
+ *
+ * ```
+ * ((a AND b) AND (c AND (d OR (e OR f)))) -> (a AND b AND c AND (d OR e OR f))
+ * ```
+ *
+ * Also flattens singleton Conjunctions regardless of operator, and removes
+ * empty Conjunctions.
+ */
+function flattened(cond) {
+    if (cond === undefined) {
+        return undefined;
+    }
+    if (cond.type === 'simple') {
+        return cond;
+    }
+    const conditions = defined(cond.conditions.flatMap(c => c.type === cond.type ? c.conditions.map(c => flattened(c)) : flattened(c)));
+    switch (conditions.length) {
+        case 0:
+            return undefined;
+        case 1:
+            return conditions[0];
+        default:
+            return {
+                type: cond.type,
+                conditions,
+            };
+    }
+}
 function compareUTF8MaybeNull(a, b) {
     if (a !== null && b !== null) {
         return compareUTF8(a, b);

package/out/zero-protocol/src/ast.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../../zero-protocol/src/ast.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AACzC,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAGhD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;AAEzC,MAAM,qBAAqB,GAAG,CAAC,CAAC,QAAQ,CACtC,CAAC,CAAC,KAAK,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CACxE,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;AAErE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CACpC,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,OAAO,EAAE,EACX,CAAC,CAAC,IAAI,EAAE,CACT,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CACnC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EACd,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EACd,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EACf,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAClC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EACjB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EACrB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAClB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CACzC,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,WAAW,CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACzB,EAAE,EAAE,oBAAoB;IACxB,KAAK,EAAE,cAAc;IACrB,KAAK,EAAE,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,OAAO,EAAE,EACX,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAC7D,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QACzB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACnE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;KAClB,CAAC,CACH;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAErD,6DAA6D;AAC7D,+DAA+D;AAC/D,qEAAqE;AACrE,yEAAyE;AACzE,2EAA2E;AAC3E,QAAQ;AACR,MAAM,CAAC,MAAM,oCAAoC,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3D,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QACpB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;QACvB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;QACtB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;KACnB,CAAC;IACF,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,wBAAwB,GACnC,oCAAoC,CAAC,MAAM,CAAC;IAC1C,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;CAClC,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE;IAClD,OAAO,EAAE,CAAC,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC,QAAQ,EAAE;IAC7D,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,OAAO,EAAE,cAAc,CAAC,QAAQ,EAAE;IAClC,KAAK,EAAE,CAAC;SACL,MAAM,CAAC;QACN,GAAG,EAAE,CAAC,CAAC,MAAM,CACX,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CACtE;QACD,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;KACvB,CAAC;SACD,QAAQ,EAAE;CACd,CAAC,CAAC;AAkIH,MAAM,cAAc,GAAG,IAAI,OAAO,EAAsB,CAAC;AAEzD,MAAM,UAAU,YAAY,CAAC,GAAQ;IACnC,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACrD,OAAO,EAAE,GAAG,CAAC,OAAO;YAClB,CAAC,CAAC,aAAa,CACX,GAAG,CAAC,OAAO,CAAC,GAAG,CACb,CAAC,CAAC,EAAE,CACF,CAAC;gBACC,WAAW,EAAE;oBACX,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC,WAAW;oBACtC,UAAU,EAAE,CAAC,CAAC,WAAW,CAAC,UAAU;oBACpC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE;iBACrB;gBACD,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC;aACnC,CAAwC,CAC5C,CACF;YACH,CAAC,CAAC,SAAS;QACb,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC;IAEF,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IACpC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,WAAW,CAAC,KAA2B;IAC9C,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,aAAa,CACpB,OAA6B;IAE7B,OAAO,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,YAAY,CAAC,CAAY,EAAE,CAAY;IAC9C,OAAO,CACL,oBAAoB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC;QACtC,oBAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;QAChC,gFAAgF;QAChF,iFAAiF;QACjF,8BAA8B;QAC9B,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CACvD,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,CAAqB,EAAE,CAAqB;IAC9D,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,oBAAoB,CAAC,CAAgB,EAAE,CAAgB;IAC9D,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QAC7B,OAAO,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACf,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../../zero-protocol/src/ast.ts"],"names":[],"mappings":"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"}

package/out/zero-protocol/src/change-desired-queries.d.ts

@@ -7,7 +7,7 @@ declare const changeDesiredQueriesBodySchema: v.ObjectType<{
             schema: v.Optional<string>;
             table: v.Type<string>;
             alias: v.Optional<string>;
-            where: v.Optional<readonly {
+            where: v.Optional<{
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -16,7 +16,7 @@ declare const changeDesiredQueriesBodySchema: v.ObjectType<{
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[]>;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction>;
             related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
             limit: v.Optional<number>;
             orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;
@@ -40,7 +40,7 @@ export declare const changeDesiredQueriesMessageSchema: v.TupleType<[v.Type<"cha
             schema: v.Optional<string>;
             table: v.Type<string>;
             alias: v.Optional<string>;
-            where: v.Optional<readonly {
+            where: v.Optional<{
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -49,7 +49,7 @@ export declare const changeDesiredQueriesMessageSchema: v.TupleType<[v.Type<"cha
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[]>;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction>;
             related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
             limit: v.Optional<number>;
             orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;

package/out/zero-protocol/src/connect.d.ts

@@ -22,7 +22,7 @@ declare const initConnectionBodySchema: v.ObjectType<{
             schema: v.Optional<string>;
             table: v.Type<string>;
             alias: v.Optional<string>;
-            where: v.Optional<readonly {
+            where: v.Optional<{
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -31,7 +31,7 @@ declare const initConnectionBodySchema: v.ObjectType<{
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[]>;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction>;
             related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
             limit: v.Optional<number>;
             orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;
@@ -55,7 +55,7 @@ export declare const initConnectionMessageSchema: v.TupleType<[v.Type<"initConne
             schema: v.Optional<string>;
             table: v.Type<string>;
             alias: v.Optional<string>;
-            where: v.Optional<readonly {
+            where: v.Optional<{
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -64,7 +64,7 @@ export declare const initConnectionMessageSchema: v.TupleType<[v.Type<"initConne
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[]>;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction>;
             related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
             limit: v.Optional<number>;
             orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;
@@ -84,12 +84,10 @@ export type ConnectedBody = v.Infer<typeof connectedBodySchema>;
 export type ConnectedMessage = v.Infer<typeof connectedMessageSchema>;
 export type InitConnectionBody = v.Infer<typeof initConnectionBodySchema>;
 export type InitConnectionMessage = v.Infer<typeof initConnectionMessageSchema>;
-export declare function encodeSecProtocols(initConnectionMessage: InitConnectionMessage, authToken?: string | undefined): string;
-/**
- * The initConnectionMessage is purposely returned as a string
- * since it is passed directly into the WebSocket message handler
- * which does JSON.parse and Valita.parse on the message.
- */
-export declare function decodeSecProtocols(secProtocol: string): [initConnectionMessage: string, maybeAuthToken: string | undefined];
+export declare function encodeSecProtocols(initConnectionMessage: InitConnectionMessage | undefined, authToken: string | undefined): string;
+export declare function decodeSecProtocols(secProtocol: string): {
+    initConnectionMessage: InitConnectionMessage | undefined;
+    authToken: string | undefined;
+};
 export {};
 //# sourceMappingURL=connect.d.ts.map

package/out/zero-protocol/src/connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/connect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAGhD;;;;;;GAMG;AAEH,eAAO,MAAM,mBAAmB;;;aAG9B,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;eAGjC,CAAC;AAEH,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAE5B,CAAC;AAEH,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAGtC,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC1E,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAEhF,wBAAgB,kBAAkB,CAChC,qBAAqB,EAAE,qBAAqB,EAC5C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,UAQ/B;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,MAAM,GAClB,CAAC,qBAAqB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC,CAOrE"}
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/connect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAGhD;;;;;;GAMG;AAEH,eAAO,MAAM,mBAAmB;;;aAG9B,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;eAGjC,CAAC;AAEH,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAE5B,CAAC;AAEH,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAGtC,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC1E,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAEhF,wBAAgB,kBAAkB,CAChC,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,EACxD,SAAS,EAAE,MAAM,GAAG,SAAS,UAQ9B;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG;IACvD,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACzD,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,CAEA"}

package/out/zero-protocol/src/connect.js

@@ -1,4 +1,3 @@
-import { assert } from '../../shared/src/asserts.js';
 import * as v from '../../shared/src/valita.js';
 import { queriesPatchSchema } from './queries-patch.js';
 /**
@@ -24,23 +23,14 @@ export const initConnectionMessageSchema = v.tuple([
     initConnectionBodySchema,
 ]);
 export function encodeSecProtocols(initConnectionMessage, authToken) {
+    const protocols = {
+        initConnectionMessage,
+        authToken,
+    };
     // base64 encoding the JSON before URI encoding it results in a smaller payload.
-    const protocols = [btoa(JSON.stringify(initConnectionMessage))];
-    if (authToken !== undefined) {
-        protocols.push(authToken);
-    }
-    return encodeURIComponent(protocols.join(','));
+    return encodeURIComponent(btoa(JSON.stringify(protocols)));
 }
-/**
- * The initConnectionMessage is purposely returned as a string
- * since it is passed directly into the WebSocket message handler
- * which does JSON.parse and Valita.parse on the message.
- */
 export function decodeSecProtocols(secProtocol) {
-    const ret = decodeURIComponent(secProtocol)
-        .split(',')
-        .map((s, i) => (i === 0 ? atob(s) : s));
-    assert(ret.length === 1 || ret.length === 2);
-    return ret.length === 1 ? [ret[0], undefined] : [ret[0], ret[1]];
+    return JSON.parse(atob(decodeURIComponent(secProtocol)));
 }
 //# sourceMappingURL=connect.js.map

package/out/zero-protocol/src/connect.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../../zero-protocol/src/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACnD,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAEtD;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC;IAC5C,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IACtB,mBAAmB;CACpB,CAAC,CAAC;AAEH,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,mBAAmB,EAAE,kBAAkB;CACxC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,KAAK,CAAC;IACjD,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IAC3B,wBAAwB;CACzB,CAAC,CAAC;AAQH,MAAM,UAAU,kBAAkB,CAChC,qBAA4C,EAC5C,SAA8B;IAE9B,gFAAgF;IAChF,MAAM,SAAS,GAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC1E,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACjD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,WAAmB;IAEnB,MAAM,GAAG,GAAG,kBAAkB,CAAC,WAAW,CAAC;SACxC,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1C,MAAM,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;IAC7C,OAAO,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC"}
+{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../../zero-protocol/src/connect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAEtD;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC;IAC5C,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IACtB,mBAAmB;CACpB,CAAC,CAAC;AAEH,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,mBAAmB,EAAE,kBAAkB;CACxC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,KAAK,CAAC;IACjD,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IAC3B,wBAAwB;CACzB,CAAC,CAAC;AAQH,MAAM,UAAU,kBAAkB,CAChC,qBAAwD,EACxD,SAA6B;IAE7B,MAAM,SAAS,GAAG;QAChB,qBAAqB;QACrB,SAAS;KACV,CAAC;IACF,gFAAgF;IAChF,OAAO,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,WAAmB;IAIpD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;AAC3D,CAAC"}

package/out/zero-protocol/src/down.d.ts

@@ -31,7 +31,7 @@ export declare const downstreamSchema: v.UnionType<[v.TupleType<[v.Type<"connect
         ast: {
             schema?: string | undefined;
             alias?: string | undefined;
-            where?: readonly {
+            where?: {
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -40,7 +40,7 @@ export declare const downstreamSchema: v.UnionType<[v.TupleType<[v.Type<"connect
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[] | undefined;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction | undefined;
             related?: readonly import("./ast.js").CorrelatedSubQuery[] | undefined;
             limit?: number | undefined;
             orderBy?: readonly (readonly [string, "asc" | "desc"])[] | undefined;
@@ -62,7 +62,7 @@ export declare const downstreamSchema: v.UnionType<[v.TupleType<[v.Type<"connect
         ast: {
             schema?: string | undefined;
             alias?: string | undefined;
-            where?: readonly {
+            where?: {
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -71,7 +71,7 @@ export declare const downstreamSchema: v.UnionType<[v.TupleType<[v.Type<"connect
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[] | undefined;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction | undefined;
             related?: readonly import("./ast.js").CorrelatedSubQuery[] | undefined;
             limit?: number | undefined;
             orderBy?: readonly (readonly [string, "asc" | "desc"])[] | undefined;

package/out/zero-protocol/src/poke.d.ts

@@ -51,7 +51,7 @@ export declare const pokePartBodySchema: v.ObjectType<{
         ast: {
             schema?: string | undefined;
             alias?: string | undefined;
-            where?: readonly {
+            where?: {
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -60,7 +60,7 @@ export declare const pokePartBodySchema: v.ObjectType<{
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[] | undefined;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction | undefined;
             related?: readonly import("./ast.js").CorrelatedSubQuery[] | undefined;
             limit?: number | undefined;
             orderBy?: readonly (readonly [string, "asc" | "desc"])[] | undefined;
@@ -82,7 +82,7 @@ export declare const pokePartBodySchema: v.ObjectType<{
         ast: {
             schema?: string | undefined;
             alias?: string | undefined;
-            where?: readonly {
+            where?: {
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -91,7 +91,7 @@ export declare const pokePartBodySchema: v.ObjectType<{
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[] | undefined;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction | undefined;
             related?: readonly import("./ast.js").CorrelatedSubQuery[] | undefined;
             limit?: number | undefined;
             orderBy?: readonly (readonly [string, "asc" | "desc"])[] | undefined;
@@ -157,7 +157,7 @@ export declare const pokePartMessageSchema: v.TupleType<[v.Type<"pokePart">, v.O
         ast: {
             schema?: string | undefined;
             alias?: string | undefined;
-            where?: readonly {
+            where?: {
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -166,7 +166,7 @@ export declare const pokePartMessageSchema: v.TupleType<[v.Type<"pokePart">, v.O
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[] | undefined;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction | undefined;
             related?: readonly import("./ast.js").CorrelatedSubQuery[] | undefined;
             limit?: number | undefined;
             orderBy?: readonly (readonly [string, "asc" | "desc"])[] | undefined;
@@ -188,7 +188,7 @@ export declare const pokePartMessageSchema: v.TupleType<[v.Type<"pokePart">, v.O
         ast: {
             schema?: string | undefined;
             alias?: string | undefined;
-            where?: readonly {
+            where?: {
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -197,7 +197,7 @@ export declare const pokePartMessageSchema: v.TupleType<[v.Type<"pokePart">, v.O
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[] | undefined;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction | undefined;
             related?: readonly import("./ast.js").CorrelatedSubQuery[] | undefined;
             limit?: number | undefined;
             orderBy?: readonly (readonly [string, "asc" | "desc"])[] | undefined;

package/out/zero-protocol/src/queries-patch.d.ts

@@ -6,7 +6,7 @@ declare const putOpSchema: v.ObjectType<{
         schema: v.Optional<string>;
         table: v.Type<string>;
         alias: v.Optional<string>;
-        where: v.Optional<readonly {
+        where: v.Optional<{
             type: "simple";
             op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
             field: string;
@@ -15,7 +15,7 @@ declare const putOpSchema: v.ObjectType<{
                 anchor: "authData" | "preMutationRow";
                 field: string;
             };
-        }[]>;
+        } | import("./ast.js").Conjunction | import("./ast.js").Disjunction>;
         related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
         limit: v.Optional<number>;
         orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;
@@ -39,7 +39,7 @@ declare const patchOpSchema: v.UnionType<[v.ObjectType<{
         schema: v.Optional<string>;
         table: v.Type<string>;
         alias: v.Optional<string>;
-        where: v.Optional<readonly {
+        where: v.Optional<{
             type: "simple";
             op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
             field: string;
@@ -48,7 +48,7 @@ declare const patchOpSchema: v.UnionType<[v.ObjectType<{
                 anchor: "authData" | "preMutationRow";
                 field: string;
             };
-        }[]>;
+        } | import("./ast.js").Conjunction | import("./ast.js").Disjunction>;
         related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
         limit: v.Optional<number>;
         orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;
@@ -70,7 +70,7 @@ export declare const queriesPatchSchema: v.ArrayType<v.UnionType<[v.ObjectType<{
         schema: v.Optional<string>;
         table: v.Type<string>;
         alias: v.Optional<string>;
-        where: v.Optional<readonly {
+        where: v.Optional<{
             type: "simple";
             op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
             field: string;
@@ -79,7 +79,7 @@ export declare const queriesPatchSchema: v.ArrayType<v.UnionType<[v.ObjectType<{
                 anchor: "authData" | "preMutationRow";
                 field: string;
             };
-        }[]>;
+        } | import("./ast.js").Conjunction | import("./ast.js").Disjunction>;
         related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
         limit: v.Optional<number>;
         orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;

package/out/zero-protocol/src/up.d.ts

@@ -7,7 +7,7 @@ export declare const upstreamSchema: v.UnionType<[v.TupleType<[v.Type<"initConne
             schema: v.Optional<string>;
             table: v.Type<string>;
             alias: v.Optional<string>;
-            where: v.Optional<readonly {
+            where: v.Optional<{
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -16,7 +16,7 @@ export declare const upstreamSchema: v.UnionType<[v.TupleType<[v.Type<"initConne
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[]>;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction>;
             related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
             limit: v.Optional<number>;
             orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;
@@ -41,7 +41,7 @@ export declare const upstreamSchema: v.UnionType<[v.TupleType<[v.Type<"initConne
             schema: v.Optional<string>;
             table: v.Type<string>;
             alias: v.Optional<string>;
-            where: v.Optional<readonly {
+            where: v.Optional<{
                 type: "simple";
                 op: "=" | "!=" | "<" | ">" | "<=" | ">=" | "LIKE" | "NOT LIKE" | "ILIKE" | "NOT ILIKE" | "IN" | "NOT IN";
                 field: string;
@@ -50,7 +50,7 @@ export declare const upstreamSchema: v.UnionType<[v.TupleType<[v.Type<"initConne
                     anchor: "authData" | "preMutationRow";
                     field: string;
                 };
-            }[]>;
+            } | import("./ast.js").Conjunction | import("./ast.js").Disjunction>;
             related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
             limit: v.Optional<number>;
             orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;

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

@@ -0,0 +1,3 @@
+import { Zero, type Schema, type ZeroOptions } from '../../zero-client/src/mod.js';
+export declare function createZero<S extends Schema>(options: ZeroOptions<S>): Zero<S>;
+//# sourceMappingURL=create-zero.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"create-zero.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/create-zero.ts"],"names":[],"mappings":"AACA,OAAO,EACL,IAAI,EACJ,KAAK,MAAM,EACX,KAAK,WAAW,EACjB,MAAM,8BAA8B,CAAC;AAGtC,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAM7E"}

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

@@ -1,2 +1,3 @@
+export { createZero } from './create-zero.js';
 export { useQuery } from './use-query.js';
 //# sourceMappingURL=mod.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC"}

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

@@ -1,4 +1,4 @@
-import { type Change, type Format, type Input, type Output, type Query, type QueryType, type Smash, type TableSchema, type View } from '../../zero-internal/src/mod.js';
+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';
 export declare class SolidView<V extends View> implements Output {
     #private;
     constructor(input: Input, format?: Format, onDestroy?: () => void);

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

@@ -1,4 +1,4 @@
 import { type Accessor } from 'solid-js';
-import type { Query, QueryType, Smash, TableSchema } from '../../zero-internal/src/mod.js';
+import type { Query, QueryType, Smash, TableSchema } from '../../zero-advanced/src/mod.js';
 export declare function useQuery<TSchema extends TableSchema, TReturn extends QueryType>(querySignal: () => Query<TSchema, TReturn>): Accessor<Smash<TReturn>>;
 //# sourceMappingURL=use-query.d.ts.map