@rocicorp/zero 0.25.0-canary.15 → 0.25.0-canary.18

package/out/shared/src/deep-merge.d.ts

@@ -2,15 +2,17 @@ type Simplify<T> = {
     [K in keyof T]: T[K];
 } & {};
 type IsPlainObject<T> = T extends object ? T extends Function | readonly unknown[] ? false : true : false;
-type MergeValue<A, B> = IsPlainObject<A> extends true ? IsPlainObject<B> extends true ? DeepMerge<A & {}, B & {}> : B : B;
+type IsLeaf<T, Leaf> = [T] extends [Leaf] ? true : false;
+type MergeValue<A, B, Leaf> = IsLeaf<A, Leaf> extends true ? B : IsLeaf<B, Leaf> extends true ? B : IsPlainObject<A> extends true ? IsPlainObject<B> extends true ? DeepMerge<A & {}, B & {}, Leaf> : B : B;
 /**
  * Type-level deep merge of two object types. Properties from B override
  * properties from A. When both A[K] and B[K] are objects (not arrays or
  * functions), they are recursively merged.
  */
-export type DeepMerge<A, B> = Simplify<Omit<A, keyof B> & {
-    [K in keyof B]: K extends keyof A ? MergeValue<A[K], B[K]> : B[K];
+export type DeepMerge<A, B, Leaf = never> = Simplify<Omit<A, keyof B> & {
+    [K in keyof B]: K extends keyof A ? MergeValue<A[K], B[K], Leaf> : B[K];
 }>;
+export declare function isPlainObject(value: unknown): value is Record<string, unknown>;
 /**
  * Deep merges two objects. Properties from `b` override properties from `a`.
  * Nested objects are recursively merged.
@@ -21,6 +23,6 @@ export type DeepMerge<A, B> = Simplify<Omit<A, keyof B> & {
  *   as a leaf (not recursed into). Defaults to checking if the value is not a
  *   plain object.
  */
-export declare function deepMerge<A extends Record<string, unknown>, B extends Record<string, unknown>>(a: A, b: B, isLeaf?: (value: unknown) => boolean): DeepMerge<A, B>;
+export declare function deepMerge<A extends Record<string, unknown>, B extends Record<string, unknown>, Leaf = never>(a: A, b: B, isLeaf?: (value: unknown) => boolean): DeepMerge<A, B, Leaf>;
 export {};
 //# sourceMappingURL=deep-merge.d.ts.map

package/out/shared/src/deep-merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deep-merge.d.ts","sourceRoot":"","sources":["../../../../shared/src/deep-merge.ts"],"names":[],"mappings":"AACA,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG,EAAE,CAAC;AAG/C,KAAK,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GACpC,CAAC,SAAS,QAAQ,GAAG,SAAS,OAAO,EAAE,GACrC,KAAK,GACL,IAAI,GACN,KAAK,CAAC;AAGV,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAClB,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GACzB,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GAC3B,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,GACzB,CAAC,GACH,CAAC,CAAC;AAER;;;;GAIG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CACpC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG;KAChB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAClE,CACF,CAAC;AAMF;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAEjC,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,MAAM,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAgC,GAC3D,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAyBjB"}
+{"version":3,"file":"deep-merge.d.ts","sourceRoot":"","sources":["../../../../shared/src/deep-merge.ts"],"names":[],"mappings":"AACA,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG,EAAE,CAAC;AAG/C,KAAK,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GACpC,CAAC,SAAS,QAAQ,GAAG,SAAS,OAAO,EAAE,GACrC,KAAK,GACL,IAAI,GACN,KAAK,CAAC;AAEV,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAEzD,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,IACxB,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,IAAI,GACxB,CAAC,GACD,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,IAAI,GAC1B,CAAC,GACD,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GAC3B,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GAC3B,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,GAC/B,CAAC,GACH,CAAC,CAAC;AAEZ;;;;GAIG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,KAAK,IAAI,QAAQ,CAClD,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG;KAChB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACxE,CACF,CAAC;AAEF,wBAAgB,aAAa,CAC3B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAElC;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,IAAI,GAAG,KAAK,EAEZ,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,MAAM,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAgC,GAC3D,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CA6BvB"}

package/out/shared/src/deep-merge.js

@@ -22,6 +22,7 @@ function deepMerge(a, b, isLeaf = (v) => !isPlainObject(v)) {
   return result;
 }
 export {
-  deepMerge
+  deepMerge,
+  isPlainObject
 };
 //# sourceMappingURL=deep-merge.js.map

package/out/shared/src/deep-merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"deep-merge.js","sources":["../../../../shared/src/deep-merge.ts"],"sourcesContent":["// Force TypeScript to evaluate/flatten a type\ntype Simplify<T> = {[K in keyof T]: T[K]} & {};\n\n// Helper to check if T is a plain object (not array or function)\ntype IsPlainObject<T> = T extends object\n  ? T extends Function | readonly unknown[]\n    ? false\n    : true\n  : false;\n\n// Merge when both are plain objects, otherwise B wins\ntype MergeValue<A, B> =\n  IsPlainObject<A> extends true\n    ? IsPlainObject<B> extends true\n      ? DeepMerge<A & {}, B & {}>\n      : B\n    : B;\n\n/**\n * Type-level deep merge of two object types. Properties from B override\n * properties from A. When both A[K] and B[K] are objects (not arrays or\n * functions), they are recursively merged.\n */\nexport type DeepMerge<A, B> = Simplify<\n  Omit<A, keyof B> & {\n    [K in keyof B]: K extends keyof A ? MergeValue<A[K], B[K]> : B[K];\n  }\n>;\n\nfunction isPlainObject(value: unknown): value is Record<string, unknown> {\n  return typeof value === 'object' && value !== null;\n}\n\n/**\n * Deep merges two objects. Properties from `b` override properties from `a`.\n * Nested objects are recursively merged.\n *\n * @param a - The base object.\n * @param b - The object to merge into `a`.\n * @param isLeaf - Optional predicate to determine if a value should be treated\n *   as a leaf (not recursed into). Defaults to checking if the value is not a\n *   plain object.\n */\nexport function deepMerge<\n  A extends Record<string, unknown>,\n  B extends Record<string, unknown>,\n>(\n  a: A,\n  b: B,\n  isLeaf: (value: unknown) => boolean = v => !isPlainObject(v),\n): DeepMerge<A, B> {\n  const result: Record<string, unknown> = {};\n\n  // Copy all keys from a\n  for (const key of Object.keys(a)) {\n    result[key] = a[key];\n  }\n\n  // Merge/override with keys from b\n  for (const key of Object.keys(b)) {\n    const aVal = a[key];\n    const bVal = b[key];\n\n    if (key in a && !isLeaf(aVal) && !isLeaf(bVal)) {\n      result[key] = deepMerge(\n        aVal as Record<string, unknown>,\n        bVal as Record<string, unknown>,\n        isLeaf,\n      );\n    } else {\n      result[key] = bVal;\n    }\n  }\n\n  return result as DeepMerge<A, B>;\n}\n"],"names":[],"mappings":"AA6BA,SAAS,cAAc,OAAkD;AACvE,SAAO,OAAO,UAAU,YAAY,UAAU;AAChD;AAYO,SAAS,UAId,GACA,GACA,SAAsC,OAAK,CAAC,cAAc,CAAC,GAC1C;AACjB,QAAM,SAAkC,CAAA;AAGxC,aAAW,OAAO,OAAO,KAAK,CAAC,GAAG;AAChC,WAAO,GAAG,IAAI,EAAE,GAAG;AAAA,EACrB;AAGA,aAAW,OAAO,OAAO,KAAK,CAAC,GAAG;AAChC,UAAM,OAAO,EAAE,GAAG;AAClB,UAAM,OAAO,EAAE,GAAG;AAElB,QAAI,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,GAAG;AAC9C,aAAO,GAAG,IAAI;AAAA,QACZ;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAAA,IAEJ,OAAO;AACL,aAAO,GAAG,IAAI;AAAA,IAChB;AAAA,EACF;AAEA,SAAO;AACT;"}
+{"version":3,"file":"deep-merge.js","sources":["../../../../shared/src/deep-merge.ts"],"sourcesContent":["// Force TypeScript to evaluate/flatten a type\ntype Simplify<T> = {[K in keyof T]: T[K]} & {};\n\n// Helper to check if T is a plain object (not array or function)\ntype IsPlainObject<T> = T extends object\n  ? T extends Function | readonly unknown[]\n    ? false\n    : true\n  : false;\n\ntype IsLeaf<T, Leaf> = [T] extends [Leaf] ? true : false;\n\ntype MergeValue<A, B, Leaf> =\n  IsLeaf<A, Leaf> extends true\n    ? B\n    : IsLeaf<B, Leaf> extends true\n      ? B\n      : IsPlainObject<A> extends true\n        ? IsPlainObject<B> extends true\n          ? DeepMerge<A & {}, B & {}, Leaf>\n          : B\n        : B;\n\n/**\n * Type-level deep merge of two object types. Properties from B override\n * properties from A. When both A[K] and B[K] are objects (not arrays or\n * functions), they are recursively merged.\n */\nexport type DeepMerge<A, B, Leaf = never> = Simplify<\n  Omit<A, keyof B> & {\n    [K in keyof B]: K extends keyof A ? MergeValue<A[K], B[K], Leaf> : B[K];\n  }\n>;\n\nexport function isPlainObject(\n  value: unknown,\n): value is Record<string, unknown> {\n  return typeof value === 'object' && value !== null;\n}\n\n/**\n * Deep merges two objects. Properties from `b` override properties from `a`.\n * Nested objects are recursively merged.\n *\n * @param a - The base object.\n * @param b - The object to merge into `a`.\n * @param isLeaf - Optional predicate to determine if a value should be treated\n *   as a leaf (not recursed into). Defaults to checking if the value is not a\n *   plain object.\n */\nexport function deepMerge<\n  A extends Record<string, unknown>,\n  B extends Record<string, unknown>,\n  Leaf = never,\n>(\n  a: A,\n  b: B,\n  isLeaf: (value: unknown) => boolean = v => !isPlainObject(v),\n): DeepMerge<A, B, Leaf> {\n  const result: Record<string, unknown> = {};\n\n  // Copy all keys from a\n  for (const key of Object.keys(a)) {\n    result[key] = a[key];\n  }\n\n  // Merge/override with keys from b\n  for (const key of Object.keys(b)) {\n    const aVal = a[key];\n    const bVal = b[key];\n\n    if (key in a && !isLeaf(aVal) && !isLeaf(bVal)) {\n      result[key] = deepMerge<\n        Record<string, unknown>,\n        Record<string, unknown>,\n        Leaf\n      >(\n        aVal as Record<string, unknown>,\n        bVal as Record<string, unknown>,\n        isLeaf,\n      );\n    } else {\n      result[key] = bVal;\n    }\n  }\n\n  return result as DeepMerge<A, B, Leaf>;\n}\n"],"names":[],"mappings":"AAkCO,SAAS,cACd,OACkC;AAClC,SAAO,OAAO,UAAU,YAAY,UAAU;AAChD;AAYO,SAAS,UAKd,GACA,GACA,SAAsC,OAAK,CAAC,cAAc,CAAC,GACpC;AACvB,QAAM,SAAkC,CAAA;AAGxC,aAAW,OAAO,OAAO,KAAK,CAAC,GAAG;AAChC,WAAO,GAAG,IAAI,EAAE,GAAG;AAAA,EACrB;AAGA,aAAW,OAAO,OAAO,KAAK,CAAC,GAAG;AAChC,UAAM,OAAO,EAAE,GAAG;AAClB,UAAM,OAAO,EAAE,GAAG;AAElB,QAAI,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,GAAG;AAC9C,aAAO,GAAG,IAAI;AAAA,QAKZ;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAAA,IAEJ,OAAO;AACL,aAAO,GAAG,IAAI;AAAA,IAChB;AAAA,EACF;AAEA,SAAO;AACT;"}

