npm - @rocicorp/zero - Versions diffs - 0.25.0-canary.2 → 0.25.0-canary.3 - Mend

@rocicorp/zero 0.25.0-canary.2 → 0.25.0-canary.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (332) hide show

package/out/zero-protocol/src/application-error.d.ts CHANGED Viewed

@@ -4,13 +4,6 @@ import type { ReadonlyJSONValue } from '../../shared/src/json.ts';
  *
  * Use these when you need to attach additional context to an error that will
  * be sent back to the client.
- *
- * @property details Structured data forwarded to the client alongside the
- * error. Values must be JSON-serializable so they can safely cross the network
- * boundary.
- * @property cause Optional underlying error that triggered this application
- * error. This is surfaced through the standard `cause` property for debugging
- * on the server.
  */
 export interface ApplicationErrorOptions<T extends ReadonlyJSONValue | undefined> {
     details?: T;
@@ -23,10 +16,11 @@ export interface ApplicationErrorOptions<T extends ReadonlyJSONValue | undefined
  * Use this when you want to return a descriptive message along with the
  * JSON-serializable `details`.
  */
-export declare class ApplicationError<const T extends ReadonlyJSONValue | undefined = undefined> extends Error {
+export declare class ApplicationError<const T extends ReadonlyJSONValue | undefined = ReadonlyJSONValue | undefined> extends Error {
     #private;
     constructor(message: string, options?: ApplicationErrorOptions<T> | undefined);
     get details(): T;
+    get kind(): 'Application';
 }
 export declare function isApplicationError(error: unknown): error is ApplicationError;
 export declare function wrapWithApplicationError<T extends ReadonlyJSONValue | undefined = ReadonlyJSONValue | undefined>(error: unknown): ApplicationError<T>;

package/out/zero-protocol/src/application-error.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"application-error.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/application-error.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAEhE~~;;;;;;;;;;;;GAYG~~;AACH,MAAM,WAAW,uBAAuB,CACtC,CAAC,SAAS,iBAAiB,GAAG,SAAS;IAEvC,OAAO,CAAC,EAAE,CAAC,CAAC;IACZ,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;GAMG;AACH,qBAAa,gBAAgB,CAC3B,KAAK,CAAC,CAAC,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,~~CACzD~~,SAAQ,KAAK;;gBAOX,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,SAAS;IAOlD,IAAI,OAAO,IAAI,CAAC,CAEf;CACF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAE5E;AAED,wBAAgB,wBAAwB,CACtC,CAAC,SAAS,iBAAiB,GAAG,SAAS,GAAG,iBAAiB,GAAG,SAAS,EACvE,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAYrC"}
1	+ {"version":3,"file":"application-error.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/application-error.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB,CACtC,CAAC,SAAS,iBAAiB,GAAG,SAAS;IAEvC,OAAO,CAAC,EAAE,CAAC,CAAC;IACZ,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;GAMG;AACH,qBAAa,gBAAgB,CAC3B,KAAK,CAAC,CAAC,SAAS,iBAAiB,GAAG,SAAS,GAAG,iBAAiB,GAAG,SAAS,CAC7E,SAAQ,KAAK;;gBAOX,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,SAAS;IAOlD,IAAI,OAAO,IAAI,CAAC,CAEf;IAED,IAAI,IAAI,IAAI,aAAa,CAExB;CACF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAE5E;AAED,wBAAgB,wBAAwB,CACtC,CAAC,SAAS,iBAAiB,GAAG,SAAS,GAAG,iBAAiB,GAAG,SAAS,EACvE,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAYrC"}

package/out/zero-protocol/src/application-error.js CHANGED Viewed

@@ -19,6 +19,9 @@ export class ApplicationError extends Error {
     get details() {
         return this.#details;
     }
+    get kind() {
+        return 'Application';
+    }
 }
 export function isApplicationError(error) {
     return error instanceof ApplicationError;

package/out/zero-protocol/src/application-error.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"application-error.js","sourceRoot":"","sources":["../../../../zero-protocol/src/application-error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAC,MAAM,2BAA2B,CAAC;~~AAuB3E~~;;;;;;GAMG;AACH,MAAM,OAAO,gBAEX,SAAQ,KAAK;IACb;;OAEG;IACM,QAAQ,CAAI;IAErB,YACE,OAAe,EACf,OAAgD;QAEhD,KAAK,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,EAAE,OAAO,IAAK,SAAe,CAAC;IACvD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,KAAK,YAAY,gBAAgB,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAEtC,KAAc;IACd,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,KAA4B,CAAC;IACtC,CAAC;IAED,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAEvC,OAAO,IAAI,gBAAgB,CAAI,OAAO,EAAE;QACtC,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,OAAY;KACtB,CAAC,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"application-error.js","sourceRoot":"","sources":["../../../../zero-protocol/src/application-error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAgB3E;;;;;;GAMG;AACH,MAAM,OAAO,gBAEX,SAAQ,KAAK;IACb;;OAEG;IACM,QAAQ,CAAI;IAErB,YACE,OAAe,EACf,OAAgD;QAEhD,KAAK,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,EAAE,OAAO,IAAK,SAAe,CAAC;IACvD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,KAAK,YAAY,gBAAgB,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAEtC,KAAc;IACd,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,KAA4B,CAAC;IACtC,CAAC;IAED,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAEvC,OAAO,IAAI,gBAAgB,CAAI,OAAO,EAAE;QACtC,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,OAAY;KACtB,CAAC,CAAC;AACL,CAAC"}

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

@@ -186,6 +186,7 @@ export declare const downstreamSchema: v.UnionType<[v.TupleType<[v.Type<"connect
         readRows: v.Optional<Record<string, Record<string, Readonly<Record<string, import("../../shared/src/json.ts").ReadonlyJSONValue | undefined>>[]>>>;
         readRowCountsByQuery: v.Optional<Record<string, Record<string, number>>>;
         readRowCount: v.Optional<number>;
+        dbScansByQuery: v.Optional<Record<string, Record<string, number>>>;
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;

package/out/zero-protocol/src/down.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/down.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAehD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAY5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC"}
1	+ {"version":3,"file":"down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/down.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAehD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAY5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC"}

package/out/zero-protocol/src/inspect-down.d.ts CHANGED Viewed

@@ -84,6 +84,7 @@ export declare const inspectAnalyzeQueryDownSchema: v.ObjectType<Omit<{
         readRows: v.Optional<Record<string, Record<string, Readonly<Record<string, import("../../shared/src/json.ts").ReadonlyJSONValue | undefined>>[]>>>;
         readRowCountsByQuery: v.Optional<Record<string, Record<string, number>>>;
         readRowCount: v.Optional<number>;
+        dbScansByQuery: v.Optional<Record<string, Record<string, number>>>;
     }, undefined>;
 }, undefined>;
 export type InspectAnalyzeQueryDown = v.Infer<typeof inspectAnalyzeQueryDownSchema>;
@@ -150,6 +151,7 @@ export declare const inspectDownBodySchema: v.UnionType<[v.ObjectType<Omit<{
         readRows: v.Optional<Record<string, Record<string, Readonly<Record<string, import("../../shared/src/json.ts").ReadonlyJSONValue | undefined>>[]>>>;
         readRowCountsByQuery: v.Optional<Record<string, Record<string, number>>>;
         readRowCount: v.Optional<number>;
+        dbScansByQuery: v.Optional<Record<string, Record<string, number>>>;
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
@@ -213,6 +215,7 @@ export declare const inspectDownMessageSchema: v.TupleType<[v.Type<"inspect">, v
         readRows: v.Optional<Record<string, Record<string, Readonly<Record<string, import("../../shared/src/json.ts").ReadonlyJSONValue | undefined>>[]>>>;
         readRowCountsByQuery: v.Optional<Record<string, Record<string, number>>>;
         readRowCount: v.Optional<number>;
+        dbScansByQuery: v.Optional<Record<string, Record<string, number>>>;
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;

package/out/zero-protocol/src/inspect-down.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"inspect-down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-down.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAIhD,QAAA,MAAM,mBAAmB;;;aAGvB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;aAgBzB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAMpE,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;aAGnC,CAAC;AAEH,eAAO,MAAM,8BAA8B;;;;;aAGzC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAC5C,OAAO,8BAA8B,CACtC,CAAC;AAEF,eAAO,MAAM,6BAA6B~~;;;;;;;;;;;;;;;;;;;~~aAGxC,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAC3C,OAAO,6BAA6B,CACrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;aAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,qBAAqB~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~eAOjC,CAAC;AAEF,eAAO,MAAM,wBAAwB~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~iBAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
1	+ {"version":3,"file":"inspect-down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-down.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAIhD,QAAA,MAAM,mBAAmB;;;aAGvB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;aAgBzB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAMpE,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;aAGnC,CAAC;AAEH,eAAO,MAAM,8BAA8B;;;;;aAGzC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAC5C,OAAO,8BAA8B,CACtC,CAAC;AAEF,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;aAGxC,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAC3C,OAAO,6BAA6B,CACrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;aAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAOjC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/out/zero-protocol/src/protocol-version.d.ts CHANGED Viewed

@@ -10,7 +10,7 @@
  * release. The server (`zero-cache`) must be deployed before clients start
  * running the new code.
  */
-export declare const PROTOCOL_VERSION = 39;
+export declare const PROTOCOL_VERSION = 40;
 /**
  * The minimum server-supported sync protocol version (i.e. the version
  * declared in the "/sync/v{#}/connect" URL). The contract for

package/out/zero-protocol/src/protocol-version.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"protocol-version.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;~~AAkCH~~,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;;;;;;;;GASG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAC"}
1	+ {"version":3,"file":"protocol-version.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AAmCH,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;;;;;;;;GASG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAC"}

package/out/zero-protocol/src/protocol-version.js CHANGED Viewed

@@ -44,7 +44,8 @@ import { assert } from "../../shared/src/asserts.js";
 // -- version 37 adds `elapsed` to AnalyzeQueryResult (0.25)
 // -- version 38 adds structured push/transform error responses (0.25)
 // -- version 39 removes per-transform error types and adds `message` to app error (0.25)
-export const PROTOCOL_VERSION = 39;
+// -- version 40 adds `dbRowScansByQuery` to AnalyzeQueryResult (0.25)
+export const PROTOCOL_VERSION = 40;
 /**
  * The minimum server-supported sync protocol version (i.e. the version
  * declared in the "/sync/v{#}/connect" URL). The contract for

package/out/zero-protocol/src/protocol-version.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"protocol-version.js","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,WAAW;AACX,yDAAyD;AACzD,yDAAyD;AACzD,wEAAwE;AACxE,mDAAmD;AACnD,6CAA6C;AAC7C,uHAAuH;AACvH,6FAA6F;AAC7F,yEAAyE;AACzE,sFAAsF;AACtF,4FAA4F;AAC5F,8EAA8E;AAC9E,6EAA6E;AAC7E,sDAAsD;AACtD,oIAAoI;AACpI,oFAAoF;AACpF,qDAAqD;AACrD,8DAA8D;AAC9D,4EAA4E;AAC5E,8EAA8E;AAC9E,4CAA4C;AAC5C,iDAAiD;AACjD,+DAA+D;AAC/D,uEAAuE;AACvE,iFAAiF;AACjF,qEAAqE;AACrE,yDAAyD;AACzD,2FAA2F;AAC3F,0GAA0G;AAC1G,sFAAsF;AACtF,4DAA4D;AAC5D,sEAAsE;AACtE,yFAAyF;AACzF,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAEnC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,CAAC;AAErD,MAAM,CAAC,kCAAkC,GAAG,gBAAgB,CAAC,CAAC"}
1	+ {"version":3,"file":"protocol-version.js","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,WAAW;AACX,yDAAyD;AACzD,yDAAyD;AACzD,wEAAwE;AACxE,mDAAmD;AACnD,6CAA6C;AAC7C,uHAAuH;AACvH,6FAA6F;AAC7F,yEAAyE;AACzE,sFAAsF;AACtF,4FAA4F;AAC5F,8EAA8E;AAC9E,6EAA6E;AAC7E,sDAAsD;AACtD,oIAAoI;AACpI,oFAAoF;AACpF,qDAAqD;AACrD,8DAA8D;AAC9D,4EAA4E;AAC5E,8EAA8E;AAC9E,4CAA4C;AAC5C,iDAAiD;AACjD,+DAA+D;AAC/D,uEAAuE;AACvE,iFAAiF;AACjF,qEAAqE;AACrE,yDAAyD;AACzD,2FAA2F;AAC3F,0GAA0G;AAC1G,sFAAsF;AACtF,4DAA4D;AAC5D,sEAAsE;AACtE,yFAAyF;AACzF,sEAAsE;AACtE,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAEnC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,CAAC;AAErD,MAAM,CAAC,kCAAkC,GAAG,gBAAgB,CAAC,CAAC"}

package/out/zero-react/src/components/inspector.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { CustomMutatorDefs } from '../../../zero-client/src/client/custom.ts';
 import type { Zero } from '../../../zero-client/src/client/zero.ts';
-import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
 export default function Inspector<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined>({ zero, onClose }: {
     zero: Zero<S, MD>;
     onClose: () => void;

package/out/zero-react/src/components/inspector.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"inspector.d.ts","sourceRoot":"","sources":["../../../../../zero-react/src/components/inspector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,yCAAyC,CAAC;AAClE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,~~oDAAoD~~,CAAC;~~AAG/E~~,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,EAAC,IAAI,EAAE,OAAO,EAAC,EAAE;IAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAC,2CA4B1D"}
1	+ {"version":3,"file":"inspector.d.ts","sourceRoot":"","sources":["../../../../../zero-react/src/components/inspector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,yCAAyC,CAAC;AAClE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAG9D,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,EAAC,IAAI,EAAE,OAAO,EAAC,EAAE;IAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAC,2CA4B1D"}

package/out/zero-react/src/components/zero-inspector.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { CustomMutatorDefs } from '../../../zero-client/src/client/custom.ts';
 import type { Zero } from '../../../zero-client/src/client/zero.ts';
-import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
 export declare function ZeroInspector<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined>({ zero }: {
     zero: Zero<S, MD>;
 }): JSX.Element;

package/out/zero-react/src/components/zero-inspector.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"zero-inspector.d.ts","sourceRoot":"","sources":["../../../../../zero-react/src/components/zero-inspector.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,yCAAyC,CAAC;AAClE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,~~oDAAoD~~,CAAC;~~AAK/E~~,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,EAAC,IAAI,EAAC,EAAE;IAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;CAAC,GAAG,GAAG,CAAC,OAAO,CAkC1C"}
1	+ {"version":3,"file":"zero-inspector.d.ts","sourceRoot":"","sources":["../../../../../zero-react/src/components/zero-inspector.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,yCAAyC,CAAC;AAClE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAK9D,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,EAAC,IAAI,EAAC,EAAE;IAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;CAAC,GAAG,GAAG,CAAC,OAAO,CAkC1C"}

package/out/zero-react/src/mod.d.ts CHANGED Viewed

@@ -4,8 +4,8 @@ export { ConnectionStatus } from '../../zero-client/src/client/connection-status
 export type { AuthError, NeedsAuthReason, ZeroError, ZeroErrorKind, } from '../../zero-client/src/client/error.ts';
 export type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
 export type { PrimaryKey } from '../../zero-protocol/src/primary-key.ts';
-export type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
 export type { RelationshipsSchema, SchemaValue, TableSchema, } from '../../zero-schema/src/table-schema.ts';
+export type { Schema } from '../../zero-types/src/schema.ts';
 export type { HumanReadable } from '../../zql/src/query/query.ts';
 export type { ResultType } from '../../zql/src/query/typed-view.ts';
 export { ZeroInspector } from './components/zero-inspector.tsx';

package/out/zero-react/src/mod.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-react/src/mod.ts"],"names":[],"mappings":"AAAA,YAAY,EAAC,MAAM,EAAC,MAAM,4BAA4B,CAAC;AACvD,YAAY,EAAC,eAAe,EAAC,MAAM,oDAAoD,CAAC;AACxF,OAAO,EAAC,gBAAgB,EAAC,MAAM,mDAAmD,CAAC;AACnF,YAAY,EACV,SAAS,EACT,eAAe,EACf,SAAS,EACT,aAAa,GACd,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EAAC,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AACpF,YAAY,EAAC,UAAU,EAAC,MAAM,wCAAwC,CAAC;AACvE,YAAY,~~EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,YAAY,~~EACV,mBAAmB,EACnB,WAAW,EACX,WAAW,GACZ,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAChE,YAAY,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,WAAW,EAChB,KAAK,eAAe,GACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,sBAAsB,EAAC,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,aAAa,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,qBAAqB,CAAC"}
1	+ {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-react/src/mod.ts"],"names":[],"mappings":"AAAA,YAAY,EAAC,MAAM,EAAC,MAAM,4BAA4B,CAAC;AACvD,YAAY,EAAC,eAAe,EAAC,MAAM,oDAAoD,CAAC;AACxF,OAAO,EAAC,gBAAgB,EAAC,MAAM,mDAAmD,CAAC;AACnF,YAAY,EACV,SAAS,EACT,eAAe,EACf,SAAS,EACT,aAAa,GACd,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EAAC,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AACpF,YAAY,EAAC,UAAU,EAAC,MAAM,wCAAwC,CAAC;AACvE,YAAY,EACV,mBAAmB,EACnB,WAAW,EACX,WAAW,GACZ,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,YAAY,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAChE,YAAY,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,WAAW,EAChB,KAAK,eAAe,GACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,sBAAsB,EAAC,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,aAAa,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,qBAAqB,CAAC"}

package/out/zero-react/src/use-query.d.ts CHANGED Viewed

@@ -1,11 +1,12 @@
+import type { CustomMutatorDefs } from '../../zero-client/src/client/custom.ts';
 import { Zero } from '../../zero-client/src/client/zero.ts';
-import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
+import type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
+import type { Schema } from '../../zero-types/src/schema.ts';
 import { type HumanReadable, type Query } from '../../zql/src/query/query.ts';
 import { type TTL } from '../../zql/src/query/ttl.ts';
-import type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
 export type QueryResult<TReturn> = readonly [
     HumanReadable<TReturn>,
-    QueryResultDetails
+    QueryResultDetails & {}
 ];
 export type UseQueryOptions = {
     enabled?: boolean | undefined;
@@ -31,8 +32,8 @@ export type UseSuspenseQueryOptions = UseQueryOptions & {
      */
     suspendUntil?: 'complete' | 'partial';
 };
-export declare function useQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, options?: UseQueryOptions | boolean): QueryResult<TReturn>;
-export declare function useSuspenseQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, options?: UseSuspenseQueryOptions | boolean): QueryResult<TReturn>;
+export declare function useQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext>(query: Query<TSchema, TTable, TReturn, TContext>, options?: UseQueryOptions | boolean): QueryResult<TReturn>;
+export declare function useSuspenseQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext>(query: Query<TSchema, TTable, TReturn, TContext>, options?: UseSuspenseQueryOptions | boolean): QueryResult<TReturn>;
 export declare function getAllViewsSizeForTesting(store: ViewStore): number;
 /**
  * A global store of all active views.
@@ -85,7 +86,7 @@ export declare function getAllViewsSizeForTesting(store: ViewStore): number;
 export declare class ViewStore {
     #private;
     constructor();
-    getView<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(zero: Zero<TSchema>, query: Query<TSchema, TTable, TReturn>, enabled: boolean, ttl: TTL): {
+    getView<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, MD extends CustomMutatorDefs | undefined, TContext>(zero: Zero<TSchema, MD, TContext>, query: Query<TSchema, TTable, TReturn, TContext>, enabled: boolean, ttl: TTL): {
         getSnapshot: () => QueryResult<TReturn>;
         subscribeReactInternals: (internals: () => void) => () => void;
         updateTTL: (ttl: TTL) => void;

package/out/zero-react/src/use-query.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-react/src/use-query.tsx"],"names":[],"mappings":"~~AAKA~~,OAAO,EAAC,IAAI,EAAC,MAAM,sCAAsC,CAAC;~~AAE1D~~,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,~~iDAAiD~~,CAAC;~~AAG5E~~,OAAO,EAAC,KAAK,aAAa,EAAE,KAAK,KAAK,EAAC,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAiB,KAAK,GAAG,EAAC,MAAM,4BAA4B,CAAC;~~AAGpE~~,~~OAAO,KAAK,EAEV,kBAAkB,EACnB,~~MAAM,~~6CAA6C,CAAC;AAErD,~~MAAM,~~MAAM,~~WAAW,CAAC,OAAO,IAAI,SAAS;IAC1C,aAAa,CAAC,OAAO,CAAC;IACtB,kBAAkB;~~CACnB~~,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B;;;;OAIG;IACH,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,eAAe,GAAG;IACtD;;;;;;;;;;;OAWG;IACH,YAAY,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACvC,CAAC;AASF,wBAAgB,QAAQ,CACtB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,~~EAEP~~,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,~~EACtC~~,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,GAClC,WAAW,CAAC,OAAO,CAAC,~~CAqBtB~~;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,~~EAEP~~,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,~~EACtC~~,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,GAC1C,WAAW,CAAC,OAAO,CAAC,~~CAsCtB~~;AA6GD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAKlE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,qBAAa,SAAS;;;IASpB,OAAO,CACL,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,~~EAEP~~,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,~~EACnB~~,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,~~EACtC~~,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,GACP;QACD,WAAW,EAAE,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;QACxC,uBAAuB,EAAE,CAAC,SAAS,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;QAC/D,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;QAC9B,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QACrC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QACrC,QAAQ,EAAE,OAAO,CAAC;QAClB,QAAQ,EAAE,OAAO,CAAC;KACnB;~~CA+BF~~"}
1	+ {"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-react/src/use-query.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAC,IAAI,EAAC,MAAM,sCAAsC,CAAC;AAC1D,OAAO,KAAK,EAEV,kBAAkB,EACnB,MAAM,6CAA6C,CAAC;AAErD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAE3D,OAAO,EAAC,KAAK,aAAa,EAAE,KAAK,KAAK,EAAC,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAiB,KAAK,GAAG,EAAC,MAAM,4BAA4B,CAAC;AAIpE,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,SAAS;IAC1C,aAAa,CAAC,OAAO,CAAC;IACtB,kBAAkB,GAAG,EAAE;CACxB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B;;;;OAIG;IACH,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,eAAe,GAAG;IACtD;;;;;;;;;;;OAWG;IACH,YAAY,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACvC,CAAC;AASF,wBAAgB,QAAQ,CACtB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EACP,QAAQ,EAER,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,EAChD,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,GAClC,WAAW,CAAC,OAAO,CAAC,CAgBtB;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EACP,QAAQ,EAER,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,EAChD,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,GAC1C,WAAW,CAAC,OAAO,CAAC,CAiCtB;AA6GD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAKlE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,qBAAa,SAAS;;;IASpB,OAAO,CACL,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EACP,EAAE,SAAS,iBAAiB,GAAG,SAAS,EACxC,QAAQ,EAER,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,EACjC,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,EAChD,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,GACP;QACD,WAAW,EAAE,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;QACxC,uBAAuB,EAAE,CAAC,SAAS,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;QAC/D,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;QAC9B,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QACrC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QACrC,QAAQ,EAAE,OAAO,CAAC;QAClB,QAAQ,EAAE,OAAO,CAAC;KACnB;CAgCF"}

package/out/zero-react/src/zero-provider.d.ts CHANGED Viewed

@@ -2,14 +2,14 @@ import { type ReactNode } from 'react';
 import type { CustomMutatorDefs } from '../../zero-client/src/client/custom.ts';
 import type { ZeroOptions } from '../../zero-client/src/client/options.ts';
 import { Zero } from '../../zero-client/src/client/zero.ts';
-import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
-export declare function useZero<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined>(): Zero<S, MD>;
-export declare function createUseZero<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined>(): () => Zero<S, MD>;
-export type ZeroProviderProps<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined> = (ZeroOptions<S, MD> | {
-    zero: Zero<S, MD>;
+import type { Schema } from '../../zero-types/src/schema.ts';
+export declare function useZero<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined, Context = unknown>(): Zero<S, MD, Context>;
+export declare function createUseZero<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined, Context = unknown>(): () => Zero<S, MD, Context>;
+export type ZeroProviderProps<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined, Context = unknown> = (ZeroOptions<S, MD, Context> | {
+    zero: Zero<S, MD, Context>;
 }) & {
-    init?: (zero: Zero<S, MD>) => void;
+    init?: (zero: Zero<S, MD, Context>) => void;
     children: ReactNode;
 };
-export declare function ZeroProvider<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined>({ children, init, ...props }: ZeroProviderProps<S, MD>): import("react/jsx-runtime").JSX.Element | undefined;
+export declare function ZeroProvider<S extends Schema, MD extends CustomMutatorDefs | undefined = undefined, Context = unknown>({ children, init, ...props }: ZeroProviderProps<S, MD, Context>): import("react/jsx-runtime").JSX.Element | undefined;
 //# sourceMappingURL=zero-provider.d.ts.map

package/out/zero-react/src/zero-provider.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"zero-provider.d.ts","sourceRoot":"","sources":["../../../../zero-react/src/zero-provider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,wCAAwC,CAAC;AAC9E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAC,IAAI,EAAC,MAAM,sCAAsC,CAAC;AAC1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,~~iDAAiD~~,CAAC;~~AAI5E~~,wBAAgB,OAAO,CACrB,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,~~KACjD~~,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,~~CAMf~~;AAED,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,~~uBAGrD~~;AAED,MAAM,MAAM,iBAAiB,CAC3B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,~~IAClD~~,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG;IAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;CAAC,CAAC,GAAG;~~IAC/C~~,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC;~~IACnC~~,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAIF,wBAAgB,YAAY,CAC1B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,EAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,EAAC,EAAE,iBAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,~~uDA0DrD~~"}
1	+ {"version":3,"file":"zero-provider.d.ts","sourceRoot":"","sources":["../../../../zero-react/src/zero-provider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,wCAAwC,CAAC;AAC9E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAC,IAAI,EAAC,MAAM,sCAAsC,CAAC;AAC1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAK3D,wBAAgB,OAAO,CACrB,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,OAAO,GAAG,OAAO,KACd,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAMxB;AAED,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,OAAO,GAAG,OAAO,gCAGlB;AAED,MAAM,MAAM,iBAAiB,CAC3B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,OAAO,GAAG,OAAO,IACf,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,GAAG;IAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;CAAC,CAAC,GAAG;IACjE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAC5C,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAIF,wBAAgB,YAAY,CAC1B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,OAAO,GAAG,OAAO,EACjB,EAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,EAAC,EAAE,iBAAiB,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,uDA0D9D"}

package/out/zero-schema/src/builder/schema-builder.d.ts CHANGED Viewed

@@ -1,9 +1,7 @@
 import { type ClientSchema } from '../../../zero-protocol/src/client-schema.ts';
-import type { Schema } from '../../../zero-types/src/schema.ts';
-import type { TableSchema } from '../table-schema.ts';
+import type { Schema, TableSchema } from '../../../zero-types/src/schema.ts';
 import type { Relationships } from './relationship-builder.ts';
 import { type TableBuilderWithColumns } from './table-builder.ts';
-export type { Schema };
 /**
  * Note: the keys of the `tables` and `relationships` parameters do not matter.
  * You can assign them to any value you like. E.g.,

package/out/zero-schema/src/builder/schema-builder.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schema-builder.d.ts","sourceRoot":"","sources":["../../../../../zero-schema/src/builder/schema-builder.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,~~EAAC~~,MAAM,~~EAAC~~,~~MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAe,~~WAAW,~~EAAC~~,MAAM,~~oBAAoB~~,CAAC;~~AAClE~~,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAC,KAAK,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAEhE~~,YAAY,EAAC,MAAM,EAAC,CAAC;AAErB~~;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,CAAC,OAAO,SAAS,SAAS,uBAAuB,CAAC,WAAW,CAAC,EAAE,EACrE,KAAK,CAAC,cAAc,SAAS,SAAS,aAAa,EAAE,EACrD,KAAK,CAAC,oBAAoB,SAAS,OAAO,GAAG,SAAS,EACtD,KAAK,CAAC,qBAAqB,SAAS,OAAO,GAAG,SAAS,EACvD,OAAO,EAAE;IACT,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,aAAa,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACpD,sCAAsC;IACtC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAChE,uCAAuC;IACvC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;CACnE,GAAG;IACF,MAAM,EAAE;QACN,QAAQ,EAAE,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CACxD,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB;YAAC,IAAI,EAAE,CAAC,CAAA;SAAC,CACV;KACF,CAAC;IACF,aAAa,EAAE;QACb,QAAQ,EAAE,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CACrD,cAAc,CAAC,MAAM,CAAC,EACtB;YAAC,IAAI,EAAE,CAAC,CAAA;SAAC,CACV,CAAC,eAAe,CAAC;KACnB,CAAC;IACF,mBAAmB,EAAE,oBAAoB,CAAC;IAC1C,oBAAoB,EAAE,qBAAqB,CAAC;CAC7C,CAsCA;AA+BD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG;IAChD,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd,CAmBA"}
1	+ {"version":3,"file":"schema-builder.d.ts","sourceRoot":"","sources":["../../../../../zero-schema/src/builder/schema-builder.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAEV,MAAM,EACN,WAAW,EACZ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAC,KAAK,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAEhE;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,CAAC,OAAO,SAAS,SAAS,uBAAuB,CAAC,WAAW,CAAC,EAAE,EACrE,KAAK,CAAC,cAAc,SAAS,SAAS,aAAa,EAAE,EACrD,KAAK,CAAC,oBAAoB,SAAS,OAAO,GAAG,SAAS,EACtD,KAAK,CAAC,qBAAqB,SAAS,OAAO,GAAG,SAAS,EACvD,OAAO,EAAE;IACT,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,aAAa,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACpD,sCAAsC;IACtC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAChE,uCAAuC;IACvC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;CACnE,GAAG;IACF,MAAM,EAAE;QACN,QAAQ,EAAE,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CACxD,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB;YAAC,IAAI,EAAE,CAAC,CAAA;SAAC,CACV;KACF,CAAC;IACF,aAAa,EAAE;QACb,QAAQ,EAAE,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CACrD,cAAc,CAAC,MAAM,CAAC,EACtB;YAAC,IAAI,EAAE,CAAC,CAAA;SAAC,CACV,CAAC,eAAe,CAAC;KACnB,CAAC;IACF,mBAAmB,EAAE,oBAAoB,CAAC;IAC1C,oBAAoB,EAAE,qBAAqB,CAAC;CAC7C,CAsCA;AA+BD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG;IAChD,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd,CAmBA"}

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

@@ -1,7 +1,7 @@
 import { toStaticParam, type Condition, type Parameter } from '../../zero-protocol/src/ast.ts';
+import type { Schema } from '../../zero-types/src/schema.ts';
 import type { ExpressionBuilder } from '../../zql/src/query/expression.ts';
 import type { Query } from '../../zql/src/query/query.ts';
-import type { Schema } from './builder/schema-builder.ts';
 import type { PermissionsConfig as CompiledPermissionsConfig } from './compiled-permissions.ts';
 export declare const ANYONE_CAN: ((_: unknown, eb: ExpressionBuilder<Schema, never>) => Condition)[];
 /**

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

	@@ -1 +1 @@
1	- {"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/permissions.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EACb,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAC,~~iBAAiB~~,EAAC,MAAM,~~mCAAmC~~,CAAC;~~AACzE~~,OAAO,KAAK,EAAC,~~KAAK~~,EAAC,MAAM,~~8BAA8B~~,CAAC;~~AAExD~~,OAAO,KAAK,EAAC,~~MAAM~~,EAAC,MAAM,~~6BAA6B~~,CAAC;~~AACxD~~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"}
1	+ {"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/permissions.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,5 @@
 import * as v from '../../shared/src/valita.ts';
-import type { Schema } from './builder/schema-builder.ts';
+import type { Schema } from '../../zero-types/src/schema.ts';
 import { type PermissionsConfig } from './compiled-permissions.ts';
 import type { Relationship, TableSchema } from './table-schema.ts';
 export type SchemaConfig = {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"schema-config.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/schema-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAIhD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,~~6BAA6B~~,CAAC;~~AACxD~~,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAC,YAAY,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEjE,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AASF,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAGnD,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;cAI5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAKhD,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;cAKvB,CAAC;AAGH,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,YAAY,CAGhE;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE,OAAO,mBAoBpD;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb;IACD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAWA"}
1	+ {"version":3,"file":"schema-config.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/schema-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAIhD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAC,YAAY,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEjE,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AASF,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAGnD,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;cAI5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAKhD,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;cAKvB,CAAC;AAGH,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,YAAY,CAGhE;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE,OAAO,mBAoBpD;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb;IACD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAWA"}

package/out/zero-server/src/adapters/drizzle.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { type SQL } from 'drizzle-orm';
 import type { PgDatabase, PgQueryResultHKT, PgTransaction } from 'drizzle-orm/pg-core';
 import type { ExtractTablesWithRelations } from 'drizzle-orm/relations';
-import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
 import type { DBConnection, DBTransaction, Row } from '../../../zql/src/mutate/custom.ts';
 import { ZQLDatabase } from '../zql-database.ts';
 export type { ZQLDatabase };
@@ -55,5 +55,5 @@ export declare function toIterableRows(result: unknown): Iterable<Row>;
  * }
  * ```
  */
-export declare function zeroDrizzle<S extends Schema, TDrizzle extends DrizzleDatabase>(schema: S, client: TDrizzle): ZQLDatabase<S, DrizzleTransaction<TDrizzle>>;
+export declare function zeroDrizzle<TSchema extends Schema, TDrizzle extends DrizzleDatabase, TContext>(schema: TSchema, client: TDrizzle): ZQLDatabase<TSchema, DrizzleTransaction<TDrizzle>, TContext>;
 //# sourceMappingURL=drizzle.d.ts.map

package/out/zero-server/src/adapters/drizzle.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"drizzle.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,KAAK,GAAG,EAAC,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,uBAAuB,CAAC;~~AACtE~~,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,~~oDAAoD~~,CAAC;~~AAC/E~~,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;~~AAC3C~~,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B,MAAM,MAAM,eAAe,CACzB,YAAY,SAAS,gBAAgB,GAAG,gBAAgB,EACxD,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAC/D,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AAEtC;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,CAC5B,WAAW,SAAS,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7D,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW,SAAS,UAAU,CACtE,gBAAgB,EAChB,MAAM,eAAe,CACtB,GACG,eAAe,GACf,WAAW,IACb,aAAa,CACf,gBAAgB,EAChB,OAAO,EACP,0BAA0B,CAAC,OAAO,CAAC,CACpC,CAAC;AAEF,qBAAa,iBAAiB,CAC5B,QAAQ,SAAS,eAAe,EAChC,YAAY,SACV,kBAAkB,CAAC,QAAQ,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAC7D,YAAW,YAAY,CAAC,YAAY,CAAC;;gBAIzB,OAAO,EAAE,QAAQ;IAI7B,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAClD,OAAO,CAAC,CAAC,CAAC;CASd;~~AAmBD~~;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAiBrE;AAUD,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAuB7D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,WAAW,~~CAAC~~,~~CAAC~~,SAAS,MAAM,~~EAAE~~,QAAQ,SAAS,eAAe,~~EAC5E~~,MAAM,EAAE,~~CAAC~~,~~EACT~~,MAAM,EAAE,QAAQ,GACf,WAAW,CAAC,~~CAAC~~,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC,~~CAK9C~~"}
1	+ {"version":3,"file":"drizzle.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,KAAK,GAAG,EAAC,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,uBAAuB,CAAC;AAGtE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B,MAAM,MAAM,eAAe,CACzB,YAAY,SAAS,gBAAgB,GAAG,gBAAgB,EACxD,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAC/D,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AAEtC;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,CAC5B,WAAW,SAAS,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7D,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW,SAAS,UAAU,CACtE,gBAAgB,EAChB,MAAM,eAAe,CACtB,GACG,eAAe,GACf,WAAW,IACb,aAAa,CACf,gBAAgB,EAChB,OAAO,EACP,0BAA0B,CAAC,OAAO,CAAC,CACpC,CAAC;AAEF,qBAAa,iBAAiB,CAC5B,QAAQ,SAAS,eAAe,EAChC,YAAY,SACV,kBAAkB,CAAC,QAAQ,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAC7D,YAAW,YAAY,CAAC,YAAY,CAAC;;gBAIzB,OAAO,EAAE,QAAQ;IAI7B,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAClD,OAAO,CAAC,CAAC,CAAC;CASd;AAkCD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAiBrE;AAUD,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAuB7D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,WAAW,CACzB,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,eAAe,EAChC,QAAQ,EAER,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,QAAQ,GACf,WAAW,CAAC,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAK9D"}

package/out/zero-server/src/adapters/drizzle.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import { sql } from 'drizzle-orm';
+import { executePostgresQuery } from "../pg-query-executor.js";
 import { ZQLDatabase } from "../zql-database.js";
 export class DrizzleConnection {
     #drizzle;
@@ -14,6 +15,9 @@ class DrizzleInternalTransaction {
     constructor(drizzleTx) {
         this.wrappedTransaction = drizzleTx;
     }
+    executeQuery(ast, format, schema, serverSchema) {
+        return executePostgresQuery(this, ast, format, schema, serverSchema);
+    }
     async query(sql, params) {
         const stmt = fromDollarParams(sql, params);
         const result = await this.wrappedTransaction.execute(stmt);

package/out/zero-server/src/adapters/drizzle.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"drizzle.js","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAW,MAAM,aAAa,CAAC;~~AAa1C~~,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AA4B/C,MAAM,OAAO,iBAAiB;IAMnB,QAAQ,CAAW;IAE5B,YAAY,OAAiB;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,WAAW,CACT,EAAmD;QAEnD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAC3C,EAAE,CACA,IAAI,0BAA0B,CAC5B,SAAS,~~CACgC~~,~~CAC5C~~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~~CACzB~~,~~MAAS~~,~~EACT~~,MAAgB;IAEhB,OAAO,IAAI,WAAW,CACpB,IAAI,iBAAiB,CAAyC,MAAM,CAAC,EACrE,MAAM,CACP,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"drizzle.js","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAW,MAAM,aAAa,CAAC;AAiB1C,OAAO,EAAC,oBAAoB,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AA4B/C,MAAM,OAAO,iBAAiB;IAMnB,QAAQ,CAAW;IAE5B,YAAY,OAAiB;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,WAAW,CACT,EAAmD;QAEnD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAC3C,EAAE,CACA,IAAI,0BAA0B,CAC5B,SAAS,CACqB,CACjC,CACF,CAAC;IACJ,CAAC;CACF;AAED,MAAM,0BAA0B;IAIrB,kBAAkB,CAAe;IAE1C,YAAY,SAAuB;QACjC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;IACtC,CAAC;IAED,YAAY,CACV,GAAQ,EACR,MAAc,EACd,MAAc,EACd,YAA0B;QAE1B,OAAO,oBAAoB,CACzB,IAAI,EACJ,GAAG,EACH,MAAM,EACN,MAAM,EACN,YAAY,CACb,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW,EAAE,MAAiB;QACxC,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3D,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,MAAiB;IAC9D,MAAM,EAAE,GAAG,UAAU,CAAC;IACtB,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;IACtB,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,CAAyB,CAAC;IAE9B,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,CAAC,CAAC,KAAK,GAAG,IAAI;YAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,sBAAsB;QACrD,IAAI,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/B,CAAC;IACD,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM;QAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5D,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO;IACL,kCAAkC;IAClC,KAAK,IAAI,IAAI;QACb,OAAQ,KAA2B,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,UAAU,CACpE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAe;IAC5C,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC5C,OAAO,EAAW,CAAC;IACrB,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,OAAO,MAAe,CAAC;IACzB,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,OAAO,MAAuB,CAAC;IACjC,CAAC;IACD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAI,MAA2B,CAAC,IAAI,CAAC;QAC/C,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACxC,OAAO,EAAW,CAAC;QACrB,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,IAAa,CAAC;QACvB,CAAC;QACD,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO,IAAqB,CAAC;QAC/B,CAAC;IACH,CAAC;IACD,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;AAC9D,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,UAAU,WAAW,CAKzB,MAAe,EACf,MAAgB;IAEhB,OAAO,IAAI,WAAW,CACpB,IAAI,iBAAiB,CAAyC,MAAM,CAAC,EACrE,MAAM,CACP,CAAC;AACJ,CAAC"}

package/out/zero-server/src/adapters/pg.d.ts CHANGED Viewed

@@ -1,6 +1,10 @@
-import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
-import type { DBConnection, DBTransaction, Row } from '../../../zql/src/mutate/custom.ts';
 import { Client, Pool, type PoolClient } from 'pg';
+import type { AST } from '../../../zero-protocol/src/ast.ts';
+import type { Format } from '../../../zero-types/src/format.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { ServerSchema } from '../../../zero-types/src/server-schema.ts';
+import type { DBConnection, DBTransaction, Row } from '../../../zql/src/mutate/custom.ts';
+import type { HumanReadable } from '../../../zql/src/query/query.ts';
 import { ZQLDatabase } from '../zql-database.ts';
 export type { ZQLDatabase };
 /**
@@ -17,6 +21,7 @@ export declare class NodePgConnection implements DBConnection<NodePgTransaction>
 export declare class NodePgTransactionInternal implements DBTransaction<NodePgTransaction> {
     readonly wrappedTransaction: NodePgTransaction;
     constructor(client: NodePgTransaction);
+    executeQuery<TReturn>(ast: AST, format: Format, schema: Schema, serverSchema: ServerSchema): Promise<HumanReadable<TReturn>>;
     query(sql: string, params: unknown[]): Promise<Row[]>;
 }
 /**
@@ -50,5 +55,5 @@ export declare class NodePgTransactionInternal implements DBTransaction<NodePgTr
  * }
  * ```
  */
-export declare function zeroNodePg<S extends Schema>(schema: S, pg: NodePgTransaction | string): ZQLDatabase<S, NodePgTransaction>;
+export declare function zeroNodePg<S extends Schema>(schema: S, pg: NodePgTransaction | string): ZQLDatabase<S, NodePgTransaction, unknown>;
 //# sourceMappingURL=pg.d.ts.map

package/out/zero-server/src/adapters/pg.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/pg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,~~oDAAoD~~,CAAC;~~AAC/E~~,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAC,~~MAAM~~,~~EAAE,IAAI,EAAE,KAAK,UAAU,~~EAAC,MAAM,~~IAAI~~,CAAC;~~AACjD~~,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAE3D,qBAAa,gBAAiB,YAAW,YAAY,CAAC,iBAAiB,CAAC;;~~gBAE1D~~,IAAI,EAAE,iBAAiB;IAI7B,WAAW,CAAC,IAAI,EACpB,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAC1D,OAAO,CAAC,IAAI,CAAC;CAqBjB;AAED,qBAAa,yBACX,YAAW,aAAa,CAAC,iBAAiB,CAAC;IAE3C,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;~~gBACnC~~,MAAM,EAAE,iBAAiB;~~IAI/B~~,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CAI5D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,iBAAiB,GAAG,MAAM,~~qCAM~~/B"}
1	+ {"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,UAAU,EAAC,MAAM,IAAI,CAAC;AACjD,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAE3D,qBAAa,gBAAiB,YAAW,YAAY,CAAC,iBAAiB,CAAC;;gBAG1D,IAAI,EAAE,iBAAiB;IAI7B,WAAW,CAAC,IAAI,EACpB,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAC1D,OAAO,CAAC,IAAI,CAAC;CAqBjB;AAED,qBAAa,yBACX,YAAW,aAAa,CAAC,iBAAiB,CAAC;IAE3C,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;gBAEnC,MAAM,EAAE,iBAAiB;IAIrC,YAAY,CAAC,OAAO,EAClB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAU5B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CAI5D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,iBAAiB,GAAG,MAAM,8CAM/B"}

package/out/zero-server/src/adapters/pg.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import { Client, Pool } from 'pg';
+import { executePostgresQuery } from "../pg-query-executor.js";
 import { ZQLDatabase } from "../zql-database.js";
 export class NodePgConnection {
     #pool;
@@ -34,6 +35,9 @@ export class NodePgTransactionInternal {
     constructor(client) {
         this.wrappedTransaction = client;
     }
+    executeQuery(ast, format, schema, serverSchema) {
+        return executePostgresQuery(this, ast, format, schema, serverSchema);
+    }
     async query(sql, params) {
         const res = await this.wrappedTransaction.query(sql, params);
         return res.rows;

package/out/zero-server/src/adapters/pg.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pg.js","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/pg.ts"],"names":[],"mappings":"~~AAMA~~,OAAO,EAAC,MAAM,EAAE,IAAI,EAAkB,MAAM,IAAI,CAAC;~~AACjD~~,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAW/C,MAAM,OAAO,gBAAgB;IAClB,KAAK,CAAoB;~~IAClC~~,YAAY,IAAuB;QACjC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CACf,EAA2D;QAE3D,MAAM,MAAM,GACV,IAAI,CAAC,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QACvE,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC7B,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACjC,CAAC;YAAC,MAAM,CAAC;gBACP,uDAAuD;YACzD,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,IAAI,IAAI,CAAC,KAAK,YAAY,IAAI,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;gBACtD,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,yBAAyB;IAG3B,kBAAkB,CAAoB;~~IAC~~/C,YAAY,MAAyB;QACnC,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW,EAAE,MAAiB;QACxC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,MAAmB,CAAC,CAAC;QAC1E,OAAO,GAAG,CAAC,IAAa,CAAC;IAC3B,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,UAAU,CACxB,MAAS,EACT,EAA8B;IAE9B,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAC3B,EAAE,GAAG,IAAI,IAAI,CAAC,EAAC,gBAAgB,EAAE,EAAE,EAAC,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,IAAI,WAAW,CAAC,IAAI,gBAAgB,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AAC3D,CAAC"}
1	+ {"version":3,"file":"pg.js","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAkB,MAAM,IAAI,CAAC;AAWjD,OAAO,EAAC,oBAAoB,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAW/C,MAAM,OAAO,gBAAgB;IAClB,KAAK,CAAoB;IAElC,YAAY,IAAuB;QACjC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CACf,EAA2D;QAE3D,MAAM,MAAM,GACV,IAAI,CAAC,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QACvE,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC7B,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACjC,CAAC;YAAC,MAAM,CAAC;gBACP,uDAAuD;YACzD,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,IAAI,IAAI,CAAC,KAAK,YAAY,IAAI,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;gBACtD,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,yBAAyB;IAG3B,kBAAkB,CAAoB;IAE/C,YAAY,MAAyB;QACnC,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC;IACnC,CAAC;IAED,YAAY,CACV,GAAQ,EACR,MAAc,EACd,MAAc,EACd,YAA0B;QAE1B,OAAO,oBAAoB,CACzB,IAAI,EACJ,GAAG,EACH,MAAM,EACN,MAAM,EACN,YAAY,CACb,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW,EAAE,MAAiB;QACxC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,MAAmB,CAAC,CAAC;QAC1E,OAAO,GAAG,CAAC,IAAa,CAAC;IAC3B,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,UAAU,CACxB,MAAS,EACT,EAA8B;IAE9B,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAC3B,EAAE,GAAG,IAAI,IAAI,CAAC,EAAC,gBAAgB,EAAE,EAAE,EAAC,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,IAAI,WAAW,CAAC,IAAI,gBAAgB,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AAC3D,CAAC"}

package/out/zero-server/src/adapters/postgresjs.d.ts CHANGED Viewed

@@ -1,6 +1,10 @@
-import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
-import type { DBConnection, DBTransaction, Row } from '../../../zql/src/mutate/custom.ts';
 import postgres from 'postgres';
+import type { AST } from '../../../zero-protocol/src/ast.ts';
+import type { Format } from '../../../zero-types/src/format.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { ServerSchema } from '../../../zero-types/src/server-schema.ts';
+import type { DBConnection, DBTransaction, Row } from '../../../zql/src/mutate/custom.ts';
+import type { HumanReadable } from '../../../zql/src/query/query.ts';
 import { ZQLDatabase } from '../zql-database.ts';
 export type { ZQLDatabase };
 /**
@@ -19,6 +23,7 @@ export declare class PostgresJsTransactionInternal<T extends Record<string, unkn
     readonly wrappedTransaction: PostgresJsTransaction<T>;
     constructor(pgTx: PostgresJsTransaction<T>);
     query(sql: string, params: unknown[]): Promise<Row[]>;
+    executeQuery<TReturn>(ast: AST, format: Format, schema: Schema, serverSchema: ServerSchema): Promise<HumanReadable<TReturn>>;
 }
 /**
  * Wrap a `postgres` client for Zero ZQL.
@@ -51,5 +56,5 @@ export declare class PostgresJsTransactionInternal<T extends Record<string, unkn
  * }
  * ```
  */
-export declare function zeroPostgresJS<S extends Schema, T extends Record<string, unknown> = Record<string, unknown>>(schema: S, pg: postgres.Sql<T> | string): ZQLDatabase<S, PostgresJsTransaction<T>>;
+export declare function zeroPostgresJS<S extends Schema, T extends Record<string, unknown> = Record<string, unknown>>(schema: S, pg: postgres.Sql<T> | string): ZQLDatabase<S, PostgresJsTransaction<T>, unknown>;
 //# sourceMappingURL=postgresjs.d.ts.map

package/out/zero-server/src/adapters/postgresjs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgresjs.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/postgresjs.ts"],"names":[],"mappings":"~~AACA~~,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,~~oDAAoD~~,CAAC;~~AAC/E~~,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,~~QAAQ~~,MAAM,~~UAAU~~,CAAC;~~AAChC~~,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B;;;;;GAKG;AACH,MAAM,MAAM,qBAAqB,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IACzD,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;AAE/B,qBAAa,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACjE,YAAW,YAAY,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;;gBAGrC,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAI/B,WAAW,CAAC,IAAI,EACd,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GACjE,OAAO,CAAC,IAAI,CAAC;CAKjB;AAED,qBAAa,6BAA6B,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAC1E,YAAW,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAElD,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;gBAC1C,IAAI,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAI1C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;~~CAGtD~~;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,cAAc,CAC5B,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,~~4CAKxC~~"}
1	+ {"version":3,"file":"postgresjs.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/postgresjs.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B;;;;;GAKG;AACH,MAAM,MAAM,qBAAqB,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IACzD,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;AAE/B,qBAAa,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACjE,YAAW,YAAY,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;;gBAGrC,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAI/B,WAAW,CAAC,IAAI,EACd,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GACjE,OAAO,CAAC,IAAI,CAAC;CAKjB;AAED,qBAAa,6BAA6B,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAC1E,YAAW,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAElD,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;gBAC1C,IAAI,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAI1C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAIrD,YAAY,CAAC,OAAO,EAClB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CASnC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,cAAc,CAC5B,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,qDAKxC"}

package/out/zero-server/src/adapters/postgresjs.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import postgres from 'postgres';
+import { executePostgresQuery } from "../pg-query-executor.js";
 import { ZQLDatabase } from "../zql-database.js";
 export class PostgresJSConnection {
     #pg;
@@ -17,6 +18,9 @@ export class PostgresJsTransactionInternal {
     query(sql, params) {
         return this.wrappedTransaction.unsafe(sql, params);
     }
+    executeQuery(ast, format, schema, serverSchema) {
+        return executePostgresQuery(this, ast, format, schema, serverSchema);
+    }
 }
 /**
  * Wrap a `postgres` client for Zero ZQL.

package/out/zero-server/src/adapters/postgresjs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgresjs.js","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/postgresjs.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,QAAQ,MAAM,UAAU,CAAC;~~AAChC~~,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAc/C,MAAM,OAAO,oBAAoB;IAGtB,GAAG,CAAkB;IAC9B,YAAY,EAAmB;QAC7B,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;IAChB,CAAC;IAED,WAAW,CACT,EAAkE;QAElE,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAC3B,EAAE,CAAC,IAAI,6BAA6B,CAAC,IAAI,CAAC,CAAC,CAC3B,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,6BAA6B;IAG/B,kBAAkB,CAA2B;IACtD,YAAY,IAA8B;QACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,MAAiB;QAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAqB,CAAC,CAAC;IACpE,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,cAAc,CAG5B,MAAS,EAAE,EAA4B;IACvC,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAC3B,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAoB,CAAC;IACvC,CAAC;IACD,OAAO,IAAI,WAAW,CAAC,IAAI,oBAAoB,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AAC/D,CAAC"}
1	+ {"version":3,"file":"postgresjs.js","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/postgresjs.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAYhC,OAAO,EAAC,oBAAoB,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAc/C,MAAM,OAAO,oBAAoB;IAGtB,GAAG,CAAkB;IAC9B,YAAY,EAAmB;QAC7B,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;IAChB,CAAC;IAED,WAAW,CACT,EAAkE;QAElE,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAC3B,EAAE,CAAC,IAAI,6BAA6B,CAAC,IAAI,CAAC,CAAC,CAC3B,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,6BAA6B;IAG/B,kBAAkB,CAA2B;IACtD,YAAY,IAA8B;QACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,GAAW,EAAE,MAAiB;QAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAqB,CAAC,CAAC;IACpE,CAAC;IAED,YAAY,CACV,GAAQ,EACR,MAAc,EACd,MAAc,EACd,YAA0B;QAE1B,OAAO,oBAAoB,CACzB,IAAI,EACJ,GAAG,EACH,MAAM,EACN,MAAM,EACN,YAAY,CACb,CAAC;IACJ,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,cAAc,CAG5B,MAAS,EAAE,EAA4B;IACvC,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAC3B,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAoB,CAAC;IACvC,CAAC;IACD,OAAO,IAAI,WAAW,CAAC,IAAI,oBAAoB,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AAC/D,CAAC"}

package/out/zero-server/src/custom.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
-import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
-import type { ServerSchema } from '../../zero-schema/src/server-schema.ts';
+import type { Schema } from '../../zero-types/src/schema.ts';
+import type { ServerSchema } from '../../zero-types/src/server-schema.ts';
 import type { DBTransaction, SchemaCRUD, SchemaQuery, TransactionBase } from '../../zql/src/mutate/custom.ts';
-interface ServerTransaction<S extends Schema, TWrappedTransaction> extends TransactionBase<S> {
+import type { HumanReadable, Query, RunOptions } from '../../zql/src/query/query.ts';
+interface ServerTransaction<TSchema extends Schema, TWrappedTransaction, TContext> extends TransactionBase<TSchema, TContext> {
     readonly location: 'server';
     readonly reason: 'authoritative';
     readonly dbTransaction: DBTransaction<TWrappedTransaction>;
@@ -12,17 +13,19 @@ export type CustomMutatorDefs<TDBTransaction> = {
     } | CustomMutatorImpl<TDBTransaction>;
 };
 export type CustomMutatorImpl<TDBTransaction, TArgs = any> = (tx: TDBTransaction, args: TArgs) => Promise<void>;
-export declare class TransactionImpl<S extends Schema, TWrappedTransaction> implements ServerTransaction<S, TWrappedTransaction> {
+export declare class TransactionImpl<TSchema extends Schema, TWrappedTransaction, TContext> implements ServerTransaction<TSchema, TWrappedTransaction, TContext> {
+    #private;
     readonly location = "server";
     readonly reason = "authoritative";
     readonly dbTransaction: DBTransaction<TWrappedTransaction>;
     readonly clientID: string;
     readonly mutationID: number;
-    readonly mutate: SchemaCRUD<S>;
-    readonly query: SchemaQuery<S>;
-    constructor(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, mutate: SchemaCRUD<S>, query: SchemaQuery<S>);
+    readonly mutate: SchemaCRUD<TSchema>;
+    readonly query: SchemaQuery<TSchema, TContext>;
+    constructor(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, mutate: SchemaCRUD<TSchema>, query: SchemaQuery<TSchema, TContext>, schema: TSchema, serverSchema: ServerSchema, context: TContext);
+    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn, TContext>, _options?: RunOptions): Promise<HumanReadable<TReturn>>;
 }
-export declare function makeServerTransaction<S extends Schema, TWrappedTransaction>(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, schema: S, mutate: (dbTransaction: DBTransaction<TWrappedTransaction>, serverSchema: ServerSchema) => SchemaCRUD<S>, query: (dbTransaction: DBTransaction<TWrappedTransaction>, serverSchema: ServerSchema) => SchemaQuery<S>): Promise<TransactionImpl<S, TWrappedTransaction>>;
+export declare function makeServerTransaction<TSchema extends Schema, TWrappedTransaction, TContext>(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, schema: TSchema, mutate: (dbTransaction: DBTransaction<TWrappedTransaction>, serverSchema: ServerSchema) => SchemaCRUD<TSchema>, query: SchemaQuery<TSchema, TContext>, context: TContext): Promise<TransactionImpl<TSchema, TWrappedTransaction, TContext>>;
 export declare function makeSchemaCRUD<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) => SchemaCRUD<S>;
 export {};
 //# sourceMappingURL=custom.d.ts.map