@rocicorp/zero 0.25.0-canary.7 → 0.25.0-canary.8

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

@@ -2,7 +2,7 @@ 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';
 import type { HumanReadable, Query, RunOptions } from '../../zql/src/query/query.ts';
-interface ServerTransaction<TSchema extends Schema, TWrappedTransaction, TContext> extends TransactionBase<TSchema, TContext> {
+interface ServerTransaction<TSchema extends Schema, TWrappedTransaction> extends TransactionBase<TSchema> {
     readonly location: 'server';
     readonly reason: 'authoritative';
     readonly dbTransaction: DBTransaction<TWrappedTransaction>;
@@ -13,7 +13,7 @@ export type CustomMutatorDefs<TDBTransaction> = {
     } | CustomMutatorImpl<TDBTransaction>;
 };
 export type CustomMutatorImpl<TDBTransaction, TArgs = any> = (tx: TDBTransaction, args: TArgs) => Promise<void>;
-export declare class TransactionImpl<TSchema extends Schema, TWrappedTransaction, TContext> implements ServerTransaction<TSchema, TWrappedTransaction, TContext> {
+export declare class TransactionImpl<TSchema extends Schema, TWrappedTransaction> implements ServerTransaction<TSchema, TWrappedTransaction> {
     #private;
     readonly location = "server";
     readonly reason = "authoritative";
@@ -21,11 +21,11 @@ export declare class TransactionImpl<TSchema extends Schema, TWrappedTransaction
     readonly clientID: string;
     readonly mutationID: number;
     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>>;
+    readonly query: SchemaQuery<TSchema>;
+    constructor(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, mutate: SchemaCRUD<TSchema>, query: SchemaQuery<TSchema>, schema: TSchema, serverSchema: ServerSchema);
+    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, _options?: RunOptions): Promise<HumanReadable<TReturn>>;
 }
-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 makeServerTransaction<TSchema extends Schema, TWrappedTransaction>(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, schema: TSchema, mutate: (dbTransaction: DBTransaction<TWrappedTransaction>, serverSchema: ServerSchema) => SchemaCRUD<TSchema>, query: SchemaQuery<TSchema>): Promise<TransactionImpl<TSchema, TWrappedTransaction>>;
 export declare function makeSchemaCRUD<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) => SchemaCRUD<S>;
 export {};
 //# 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":"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"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/custom.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAEV,YAAY,EAEb,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,WAAW,EAEX,eAAe,EAChB,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;AAGtC,UAAU,iBAAiB,CAAC,OAAO,SAAS,MAAM,EAAE,mBAAmB,CACrE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,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,OAAO,SAAS,MAAM,EAAE,mBAAmB,CACtE,YAAW,iBAAiB,CAAC,OAAO,EAAE,mBAAmB,CAAC;;IAE1D,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,OAAO,CAAC,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;gBAKnC,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,EACjD,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,EAC3B,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,EAC3B,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY;IAW5B,GAAG,CAAC,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,EAC1D,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EACtC,QAAQ,CAAC,EAAE,UAAU,GACpB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CAWnC;AAWD,wBAAsB,qBAAqB,CACzC,OAAO,SAAS,MAAM,EACtB,mBAAmB,EAEnB,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,EACjD,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,CACN,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,EACjD,YAAY,EAAE,YAAY,KACvB,UAAU,CAAC,OAAO,CAAC,EACxB,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,0DAY5B;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"}

package/out/zero-server/src/custom.js

@@ -1,145 +1,213 @@
 import { assert } from "../../shared/src/asserts.js";
-import { formatPgInternalConvert, sql, sqlConvertColumnArg, } from "../../z2s/src/sql.js";
-import { queryWithContext } from "../../zql/src/query/query-internals.js";
+import { formatPgInternalConvert, sql, sqlConvertColumnArg } from "../../z2s/src/sql.js";
+import { asQueryInternals } from "../../zql/src/query/query-internals.js";
 import { getServerSchema } from "./schema.js";