package/out/z2s/src/compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAQ7C,OAAO,EAAC,KAAK,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAGxD,OAAO,KAAK,EACV,GAAG,EAEH,kBAAkB,EAElB,WAAW,EAEX,QAAQ,EACR,eAAe,EAEhB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAEL,KAAK,UAAU,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAEV,YAAY,EACb,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,2BAA2B,CAAC;AAWtD,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,YAAY,CAAC;IAErB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAKF,wBAAgB,OAAO,CACrB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,GAAG,EACR,MAAM,CAAC,EAAE,MAAM,GACd,QAAQ,CAgBV;AA4CD,wBAAgB,KAAK,CACnB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,OAAO,GAAG,SAAS,GAC5B,QAAQ,CAWV;AAUD,wBAAgB,OAAO,CACrB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,QAAQ,GAAG,SAAS,EAC7B,KAAK,EAAE,KAAK,GACX,QAAQ,CAqBV;AAoKD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,SAAS,eAAe,EAAE,EACxC,cAAc,EAAE,SAAS,MAAM,EAAE,GAChC,CAAC,UAAU,EAAE,KAAK,KAAK,QAAQ,CAiBjC;AAED,wBAAgB,MAAM,CACpB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,KAAK,GACX,QAAQ,CAgCV;AAED,wBAAgB,GAAG,CACjB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,KAAK,GACX,QAAQ,CAMV;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,KAAK,GACX,QAAQ,CAIV;AAwGD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,GAC/B;IACD,IAAI,EAAE,QAAQ,CAAC;IACf,mBAAmB,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;CAC/D,CA2BA;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,GAC/B;IACD;QACE,KAAK,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;KAC3B;IACD;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,WAAW,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC;CACpE,CAmBA;AAiDD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAMhE"}
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAQ7C,OAAO,EAAC,KAAK,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAGxD,OAAO,KAAK,EACV,GAAG,EAEH,kBAAkB,EAElB,WAAW,EAEX,QAAQ,EACR,eAAe,EAEhB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAEL,KAAK,UAAU,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAEV,YAAY,EACb,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,2BAA2B,CAAC;AAWtD,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,YAAY,CAAC;IAErB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAQF,wBAAgB,OAAO,CACrB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,GAAG,EACR,MAAM,CAAC,EAAE,MAAM,GACd,QAAQ,CAgBV;AA4CD,wBAAgB,KAAK,CACnB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,OAAO,GAAG,SAAS,GAC5B,QAAQ,CAWV;AAUD,wBAAgB,OAAO,CACrB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,QAAQ,GAAG,SAAS,EAC7B,KAAK,EAAE,KAAK,GACX,QAAQ,CAqBV;AAoKD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,SAAS,eAAe,EAAE,EACxC,cAAc,EAAE,SAAS,MAAM,EAAE,GAChC,CAAC,UAAU,EAAE,KAAK,KAAK,QAAQ,CAiBjC;AAED,wBAAgB,MAAM,CACpB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,KAAK,GACX,QAAQ,CAgCV;AAED,wBAAgB,GAAG,CACjB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,KAAK,GACX,QAAQ,CAMV;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,KAAK,GACX,QAAQ,CAIV;AAwGD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,GAC/B;IACD,IAAI,EAAE,QAAQ,CAAC;IACf,mBAAmB,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;CAC/D,CA2BA;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,GAC/B;IACD;QACE,KAAK,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;KAC3B;IACD;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,WAAW,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC;CACpE,CAmBA;AAiDD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAMhE"}

package/out/z2s/src/compiler.js

@@ -10,6 +10,8 @@ import { completeOrdering } from "../../zql/src/query/complete-ordering.js";
 import { sql, sqlConvertSingularLiteralArg, Z2S_COLLATION, sqlConvertPluralLiteralArg, sqlConvertColumnArg } from "./sql.js";
 const ZQL_RESULT_KEY = "zql_result";
 const ZQL_RESULT_KEY_IDENT = sql.ident(ZQL_RESULT_KEY);
