@rocicorp/zero 0.25.0 → 0.26.0-canary.0

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

@@ -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"}
+{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/pg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,IAAI,CAAC;AAC/B,OAAO,EAAC,IAAI,EAAE,KAAK,UAAU,EAAC,MAAM,IAAI,CAAC;AACzC,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,QAAQ,CAAC,OAAO,EACd,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,qCAM/B"}

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

@@ -1,79 +1,59 @@
-import { Client, Pool } from 'pg';
+import { Pool } from "pg";
+import { executePostgresQuery } from "../pg-query-executor.js";
 import { ZQLDatabase } from "../zql-database.js";
-export class NodePgConnection {
-    #pool;
-    constructor(pool) {
-        this.#pool = pool;
-    }
-    async transaction(fn) {
-        const client = this.#pool instanceof Pool ? await this.#pool.connect() : this.#pool;
-        try {
-            await client.query('BEGIN');
-            const result = await fn(new NodePgTransactionInternal(client));
-            await client.query('COMMIT');
-            return result;
-        }
-        catch (error) {
-            try {
-                await client.query('ROLLBACK');
-            }
-            catch {
-                // ignore rollback error; original error will be thrown
-            }
-            throw error;
-        }
-        finally {
-            if (this.#pool instanceof Pool && 'release' in client) {
-                client.release();
-            }
-        }
+class NodePgConnection {
+  #pool;
+  constructor(pool) {
+    this.#pool = pool;
+  }
+  async transaction(fn) {
+    const client = this.#pool instanceof Pool ? await this.#pool.connect() : this.#pool;
+    try {
+      await client.query("BEGIN");
+      const result = await fn(new NodePgTransactionInternal(client));
+      await client.query("COMMIT");
+      return result;
+    } catch (error) {
+      try {
+        await client.query("ROLLBACK");
+      } catch {
+      }
+      throw error;
+    } finally {
+      if (this.#pool instanceof Pool && "release" in client) {
+        client.release();
+      }
     }
+  }
 }
-export class NodePgTransactionInternal {
-    wrappedTransaction;
-    constructor(client) {
-        this.wrappedTransaction = client;
-    }
-    async query(sql, params) {
-        const res = await this.wrappedTransaction.query(sql, params);
-        return res.rows;
-    }
+class NodePgTransactionInternal {
+  wrappedTransaction;
+  constructor(client) {
+    this.wrappedTransaction = client;
+  }
+  runQuery(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;
+  }
 }
-/**
- * Wrap a `pg` Pool for Zero ZQL.
- *
- * Provides ZQL querying plus access to the underlying node-postgres client.
- * Use {@link NodePgTransaction} to type your server mutator transaction.
- *
- * @param schema - Zero schema.
- * @param pg - `pg` Pool or connection string.
- *
- * @example
- * ```ts
- * import {Pool} from 'pg';
- *
- * const pool = new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!});
- * const zql = zeroNodePg(schema, pool);
- *
- * // Define the server mutator transaction type using the helper
- * type ServerTx = ServerTransaction<
- *   Schema,
- *   NodePgTransaction
- * >;
- *
- * async function createUser(
- *   tx: ServerTx,
- *   {id, name}: {id: string; name: string},
- * ) {
- *   await tx.dbTransaction.wrappedTransaction
- *     .query('SELECT * FROM "user" WHERE id = $1', [id]);
- * }
- * ```
- */
-export function zeroNodePg(schema, pg) {
-    if (typeof pg === 'string') {
-        pg = new Pool({ connectionString: pg });
-    }
-    return new ZQLDatabase(new NodePgConnection(pg), schema);
+function zeroNodePg(schema, pg) {
+  if (typeof pg === "string") {
+    pg = new Pool({ connectionString: pg });
+  }
+  return new ZQLDatabase(new NodePgConnection(pg), schema);
 }
-//# sourceMappingURL=pg.js.map
+export {
+  NodePgConnection,
+  NodePgTransactionInternal,
+  zeroNodePg
+};
+//# sourceMappingURL=pg.js.map

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

@@ -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"}
+{"version":3,"file":"pg.js","sources":["../../../../../zero-server/src/adapters/pg.ts"],"sourcesContent":["import type {Client} from 'pg';\nimport {Pool, type PoolClient} from 'pg';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\n/**\n * Helper type for the wrapped transaction used by node-postgres.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, NodePgTransaction>`.\n */\nexport type NodePgTransaction = Pool | PoolClient | Client;\n\nexport class NodePgConnection implements DBConnection<NodePgTransaction> {\n  readonly #pool: NodePgTransaction;\n\n  constructor(pool: NodePgTransaction) {\n    this.#pool = pool;\n  }\n\n  async transaction<TRet>(\n    fn: (tx: DBTransaction<NodePgTransaction>) => Promise<TRet>,\n  ): Promise<TRet> {\n    const client =\n      this.#pool instanceof Pool ? await this.#pool.connect() : this.#pool;\n    try {\n      await client.query('BEGIN');\n      const result = await fn(new NodePgTransactionInternal(client));\n      await client.query('COMMIT');\n      return result;\n    } catch (error) {\n      try {\n        await client.query('ROLLBACK');\n      } catch {\n        // ignore rollback error; original error will be thrown\n      }\n      throw error;\n    } finally {\n      if (this.#pool instanceof Pool && 'release' in client) {\n        client.release();\n      }\n    }\n  }\n}\n\nexport class NodePgTransactionInternal\n  implements DBTransaction<NodePgTransaction>\n{\n  readonly wrappedTransaction: NodePgTransaction;\n\n  constructor(client: NodePgTransaction) {\n    this.wrappedTransaction = client;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  async query(sql: string, params: unknown[]): Promise<Row[]> {\n    const res = await this.wrappedTransaction.query(sql, params as unknown[]);\n    return res.rows as Row[];\n  }\n}\n\n/**\n * Wrap a `pg` Pool for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying node-postgres client.\n * Use {@link NodePgTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param pg - `pg` Pool or connection string.\n *\n * @example\n * ```ts\n * import {Pool} from 'pg';\n *\n * const pool = new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!});\n * const zql = zeroNodePg(schema, pool);\n *\n * // Define the server mutator transaction type using the helper\n * type ServerTx = ServerTransaction<\n *   Schema,\n *   NodePgTransaction\n * >;\n *\n * async function createUser(\n *   tx: ServerTx,\n *   {id, name}: {id: string; name: string},\n * ) {\n *   await tx.dbTransaction.wrappedTransaction\n *     .query('SELECT * FROM \"user\" WHERE id = $1', [id]);\n * }\n * ```\n */\nexport function zeroNodePg<S extends Schema>(\n  schema: S,\n  pg: NodePgTransaction | string,\n) {\n  if (typeof pg === 'string') {\n    pg = new Pool({connectionString: pg});\n  }\n  return new ZQLDatabase(new NodePgConnection(pg), schema);\n}\n"],"names":[],"mappings":";;;AAwBO,MAAM,iBAA4D;AAAA,EAC9D;AAAA,EAET,YAAY,MAAyB;AACnC,SAAK,QAAQ;AAAA,EACf;AAAA,EAEA,MAAM,YACJ,IACe;AACf,UAAM,SACJ,KAAK,iBAAiB,OAAO,MAAM,KAAK,MAAM,YAAY,KAAK;AACjE,QAAI;AACF,YAAM,OAAO,MAAM,OAAO;AAC1B,YAAM,SAAS,MAAM,GAAG,IAAI,0BAA0B,MAAM,CAAC;AAC7D,YAAM,OAAO,MAAM,QAAQ;AAC3B,aAAO;AAAA,IACT,SAAS,OAAO;AACd,UAAI;AACF,cAAM,OAAO,MAAM,UAAU;AAAA,MAC/B,QAAQ;AAAA,MAER;AACA,YAAM;AAAA,IACR,UAAA;AACE,UAAI,KAAK,iBAAiB,QAAQ,aAAa,QAAQ;AACrD,eAAO,QAAA;AAAA,MACT;AAAA,IACF;AAAA,EACF;AACF;AAEO,MAAM,0BAEb;AAAA,EACW;AAAA,EAET,YAAY,QAA2B;AACrC,SAAK,qBAAqB;AAAA,EAC5B;AAAA,EAEA,SACE,KACA,QACA,QACA,cACiC;AACjC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ;AAAA,EAEA,MAAM,MAAM,KAAa,QAAmC;AAC1D,UAAM,MAAM,MAAM,KAAK,mBAAmB,MAAM,KAAK,MAAmB;AACxE,WAAO,IAAI;AAAA,EACb;AACF;AAiCO,SAAS,WACd,QACA,IACA;AACA,MAAI,OAAO,OAAO,UAAU;AAC1B,SAAK,IAAI,KAAK,EAAC,kBAAkB,IAAG;AAAA,EACtC;AACA,SAAO,IAAI,YAAY,IAAI,iBAAiB,EAAE,GAAG,MAAM;AACzD;"}

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

@@ -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[]>;
+    runQuery<TReturn>(ast: AST, format: Format, schema: Schema, serverSchema: ServerSchema): Promise<HumanReadable<TReturn>>;
 }
 /**
  * Wrap a `postgres` client for Zero ZQL.

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

@@ -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"}
+{"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,QAAQ,CAAC,OAAO,EACd,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,4CAKxC"}

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

@@ -1,58 +1,44 @@
-import postgres from 'postgres';
+import postgres from "postgres";
+import { executePostgresQuery } from "../pg-query-executor.js";
 import { ZQLDatabase } from "../zql-database.js";
-export class PostgresJSConnection {
-    #pg;
-    constructor(pg) {
-        this.#pg = pg;
-    }
-    transaction(fn) {
-        return this.#pg.begin(pgTx => fn(new PostgresJsTransactionInternal(pgTx)));
-    }
+class PostgresJSConnection {
+  #pg;
+  constructor(pg) {
+    this.#pg = pg;
+  }
+  transaction(fn) {
+    return this.#pg.begin(
+      (pgTx) => fn(new PostgresJsTransactionInternal(pgTx))
+    );
+  }
 }
-export class PostgresJsTransactionInternal {
-    wrappedTransaction;
-    constructor(pgTx) {
-        this.wrappedTransaction = pgTx;
-    }
-    query(sql, params) {
-        return this.wrappedTransaction.unsafe(sql, params);
-    }
+class PostgresJsTransactionInternal {
+  wrappedTransaction;
+  constructor(pgTx) {
+    this.wrappedTransaction = pgTx;
+  }
+  query(sql, params) {
+    return this.wrappedTransaction.unsafe(sql, params);
+  }
+  runQuery(ast, format, schema, serverSchema) {
+    return executePostgresQuery(
+      this,
+      ast,
+      format,
+      schema,
+      serverSchema
+    );
+  }
 }
-/**
- * Wrap a `postgres` client for Zero ZQL.
- *
- * Provides ZQL querying plus access to the underlying postgres.js transaction.
- * Use {@link PostgresJsTransaction} to type your server mutator transaction.
- *
- * @param schema - Zero schema.
- * @param pg - `postgres` client or connection string.
- *
- * @example
- * ```ts
- * import postgres from 'postgres';
- *
- * const sql = postgres(process.env.ZERO_UPSTREAM_DB!);
- * const zql = zeroPostgresJS(schema, sql);
- *
- * // Define the server mutator transaction type using the helper
- * type ServerTx = ServerTransaction<
- *   Schema,
- *   PostgresJsTransaction
- * >;
- *
- * async function createUser(
- *   tx: ServerTx,
- *   {id, name}: {id: string; name: string},
- * ) {
- *   await tx.dbTransaction.wrappedTransaction
- *     .unsafe('INSERT INTO "user" (id, name) VALUES ($1, $2)', [id, name]);
- * }
- * ```
- */
-export function zeroPostgresJS(schema, pg) {
-    if (typeof pg === 'string') {
-        pg = postgres(pg);
-    }
-    return new ZQLDatabase(new PostgresJSConnection(pg), schema);
+function zeroPostgresJS(schema, pg) {
+  if (typeof pg === "string") {
+    pg = postgres(pg);
+  }
+  return new ZQLDatabase(new PostgresJSConnection(pg), schema);
 }
-//# sourceMappingURL=postgresjs.js.map
+export {
+  PostgresJSConnection,
+  PostgresJsTransactionInternal,
+  zeroPostgresJS
+};
+//# sourceMappingURL=postgresjs.js.map

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

@@ -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"}
+{"version":3,"file":"postgresjs.js","sources":["../../../../../zero-server/src/adapters/postgresjs.ts"],"sourcesContent":["import postgres from 'postgres';\nimport type {JSONValue} from '../../../shared/src/json.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\n/**\n * Helper type for the wrapped transaction used by postgres.js.\n *\n * @typeParam T - The row-shape context bound to the postgres.js client.\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, PostgresJsTransaction>`.\n */\nexport type PostgresJsTransaction<\n  T extends Record<string, unknown> = Record<string, unknown>,\n> = postgres.TransactionSql<T>;\n\nexport class PostgresJSConnection<T extends Record<string, unknown>>\n  implements DBConnection<PostgresJsTransaction<T>>\n{\n  readonly #pg: postgres.Sql<T>;\n  constructor(pg: postgres.Sql<T>) {\n    this.#pg = pg;\n  }\n\n  transaction<TRet>(\n    fn: (tx: DBTransaction<PostgresJsTransaction<T>>) => Promise<TRet>,\n  ): Promise<TRet> {\n    return this.#pg.begin(pgTx =>\n      fn(new PostgresJsTransactionInternal(pgTx)),\n    ) as Promise<TRet>;\n  }\n}\n\nexport class PostgresJsTransactionInternal<T extends Record<string, unknown>>\n  implements DBTransaction<PostgresJsTransaction<T>>\n{\n  readonly wrappedTransaction: PostgresJsTransaction<T>;\n  constructor(pgTx: PostgresJsTransaction<T>) {\n    this.wrappedTransaction = pgTx;\n  }\n\n  query(sql: string, params: unknown[]): Promise<Row[]> {\n    return this.wrappedTransaction.unsafe(sql, params as JSONValue[]);\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n}\n\n/**\n * Wrap a `postgres` client for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying postgres.js transaction.\n * Use {@link PostgresJsTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param pg - `postgres` client or connection string.\n *\n * @example\n * ```ts\n * import postgres from 'postgres';\n *\n * const sql = postgres(process.env.ZERO_UPSTREAM_DB!);\n * const zql = zeroPostgresJS(schema, sql);\n *\n * // Define the server mutator transaction type using the helper\n * type ServerTx = ServerTransaction<\n *   Schema,\n *   PostgresJsTransaction\n * >;\n *\n * async function createUser(\n *   tx: ServerTx,\n *   {id, name}: {id: string; name: string},\n * ) {\n *   await tx.dbTransaction.wrappedTransaction\n *     .unsafe('INSERT INTO \"user\" (id, name) VALUES ($1, $2)', [id, name]);\n * }\n * ```\n */\nexport function zeroPostgresJS<\n  S extends Schema,\n  T extends Record<string, unknown> = Record<string, unknown>,\n>(schema: S, pg: postgres.Sql<T> | string) {\n  if (typeof pg === 'string') {\n    pg = postgres(pg) as postgres.Sql<T>;\n  }\n  return new ZQLDatabase(new PostgresJSConnection(pg), schema);\n}\n"],"names":[],"mappings":";;;AA2BO,MAAM,qBAEb;AAAA,EACW;AAAA,EACT,YAAY,IAAqB;AAC/B,SAAK,MAAM;AAAA,EACb;AAAA,EAEA,YACE,IACe;AACf,WAAO,KAAK,IAAI;AAAA,MAAM,CAAA,SACpB,GAAG,IAAI,8BAA8B,IAAI,CAAC;AAAA,IAAA;AAAA,EAE9C;AACF;AAEO,MAAM,8BAEb;AAAA,EACW;AAAA,EACT,YAAY,MAAgC;AAC1C,SAAK,qBAAqB;AAAA,EAC5B;AAAA,EAEA,MAAM,KAAa,QAAmC;AACpD,WAAO,KAAK,mBAAmB,OAAO,KAAK,MAAqB;AAAA,EAClE;AAAA,EAEA,SACE,KACA,QACA,QACA,cACiC;AACjC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ;AACF;AAiCO,SAAS,eAGd,QAAW,IAA8B;AACzC,MAAI,OAAO,OAAO,UAAU;AAC1B,SAAK,SAAS,EAAE;AAAA,EAClB;AACA,SAAO,IAAI,YAAY,IAAI,qBAAqB,EAAE,GAAG,MAAM;AAC7D;"}

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

@@ -1,28 +1,57 @@
-import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
-import type { ServerSchema } from '../../zero-schema/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> {
-    readonly location: 'server';
-    readonly reason: 'authoritative';
-    readonly dbTransaction: DBTransaction<TWrappedTransaction>;
-}
+import type { Schema } from '../../zero-types/src/schema.ts';
+import type { ServerSchema } from '../../zero-types/src/server-schema.ts';
+import { type CRUDExecutor, type TransactionMutate } from '../../zql/src/mutate/crud.ts';
+import type { DBTransaction, MutateCRUD, ServerTransaction } from '../../zql/src/mutate/custom.ts';
+import type { HumanReadable, Query, RunOptions } from '../../zql/src/query/query.ts';
+import type { ConditionalSchemaQuery } from '../../zql/src/query/schema-query.ts';
 export type CustomMutatorDefs<TDBTransaction> = {
-    [namespaceOrKey: string]: {
-        [key: string]: CustomMutatorImpl<TDBTransaction>;
-    } | CustomMutatorImpl<TDBTransaction>;
+    [namespaceOrKey: string]: CustomMutatorImpl<TDBTransaction> | CustomMutatorDefs<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 type CustomMutatorImpl<TDBTransaction, TArgs = any, Context = unknown> = (tx: TDBTransaction, args: TArgs, ctx: Context) => Promise<void>;
+export declare class TransactionImpl<TSchema extends Schema, TWrappedTransaction> implements ServerTransaction<TSchema, TWrappedTransaction> {
+    #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: TransactionMutate<TSchema>;
+    /**
+     * @deprecated Use {@linkcode createBuilder} with `tx.run(zql.table.where(...))` instead.
+     */
+    readonly query: ConditionalSchemaQuery<TSchema>;
+    constructor(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, mutate: TransactionMutate<TSchema>, schema: TSchema, serverSchema: ServerSchema);
+    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TTable, TSchema, TReturn>, _options?: RunOptions): Promise<HumanReadable<TReturn>>;
+}
+/**
+ * Factory for creating MutateCRUD instances efficiently.
+ *
+ * Pre-creates the SQL-generating TableCRUD methods once from the schema,
+ * caches the serverSchema after first fetch, and only binds the transaction
+ * at transaction time.
+ *
+ * Use this when you need to create many transactions and want to avoid
+ * the overhead of re-creating CRUD methods for each one.
+ */
+export declare class CRUDMutatorFactory<S extends Schema> {
+    #private;
+    constructor(schema: S);
+    /**
+     * Creates a CRUDExecutor bound to the given transaction and serverSchema.
+     * Uses the pre-created TableCRUD methods from construction time.
+     */
+    createExecutor(dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema): CRUDExecutor;
+    /**
+     * Creates a full ServerTransaction.
+     * Fetches/caches serverSchema automatically.
+     */
+    createTransaction<TWrappedTransaction>(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number): Promise<TransactionImpl<S, TWrappedTransaction>>;
 }
-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 makeSchemaCRUD<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) => SchemaCRUD<S>;
-export {};
+export declare function makeServerTransaction<TSchema extends Schema, TWrappedTransaction>(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, schema: TSchema): Promise<TransactionImpl<TSchema, TWrappedTransaction>>;
+/**
+ * @deprecated Use transactions instead.
+ *
+ * Returns a curried function for backwards compatibility.
+ */
+export declare function makeSchemaCRUD<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) => MutateCRUD<S, true>;
 //# sourceMappingURL=custom.d.ts.map

package/out/zero-server/src/custom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/custom.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAEV,YAAY,EAEb,MAAM,wCAAwC,CAAC;AAEhD,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,WAAW,EAEX,eAAe,EAChB,MAAM,gCAAgC,CAAC;AAGxC,UAAU,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,mBAAmB,CAC/D,SAAQ,eAAe,CAAC,CAAC,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC;CAC5D;AAED,MAAM,MAAM,iBAAiB,CAAC,cAAc,IAAI;IAC9C,CAAC,cAAc,EAAE,MAAM,GACnB;QACE,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;KAClD,GACD,iBAAiB,CAAC,cAAc,CAAC,CAAC;CACvC,CAAC;AAGF,MAAM,MAAM,iBAAiB,CAAC,cAAc,EAAE,KAAK,GAAG,GAAG,IAAI,CAC3D,EAAE,EAAE,cAAc,EAClB,IAAI,EAAE,KAAK,KACR,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,qBAAa,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,mBAAmB,CAChE,YAAW,iBAAiB,CAAC,CAAC,EAAE,mBAAmB,CAAC;IAEpD,QAAQ,CAAC,QAAQ,YAAY;IAC7B,QAAQ,CAAC,MAAM,mBAAmB;IAClC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAC3D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;gBAG7B,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,EACjD,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,EACrB,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;CAQxB;AASD,wBAAsB,qBAAqB,CACzC,CAAC,SAAS,MAAM,EAChB,mBAAmB,EAEnB,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,EACjD,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,CACN,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,EACjD,YAAY,EAAE,YAAY,KACvB,UAAU,CAAC,CAAC,CAAC,EAClB,KAAK,EAAE,CACL,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,EACjD,YAAY,EAAE,YAAY,KACvB,WAAW,CAAC,CAAC,CAAC,oDAUpB;AAED,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,MAAM,EAAE,CAAC,GACR,CACD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,YAAY,EAAE,YAAY,KACvB,UAAU,CAAC,CAAC,CAAC,CAgDjB"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/custom.ts"],"names":[],"mappings":"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"}