-export class TransactionImpl {
-    location = 'server';
-    reason = 'authoritative';
-    dbTransaction;
-    clientID;
-    mutationID;
-    mutate;
-    query;
-    #schema;
-    #serverSchema;
-    #context;
-    constructor(dbTransaction, clientID, mutationID, mutate, query, schema, serverSchema, context) {
-        this.dbTransaction = dbTransaction;
-        this.clientID = clientID;
-        this.mutationID = mutationID;
-        this.mutate = mutate;
-        this.query = query;
-        this.#schema = schema;
-        this.#serverSchema = serverSchema;
-        this.#context = context;
-    }
-    run(query, _options) {
-        const queryInternals = queryWithContext(query, this.#context);
-        // Execute the query using the database-specific executor
-        return this.dbTransaction.runQuery(queryInternals.ast, queryInternals.format, this.#schema, this.#serverSchema);
-    }
+class TransactionImpl {
+  location = "server";
+  reason = "authoritative";
+  dbTransaction;
+  clientID;
+  mutationID;
+  mutate;
+  query;
+  #schema;
+  #serverSchema;
+  constructor(dbTransaction, clientID, mutationID, mutate, query, schema, serverSchema) {
+    this.dbTransaction = dbTransaction;
+    this.clientID = clientID;
+    this.mutationID = mutationID;
+    this.mutate = mutate;
+    this.query = query;
+    this.#schema = schema;
+    this.#serverSchema = serverSchema;
+  }
+  run(query, _options) {
+    const queryInternals = asQueryInternals(query);
+    return this.dbTransaction.runQuery(
+      queryInternals.ast,
+      queryInternals.format,
+      this.#schema,
+      this.#serverSchema
+    );
+  }
 }
 const dbTxSymbol = Symbol();
 const serverSchemaSymbol = Symbol();
-export async function makeServerTransaction(dbTransaction, clientID, mutationID, schema, mutate, query, context) {
-    const serverSchema = await getServerSchema(dbTransaction, schema);
-    return new TransactionImpl(dbTransaction, clientID, mutationID, mutate(dbTransaction, serverSchema), query, schema, serverSchema, context);
+async function makeServerTransaction(dbTransaction, clientID, mutationID, schema, mutate, query) {
+  const serverSchema = await getServerSchema(dbTransaction, schema);
+  return new TransactionImpl(
+    dbTransaction,
+    clientID,
+    mutationID,
+    mutate(dbTransaction, serverSchema),
+    query,
+    schema,
+    serverSchema
+  );
 }
-export function makeSchemaCRUD(schema) {
-    const schemaCRUDs = {};
-    for (const tableSchema of Object.values(schema.tables)) {
-        schemaCRUDs[tableSchema.name] = makeTableCRUD(tableSchema);
+function makeSchemaCRUD(schema) {
+  const schemaCRUDs = {};
+  for (const tableSchema of Object.values(schema.tables)) {
+    schemaCRUDs[tableSchema.name] = makeTableCRUD(tableSchema);
+  }
+  class CRUDHandler {
+    #dbTransaction;
+    #serverSchema;
+    constructor(dbTransaction, serverSchema) {
+      this.#dbTransaction = dbTransaction;
+      this.#serverSchema = serverSchema;
     }
-    /**
-     * For users with very large schemas it is expensive to re-create
-     * all the CRUD mutators for each transaction. Instead, we create
-     * them all once up-front and then bind them to the transaction
-     * as requested.
-     */
-    class CRUDHandler {
-        #dbTransaction;
-        #serverSchema;
-        constructor(dbTransaction, serverSchema) {
-            this.#dbTransaction = dbTransaction;
-            this.#serverSchema = serverSchema;
-        }
-        get(target, prop) {
-            if (prop in target) {
-                return target[prop];
-            }
-            const txHolder = {
-                [dbTxSymbol]: this.#dbTransaction,
-                [serverSchemaSymbol]: this.#serverSchema,
-            };
-            target[prop] = Object.fromEntries(Object.entries(schemaCRUDs[prop]).map(([name, method]) => [
-                name,
-                method.bind(txHolder),
-            ]));
-            return target[prop];
-        }
+    get(target, prop) {
+      if (prop in target) {
+        return target[prop];
+      }
+      const txHolder = {
+        [dbTxSymbol]: this.#dbTransaction,
+        [serverSchemaSymbol]: this.#serverSchema
+      };
+      target[prop] = Object.fromEntries(
+        Object.entries(schemaCRUDs[prop]).map(([name, method]) => [
+          name,
+          method.bind(txHolder)
+        ])
+      );
+      return target[prop];
     }
-    return (dbTransaction, serverSchema) => new Proxy({}, new CRUDHandler(dbTransaction, serverSchema));
+  }
+  return (dbTransaction, serverSchema) => new Proxy(
+    {},
+    new CRUDHandler(dbTransaction, serverSchema)
+  );
 }
 function removeUndefined(value) {
-    const valueWithoutUndefined = {};
-    for (const [key, val] of Object.entries(value)) {
-        if (val !== undefined) {
-            valueWithoutUndefined[key] = val;
-        }
+  const valueWithoutUndefined = {};
+  for (const [key, val] of Object.entries(value)) {
+    if (val !== void 0) {
+      valueWithoutUndefined[key] = val;
     }
-    return valueWithoutUndefined;
+  }
+  return valueWithoutUndefined;
 }
 function makeTableCRUD(schema) {
-    return {
-        async insert(value) {
-            value = removeUndefined(value);
-            const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
-            const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
-            const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, v]) => sqlInsertValue(v, serverTableSchema[serverNameFor(col, schema)])), ', ')})`);
-            const tx = this[dbTxSymbol];
-            await tx.query(stmt.text, stmt.values);
-        },
-        async upsert(value) {
-            value = removeUndefined(value);
-            const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
-            const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
-            const primaryKeyColumns = origAndServerNamesFor(schema.primaryKey, schema);
-            const stmt = formatPgInternalConvert(sql `INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ',')}) VALUES (${sql.join(Object.entries(value).map(([col, val]) => sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])), ', ')}) ON CONFLICT (${sql.join(primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)), ', ')}) DO UPDATE SET ${sql.join(Object.entries(value).map(([col, val]) => sql `${sql.ident(schema.columns[col].serverName ?? col)} = ${sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])}`), ', ')}`);
-            const tx = this[dbTxSymbol];
-            await tx.query(stmt.text, stmt.values);
-        },
-        async update(value) {
-            value = removeUndefined(value);
-            const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
-            const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
-            const stmt = formatPgInternalConvert(sql `UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(targetedColumns.map(([origName, serverName]) => sql `${sql.ident(serverName)} = ${sqlInsertValue(value[origName], serverTableSchema[serverName])}`), ', ')} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`);
-            const tx = this[dbTxSymbol];
-            await tx.query(stmt.text, stmt.values);
-        },
-        async delete(value) {
-            value = removeUndefined(value);
-            const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
-            const stmt = formatPgInternalConvert(sql `DELETE FROM ${sql.ident(serverName(schema))} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`);
-            const tx = this[dbTxSymbol];
-            await tx.query(stmt.text, stmt.values);
-        },
-    };
+  return {
+    async insert(value) {
+      value = removeUndefined(value);
+      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
+      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
+      const stmt = formatPgInternalConvert(
+        sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(
+          targetedColumns.map(([, serverName2]) => sql.ident(serverName2)),
+          ","
+        )}) VALUES (${sql.join(
+          Object.entries(value).map(
+            ([col, v]) => sqlInsertValue(v, serverTableSchema[serverNameFor(col, schema)])
+          ),
+          ", "
+        )})`
+      );
+      const tx = this[dbTxSymbol];
+      await tx.query(stmt.text, stmt.values);
+    },
+    async upsert(value) {
+      value = removeUndefined(value);
+      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
+      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
+      const primaryKeyColumns = origAndServerNamesFor(
+        schema.primaryKey,
+        schema
+      );
+      const stmt = formatPgInternalConvert(
+        sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(
+          targetedColumns.map(([, serverName2]) => sql.ident(serverName2)),
+          ","
+        )}) VALUES (${sql.join(
+          Object.entries(value).map(
+            ([col, val]) => sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])
+          ),
+          ", "
+        )}) ON CONFLICT (${sql.join(
+          primaryKeyColumns.map(([, serverName2]) => sql.ident(serverName2)),
+          ", "
+        )}) DO UPDATE SET ${sql.join(
+          Object.entries(value).map(
+            ([col, val]) => sql`${sql.ident(
+              schema.columns[col].serverName ?? col
+            )} = ${sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])}`
+          ),
+          ", "
+        )}`
+      );
+      const tx = this[dbTxSymbol];
+      await tx.query(stmt.text, stmt.values);
+    },
+    async update(value) {
+      value = removeUndefined(value);
+      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
+      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
+      const stmt = formatPgInternalConvert(
+        sql`UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(
+          targetedColumns.map(
+            ([origName, serverName2]) => sql`${sql.ident(serverName2)} = ${sqlInsertValue(value[origName], serverTableSchema[serverName2])}`
+          ),
+          ", "
+        )} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`
+      );
+      const tx = this[dbTxSymbol];
+      await tx.query(stmt.text, stmt.values);
+    },
+    async delete(value) {
+      value = removeUndefined(value);
+      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
+      const stmt = formatPgInternalConvert(
+        sql`DELETE FROM ${sql.ident(
+          serverName(schema)
+        )} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`
+      );
+      const tx = this[dbTxSymbol];
+      await tx.query(stmt.text, stmt.values);
+    }
+  };
 }
 function serverName(x) {
-    return x.serverName ?? x.name;
+  return x.serverName ?? x.name;
 }
 function primaryKeyClause(schema, serverTableSchema, row) {
-    const primaryKey = origAndServerNamesFor(schema.primaryKey, schema);
-    return sql `${sql.join(primaryKey.map(([origName, serverName]) => sql `${sql.ident(serverName)}${maybeCastColumn(serverTableSchema[serverName])} = ${sqlValue(row[origName], serverTableSchema[serverName])}`), ' AND ')}`;
+  const primaryKey = origAndServerNamesFor(schema.primaryKey, schema);
+  return sql`${sql.join(
+    primaryKey.map(
+      ([origName, serverName2]) => sql`${sql.ident(serverName2)}${maybeCastColumn(serverTableSchema[serverName2])} = ${sqlValue(row[origName], serverTableSchema[serverName2])}`
+    ),
+    " AND "
+  )}`;
 }
 function maybeCastColumn(col) {
-    if (col.type === 'uuid' || col.isEnum) {
-        return sql `::text`;
-    }
-    return sql ``;
+  if (col.type === "uuid" || col.isEnum) {
+    return sql`::text`;
+  }
+  return sql``;
 }
 function origAndServerNamesFor(originalNames, schema) {
-    return originalNames.map(name => [name, serverNameFor(name, schema)]);
+  return originalNames.map(
+    (name) => [name, serverNameFor(name, schema)]
+  );
 }
 function serverNameFor(originalName, schema) {
-    const col = schema.columns[originalName];
-    assert(col, `Column ${originalName} was not found in the Zero schema for the table ${schema.name}`);
-    return col.serverName ?? originalName;
+  const col = schema.columns[originalName];
+  assert(
+    col,
+    `Column ${originalName} was not found in the Zero schema for the table ${schema.name}`
+  );
+  return col.serverName ?? originalName;
 }
 function sqlValue(value, serverColumnSchema) {
-    return sqlConvertColumnArg(serverColumnSchema, value, false, true);
+  return sqlConvertColumnArg(serverColumnSchema, value, false, true);
 }
 function sqlInsertValue(value, serverColumnSchema) {
-    return sqlConvertColumnArg(serverColumnSchema, value, false, false);
+  return sqlConvertColumnArg(serverColumnSchema, value, false, false);
 }
-//# sourceMappingURL=custom.js.map
+export {
+  TransactionImpl,
+  makeSchemaCRUD,
+  makeServerTransaction
+};
+//# sourceMappingURL=custom.js.map

package/out/zero-server/src/custom.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../zero-server/src/custom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACnD,OAAO,EACL,uBAAuB,EACvB,GAAG,EACH,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAe9B,OAAO,EAAC,gBAAgB,EAAC,MAAM,wCAAwC,CAAC;AAMxE,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AA0B5C,MAAM,OAAO,eAAe;IAMjB,QAAQ,GAAG,QAAQ,CAAC;IACpB,MAAM,GAAG,eAAe,CAAC;IACzB,aAAa,CAAqC;IAClD,QAAQ,CAAS;IACjB,UAAU,CAAS;IACnB,MAAM,CAAsB;IAC5B,KAAK,CAAiC;IACtC,OAAO,CAAU;IACjB,aAAa,CAAe;IAC5B,QAAQ,CAAW;IAE5B,YACE,aAAiD,EACjD,QAAgB,EAChB,UAAkB,EAClB,MAA2B,EAC3B,KAAqC,EACrC,MAAe,EACf,YAA0B,EAC1B,OAAiB;QAEjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,GAAG,CACD,KAAgD,EAChD,QAAqB;QAErB,MAAM,cAAc,GAAG,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAoB,CAAC,CAAC;QAE1E,yDAAyD;QACzD,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAChC,cAAc,CAAC,GAAG,EAClB,cAAc,CAAC,MAAM,EACrB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,aAAa,CACnB,CAAC;IACJ,CAAC;CACF;AAED,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC;AAE5B,MAAM,kBAAkB,GAAG,MAAM,EAAE,CAAC;AAOpC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAKzC,aAAiD,EACjD,QAAgB,EAChB,UAAkB,EAClB,MAAe,EACf,MAGwB,EACxB,KAAqC,EACrC,OAAiB;IAEjB,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAClE,OAAO,IAAI,eAAe,CACxB,aAAa,EACb,QAAQ,EACR,UAAU,EACV,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,EACnC,KAAK,EACL,MAAM,EACN,YAAY,EACZ,OAAO,CACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,MAAS;IAKT,MAAM,WAAW,GAA2C,EAAE,CAAC;IAC/D,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACvD,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;OAKG;IACH,MAAM,WAAW;QACN,cAAc,CAAyB;QACvC,aAAa,CAAe;QACrC,YACE,aAAqC,EACrC,YAA0B;YAE1B,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;YACpC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QACpC,CAAC;QAED,GAAG,CAAC,MAA8C,EAAE,IAAY;YAC9D,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;gBACnB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;YAED,MAAM,QAAQ,GAA0B;gBACtC,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,cAAc;gBACjC,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC,aAAa;aACzC,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAC/B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;gBACxD,IAAI;gBACJ,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;aACtB,CAAC,CACuB,CAAC;YAE5B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;KACF;IAED,OAAO,CAAC,aAAqC,EAAE,YAA0B,EAAE,EAAE,CAC3E,IAAI,KAAK,CACP,EAAE,EACF,IAAI,WAAW,CAAC,aAAa,EAAE,YAAY,CAAC,CAC5B,CAAC;AACvB,CAAC;AAED,SAAS,eAAe,CAAoC,KAAQ;IAClE,MAAM,qBAAqB,GAA4B,EAAE,CAAC;IAC1D,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,qBAAqB,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACnC,CAAC;IACH,CAAC;IACD,OAAO,qBAA0B,CAAC;AACpC,CAAC;AAED,SAAS,aAAa,CAAC,MAAmB;IACxC,OAAO;QACL,KAAK,CAAC,MAAM,CAA8B,KAAK;YAC7C,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;YAEvE,MAAM,eAAe,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;YAC1E,MAAM,IAAI,GAAG,uBAAuB,CAClC,GAAG,CAAA,eAAe,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,GAAG,CAAC,IAAI,CAC1D,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAC9D,GAAG,CACJ,aAAa,GAAG,CAAC,IAAI,CACpB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CACrC,cAAc,CAAC,CAAC,EAAE,iBAAiB,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CACjE,EACD,IAAI,CACL,GAAG,CACL,CAAC;YACF,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5B,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;QACD,KAAK,CAAC,MAAM,CAA8B,KAAK;YAC7C,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;YACvE,MAAM,eAAe,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;YAC1E,MAAM,iBAAiB,GAAG,qBAAqB,CAC7C,MAAM,CAAC,UAAU,EACjB,MAAM,CACP,CAAC;YACF,MAAM,IAAI,GAAG,uBAAuB,CAClC,GAAG,CAAA,eAAe,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,GAAG,CAAC,IAAI,CAC1D,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAC9D,GAAG,CACJ,aAAa,GAAG,CAAC,IAAI,CACpB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CACvC,cAAc,CAAC,GAAG,EAAE,iBAAiB,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CACnE,EACD,IAAI,CACL,kBAAkB,GAAG,CAAC,IAAI,CACzB,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAChE,IAAI,CACL,mBAAmB,GAAG,CAAC,IAAI,CAC1B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CACvB,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CACb,GAAG,CAAA,GAAG,GAAG,CAAC,KAAK,CACb,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,GAAG,CACtC,MAAM,cAAc,CAAC,GAAG,EAAE,iBAAiB,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAC9E,EACD,IAAI,CACL,EAAE,CACJ,CAAC;YACF,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5B,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;QACD,KAAK,CAAC,MAAM,CAA8B,KAAK;YAC7C,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;YACvE,MAAM,eAAe,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;YAC1E,MAAM,IAAI,GAAG,uBAAuB,CAClC,GAAG,CAAA,UAAU,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,GAAG,CAAC,IAAI,CACxD,eAAe,CAAC,GAAG,CACjB,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,CACzB,GAAG,CAAA,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC,EAAE,CACpG,EACD,IAAI,CACL,UAAU,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAChE,CAAC;YACF,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5B,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;QACD,KAAK,CAAC,MAAM,CAA8B,KAAK;YAC7C,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;YACvE,MAAM,IAAI,GAAG,uBAAuB,CAClC,GAAG,CAAA,eAAe,GAAG,CAAC,KAAK,CACzB,UAAU,CAAC,MAAM,CAAC,CACnB,UAAU,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAChE,CAAC;YACF,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5B,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,CAAkD;IACpE,OAAO,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC;AAChC,CAAC;AAED,SAAS,gBAAgB,CACvB,MAAmB,EACnB,iBAAoC,EACpC,GAA4B;IAE5B,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACpE,OAAO,GAAG,CAAA,GAAG,GAAG,CAAC,IAAI,CACnB,UAAU,CAAC,GAAG,CACZ,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,CACzB,GAAG,CAAA,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC,EAAE,CAC7I,EACD,OAAO,CACR,EAAE,CAAC;AACN,CAAC;AAED,SAAS,eAAe,CAAC,GAAuB;IAC9C,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACtC,OAAO,GAAG,CAAA,QAAQ,CAAC;IACrB,CAAC;IACD,OAAO,GAAG,CAAA,EAAE,CAAC;AACf,CAAC;AAED,SAAS,qBAAqB,CAC5B,aAAgC,EAChC,MAAmB;IAEnB,OAAO,aAAa,CAAC,GAAG,CACtB,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAU,CACrD,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,YAAoB,EAAE,MAAmB;IAC9D,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACzC,MAAM,CACJ,GAAG,EACH,UAAU,YAAY,mDAAmD,MAAM,CAAC,IAAI,EAAE,CACvF,CAAC;IACF,OAAO,GAAG,CAAC,UAAU,IAAI,YAAY,CAAC;AACxC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc,EAAE,kBAAsC;IACtE,OAAO,mBAAmB,CAAC,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,cAAc,CACrB,KAAc,EACd,kBAAsC;IAEtC,OAAO,mBAAmB,CAAC,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACtE,CAAC"}
+{"version":3,"file":"custom.js","sources":["../../../../zero-server/src/custom.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport {\n  formatPgInternalConvert,\n  sql,\n  sqlConvertColumnArg,\n} from '../../z2s/src/sql.ts';\nimport type {TableSchema} from '../../zero-schema/src/table-schema.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {\n  ServerColumnSchema,\n  ServerSchema,\n  ServerTableSchema,\n} from '../../zero-types/src/server-schema.ts';\nimport type {\n  DBTransaction,\n  SchemaCRUD,\n  SchemaQuery,\n  TableCRUD,\n  TransactionBase,\n} from '../../zql/src/mutate/custom.ts';\nimport {asQueryInternals} from '../../zql/src/query/query-internals.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport {getServerSchema} from './schema.ts';\n\ninterface ServerTransaction<TSchema extends Schema, TWrappedTransaction>\n  extends TransactionBase<TSchema> {\n  readonly location: 'server';\n  readonly reason: 'authoritative';\n  readonly dbTransaction: DBTransaction<TWrappedTransaction>;\n}\n\nexport type CustomMutatorDefs<TDBTransaction> = {\n  [namespaceOrKey: string]:\n    | {\n        [key: string]: CustomMutatorImpl<TDBTransaction>;\n      }\n    | CustomMutatorImpl<TDBTransaction>;\n};\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\nexport type CustomMutatorImpl<TDBTransaction, TArgs = any> = (\n  tx: TDBTransaction,\n  args: TArgs,\n) => Promise<void>;\n\nexport class TransactionImpl<TSchema extends Schema, TWrappedTransaction>\n  implements ServerTransaction<TSchema, TWrappedTransaction>\n{\n  readonly location = 'server';\n  readonly reason = 'authoritative';\n  readonly dbTransaction: DBTransaction<TWrappedTransaction>;\n  readonly clientID: string;\n  readonly mutationID: number;\n  readonly mutate: SchemaCRUD<TSchema>;\n  readonly query: SchemaQuery<TSchema>;\n  readonly #schema: TSchema;\n  readonly #serverSchema: ServerSchema;\n\n  constructor(\n    dbTransaction: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n    mutate: SchemaCRUD<TSchema>,\n    query: SchemaQuery<TSchema>,\n    schema: TSchema,\n    serverSchema: ServerSchema,\n  ) {\n    this.dbTransaction = dbTransaction;\n    this.clientID = clientID;\n    this.mutationID = mutationID;\n    this.mutate = mutate;\n    this.query = query;\n    this.#schema = schema;\n    this.#serverSchema = serverSchema;\n  }\n\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TSchema, TTable, TReturn>,\n    _options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    const queryInternals = asQueryInternals(query);\n\n    // Execute the query using the database-specific executor\n    return this.dbTransaction.runQuery<TReturn>(\n      queryInternals.ast,\n      queryInternals.format,\n      this.#schema,\n      this.#serverSchema,\n    );\n  }\n}\n\nconst dbTxSymbol = Symbol();\n\nconst serverSchemaSymbol = Symbol();\n\ntype WithHiddenTxAndSchema = {\n  [dbTxSymbol]: DBTransaction<unknown>;\n  [serverSchemaSymbol]: ServerSchema;\n};\n\nexport async function makeServerTransaction<\n  TSchema extends Schema,\n  TWrappedTransaction,\n>(\n  dbTransaction: DBTransaction<TWrappedTransaction>,\n  clientID: string,\n  mutationID: number,\n  schema: TSchema,\n  mutate: (\n    dbTransaction: DBTransaction<TWrappedTransaction>,\n    serverSchema: ServerSchema,\n  ) => SchemaCRUD<TSchema>,\n  query: SchemaQuery<TSchema>,\n) {\n  const serverSchema = await getServerSchema(dbTransaction, schema);\n  return new TransactionImpl(\n    dbTransaction,\n    clientID,\n    mutationID,\n    mutate(dbTransaction, serverSchema),\n    query,\n    schema,\n    serverSchema,\n  );\n}\n\nexport function makeSchemaCRUD<S extends Schema>(\n  schema: S,\n): (\n  dbTransaction: DBTransaction<unknown>,\n  serverSchema: ServerSchema,\n) => SchemaCRUD<S> {\n  const schemaCRUDs: Record<string, TableCRUD<TableSchema>> = {};\n  for (const tableSchema of Object.values(schema.tables)) {\n    schemaCRUDs[tableSchema.name] = makeTableCRUD(tableSchema);\n  }\n\n  /**\n   * For users with very large schemas it is expensive to re-create\n   * all the CRUD mutators for each transaction. Instead, we create\n   * them all once up-front and then bind them to the transaction\n   * as requested.\n   */\n  class CRUDHandler {\n    readonly #dbTransaction: DBTransaction<unknown>;\n    readonly #serverSchema: ServerSchema;\n    constructor(\n      dbTransaction: DBTransaction<unknown>,\n      serverSchema: ServerSchema,\n    ) {\n      this.#dbTransaction = dbTransaction;\n      this.#serverSchema = serverSchema;\n    }\n\n    get(target: Record<string, TableCRUD<TableSchema>>, prop: string) {\n      if (prop in target) {\n        return target[prop];\n      }\n\n      const txHolder: WithHiddenTxAndSchema = {\n        [dbTxSymbol]: this.#dbTransaction,\n        [serverSchemaSymbol]: this.#serverSchema,\n      };\n      target[prop] = Object.fromEntries(\n        Object.entries(schemaCRUDs[prop]).map(([name, method]) => [\n          name,\n          method.bind(txHolder),\n        ]),\n      ) as TableCRUD<TableSchema>;\n\n      return target[prop];\n    }\n  }\n\n  return (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) =>\n    new Proxy(\n      {},\n      new CRUDHandler(dbTransaction, serverSchema),\n    ) as SchemaCRUD<S>;\n}\n\nfunction removeUndefined<T extends Record<string, unknown>>(value: T): T {\n  const valueWithoutUndefined: Record<string, unknown> = {};\n  for (const [key, val] of Object.entries(value)) {\n    if (val !== undefined) {\n      valueWithoutUndefined[key] = val;\n    }\n  }\n  return valueWithoutUndefined as T;\n}\n\nfunction makeTableCRUD(schema: TableSchema): TableCRUD<TableSchema> {\n  return {\n    async insert(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n\n      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);\n      const stmt = formatPgInternalConvert(\n        sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(\n          targetedColumns.map(([, serverName]) => sql.ident(serverName)),\n          ',',\n        )}) VALUES (${sql.join(\n          Object.entries(value).map(([col, v]) =>\n            sqlInsertValue(v, serverTableSchema[serverNameFor(col, schema)]),\n          ),\n          ', ',\n        )})`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n    async upsert(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);\n      const primaryKeyColumns = origAndServerNamesFor(\n        schema.primaryKey,\n        schema,\n      );\n      const stmt = formatPgInternalConvert(\n        sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(\n          targetedColumns.map(([, serverName]) => sql.ident(serverName)),\n          ',',\n        )}) VALUES (${sql.join(\n          Object.entries(value).map(([col, val]) =>\n            sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)]),\n          ),\n          ', ',\n        )}) ON CONFLICT (${sql.join(\n          primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)),\n          ', ',\n        )}) DO UPDATE SET ${sql.join(\n          Object.entries(value).map(\n            ([col, val]) =>\n              sql`${sql.ident(\n                schema.columns[col].serverName ?? col,\n              )} = ${sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])}`,\n          ),\n          ', ',\n        )}`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n    async update(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);\n      const stmt = formatPgInternalConvert(\n        sql`UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(\n          targetedColumns.map(\n            ([origName, serverName]) =>\n              sql`${sql.ident(serverName)} = ${sqlInsertValue(value[origName], serverTableSchema[serverName])}`,\n          ),\n          ', ',\n        )} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n    async delete(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n      const stmt = formatPgInternalConvert(\n        sql`DELETE FROM ${sql.ident(\n          serverName(schema),\n        )} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n  };\n}\n\nfunction serverName(x: {name: string; serverName?: string | undefined}) {\n  return x.serverName ?? x.name;\n}\n\nfunction primaryKeyClause(\n  schema: TableSchema,\n  serverTableSchema: ServerTableSchema,\n  row: Record<string, unknown>,\n) {\n  const primaryKey = origAndServerNamesFor(schema.primaryKey, schema);\n  return sql`${sql.join(\n    primaryKey.map(\n      ([origName, serverName]) =>\n        sql`${sql.ident(serverName)}${maybeCastColumn(serverTableSchema[serverName])} = ${sqlValue(row[origName], serverTableSchema[serverName])}`,\n    ),\n    ' AND ',\n  )}`;\n}\n\nfunction maybeCastColumn(col: ServerColumnSchema) {\n  if (col.type === 'uuid' || col.isEnum) {\n    return sql`::text`;\n  }\n  return sql``;\n}\n\nfunction origAndServerNamesFor(\n  originalNames: readonly string[],\n  schema: TableSchema,\n): [origName: string, serverName: string][] {\n  return originalNames.map(\n    name => [name, serverNameFor(name, schema)] as const,\n  );\n}\n\nfunction serverNameFor(originalName: string, schema: TableSchema): string {\n  const col = schema.columns[originalName];\n  assert(\n    col,\n    `Column ${originalName} was not found in the Zero schema for the table ${schema.name}`,\n  );\n  return col.serverName ?? originalName;\n}\n\nfunction sqlValue(value: unknown, serverColumnSchema: ServerColumnSchema) {\n  return sqlConvertColumnArg(serverColumnSchema, value, false, true);\n}\n\nfunction sqlInsertValue(\n  value: unknown,\n  serverColumnSchema: ServerColumnSchema,\n) {\n  return sqlConvertColumnArg(serverColumnSchema, value, false, false);\n}\n"],"names":["serverName"],"mappings":"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"}

package/out/zero-server/src/logging.js

@@ -1,5 +1,8 @@
-import { LogContext, consoleLogSink } from '@rocicorp/logger';
-export function createLogContext(level) {
-    return new LogContext(level, {}, consoleLogSink);
+import { LogContext, consoleLogSink } from "@rocicorp/logger";
+function createLogContext(level) {
+  return new LogContext(level, {}, consoleLogSink);
 }
-//# sourceMappingURL=logging.js.map
+export {
+  createLogContext
+};
+//# sourceMappingURL=logging.js.map

package/out/zero-server/src/logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../zero-server/src/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,cAAc,EAAgB,MAAM,kBAAkB,CAAC;AAE3E,MAAM,UAAU,gBAAgB,CAAC,KAAe;IAC9C,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;AACnD,CAAC"}
+{"version":3,"file":"logging.js","sources":["../../../../zero-server/src/logging.ts"],"sourcesContent":["import {LogContext, consoleLogSink, type LogLevel} from '@rocicorp/logger';\n\nexport function createLogContext(level: LogLevel): LogContext {\n  return new LogContext(level, {}, consoleLogSink);\n}\n"],"names":[],"mappings":";AAEO,SAAS,iBAAiB,OAA6B;AAC5D,SAAO,IAAI,WAAW,OAAO,CAAA,GAAI,cAAc;AACjD;"}

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

@@ -4,5 +4,7 @@ export * from './custom.ts';
 export * from './process-mutations.ts';
 export * from './push-processor.ts';
 export * from './queries/process-queries.ts';
+export { handleTransformRequest, type TransformQueryFunction, } from './queries/process-queries.ts';
+export { QueryRegistry } from './query-registry.ts';
 export * from './zql-database.ts';
 //# sourceMappingURL=mod.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,8CAA8C,CAAC;AAC7D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,8CAA8C,CAAC;AAC7D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,OAAO,EACL,sBAAsB,EACtB,KAAK,sBAAsB,GAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,cAAc,mBAAmB,CAAC"}

package/out/zero-server/src/pg-query-executor.js

@@ -1,17 +1,20 @@
 import { compile, extractZqlResult } from "../../z2s/src/compiler.js";
 import { formatPgInternalConvert } from "../../z2s/src/sql.js";
-/**
- * Executes a query AST against a PostgreSQL database.
- */
-export async function executePostgresQuery(dbTransaction, ast, format, schema, serverSchema) {
-    const sqlQuery = formatPgInternalConvert(compile(serverSchema, schema, ast, format));
-    const pgIterableResult = await dbTransaction.query(sqlQuery.text, sqlQuery.values);
-    const pgArrayResult = Array.isArray(pgIterableResult)
-        ? pgIterableResult
-        : [...pgIterableResult];
-    if (pgArrayResult.length === 0 && format.singular) {
-        return undefined;
-    }
-    return extractZqlResult(pgArrayResult);
+async function executePostgresQuery(dbTransaction, ast, format, schema, serverSchema) {
+  const sqlQuery = formatPgInternalConvert(
+    compile(serverSchema, schema, ast, format)
+  );
+  const pgIterableResult = await dbTransaction.query(
+    sqlQuery.text,
+    sqlQuery.values
+  );
+  const pgArrayResult = Array.isArray(pgIterableResult) ? pgIterableResult : [...pgIterableResult];
+  if (pgArrayResult.length === 0 && format.singular) {
+    return void 0;
+  }
+  return extractZqlResult(pgArrayResult);
 }
-//# sourceMappingURL=pg-query-executor.js.map
+export {
+  executePostgresQuery
+};
+//# sourceMappingURL=pg-query-executor.js.map

package/out/zero-server/src/pg-query-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"pg-query-executor.js","sourceRoot":"","sources":["../../../../zero-server/src/pg-query-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAC,uBAAuB,EAAC,MAAM,sBAAsB,CAAC;AAQ7D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,aAAqC,EACrC,GAAQ,EACR,MAAc,EACd,MAAc,EACd,YAA0B;IAE1B,MAAM,QAAQ,GAAG,uBAAuB,CACtC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAC3C,CAAC;IAEF,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,KAAK,CAChD,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,MAAM,CAChB,CAAC;IAEF,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;QACnD,CAAC,CAAC,gBAAgB;QAClB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAE1B,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClD,OAAO,SAA8C,CAAC;IACxD,CAAC;IAED,OAAO,gBAAgB,CAAC,aAAa,CAA2B,CAAC;AACnE,CAAC"}
+{"version":3,"file":"pg-query-executor.js","sources":["../../../../zero-server/src/pg-query-executor.ts"],"sourcesContent":["import {compile, extractZqlResult} from '../../z2s/src/compiler.ts';\nimport {formatPgInternalConvert} from '../../z2s/src/sql.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 {DBTransaction} from '../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../zql/src/query/query.ts';\n\n/**\n * Executes a query AST against a PostgreSQL database.\n */\nexport async function executePostgresQuery<TReturn>(\n  dbTransaction: DBTransaction<unknown>,\n  ast: AST,\n  format: Format,\n  schema: Schema,\n  serverSchema: ServerSchema,\n): Promise<HumanReadable<TReturn>> {\n  const sqlQuery = formatPgInternalConvert(\n    compile(serverSchema, schema, ast, format),\n  );\n\n  const pgIterableResult = await dbTransaction.query(\n    sqlQuery.text,\n    sqlQuery.values,\n  );\n\n  const pgArrayResult = Array.isArray(pgIterableResult)\n    ? pgIterableResult\n    : [...pgIterableResult];\n\n  if (pgArrayResult.length === 0 && format.singular) {\n    return undefined as unknown as HumanReadable<TReturn>;\n  }\n\n  return extractZqlResult(pgArrayResult) as HumanReadable<TReturn>;\n}\n"],"names":[],"mappings":";;AAYA,eAAsB,qBACpB,eACA,KACA,QACA,QACA,cACiC;AACjC,QAAM,WAAW;AAAA,IACf,QAAQ,cAAc,QAAQ,KAAK,MAAM;AAAA,EAAA;AAG3C,QAAM,mBAAmB,MAAM,cAAc;AAAA,IAC3C,SAAS;AAAA,IACT,SAAS;AAAA,EAAA;AAGX,QAAM,gBAAgB,MAAM,QAAQ,gBAAgB,IAChD,mBACA,CAAC,GAAG,gBAAgB;AAExB,MAAI,cAAc,WAAW,KAAK,OAAO,UAAU;AACjD,WAAO;AAAA,EACT;AAEA,SAAO,iBAAiB,aAAa;AACvC;"}