+const ZQL_RESULT_TABLE_KEY = "zql_root";
+const ZQL_RESULT_TABLE_IDENT = sql.ident(ZQL_RESULT_TABLE_KEY);
 function compile(serverSchema, zqlSchema, ast, format) {
   ast = completeOrdering(
     ast,
@@ -24,8 +26,8 @@ function compile(serverSchema, zqlSchema, ast, format) {
     zql: zqlSchema.tables
   };
   return sql`SELECT 
-    ${toJSON("root", format?.singular)}::text AS ${ZQL_RESULT_KEY_IDENT}
-    FROM (${select(spec, ast, format)}) ${sql.ident("root")}`;
+    ${toJSON(ZQL_RESULT_TABLE_KEY, format?.singular)}::text AS ${ZQL_RESULT_KEY_IDENT}
+    FROM (${select(spec, ast, format)}) ${ZQL_RESULT_TABLE_IDENT}`;
 }
 function select(spec, ast, format, correlate) {
   const table = makeTable(spec, ast.table);

package/out/z2s/src/compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.js","sources":["../../../../z2s/src/compiler.ts"],"sourcesContent":["import type {SQLQuery} from '@databases/sql';\nimport {last, zip} from '../../shared/src/arrays.ts';\nimport {assert, unreachable} from '../../shared/src/asserts.ts';\nimport {\n  parse as parseBigIntJson,\n  type JSONValue as BigIntJSONValue,\n} from '../../shared/src/bigint-json.ts';\nimport {hasOwn} from '../../shared/src/has-own.ts';\nimport {type JSONValue} from '../../shared/src/json.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {pgToZqlStringTypeMap} from '../../zero-cache/src/types/pg-data-type.ts';\nimport type {\n  AST,\n  Condition,\n  CorrelatedSubquery,\n  CorrelatedSubqueryCondition,\n  Correlation,\n  LiteralReference,\n  Ordering,\n  SimpleCondition,\n  ValuePosition,\n} from '../../zero-protocol/src/ast.ts';\nimport {\n  clientToServer,\n  type NameMapper,\n} from '../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {\n  ServerColumnSchema,\n  ServerSchema,\n} from '../../zero-types/src/server-schema.ts';\nimport type {Format} from '../../zql/src/ivm/view.ts';\nimport {completeOrdering} from '../../zql/src/query/complete-ordering.ts';\nimport {\n  sql,\n  sqlConvertColumnArg,\n  sqlConvertPluralLiteralArg,\n  sqlConvertSingularLiteralArg,\n  Z2S_COLLATION,\n  type PluralLiteralType,\n} from './sql.ts';\n\ntype Table = {\n  zql: string;\n  alias: string;\n};\n\ntype QualifiedColumn = {\n  table: Table;\n  zql: string;\n};\n\ntype ServerSpec = {\n  schema: ServerSchema;\n  // maps zql names to server names\n  mapper: NameMapper;\n};\n\nexport type Spec = {\n  server: ServerSpec;\n  zql: Schema['tables'];\n  aliasCount: number;\n};\n\nconst ZQL_RESULT_KEY = 'zql_result';\nconst ZQL_RESULT_KEY_IDENT = sql.ident(ZQL_RESULT_KEY);\n\nexport function compile(\n  serverSchema: ServerSchema,\n  zqlSchema: Schema,\n  ast: AST,\n  format?: Format,\n): SQLQuery {\n  ast = completeOrdering(\n    ast,\n    tableName => zqlSchema.tables[tableName].primaryKey,\n  );\n  const spec: Spec = {\n    aliasCount: 0,\n    server: {\n      schema: serverSchema,\n      mapper: clientToServer(zqlSchema.tables),\n    },\n    zql: zqlSchema.tables,\n  };\n  return sql`SELECT \n    ${toJSON('root', format?.singular)}::text AS ${ZQL_RESULT_KEY_IDENT}\n    FROM (${select(spec, ast, format)}) ${sql.ident('root')}`;\n}\n\nfunction select(\n  spec: Spec,\n  ast: AST,\n  format: Format | undefined,\n  correlate?: (childTable: Table) => SQLQuery,\n): SQLQuery {\n  const table = makeTable(spec, ast.table);\n  const selectionSet = related(spec, ast.related ?? [], format, table);\n  const tableSchema = spec.zql[ast.table];\n  const usedAliases = new Set<string>(\n    ast.related?.map(r => r.subquery.alias ?? ''),\n  );\n  for (const column of Object.keys(tableSchema.columns)) {\n    if (!usedAliases.has(column)) {\n      selectionSet.push(\n        selectIdent(spec.server, {\n          table,\n          zql: column,\n        }),\n      );\n    }\n  }\n\n  let appliedWhere = false;\n  function maybeWhere(test: unknown | undefined) {\n    if (!test) {\n      return sql``;\n    }\n\n    const ret = appliedWhere ? sql`AND` : sql`WHERE`;\n    appliedWhere = true;\n    return ret;\n  }\n\n  return sql`SELECT ${sql.join(selectionSet, ',')}\n    FROM ${fromIdent(spec.server, table)}\n    ${maybeWhere(ast.where)} ${where(spec, ast.where, table)}\n    ${maybeWhere(correlate)} ${correlate ? correlate(table) : sql``}\n    ${orderBy(spec, ast.orderBy, table)}\n    ${limit(ast.limit, format?.singular)}`;\n}\n\nexport function limit(\n  limit: number | undefined,\n  singular: boolean | undefined,\n): SQLQuery {\n  if (limit === 0) {\n    return sql`LIMIT 0`;\n  }\n  if (singular) {\n    return sql`LIMIT 1`;\n  }\n  if (limit === undefined) {\n    return sql``;\n  }\n  return sql`LIMIT ${sqlConvertSingularLiteralArg(limit)}`;\n}\n\nfunction makeTable(spec: Spec, zql: string, alias?: string): Table {\n  alias = alias ?? zql + '_' + spec.aliasCount++;\n  return {\n    zql,\n    alias,\n  };\n}\n\nexport function orderBy(\n  spec: Spec,\n  orderBy: Ordering | undefined,\n  table: Table,\n): SQLQuery {\n  if (!orderBy) {\n    return sql``;\n  }\n  return sql`ORDER BY ${sql.join(\n    orderBy.map(([col, dir]) => {\n      const serverColumnSchema = getServerColumn(spec.server, table, col);\n      return dir === 'asc'\n        ? // Oh postgres. The table must be referred to by client name but the column by server name.\n          // E.g., `SELECT server_col as client_col FROM server_table as client_table ORDER BY client_Table.server_col`\n          sql`${colIdent(spec.server, {\n            table,\n            zql: col,\n          })}${maybeCollate(serverColumnSchema)} ASC NULLS FIRST`\n        : sql`${colIdent(spec.server, {\n            table,\n            zql: col,\n          })}${maybeCollate(serverColumnSchema)} DESC NULLS LAST`;\n    }),\n    ', ',\n  )}`;\n}\n\nfunction maybeCollate(serverColumnSchema: ServerColumnSchema): SQLQuery {\n  if (serverColumnSchema.type === 'uuid' || serverColumnSchema.isEnum) {\n    return sql`::text COLLATE ${sql.ident(Z2S_COLLATION)}`;\n  }\n  if (Object.hasOwn(pgToZqlStringTypeMap, serverColumnSchema.type)) {\n    return sql` COLLATE ${sql.ident(Z2S_COLLATION)}`;\n  }\n\n  return sql``;\n}\n\nfunction related(\n  spec: Spec,\n  relationships: readonly CorrelatedSubquery[],\n  format: Format | undefined,\n  parentTable: Table,\n): SQLQuery[] {\n  return relationships.map(relationship =>\n    relationshipSubquery(\n      spec,\n      relationship,\n      format?.relationships[must(relationship.subquery.alias)],\n      parentTable,\n    ),\n  );\n}\n\nfunction relationshipSubquery(\n  spec: Spec,\n  relationship: CorrelatedSubquery,\n  format: Format | undefined,\n  parentTable: Table,\n): SQLQuery {\n  const innerAlias = `inner_${relationship.subquery.alias}`;\n  if (relationship.hidden) {\n    const {join, participatingTables} = makeJunctionJoin(spec, relationship);\n    const lastTable = must(last(participatingTables)).table;\n\n    assert(\n      relationship.subquery.related,\n      'hidden relationship must be a junction',\n    );\n    const nestedAst = relationship.subquery.related[0].subquery;\n    const selectionSet = related(\n      spec,\n      nestedAst.related ?? [],\n      format,\n      lastTable,\n    );\n    const tableSchema = spec.zql[nestedAst.table];\n    for (const column of Object.keys(tableSchema.columns)) {\n      selectionSet.push(\n        selectIdent(spec.server, {\n          table: lastTable,\n          zql: column,\n        }),\n      );\n    }\n\n    return sql`(\n        SELECT ${toJSON(innerAlias, format?.singular)} FROM (SELECT ${sql.join(\n          selectionSet,\n          ',',\n        )} FROM ${join} WHERE (${makeCorrelator(\n          spec,\n          relationship.correlation.parentField.map(f => ({\n            table: parentTable,\n            zql: f,\n          })),\n          relationship.correlation.childField,\n        )(participatingTables[0].table)}) ${\n          nestedAst.where\n            ? sql`AND ${where(spec, nestedAst.where, lastTable)}`\n            : sql``\n        } ${orderBy(spec, nestedAst.orderBy, lastTable)} ${limit(\n          last(participatingTables)?.limit,\n          format?.singular,\n        )} ) ${sql.ident(innerAlias)}\n      ) as ${sql.ident(relationship.subquery.alias)}`;\n  }\n\n  return sql`(\n      SELECT ${toJSON(innerAlias, format?.singular)} FROM (${select(\n        spec,\n        relationship.subquery,\n        format,\n        makeCorrelator(\n          spec,\n          relationship.correlation.parentField.map(f => ({\n            table: parentTable,\n            zql: f,\n          })),\n          relationship.correlation.childField,\n        ),\n      )}) ${sql.ident(innerAlias)}\n    ) as ${sql.ident(relationship.subquery.alias)}`;\n}\n\nfunction where(\n  spec: Spec,\n  condition: Condition | undefined,\n  table: Table,\n): SQLQuery {\n  if (!condition) {\n    return sql``;\n  }\n\n  switch (condition.type) {\n    case 'and':\n      return sql`(${sql.join(\n        condition.conditions.map(c => where(spec, c, table)),\n        ' AND ',\n      )})`;\n    case 'or':\n      return sql`(${sql.join(\n        condition.conditions.map(c => where(spec, c, table)),\n        ' OR ',\n      )})`;\n    case 'correlatedSubquery':\n      return exists(spec, condition, table);\n    case 'simple':\n      return simple(spec, condition, table);\n  }\n}\n\nfunction exists(\n  spec: Spec,\n  condition: CorrelatedSubqueryCondition,\n  parentTable: Table,\n): SQLQuery {\n  switch (condition.op) {\n    case 'EXISTS':\n      return sql`EXISTS (${select(\n        spec,\n        condition.related.subquery,\n        undefined,\n        makeCorrelator(\n          spec,\n          condition.related.correlation.parentField.map(f => ({\n            table: parentTable,\n            zql: f,\n          })),\n          condition.related.correlation.childField,\n        ),\n      )})`;\n    case 'NOT EXISTS':\n      return sql`NOT EXISTS (${select(\n        spec,\n        condition.related.subquery,\n        undefined,\n        makeCorrelator(\n          spec,\n          condition.related.correlation.parentField.map(f => ({\n            table: parentTable,\n            zql: f,\n          })),\n          condition.related.correlation.childField,\n        ),\n      )})`;\n  }\n}\n\nexport function makeCorrelator(\n  spec: Spec,\n  parentFields: readonly QualifiedColumn[],\n  childZqlFields: readonly string[],\n): (childTable: Table) => SQLQuery {\n  return (childTable: Table) => {\n    const childFields = childZqlFields.map(zqlField => ({\n      table: childTable,\n      zql: zqlField,\n    }));\n    return sql.join(\n      zip(parentFields, childFields).map(\n        ([parentColumn, childColumn]) =>\n          sql`${colIdent(spec.server, parentColumn)} = ${colIdent(\n            spec.server,\n            childColumn,\n          )}`,\n      ),\n      ' AND ',\n    );\n  };\n}\n\nexport function simple(\n  spec: Spec,\n  condition: SimpleCondition,\n  table: Table,\n): SQLQuery {\n  switch (condition.op) {\n    case '!=':\n    case '<':\n    case '<=':\n    case '=':\n    case '>':\n    case '>=':\n    case 'ILIKE':\n    case 'LIKE':\n    case 'NOT ILIKE':\n    case 'NOT LIKE':\n      return sql`${valueComparison(\n        spec,\n        condition.left,\n        table,\n        condition.right,\n        false,\n      )} ${sql.__dangerous__rawValue(condition.op)} ${valueComparison(\n        spec,\n        condition.right,\n        table,\n        condition.left,\n        false,\n      )}`;\n    case 'NOT IN':\n    case 'IN':\n      return any(spec, condition, table);\n    case 'IS':\n    case 'IS NOT':\n      return distinctFrom(spec, condition, table);\n  }\n}\n\nexport function any(\n  spec: Spec,\n  condition: SimpleCondition,\n  table: Table,\n): SQLQuery {\n  return sql`${condition.op === 'NOT IN' ? sql`NOT` : sql``}\n    (\n      ${valueComparison(spec, condition.left, table, condition.right, false)} = ANY \n      (${valueComparison(spec, condition.right, table, condition.left, true)})\n    )`;\n}\n\nexport function distinctFrom(\n  spec: Spec,\n  condition: SimpleCondition,\n  table: Table,\n): SQLQuery {\n  return sql`${valueComparison(spec, condition.left, table, condition.right, false)} ${\n    condition.op === 'IS' ? sql`IS NOT DISTINCT FROM` : sql`IS DISTINCT FROM`\n  } ${valueComparison(spec, condition.right, table, condition.left, false)}`;\n}\n\nfunction valueComparison(\n  spec: Spec,\n  valuePos: ValuePosition,\n  table: Table,\n  otherValuePos: ValuePosition,\n  plural: boolean,\n): SQLQuery {\n  const valuePosType = valuePos.type;\n  switch (valuePosType) {\n    case 'column': {\n      const serverColumnSchema = getServerColumn(\n        spec.server,\n        table,\n        valuePos.name,\n      );\n      const qualified: QualifiedColumn = {\n        table,\n        zql: valuePos.name,\n      };\n      if (serverColumnSchema.type === 'uuid' || serverColumnSchema.isEnum) {\n        return sql`${colIdent(spec.server, qualified)}::text`;\n      }\n      return colIdent(spec.server, qualified);\n    }\n    case 'literal':\n      return literalValueComparison(\n        spec,\n        valuePos,\n        table,\n        otherValuePos,\n        plural,\n      );\n    case 'static':\n      throw new Error(\n        'Static parameters must be bound to a value before compiling to SQL',\n      );\n    default:\n      unreachable(valuePosType);\n      break;\n  }\n}\n\nfunction literalValueComparison(\n  spec: Spec,\n  valuePos: LiteralReference,\n  table: Table,\n  otherValuePos: ValuePosition,\n  plural: boolean,\n): SQLQuery {\n  const otherType = otherValuePos.type;\n  switch (otherType) {\n    case 'column':\n      return sqlConvertColumnArg(\n        getServerColumn(spec.server, table, otherValuePos.name),\n        valuePos.value,\n        plural,\n        true,\n      );\n    case 'literal': {\n      assert(plural === Array.isArray(valuePos.value));\n      if (Array.isArray(valuePos.value)) {\n        if (valuePos.value.length > 0) {\n          // If the array is non-empty base its type on its first\n          // element\n          return sqlConvertPluralLiteralArg(\n            typeof valuePos.value[0] as PluralLiteralType,\n            valuePos.value as PluralLiteralType[],\n          );\n        }\n        // If the array is empty, base its type on the other value\n        // position's type (as long as the other value position is non-null,\n        // cannot have a null[]).\n        if (otherValuePos.value !== null) {\n          return sqlConvertPluralLiteralArg(\n            typeof otherValuePos.value as PluralLiteralType,\n            [],\n          );\n        }\n        // If the other value position is null, it can be compared to any\n        // type of empty array, chose 'string' arbitrarily.\n        return sqlConvertPluralLiteralArg('string', []);\n      }\n      if (\n        typeof valuePos.value === 'string' ||\n        typeof valuePos.value === 'number' ||\n        typeof valuePos.value === 'boolean'\n      ) {\n        return sqlConvertSingularLiteralArg(valuePos.value);\n      }\n      throw new Error(\n        `Literal of unexpected type. ${valuePos.value} of type ${typeof valuePos.value}`,\n      );\n    }\n    case 'static':\n      throw new Error(\n        'Static parameters must be bound to a value before compiling to SQL',\n      );\n    default:\n      unreachable(otherType);\n  }\n}\n\nexport function makeJunctionJoin(\n  spec: Spec,\n  relationship: CorrelatedSubquery,\n): {\n  join: SQLQuery;\n  participatingTables: ReturnType<typeof pullTablesForJunction>;\n} {\n  const participatingTables = pullTablesForJunction(spec, relationship);\n  const joins: SQLQuery[] = [];\n\n  for (const {table} of participatingTables) {\n    if (joins.length === 0) {\n      joins.push(fromIdent(spec.server, table));\n      continue;\n    }\n    joins.push(\n      sql` JOIN ${fromIdent(spec.server, table)} ON ${makeCorrelator(\n        spec,\n        participatingTables[joins.length].correlation.parentField.map(f => ({\n          table: participatingTables[joins.length - 1].table,\n          zql: f,\n        })),\n        participatingTables[joins.length].correlation.childField,\n      )(participatingTables[joins.length].table)}`,\n    );\n  }\n\n  return {\n    join: sql`${sql.join(joins, '')}`,\n    participatingTables,\n    // lastTable: participatingTables[participatingTables.length - 1].table,\n    // lastLimit: participatingTables[participatingTables.length - 1].limit,\n  };\n}\n\nexport function pullTablesForJunction(\n  spec: Spec,\n  relationship: CorrelatedSubquery,\n): [\n  {\n    table: Table;\n    correlation: Correlation;\n    limit: number | undefined;\n  },\n  {table: Table; correlation: Correlation; limit: number | undefined},\n] {\n  assert(\n    relationship.subquery.related?.length === 1,\n    'Too many related tables for a junction edge',\n  );\n  const otherRelationship = relationship.subquery.related[0];\n  assert(!otherRelationship.hidden);\n  return [\n    {\n      table: makeTable(spec, relationship.subquery.table),\n      correlation: relationship.correlation,\n      limit: relationship.subquery.limit,\n    },\n    {\n      table: makeTable(spec, otherRelationship.subquery.table),\n      correlation: otherRelationship.correlation,\n      limit: otherRelationship.subquery.limit,\n    },\n  ];\n}\n\nfunction toJSON(table: string, singular = false): SQLQuery {\n  return sql`${\n    singular ? sql`` : sql`COALESCE(json_agg`\n  }(row_to_json(${sql.ident(table)}))${singular ? sql`` : sql`, '[]'::json)`}`;\n}\n\nfunction selectIdent(server: ServerSpec, column: QualifiedColumn): SQLQuery {\n  const serverColumnSchema =\n    server.schema[server.mapper.tableName(column.table.zql)][\n      server.mapper.columnName(column.table.zql, column.zql)\n    ];\n  const serverType = serverColumnSchema.type;\n  if (\n    !serverColumnSchema.isEnum &&\n    (serverType === 'date' ||\n      serverType === 'timestamp' ||\n      serverType === 'timestamp without time zone' ||\n      serverType === 'timestamptz' ||\n      serverType === 'timestamp with time zone')\n  ) {\n    if (serverColumnSchema.isArray) {\n      // Map EXTRACT(EPOCH FROM ...) * 1000 over array elements\n      return sql`ARRAY(SELECT EXTRACT(EPOCH FROM unnest(${colIdent(server, column)})) * 1000) as ${sql.ident(column.zql)}`;\n    }\n    return sql`EXTRACT(EPOCH FROM ${colIdent(server, column)}) * 1000 as ${sql.ident(column.zql)}`;\n  }\n  return sql`${colIdent(server, column)} as ${sql.ident(column.zql)}`;\n}\n\nfunction colIdent(server: ServerSpec, column: QualifiedColumn) {\n  return sql.ident(\n    column.table.alias,\n    server.mapper.columnName(column.table.zql, column.zql),\n  );\n}\n\nfunction fromIdent(server: ServerSpec, table: Table) {\n  return sql`${sql.ident(server.mapper.tableName(table.zql))} AS ${sql.ident(table.alias)}`;\n}\n\nfunction getServerColumn(spec: ServerSpec, table: Table, zqlColumn: string) {\n  return spec.schema[spec.mapper.tableName(table.zql)][\n    spec.mapper.columnName(table.zql, zqlColumn)\n  ];\n}\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\nexport function extractZqlResult(pgResult: Array<any>): JSONValue {\n  const bigIntJson: BigIntJSONValue = parseBigIntJson(\n    pgResult[0][ZQL_RESULT_KEY],\n  );\n  assertJSONValue(bigIntJson);\n  return bigIntJson;\n}\n\nfunction assertJSONValue(v: BigIntJSONValue): asserts v is JSONValue {\n  const path = findPathToBigInt(v);\n  if (path) {\n    throw new Error(`Value exceeds safe Number range. ${path}`);\n  }\n}\n\nfunction findPathToBigInt(v: BigIntJSONValue): string | undefined {\n  const typeOfV = typeof v;\n  switch (typeOfV) {\n    case 'bigint':\n      return ` = ${v}`;\n    case 'object': {\n      if (v === null) {\n        return;\n      }\n      if (Array.isArray(v)) {\n        for (let i = 0; i < v.length; i++) {\n          const path = findPathToBigInt(v[i]);\n          if (path) {\n            return `[${i}]${path}`;\n          }\n        }\n        return undefined;\n      }\n\n      const o = v as Record<string, BigIntJSONValue>;\n      for (const k in o) {\n        if (hasOwn(o, k)) {\n          const path = findPathToBigInt(o[k]);\n          if (path) {\n            return `['${k}']${path}`;\n          }\n        }\n      }\n      return undefined;\n    }\n    case 'number':\n      return undefined;\n    case 'boolean':\n      return undefined;\n    default:\n      return undefined;\n  }\n}\n"],"names":["limit","orderBy","parseBigIntJson"],"mappings":"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"}
+{"version":3,"file":"compiler.js","sources":["../../../../z2s/src/compiler.ts"],"sourcesContent":["import type {SQLQuery} from '@databases/sql';\nimport {last, zip} from '../../shared/src/arrays.ts';\nimport {assert, unreachable} from '../../shared/src/asserts.ts';\nimport {\n  parse as parseBigIntJson,\n  type JSONValue as BigIntJSONValue,\n} from '../../shared/src/bigint-json.ts';\nimport {hasOwn} from '../../shared/src/has-own.ts';\nimport {type JSONValue} from '../../shared/src/json.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {pgToZqlStringTypeMap} from '../../zero-cache/src/types/pg-data-type.ts';\nimport type {\n  AST,\n  Condition,\n  CorrelatedSubquery,\n  CorrelatedSubqueryCondition,\n  Correlation,\n  LiteralReference,\n  Ordering,\n  SimpleCondition,\n  ValuePosition,\n} from '../../zero-protocol/src/ast.ts';\nimport {\n  clientToServer,\n  type NameMapper,\n} from '../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {\n  ServerColumnSchema,\n  ServerSchema,\n} from '../../zero-types/src/server-schema.ts';\nimport type {Format} from '../../zql/src/ivm/view.ts';\nimport {completeOrdering} from '../../zql/src/query/complete-ordering.ts';\nimport {\n  sql,\n  sqlConvertColumnArg,\n  sqlConvertPluralLiteralArg,\n  sqlConvertSingularLiteralArg,\n  Z2S_COLLATION,\n  type PluralLiteralType,\n} from './sql.ts';\n\ntype Table = {\n  zql: string;\n  alias: string;\n};\n\ntype QualifiedColumn = {\n  table: Table;\n  zql: string;\n};\n\ntype ServerSpec = {\n  schema: ServerSchema;\n  // maps zql names to server names\n  mapper: NameMapper;\n};\n\nexport type Spec = {\n  server: ServerSpec;\n  zql: Schema['tables'];\n  aliasCount: number;\n};\n\nconst ZQL_RESULT_KEY = 'zql_result';\nconst ZQL_RESULT_KEY_IDENT = sql.ident(ZQL_RESULT_KEY);\n\nconst ZQL_RESULT_TABLE_KEY = 'zql_root';\nconst ZQL_RESULT_TABLE_IDENT = sql.ident(ZQL_RESULT_TABLE_KEY);\n\nexport function compile(\n  serverSchema: ServerSchema,\n  zqlSchema: Schema,\n  ast: AST,\n  format?: Format,\n): SQLQuery {\n  ast = completeOrdering(\n    ast,\n    tableName => zqlSchema.tables[tableName].primaryKey,\n  );\n  const spec: Spec = {\n    aliasCount: 0,\n    server: {\n      schema: serverSchema,\n      mapper: clientToServer(zqlSchema.tables),\n    },\n    zql: zqlSchema.tables,\n  };\n  return sql`SELECT \n    ${toJSON(ZQL_RESULT_TABLE_KEY, format?.singular)}::text AS ${ZQL_RESULT_KEY_IDENT}\n    FROM (${select(spec, ast, format)}) ${ZQL_RESULT_TABLE_IDENT}`;\n}\n\nfunction select(\n  spec: Spec,\n  ast: AST,\n  format: Format | undefined,\n  correlate?: (childTable: Table) => SQLQuery,\n): SQLQuery {\n  const table = makeTable(spec, ast.table);\n  const selectionSet = related(spec, ast.related ?? [], format, table);\n  const tableSchema = spec.zql[ast.table];\n  const usedAliases = new Set<string>(\n    ast.related?.map(r => r.subquery.alias ?? ''),\n  );\n  for (const column of Object.keys(tableSchema.columns)) {\n    if (!usedAliases.has(column)) {\n      selectionSet.push(\n        selectIdent(spec.server, {\n          table,\n          zql: column,\n        }),\n      );\n    }\n  }\n\n  let appliedWhere = false;\n  function maybeWhere(test: unknown | undefined) {\n    if (!test) {\n      return sql``;\n    }\n\n    const ret = appliedWhere ? sql`AND` : sql`WHERE`;\n    appliedWhere = true;\n    return ret;\n  }\n\n  return sql`SELECT ${sql.join(selectionSet, ',')}\n    FROM ${fromIdent(spec.server, table)}\n    ${maybeWhere(ast.where)} ${where(spec, ast.where, table)}\n    ${maybeWhere(correlate)} ${correlate ? correlate(table) : sql``}\n    ${orderBy(spec, ast.orderBy, table)}\n    ${limit(ast.limit, format?.singular)}`;\n}\n\nexport function limit(\n  limit: number | undefined,\n  singular: boolean | undefined,\n): SQLQuery {\n  if (limit === 0) {\n    return sql`LIMIT 0`;\n  }\n  if (singular) {\n    return sql`LIMIT 1`;\n  }\n  if (limit === undefined) {\n    return sql``;\n  }\n  return sql`LIMIT ${sqlConvertSingularLiteralArg(limit)}`;\n}\n\nfunction makeTable(spec: Spec, zql: string, alias?: string): Table {\n  alias = alias ?? zql + '_' + spec.aliasCount++;\n  return {\n    zql,\n    alias,\n  };\n}\n\nexport function orderBy(\n  spec: Spec,\n  orderBy: Ordering | undefined,\n  table: Table,\n): SQLQuery {\n  if (!orderBy) {\n    return sql``;\n  }\n  return sql`ORDER BY ${sql.join(\n    orderBy.map(([col, dir]) => {\n      const serverColumnSchema = getServerColumn(spec.server, table, col);\n      return dir === 'asc'\n        ? // Oh postgres. The table must be referred to by client name but the column by server name.\n          // E.g., `SELECT server_col as client_col FROM server_table as client_table ORDER BY client_Table.server_col`\n          sql`${colIdent(spec.server, {\n            table,\n            zql: col,\n          })}${maybeCollate(serverColumnSchema)} ASC NULLS FIRST`\n        : sql`${colIdent(spec.server, {\n            table,\n            zql: col,\n          })}${maybeCollate(serverColumnSchema)} DESC NULLS LAST`;\n    }),\n    ', ',\n  )}`;\n}\n\nfunction maybeCollate(serverColumnSchema: ServerColumnSchema): SQLQuery {\n  if (serverColumnSchema.type === 'uuid' || serverColumnSchema.isEnum) {\n    return sql`::text COLLATE ${sql.ident(Z2S_COLLATION)}`;\n  }\n  if (Object.hasOwn(pgToZqlStringTypeMap, serverColumnSchema.type)) {\n    return sql` COLLATE ${sql.ident(Z2S_COLLATION)}`;\n  }\n\n  return sql``;\n}\n\nfunction related(\n  spec: Spec,\n  relationships: readonly CorrelatedSubquery[],\n  format: Format | undefined,\n  parentTable: Table,\n): SQLQuery[] {\n  return relationships.map(relationship =>\n    relationshipSubquery(\n      spec,\n      relationship,\n      format?.relationships[must(relationship.subquery.alias)],\n      parentTable,\n    ),\n  );\n}\n\nfunction relationshipSubquery(\n  spec: Spec,\n  relationship: CorrelatedSubquery,\n  format: Format | undefined,\n  parentTable: Table,\n): SQLQuery {\n  const innerAlias = `inner_${relationship.subquery.alias}`;\n  if (relationship.hidden) {\n    const {join, participatingTables} = makeJunctionJoin(spec, relationship);\n    const lastTable = must(last(participatingTables)).table;\n\n    assert(\n      relationship.subquery.related,\n      'hidden relationship must be a junction',\n    );\n    const nestedAst = relationship.subquery.related[0].subquery;\n    const selectionSet = related(\n      spec,\n      nestedAst.related ?? [],\n      format,\n      lastTable,\n    );\n    const tableSchema = spec.zql[nestedAst.table];\n    for (const column of Object.keys(tableSchema.columns)) {\n      selectionSet.push(\n        selectIdent(spec.server, {\n          table: lastTable,\n          zql: column,\n        }),\n      );\n    }\n\n    return sql`(\n        SELECT ${toJSON(innerAlias, format?.singular)} FROM (SELECT ${sql.join(\n          selectionSet,\n          ',',\n        )} FROM ${join} WHERE (${makeCorrelator(\n          spec,\n          relationship.correlation.parentField.map(f => ({\n            table: parentTable,\n            zql: f,\n          })),\n          relationship.correlation.childField,\n        )(participatingTables[0].table)}) ${\n          nestedAst.where\n            ? sql`AND ${where(spec, nestedAst.where, lastTable)}`\n            : sql``\n        } ${orderBy(spec, nestedAst.orderBy, lastTable)} ${limit(\n          last(participatingTables)?.limit,\n          format?.singular,\n        )} ) ${sql.ident(innerAlias)}\n      ) as ${sql.ident(relationship.subquery.alias)}`;\n  }\n\n  return sql`(\n      SELECT ${toJSON(innerAlias, format?.singular)} FROM (${select(\n        spec,\n        relationship.subquery,\n        format,\n        makeCorrelator(\n          spec,\n          relationship.correlation.parentField.map(f => ({\n            table: parentTable,\n            zql: f,\n          })),\n          relationship.correlation.childField,\n        ),\n      )}) ${sql.ident(innerAlias)}\n    ) as ${sql.ident(relationship.subquery.alias)}`;\n}\n\nfunction where(\n  spec: Spec,\n  condition: Condition | undefined,\n  table: Table,\n): SQLQuery {\n  if (!condition) {\n    return sql``;\n  }\n\n  switch (condition.type) {\n    case 'and':\n      return sql`(${sql.join(\n        condition.conditions.map(c => where(spec, c, table)),\n        ' AND ',\n      )})`;\n    case 'or':\n      return sql`(${sql.join(\n        condition.conditions.map(c => where(spec, c, table)),\n        ' OR ',\n      )})`;\n    case 'correlatedSubquery':\n      return exists(spec, condition, table);\n    case 'simple':\n      return simple(spec, condition, table);\n  }\n}\n\nfunction exists(\n  spec: Spec,\n  condition: CorrelatedSubqueryCondition,\n  parentTable: Table,\n): SQLQuery {\n  switch (condition.op) {\n    case 'EXISTS':\n      return sql`EXISTS (${select(\n        spec,\n        condition.related.subquery,\n        undefined,\n        makeCorrelator(\n          spec,\n          condition.related.correlation.parentField.map(f => ({\n            table: parentTable,\n            zql: f,\n          })),\n          condition.related.correlation.childField,\n        ),\n      )})`;\n    case 'NOT EXISTS':\n      return sql`NOT EXISTS (${select(\n        spec,\n        condition.related.subquery,\n        undefined,\n        makeCorrelator(\n          spec,\n          condition.related.correlation.parentField.map(f => ({\n            table: parentTable,\n            zql: f,\n          })),\n          condition.related.correlation.childField,\n        ),\n      )})`;\n  }\n}\n\nexport function makeCorrelator(\n  spec: Spec,\n  parentFields: readonly QualifiedColumn[],\n  childZqlFields: readonly string[],\n): (childTable: Table) => SQLQuery {\n  return (childTable: Table) => {\n    const childFields = childZqlFields.map(zqlField => ({\n      table: childTable,\n      zql: zqlField,\n    }));\n    return sql.join(\n      zip(parentFields, childFields).map(\n        ([parentColumn, childColumn]) =>\n          sql`${colIdent(spec.server, parentColumn)} = ${colIdent(\n            spec.server,\n            childColumn,\n          )}`,\n      ),\n      ' AND ',\n    );\n  };\n}\n\nexport function simple(\n  spec: Spec,\n  condition: SimpleCondition,\n  table: Table,\n): SQLQuery {\n  switch (condition.op) {\n    case '!=':\n    case '<':\n    case '<=':\n    case '=':\n    case '>':\n    case '>=':\n    case 'ILIKE':\n    case 'LIKE':\n    case 'NOT ILIKE':\n    case 'NOT LIKE':\n      return sql`${valueComparison(\n        spec,\n        condition.left,\n        table,\n        condition.right,\n        false,\n      )} ${sql.__dangerous__rawValue(condition.op)} ${valueComparison(\n        spec,\n        condition.right,\n        table,\n        condition.left,\n        false,\n      )}`;\n    case 'NOT IN':\n    case 'IN':\n      return any(spec, condition, table);\n    case 'IS':\n    case 'IS NOT':\n      return distinctFrom(spec, condition, table);\n  }\n}\n\nexport function any(\n  spec: Spec,\n  condition: SimpleCondition,\n  table: Table,\n): SQLQuery {\n  return sql`${condition.op === 'NOT IN' ? sql`NOT` : sql``}\n    (\n      ${valueComparison(spec, condition.left, table, condition.right, false)} = ANY \n      (${valueComparison(spec, condition.right, table, condition.left, true)})\n    )`;\n}\n\nexport function distinctFrom(\n  spec: Spec,\n  condition: SimpleCondition,\n  table: Table,\n): SQLQuery {\n  return sql`${valueComparison(spec, condition.left, table, condition.right, false)} ${\n    condition.op === 'IS' ? sql`IS NOT DISTINCT FROM` : sql`IS DISTINCT FROM`\n  } ${valueComparison(spec, condition.right, table, condition.left, false)}`;\n}\n\nfunction valueComparison(\n  spec: Spec,\n  valuePos: ValuePosition,\n  table: Table,\n  otherValuePos: ValuePosition,\n  plural: boolean,\n): SQLQuery {\n  const valuePosType = valuePos.type;\n  switch (valuePosType) {\n    case 'column': {\n      const serverColumnSchema = getServerColumn(\n        spec.server,\n        table,\n        valuePos.name,\n      );\n      const qualified: QualifiedColumn = {\n        table,\n        zql: valuePos.name,\n      };\n      if (serverColumnSchema.type === 'uuid' || serverColumnSchema.isEnum) {\n        return sql`${colIdent(spec.server, qualified)}::text`;\n      }\n      return colIdent(spec.server, qualified);\n    }\n    case 'literal':\n      return literalValueComparison(\n        spec,\n        valuePos,\n        table,\n        otherValuePos,\n        plural,\n      );\n    case 'static':\n      throw new Error(\n        'Static parameters must be bound to a value before compiling to SQL',\n      );\n    default:\n      unreachable(valuePosType);\n      break;\n  }\n}\n\nfunction literalValueComparison(\n  spec: Spec,\n  valuePos: LiteralReference,\n  table: Table,\n  otherValuePos: ValuePosition,\n  plural: boolean,\n): SQLQuery {\n  const otherType = otherValuePos.type;\n  switch (otherType) {\n    case 'column':\n      return sqlConvertColumnArg(\n        getServerColumn(spec.server, table, otherValuePos.name),\n        valuePos.value,\n        plural,\n        true,\n      );\n    case 'literal': {\n      assert(plural === Array.isArray(valuePos.value));\n      if (Array.isArray(valuePos.value)) {\n        if (valuePos.value.length > 0) {\n          // If the array is non-empty base its type on its first\n          // element\n          return sqlConvertPluralLiteralArg(\n            typeof valuePos.value[0] as PluralLiteralType,\n            valuePos.value as PluralLiteralType[],\n          );\n        }\n        // If the array is empty, base its type on the other value\n        // position's type (as long as the other value position is non-null,\n        // cannot have a null[]).\n        if (otherValuePos.value !== null) {\n          return sqlConvertPluralLiteralArg(\n            typeof otherValuePos.value as PluralLiteralType,\n            [],\n          );\n        }\n        // If the other value position is null, it can be compared to any\n        // type of empty array, chose 'string' arbitrarily.\n        return sqlConvertPluralLiteralArg('string', []);\n      }\n      if (\n        typeof valuePos.value === 'string' ||\n        typeof valuePos.value === 'number' ||\n        typeof valuePos.value === 'boolean'\n      ) {\n        return sqlConvertSingularLiteralArg(valuePos.value);\n      }\n      throw new Error(\n        `Literal of unexpected type. ${valuePos.value} of type ${typeof valuePos.value}`,\n      );\n    }\n    case 'static':\n      throw new Error(\n        'Static parameters must be bound to a value before compiling to SQL',\n      );\n    default:\n      unreachable(otherType);\n  }\n}\n\nexport function makeJunctionJoin(\n  spec: Spec,\n  relationship: CorrelatedSubquery,\n): {\n  join: SQLQuery;\n  participatingTables: ReturnType<typeof pullTablesForJunction>;\n} {\n  const participatingTables = pullTablesForJunction(spec, relationship);\n  const joins: SQLQuery[] = [];\n\n  for (const {table} of participatingTables) {\n    if (joins.length === 0) {\n      joins.push(fromIdent(spec.server, table));\n      continue;\n    }\n    joins.push(\n      sql` JOIN ${fromIdent(spec.server, table)} ON ${makeCorrelator(\n        spec,\n        participatingTables[joins.length].correlation.parentField.map(f => ({\n          table: participatingTables[joins.length - 1].table,\n          zql: f,\n        })),\n        participatingTables[joins.length].correlation.childField,\n      )(participatingTables[joins.length].table)}`,\n    );\n  }\n\n  return {\n    join: sql`${sql.join(joins, '')}`,\n    participatingTables,\n    // lastTable: participatingTables[participatingTables.length - 1].table,\n    // lastLimit: participatingTables[participatingTables.length - 1].limit,\n  };\n}\n\nexport function pullTablesForJunction(\n  spec: Spec,\n  relationship: CorrelatedSubquery,\n): [\n  {\n    table: Table;\n    correlation: Correlation;\n    limit: number | undefined;\n  },\n  {table: Table; correlation: Correlation; limit: number | undefined},\n] {\n  assert(\n    relationship.subquery.related?.length === 1,\n    'Too many related tables for a junction edge',\n  );\n  const otherRelationship = relationship.subquery.related[0];\n  assert(!otherRelationship.hidden);\n  return [\n    {\n      table: makeTable(spec, relationship.subquery.table),\n      correlation: relationship.correlation,\n      limit: relationship.subquery.limit,\n    },\n    {\n      table: makeTable(spec, otherRelationship.subquery.table),\n      correlation: otherRelationship.correlation,\n      limit: otherRelationship.subquery.limit,\n    },\n  ];\n}\n\nfunction toJSON(table: string, singular = false): SQLQuery {\n  return sql`${\n    singular ? sql`` : sql`COALESCE(json_agg`\n  }(row_to_json(${sql.ident(table)}))${singular ? sql`` : sql`, '[]'::json)`}`;\n}\n\nfunction selectIdent(server: ServerSpec, column: QualifiedColumn): SQLQuery {\n  const serverColumnSchema =\n    server.schema[server.mapper.tableName(column.table.zql)][\n      server.mapper.columnName(column.table.zql, column.zql)\n    ];\n  const serverType = serverColumnSchema.type;\n  if (\n    !serverColumnSchema.isEnum &&\n    (serverType === 'date' ||\n      serverType === 'timestamp' ||\n      serverType === 'timestamp without time zone' ||\n      serverType === 'timestamptz' ||\n      serverType === 'timestamp with time zone')\n  ) {\n    if (serverColumnSchema.isArray) {\n      // Map EXTRACT(EPOCH FROM ...) * 1000 over array elements\n      return sql`ARRAY(SELECT EXTRACT(EPOCH FROM unnest(${colIdent(server, column)})) * 1000) as ${sql.ident(column.zql)}`;\n    }\n    return sql`EXTRACT(EPOCH FROM ${colIdent(server, column)}) * 1000 as ${sql.ident(column.zql)}`;\n  }\n  return sql`${colIdent(server, column)} as ${sql.ident(column.zql)}`;\n}\n\nfunction colIdent(server: ServerSpec, column: QualifiedColumn) {\n  return sql.ident(\n    column.table.alias,\n    server.mapper.columnName(column.table.zql, column.zql),\n  );\n}\n\nfunction fromIdent(server: ServerSpec, table: Table) {\n  return sql`${sql.ident(server.mapper.tableName(table.zql))} AS ${sql.ident(table.alias)}`;\n}\n\nfunction getServerColumn(spec: ServerSpec, table: Table, zqlColumn: string) {\n  return spec.schema[spec.mapper.tableName(table.zql)][\n    spec.mapper.columnName(table.zql, zqlColumn)\n  ];\n}\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\nexport function extractZqlResult(pgResult: Array<any>): JSONValue {\n  const bigIntJson: BigIntJSONValue = parseBigIntJson(\n    pgResult[0][ZQL_RESULT_KEY],\n  );\n  assertJSONValue(bigIntJson);\n  return bigIntJson;\n}\n\nfunction assertJSONValue(v: BigIntJSONValue): asserts v is JSONValue {\n  const path = findPathToBigInt(v);\n  if (path) {\n    throw new Error(`Value exceeds safe Number range. ${path}`);\n  }\n}\n\nfunction findPathToBigInt(v: BigIntJSONValue): string | undefined {\n  const typeOfV = typeof v;\n  switch (typeOfV) {\n    case 'bigint':\n      return ` = ${v}`;\n    case 'object': {\n      if (v === null) {\n        return;\n      }\n      if (Array.isArray(v)) {\n        for (let i = 0; i < v.length; i++) {\n          const path = findPathToBigInt(v[i]);\n          if (path) {\n            return `[${i}]${path}`;\n          }\n        }\n        return undefined;\n      }\n\n      const o = v as Record<string, BigIntJSONValue>;\n      for (const k in o) {\n        if (hasOwn(o, k)) {\n          const path = findPathToBigInt(o[k]);\n          if (path) {\n            return `['${k}']${path}`;\n          }\n        }\n      }\n      return undefined;\n    }\n    case 'number':\n      return undefined;\n    case 'boolean':\n      return undefined;\n    default:\n      return undefined;\n  }\n}\n"],"names":["limit","orderBy","parseBigIntJson"],"mappings":"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"}

package/out/zero/package.json.js

@@ -1,4 +1,4 @@
-const version = "0.25.0-canary.15";
+const version = "0.25.0-canary.18";
 const packageJson = {
   version
 };

package/out/zero/src/pg.js

@@ -1,6 +1,6 @@
 import { ApplicationError, isApplicationError, wrapWithApplicationError } from "../../zero-protocol/src/application-error.js";
-import { customMutatorKey, splitMutatorKey } from "../../zql/src/mutate/custom.js";
-import { TransactionImpl, makeSchemaCRUD, makeServerTransaction } from "../../zero-server/src/custom.js";
+import { customMutatorKey } from "../../zql/src/mutate/custom.js";
+import { CRUDMutatorFactory, TransactionImpl, makeMutateCRUD, makeSchemaCRUD, makeServerTransaction } from "../../zero-server/src/custom.js";
 import { OutOfOrderMutation, getMutation, handleMutateRequest, handleMutationRequest } from "../../zero-server/src/process-mutations.js";
 import { PushProcessor } from "../../zero-server/src/push-processor.js";
 import { handleGetQueriesRequest, handleQueryRequest, handleTransformRequest } from "../../zero-server/src/queries/process-queries.js";
@@ -8,6 +8,7 @@ import { ZQLDatabase } from "../../zero-server/src/zql-database.js";
 import { PostgresJSConnection, PostgresJsTransactionInternal, zeroPostgresJS } from "../../zero-server/src/adapters/postgresjs.js";
 export {
   ApplicationError,
+  CRUDMutatorFactory,
   OutOfOrderMutation,
   PostgresJSConnection,
   PostgresJsTransactionInternal,
@@ -22,9 +23,9 @@ export {
   handleQueryRequest,
   handleTransformRequest,
   isApplicationError,
+  makeMutateCRUD,
   makeSchemaCRUD,
   makeServerTransaction,
-  splitMutatorKey,
   wrapWithApplicationError,
   zeroPostgresJS
 };

package/out/zero/src/server.js

@@ -1,12 +1,13 @@
 import { ApplicationError, isApplicationError, wrapWithApplicationError } from "../../zero-protocol/src/application-error.js";
-import { customMutatorKey, splitMutatorKey } from "../../zql/src/mutate/custom.js";
-import { TransactionImpl, makeSchemaCRUD, makeServerTransaction } from "../../zero-server/src/custom.js";
+import { customMutatorKey } from "../../zql/src/mutate/custom.js";
+import { CRUDMutatorFactory, TransactionImpl, makeMutateCRUD, makeSchemaCRUD, makeServerTransaction } from "../../zero-server/src/custom.js";
 import { OutOfOrderMutation, getMutation, handleMutateRequest, handleMutationRequest } from "../../zero-server/src/process-mutations.js";
 import { PushProcessor } from "../../zero-server/src/push-processor.js";
 import { handleGetQueriesRequest, handleQueryRequest, handleTransformRequest } from "../../zero-server/src/queries/process-queries.js";
 import { ZQLDatabase } from "../../zero-server/src/zql-database.js";
 export {
   ApplicationError,
+  CRUDMutatorFactory,
   OutOfOrderMutation,
   PushProcessor,
   TransactionImpl,
@@ -19,9 +20,9 @@ export {
   handleQueryRequest,
   handleTransformRequest,
   isApplicationError,
+  makeMutateCRUD,
   makeSchemaCRUD,
   makeServerTransaction,
-  splitMutatorKey,
   wrapWithApplicationError
 };
 //# sourceMappingURL=server.js.map

package/out/zero/src/zero.js

@@ -10,12 +10,13 @@ import { createSchema } from "../../zero-schema/src/builder/schema-builder.js";
 import { boolean, enumeration, json, number, string, table } from "../../zero-schema/src/builder/table-builder.js";
 import { ANYONE_CAN, ANYONE_CAN_DO_ANYTHING, NOBODY_CAN, definePermissions } from "../../zero-schema/src/permissions.js";
 import { applyChange } from "../../zql/src/ivm/view-apply-change.js";
-import { defineMutators, getMutator, isMutatorRegistry, mustGetMutator } from "../../zql/src/mutate/mutator-registry.js";
-import { defineMutator, isMutator, isMutatorDefinition } from "../../zql/src/mutate/mutator.js";
+import { createCRUDBuilder } from "../../zql/src/mutate/crud.js";
+import { defineMutators, defineMutatorsWithType, getMutator, isMutatorRegistry, mustGetMutator } from "../../zql/src/mutate/mutator-registry.js";
+import { defineMutator, defineMutatorWithType, isMutator, isMutatorDefinition } from "../../zql/src/mutate/mutator.js";
 import { createBuilder } from "../../zql/src/query/create-builder.js";
 import { escapeLike } from "../../zql/src/query/escape-like.js";
 import { syncedQuery, syncedQueryWithContext, withValidation } from "../../zql/src/query/named.js";
-import { defineQueries, defineQuery, getQuery, isQueryDefinition, mustGetQuery } from "../../zql/src/query/query-registry.js";
+import { defineQueries, defineQueriesWithType, defineQuery, defineQueryWithType, getQuery, isQuery, isQueryDefinition, isQueryRegistry, mustGetQuery } from "../../zql/src/query/query-registry.js";
 import { bindingsForZero, registerZeroDelegate } from "../../zero-client/src/client/bindings.js";
 import * as updateNeededReasonTypeEnum from "../../zero-client/src/client/update-needed-reason-type-enum.js";
 import { Zero } from "../../zero-client/src/client/zero.js";
@@ -32,12 +33,17 @@ export {
   bindingsForZero,
   boolean,
   createBuilder,
+  createCRUDBuilder,
   createSchema,
   defineMutator,
+  defineMutatorWithType,
   defineMutators,
+  defineMutatorsWithType,
   definePermissions,
   defineQueries,
+  defineQueriesWithType,
   defineQuery,
+  defineQueryWithType,
   dropAllDatabases,
   dropDatabase,
   enumeration,
@@ -48,7 +54,9 @@ export {
   isMutator,
   isMutatorDefinition,
   isMutatorRegistry,
+  isQuery,
   isQueryDefinition,
+  isQueryRegistry,
   json,
   makeIDBName,
   mustGetMutator,

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

@@ -1 +1 @@
-{"version":3,"file":"zero.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"zero.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -355,6 +355,14 @@ export declare const zeroOptions: {
             type: v.Type<number>;
             desc: string[];
         };
+        minCheckpointPageCount: {
+            type: v.Optional<number>;
+            desc: string[];
+        };
+        maxCheckpointPageCount: {
+            type: v.Optional<number>;
+            desc: string[];
+        };
         incrementalBackupIntervalMinutes: {
             type: v.Type<number>;
             desc: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"zero-config.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AASnD,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAC,SAAS,EAAC,MAAM,kCAAkC,CAAC;AAEhE,eAAO,MAAM,UAAU;;;;;;;;;CA+CtB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;CAwBxB,CAAC;AAEF,QAAA,MAAM,cAAc;;;;;;;;;;;;;CAgCnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;AAE3D,QAAA,MAAM,oBAAoB;;;;;;;;;CAczB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE5D,QAAA,MAAM,WAAW;;;;;;;;;;;;;CAmBhB,CAAC;AA2EF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAKpD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;IAwCtB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAyJhB,kBAAkB;;;;;;QASlB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkPpB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgEnB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAI3C,wBAAgB,aAAa,CAC3B,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,eAAe,CAAM,GAC7C,UAAU,CAaZ;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,eAAe,CAAM,GAC7C,oBAAoB,CAItB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,GAAG,SAAS,GACpD,MAAM,CAER;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EACnD,QAAQ,EAAE,MAAM,GAAG,SAAS,WA4B7B;AAYD,wBAAgB,kBAAkB,SAEjC"}
+{"version":3,"file":"zero-config.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AASnD,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAC,SAAS,EAAC,MAAM,kCAAkC,CAAC;AAEhE,eAAO,MAAM,UAAU;;;;;;;;;CA+CtB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;CAwBxB,CAAC;AAEF,QAAA,MAAM,cAAc;;;;;;;;;;;;;CAgCnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;AAE3D,QAAA,MAAM,oBAAoB;;;;;;;;;CAczB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE5D,QAAA,MAAM,WAAW;;;;;;;;;;;;;CAmBhB,CAAC;AA2EF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAKpD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;IAwCtB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAyJhB,kBAAkB;;;;;;QASlB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoQpB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgEnB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAI3C,wBAAgB,aAAa,CAC3B,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,eAAe,CAAM,GAC7C,UAAU,CAaZ;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,eAAe,CAAM,GAC7C,oBAAoB,CAItB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,GAAG,SAAS,GACpD,MAAM,CAER;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EACnD,QAAQ,EAAE,MAAM,GAAG,SAAS,WA4B7B;AAYD,wBAAgB,kBAAkB,SAEjC"}

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

@@ -542,6 +542,22 @@ const zeroOptions = {
         `when restoring the replica from the backup.`
       ]
     },
+    minCheckpointPageCount: {
+      type: number().optional(),
+      desc: [
+        `The WAL page count at which SQLite attempts a PASSIVE checkpoint, which`,
+        `transfers pages to the main database file without blocking writers.`,
+        `Defaults to {bold checkpointThresholdMB * 250} (since SQLite page size is 4KB).`
+      ]
+    },
+    maxCheckpointPageCount: {
+      type: number().optional(),
+      desc: [
+        `The WAL page count at which SQLite performs a RESTART checkpoint, which`,
+        `blocks writers until complete. Defaults to {bold minCheckpointPageCount * 10}.`,
+        `Set to {bold 0} to disable RESTART checkpoints entirely.`
+      ]
+    },
     incrementalBackupIntervalMinutes: {
       type: number().default(15),
       desc: [