@rocicorp/zero 0.25.0 → 0.26.0-canary.0

package/out/zero-schema/src/permissions.js

@@ -0,0 +1,193 @@
+import { assert } from "../../shared/src/asserts.js";
+import { toStaticParam, mapCondition } from "../../zero-protocol/src/ast.js";
+import { newExpressionBuilder } from "../../zql/src/query/static-query.js";
+import { clientToServer } from "./name-mapper.js";
+const ANYONE_CAN = [
+  (_, eb) => eb.and()
+];
+const ANYONE_CAN_DO_ANYTHING = {
+  row: {
+    select: ANYONE_CAN,
+    insert: ANYONE_CAN,
+    update: {
+      preMutation: ANYONE_CAN,
+      postMutation: ANYONE_CAN
+    },
+    delete: ANYONE_CAN
+  }
+};
+const NOBODY_CAN = [];
+async function definePermissions(schema, definer) {
+  const expressionBuilders = {};
+  for (const name of Object.keys(schema.tables)) {
+    expressionBuilders[name] = newExpressionBuilder(schema, name);
+  }
+  const config = await definer();
+  return compilePermissions(schema, config, expressionBuilders);
+}
+function compilePermissions(schema, authz, expressionBuilders) {
+  if (!authz) {
+    return void 0;
+  }
+  const nameMapper = clientToServer(schema.tables);
+  const ret = { tables: {} };
+  for (const [tableName, tableConfig] of Object.entries(authz)) {
+    const serverName = schema.tables[tableName].serverName ?? tableName;
+    ret.tables[serverName] = {
+      row: compileRowConfig(
+        nameMapper,
+        tableName,
+        tableConfig.row,
+        expressionBuilders[tableName]
+      ),
+      cell: compileCellConfig(
+        nameMapper,
+        tableName,
+        tableConfig.cell,
+        expressionBuilders[tableName]
+      )
+    };
+  }
+  return ret;
+}
+function compileRowConfig(clientToServer2, tableName, rowRules, expressionBuilder) {
+  if (!rowRules) {
+    return void 0;
+  }
+  return {
+    select: compileRules(
+      clientToServer2,
+      tableName,
+      rowRules.select,
+      expressionBuilder
+    ),
+    insert: compileRules(
+      clientToServer2,
+      tableName,
+      rowRules.insert,
+      expressionBuilder
+    ),
+    update: {
+      preMutation: compileRules(
+        clientToServer2,
+        tableName,
+        rowRules.update?.preMutation,
+        expressionBuilder
+      ),
+      postMutation: compileRules(
+        clientToServer2,
+        tableName,
+        rowRules.update?.postMutation,
+        expressionBuilder
+      )
+    },
+    delete: compileRules(
+      clientToServer2,
+      tableName,
+      rowRules.delete,
+      expressionBuilder
+    )
+  };
+}
+function compileRules(clientToServer2, tableName, rules, expressionBuilder) {
+  if (!rules) {
+    return void 0;
+  }
+  return rules.map((rule) => {
+    const cond = rule(authDataRef, expressionBuilder);
+    return ["allow", mapCondition(cond, tableName, clientToServer2)];
+  });
+}
+function compileCellConfig(clientToServer2, tableName, cellRules, expressionBuilder) {
+  if (!cellRules) {
+    return void 0;
+  }
+  const ret = {};
+  for (const [columnName, rules] of Object.entries(cellRules)) {
+    ret[columnName] = {
+      select: compileRules(
+        clientToServer2,
+        tableName,
+        rules.select,
+        expressionBuilder
+      ),
+      insert: compileRules(
+        clientToServer2,
+        tableName,
+        rules.insert,
+        expressionBuilder
+      ),
+      update: {
+        preMutation: compileRules(
+          clientToServer2,
+          tableName,
+          rules.update?.preMutation,
+          expressionBuilder
+        ),
+        postMutation: compileRules(
+          clientToServer2,
+          tableName,
+          rules.update?.postMutation,
+          expressionBuilder
+        )
+      },
+      delete: compileRules(
+        clientToServer2,
+        tableName,
+        rules.delete,
+        expressionBuilder
+      )
+    };
+  }
+  return ret;
+}
+class CallTracker {
+  #anchor;
+  #path;
+  constructor(anchor, path) {
+    this.#anchor = anchor;
+    this.#path = path;
+  }
+  get(target, prop) {
+    if (prop === toStaticParam) {
+      return target[toStaticParam];
+    }
+    assert(typeof prop === "string");
+    const path = [...this.#path, prop];
+    return new Proxy(
+      {
+        [toStaticParam]: () => staticParam(this.#anchor, path)
+      },
+      new CallTracker(this.#anchor, path)
+    );
+  }
+}
+function baseTracker(anchor) {
+  return new Proxy(
+    {
+      [toStaticParam]: () => {
+        throw new Error("no JWT field specified");
+      }
+    },
+    new CallTracker(anchor, [])
+  );
+}
+const authDataRef = baseTracker("authData");
+baseTracker("preMutationRow");
+function staticParam(anchorClass, field) {
+  return {
+    type: "static",
+    anchor: anchorClass,
+    // for backwards compatibility
+    field: field.length === 1 ? field[0] : field
+  };
+}
+export {
+  ANYONE_CAN,
+  ANYONE_CAN_DO_ANYTHING,
+  NOBODY_CAN,
+  authDataRef,
+  definePermissions,
+  staticParam
+};
+//# sourceMappingURL=permissions.js.map

package/out/zero-schema/src/permissions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"permissions.js","sources":["../../../../zero-schema/src/permissions.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport {\n  mapCondition,\n  toStaticParam,\n  type Condition,\n  type Parameter,\n} from '../../zero-protocol/src/ast.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ExpressionBuilder} from '../../zql/src/query/expression.ts';\nimport type {Query} from '../../zql/src/query/query.ts';\nimport {newExpressionBuilder} from '../../zql/src/query/static-query.ts';\nimport type {\n  AssetPermissions as CompiledAssetPermissions,\n  PermissionsConfig as CompiledPermissionsConfig,\n  TablePermissions,\n} from './compiled-permissions.ts';\nimport type {NameMapper} from './name-mapper.ts';\nimport {clientToServer} from './name-mapper.ts';\n\nexport const ANYONE_CAN = [\n  (_: unknown, eb: ExpressionBuilder<never, Schema>) => eb.and(),\n];\n\n/**\n * @deprecated Use {@link ANYONE_CAN} instead.\n */\nexport const ANYONE_CAN_DO_ANYTHING = {\n  row: {\n    select: ANYONE_CAN,\n    insert: ANYONE_CAN,\n    update: {\n      preMutation: ANYONE_CAN,\n      postMutation: ANYONE_CAN,\n    },\n    delete: ANYONE_CAN,\n  },\n};\n\nexport const NOBODY_CAN = [];\n\nexport type Anchor = 'authData' | 'preMutationRow';\n\nexport type Queries<TSchema extends Schema> = {\n  [K in keyof TSchema['tables']]: Query<K & string, TSchema>;\n};\n\nexport type PermissionRule<\n  TAuthDataShape,\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n> = (\n  authData: TAuthDataShape,\n  eb: ExpressionBuilder<TTable, TSchema>,\n) => Condition;\n\nexport type AssetPermissions<\n  TAuthDataShape,\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n> = {\n  // Why an array of rules?: https://github.com/rocicorp/mono/pull/3184/files#r1869680716\n  select?: PermissionRule<TAuthDataShape, TSchema, TTable>[] | undefined;\n  /**\n   * @deprecated Use Mutators instead.\n   * @see {@link https://zero.rocicorp.dev/docs/writing-data}\n   */\n  insert?: PermissionRule<TAuthDataShape, TSchema, TTable>[] | undefined;\n  /**\n   * @deprecated Use Mutators instead.\n   * @see {@link https://zero.rocicorp.dev/docs/writing-data}\n   */\n  update?:\n    | {\n        preMutation?: PermissionRule<TAuthDataShape, TSchema, TTable>[];\n        postMutation?: PermissionRule<TAuthDataShape, TSchema, TTable>[];\n      }\n    | undefined;\n  /**\n   * @deprecated Use Mutators instead.\n   * @see {@link https://zero.rocicorp.dev/docs/writing-data}\n   */\n  delete?: PermissionRule<TAuthDataShape, TSchema, TTable>[] | undefined;\n};\n\nexport type PermissionsConfig<TAuthDataShape, TSchema extends Schema> = {\n  [K in keyof TSchema['tables']]?: {\n    row?: AssetPermissions<TAuthDataShape, TSchema, K & string> | undefined;\n    cell?:\n      | {\n          [C in keyof TSchema['tables'][K]['columns']]?: Omit<\n            AssetPermissions<TAuthDataShape, TSchema, K & string>,\n            'cell'\n          >;\n        }\n      | undefined;\n  };\n};\n\n/**\n * @deprecated Use {@link defineMutators} and {@link defineQueries} instead.\n */\nexport async function definePermissions<TAuthDataShape, TSchema extends Schema>(\n  schema: TSchema,\n  definer: () =>\n    | Promise<PermissionsConfig<TAuthDataShape, TSchema>>\n    | PermissionsConfig<TAuthDataShape, TSchema>,\n): Promise<CompiledPermissionsConfig | undefined> {\n  const expressionBuilders = {} as Record<\n    string,\n    ExpressionBuilder<string, TSchema>\n  >;\n  for (const name of Object.keys(schema.tables)) {\n    expressionBuilders[name] = newExpressionBuilder(schema, name);\n  }\n\n  const config = await definer();\n  return compilePermissions(schema, config, expressionBuilders);\n}\n\nfunction compilePermissions<TAuthDataShape, TSchema extends Schema>(\n  schema: TSchema,\n  authz: PermissionsConfig<TAuthDataShape, TSchema> | undefined,\n  expressionBuilders: Record<string, ExpressionBuilder<string, TSchema>>,\n): CompiledPermissionsConfig | undefined {\n  if (!authz) {\n    return undefined;\n  }\n  const nameMapper = clientToServer(schema.tables);\n  const ret = {tables: {} as TablePermissions};\n  for (const [tableName, tableConfig] of Object.entries(authz)) {\n    const serverName = schema.tables[tableName].serverName ?? tableName;\n    ret.tables[serverName] = {\n      row: compileRowConfig(\n        nameMapper,\n        tableName,\n        tableConfig.row,\n        expressionBuilders[tableName],\n      ),\n      cell: compileCellConfig(\n        nameMapper,\n        tableName,\n        tableConfig.cell,\n        expressionBuilders[tableName],\n      ),\n    };\n  }\n\n  return ret;\n}\n\nfunction compileRowConfig<\n  TAuthDataShape,\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n>(\n  clientToServer: NameMapper,\n  tableName: TTable,\n  rowRules: AssetPermissions<TAuthDataShape, TSchema, TTable> | undefined,\n  expressionBuilder: ExpressionBuilder<TTable, TSchema>,\n): CompiledAssetPermissions | undefined {\n  if (!rowRules) {\n    return undefined;\n  }\n  return {\n    select: compileRules(\n      clientToServer,\n      tableName,\n      rowRules.select,\n      expressionBuilder,\n    ),\n    insert: compileRules(\n      clientToServer,\n      tableName,\n      rowRules.insert,\n      expressionBuilder,\n    ),\n    update: {\n      preMutation: compileRules(\n        clientToServer,\n        tableName,\n        rowRules.update?.preMutation,\n        expressionBuilder,\n      ),\n      postMutation: compileRules(\n        clientToServer,\n        tableName,\n        rowRules.update?.postMutation,\n        expressionBuilder,\n      ),\n    },\n    delete: compileRules(\n      clientToServer,\n      tableName,\n      rowRules.delete,\n      expressionBuilder,\n    ),\n  };\n}\n\n/**\n * What is this \"allow\" and why are permissions policies an array of rules?\n *\n * Please read: https://github.com/rocicorp/mono/pull/3184/files#r1869680716\n */\nfunction compileRules<\n  TAuthDataShape,\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n>(\n  clientToServer: NameMapper,\n  tableName: TTable,\n  rules: PermissionRule<TAuthDataShape, TSchema, TTable>[] | undefined,\n  expressionBuilder: ExpressionBuilder<TTable, TSchema>,\n): ['allow', Condition][] | undefined {\n  if (!rules) {\n    return undefined;\n  }\n\n  return rules.map(rule => {\n    const cond = rule(authDataRef as TAuthDataShape, expressionBuilder);\n    return ['allow', mapCondition(cond, tableName, clientToServer)] as const;\n  });\n}\n\nfunction compileCellConfig<\n  TAuthDataShape,\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n>(\n  clientToServer: NameMapper,\n  tableName: TTable,\n  cellRules:\n    | Record<string, AssetPermissions<TAuthDataShape, TSchema, TTable>>\n    | undefined,\n  expressionBuilder: ExpressionBuilder<TTable, TSchema>,\n): Record<string, CompiledAssetPermissions> | undefined {\n  if (!cellRules) {\n    return undefined;\n  }\n  const ret: Record<string, CompiledAssetPermissions> = {};\n  for (const [columnName, rules] of Object.entries(cellRules)) {\n    ret[columnName] = {\n      select: compileRules(\n        clientToServer,\n        tableName,\n        rules.select,\n        expressionBuilder,\n      ),\n      insert: compileRules(\n        clientToServer,\n        tableName,\n        rules.insert,\n        expressionBuilder,\n      ),\n      update: {\n        preMutation: compileRules(\n          clientToServer,\n          tableName,\n          rules.update?.preMutation,\n          expressionBuilder,\n        ),\n        postMutation: compileRules(\n          clientToServer,\n          tableName,\n          rules.update?.postMutation,\n          expressionBuilder,\n        ),\n      },\n      delete: compileRules(\n        clientToServer,\n        tableName,\n        rules.delete,\n        expressionBuilder,\n      ),\n    };\n  }\n  return ret;\n}\n\nclass CallTracker {\n  readonly #anchor: Anchor;\n  readonly #path: string[];\n  constructor(anchor: Anchor, path: string[]) {\n    this.#anchor = anchor;\n    this.#path = path;\n  }\n\n  get(target: {[toStaticParam]: () => Parameter}, prop: string | symbol) {\n    if (prop === toStaticParam) {\n      return target[toStaticParam];\n    }\n    assert(typeof prop === 'string');\n    const path = [...this.#path, prop];\n    return new Proxy(\n      {\n        [toStaticParam]: () => staticParam(this.#anchor, path),\n      },\n      new CallTracker(this.#anchor, path),\n    );\n  }\n}\n\nfunction baseTracker(anchor: Anchor) {\n  return new Proxy(\n    {\n      [toStaticParam]: () => {\n        throw new Error('no JWT field specified');\n      },\n    },\n    new CallTracker(anchor, []),\n  );\n}\n\nexport const authDataRef = baseTracker('authData');\nexport const preMutationRowRef = baseTracker('preMutationRow');\nexport function staticParam(\n  anchorClass: 'authData' | 'preMutationRow',\n  field: string | string[],\n): Parameter {\n  return {\n    type: 'static',\n    anchor: anchorClass,\n    // for backwards compatibility\n    field: field.length === 1 ? field[0] : field,\n  };\n}\n"],"names":["clientToServer"],"mappings":";;;;AAmBO,MAAM,aAAa;AAAA,EACxB,CAAC,GAAY,OAAyC,GAAG,IAAA;AAC3D;AAKO,MAAM,yBAAyB;AAAA,EACpC,KAAK;AAAA,IACH,QAAQ;AAAA,IACR,QAAQ;AAAA,IACR,QAAQ;AAAA,MACN,aAAa;AAAA,MACb,cAAc;AAAA,IAAA;AAAA,IAEhB,QAAQ;AAAA,EAAA;AAEZ;AAEO,MAAM,aAAa,CAAA;AA+D1B,eAAsB,kBACpB,QACA,SAGgD;AAChD,QAAM,qBAAqB,CAAA;AAI3B,aAAW,QAAQ,OAAO,KAAK,OAAO,MAAM,GAAG;AAC7C,uBAAmB,IAAI,IAAI,qBAAqB,QAAQ,IAAI;AAAA,EAC9D;AAEA,QAAM,SAAS,MAAM,QAAA;AACrB,SAAO,mBAAmB,QAAQ,QAAQ,kBAAkB;AAC9D;AAEA,SAAS,mBACP,QACA,OACA,oBACuC;AACvC,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AACA,QAAM,aAAa,eAAe,OAAO,MAAM;AAC/C,QAAM,MAAM,EAAC,QAAQ,GAAC;AACtB,aAAW,CAAC,WAAW,WAAW,KAAK,OAAO,QAAQ,KAAK,GAAG;AAC5D,UAAM,aAAa,OAAO,OAAO,SAAS,EAAE,cAAc;AAC1D,QAAI,OAAO,UAAU,IAAI;AAAA,MACvB,KAAK;AAAA,QACH;AAAA,QACA;AAAA,QACA,YAAY;AAAA,QACZ,mBAAmB,SAAS;AAAA,MAAA;AAAA,MAE9B,MAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA,YAAY;AAAA,QACZ,mBAAmB,SAAS;AAAA,MAAA;AAAA,IAC9B;AAAA,EAEJ;AAEA,SAAO;AACT;AAEA,SAAS,iBAKPA,iBACA,WACA,UACA,mBACsC;AACtC,MAAI,CAAC,UAAU;AACb,WAAO;AAAA,EACT;AACA,SAAO;AAAA,IACL,QAAQ;AAAA,MACNA;AAAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT;AAAA,IAAA;AAAA,IAEF,QAAQ;AAAA,MACNA;AAAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT;AAAA,IAAA;AAAA,IAEF,QAAQ;AAAA,MACN,aAAa;AAAA,QACXA;AAAAA,QACA;AAAA,QACA,SAAS,QAAQ;AAAA,QACjB;AAAA,MAAA;AAAA,MAEF,cAAc;AAAA,QACZA;AAAAA,QACA;AAAA,QACA,SAAS,QAAQ;AAAA,QACjB;AAAA,MAAA;AAAA,IACF;AAAA,IAEF,QAAQ;AAAA,MACNA;AAAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT;AAAA,IAAA;AAAA,EACF;AAEJ;AAOA,SAAS,aAKPA,iBACA,WACA,OACA,mBACoC;AACpC,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AAEA,SAAO,MAAM,IAAI,CAAA,SAAQ;AACvB,UAAM,OAAO,KAAK,aAA+B,iBAAiB;AAClE,WAAO,CAAC,SAAS,aAAa,MAAM,WAAWA,eAAc,CAAC;AAAA,EAChE,CAAC;AACH;AAEA,SAAS,kBAKPA,iBACA,WACA,WAGA,mBACsD;AACtD,MAAI,CAAC,WAAW;AACd,WAAO;AAAA,EACT;AACA,QAAM,MAAgD,CAAA;AACtD,aAAW,CAAC,YAAY,KAAK,KAAK,OAAO,QAAQ,SAAS,GAAG;AAC3D,QAAI,UAAU,IAAI;AAAA,MAChB,QAAQ;AAAA,QACNA;AAAAA,QACA;AAAA,QACA,MAAM;AAAA,QACN;AAAA,MAAA;AAAA,MAEF,QAAQ;AAAA,QACNA;AAAAA,QACA;AAAA,QACA,MAAM;AAAA,QACN;AAAA,MAAA;AAAA,MAEF,QAAQ;AAAA,QACN,aAAa;AAAA,UACXA;AAAAA,UACA;AAAA,UACA,MAAM,QAAQ;AAAA,UACd;AAAA,QAAA;AAAA,QAEF,cAAc;AAAA,UACZA;AAAAA,UACA;AAAA,UACA,MAAM,QAAQ;AAAA,UACd;AAAA,QAAA;AAAA,MACF;AAAA,MAEF,QAAQ;AAAA,QACNA;AAAAA,QACA;AAAA,QACA,MAAM;AAAA,QACN;AAAA,MAAA;AAAA,IACF;AAAA,EAEJ;AACA,SAAO;AACT;AAEA,MAAM,YAAY;AAAA,EACP;AAAA,EACA;AAAA,EACT,YAAY,QAAgB,MAAgB;AAC1C,SAAK,UAAU;AACf,SAAK,QAAQ;AAAA,EACf;AAAA,EAEA,IAAI,QAA4C,MAAuB;AACrE,QAAI,SAAS,eAAe;AAC1B,aAAO,OAAO,aAAa;AAAA,IAC7B;AACA,WAAO,OAAO,SAAS,QAAQ;AAC/B,UAAM,OAAO,CAAC,GAAG,KAAK,OAAO,IAAI;AACjC,WAAO,IAAI;AAAA,MACT;AAAA,QACE,CAAC,aAAa,GAAG,MAAM,YAAY,KAAK,SAAS,IAAI;AAAA,MAAA;AAAA,MAEvD,IAAI,YAAY,KAAK,SAAS,IAAI;AAAA,IAAA;AAAA,EAEtC;AACF;AAEA,SAAS,YAAY,QAAgB;AACnC,SAAO,IAAI;AAAA,IACT;AAAA,MACE,CAAC,aAAa,GAAG,MAAM;AACrB,cAAM,IAAI,MAAM,wBAAwB;AAAA,MAC1C;AAAA,IAAA;AAAA,IAEF,IAAI,YAAY,QAAQ,CAAA,CAAE;AAAA,EAAA;AAE9B;AAEO,MAAM,cAAc,YAAY,UAAU;AAChB,YAAY,gBAAgB;AACtD,SAAS,YACd,aACA,OACW;AACX,SAAO;AAAA,IACL,MAAM;AAAA,IACN,QAAQ;AAAA;AAAA,IAER,OAAO,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI;AAAA,EAAA;AAE3C;"}

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

@@ -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 = {
@@ -20,9 +20,4 @@ export declare const schemaSchema: v.ObjectType<Readonly<{
     enableLegacyMutators: v.Optional<boolean>;
 }>, undefined>;
 export declare function isSchemaConfig(value: any): value is SchemaConfig;
-export declare function stringifySchema(module: unknown): Promise<string>;
-export declare function parseSchema(input: string, source: string): {
-    schema: Schema;
-    permissions: PermissionsConfig;
-};
 //# sourceMappingURL=schema-config.d.ts.map

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

@@ -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"}
+{"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,EAAC,KAAK,iBAAiB,EAAC,MAAM,2BAA2B,CAAC;AACjE,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"}

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

@@ -1,59 +1,43 @@
-import * as v from "../../shared/src/valita.js";
+import { readonlyObject, literalUnion, readonly } from "../../shared/src/valita.js";
 import { compoundKeySchema } from "../../zero-protocol/src/ast.js";
 import { valueTypeSchema } from "../../zero-protocol/src/client-schema.js";
 import { primaryKeySchema } from "../../zero-protocol/src/primary-key.js";
-import { permissionsConfigSchema, } from "./compiled-permissions.js";
-const relationshipPart = v.readonlyObject({
-    sourceField: compoundKeySchema,
-    destField: compoundKeySchema,
-    destSchema: v.string(),
-    cardinality: v.literalUnion('one', 'many'),
+import "./compiled-permissions.js";
+import { string, union, tuple, boolean, record } from "@badrap/valita";
+const relationshipPart = readonlyObject({
+  sourceField: compoundKeySchema,
+  destField: compoundKeySchema,
+  destSchema: string(),
+  cardinality: literalUnion("one", "many")
 });
-export const relationshipSchema = v.union(v.readonly(v.tuple([relationshipPart])), v.readonly(v.tuple([relationshipPart, relationshipPart])));
-export const schemaValueSchema = v.readonlyObject({
-    type: valueTypeSchema,
-    serverName: v.string().optional(),
-    optional: v.boolean().optional(),
+const relationshipSchema = union(
+  readonly(tuple([relationshipPart])),
+  readonly(tuple([relationshipPart, relationshipPart]))
+);
+const schemaValueSchema = readonlyObject({
+  type: valueTypeSchema,
+  serverName: string().optional(),
+  optional: boolean().optional()
 });
-export const tableSchemaSchema = v.readonlyObject({
-    name: v.string(),
-    serverName: v.string().optional(),
-    columns: v.record(schemaValueSchema),
-    primaryKey: primaryKeySchema,
+const tableSchemaSchema = readonlyObject({
+  name: string(),
+  serverName: string().optional(),
+  columns: record(schemaValueSchema),
+  primaryKey: primaryKeySchema
 });
-export const schemaSchema = v.readonlyObject({
-    tables: v.record(tableSchemaSchema),
-    relationships: v.record(v.record(relationshipSchema)),
-    enableLegacyQueries: v.boolean().optional(),
-    enableLegacyMutators: v.boolean().optional(),
+readonlyObject({
+  tables: record(tableSchemaSchema),
+  relationships: record(record(relationshipSchema)),
+  enableLegacyQueries: boolean().optional(),
+  enableLegacyMutators: boolean().optional()
 });
-// oxlint-disable-next-line @typescript-eslint/no-explicit-any
-export function isSchemaConfig(value) {
-    // oxlint-disable-next-line eqeqeq
-    return value != null && 'schema' in value && 'permissions' in value;
+function isSchemaConfig(value) {
+  return value != null && "schema" in value;
 }
-export async function stringifySchema(module) {
-    if (!isSchemaConfig(module)) {
-        throw new Error('Schema file must have a export `schema` and `permissions`.');
-    }
-    const schemaConfig = module;
-    const permissions = v.parse(await schemaConfig.permissions, permissionsConfigSchema);
-    return JSON.stringify({
-        permissions,
-        schema: schemaConfig.schema,
-    }, undefined, 2);
-}
-export function parseSchema(input, source) {
-    try {
-        const config = JSON.parse(input);
-        const permissions = v.parse(config.permissions, permissionsConfigSchema);
-        return {
-            permissions,
-            schema: config.schema,
-        };
-    }
-    catch (e) {
-        throw new Error(`Failed to parse schema config from ${source}: ${e}`);
-    }
-}
-//# sourceMappingURL=schema-config.js.map
+export {
+  isSchemaConfig,
+  relationshipSchema,
+  schemaValueSchema,
+  tableSchemaSchema
+};
+//# sourceMappingURL=schema-config.js.map

package/out/zero-schema/src/schema-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-config.js","sourceRoot":"","sources":["../../../../zero-schema/src/schema-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema-config.js","sources":["../../../../zero-schema/src/schema-config.ts"],"sourcesContent":["import * as v from '../../shared/src/valita.ts';\nimport {compoundKeySchema} from '../../zero-protocol/src/ast.ts';\nimport {valueTypeSchema} from '../../zero-protocol/src/client-schema.ts';\nimport {primaryKeySchema} from '../../zero-protocol/src/primary-key.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport {type PermissionsConfig} from './compiled-permissions.ts';\nimport type {Relationship, TableSchema} from './table-schema.ts';\n\nexport type SchemaConfig = {\n  schema: Schema;\n  permissions: PermissionsConfig;\n};\n\nconst relationshipPart = v.readonlyObject({\n  sourceField: compoundKeySchema,\n  destField: compoundKeySchema,\n  destSchema: v.string(),\n  cardinality: v.literalUnion('one', 'many'),\n});\n\nexport const relationshipSchema: v.Type<Relationship> = v.union(\n  v.readonly(v.tuple([relationshipPart])),\n  v.readonly(v.tuple([relationshipPart, relationshipPart])),\n);\n\nexport const schemaValueSchema = v.readonlyObject({\n  type: valueTypeSchema,\n  serverName: v.string().optional(),\n  optional: v.boolean().optional(),\n});\n\nexport const tableSchemaSchema: v.Type<TableSchema> = v.readonlyObject({\n  name: v.string(),\n  serverName: v.string().optional(),\n  columns: v.record(schemaValueSchema),\n  primaryKey: primaryKeySchema,\n});\n\nexport const schemaSchema = v.readonlyObject({\n  tables: v.record(tableSchemaSchema),\n  relationships: v.record(v.record(relationshipSchema)),\n  enableLegacyQueries: v.boolean().optional(),\n  enableLegacyMutators: v.boolean().optional(),\n});\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\nexport function isSchemaConfig(value: any): value is SchemaConfig {\n  // oxlint-disable-next-line eqeqeq\n  return value != null && 'schema' in value;\n}\n"],"names":["v.readonlyObject","v.string","v.literalUnion","v.union","v.readonly","v.tuple","v.boolean","v.record"],"mappings":";;;;;;AAaA,MAAM,mBAAmBA,eAAiB;AAAA,EACxC,aAAa;AAAA,EACb,WAAW;AAAA,EACX,YAAYC,OAAE;AAAA,EACd,aAAaC,aAAe,OAAO,MAAM;AAC3C,CAAC;AAEM,MAAM,qBAA2CC;AAAAA,EACtDC,SAAWC,MAAQ,CAAC,gBAAgB,CAAC,CAAC;AAAA,EACtCD,SAAWC,MAAQ,CAAC,kBAAkB,gBAAgB,CAAC,CAAC;AAC1D;AAEO,MAAM,oBAAoBL,eAAiB;AAAA,EAChD,MAAM;AAAA,EACN,YAAYC,OAAE,EAAS,SAAA;AAAA,EACvB,UAAUK,QAAE,EAAU,SAAA;AACxB,CAAC;AAEM,MAAM,oBAAyCN,eAAiB;AAAA,EACrE,MAAMC,OAAE;AAAA,EACR,YAAYA,OAAE,EAAS,SAAA;AAAA,EACvB,SAASM,OAAS,iBAAiB;AAAA,EACnC,YAAY;AACd,CAAC;AAE2BP,eAAiB;AAAA,EAC3C,QAAQO,OAAS,iBAAiB;AAAA,EAClC,eAAeA,OAASA,OAAS,kBAAkB,CAAC;AAAA,EACpD,qBAAqBD,QAAE,EAAU,SAAA;AAAA,EACjC,sBAAsBA,QAAE,EAAU,SAAA;AACpC,CAAC;AAGM,SAAS,eAAe,OAAmC;AAEhE,SAAO,SAAS,QAAQ,YAAY;AACtC;"}

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

@@ -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>(schema: TSchema, client: TDrizzle): ZQLDatabase<TSchema, DrizzleTransaction<TDrizzle>>;
 //# sourceMappingURL=drizzle.d.ts.map

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

@@ -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"}
+{"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,EAEhC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,QAAQ,GACf,WAAW,CAAC,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAKpD"}

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

@@ -1,111 +1,98 @@
-import { sql } from 'drizzle-orm';
+import { sql } from "drizzle-orm";
+import { executePostgresQuery } from "../pg-query-executor.js";
 import { ZQLDatabase } from "../zql-database.js";
-export class DrizzleConnection {
-    #drizzle;
-    constructor(drizzle) {
-        this.#drizzle = drizzle;
-    }
-    transaction(fn) {
-        return this.#drizzle.transaction(drizzleTx => fn(new DrizzleInternalTransaction(drizzleTx)));
-    }
+class DrizzleConnection {
+  #drizzle;
+  constructor(drizzle) {
+    this.#drizzle = drizzle;
+  }
+  transaction(fn) {
+    return this.#drizzle.transaction(
+      (drizzleTx) => fn(
+        new DrizzleInternalTransaction(
+          drizzleTx
+        )
+      )
+    );
+  }
 }
 class DrizzleInternalTransaction {
-    wrappedTransaction;
-    constructor(drizzleTx) {
-        this.wrappedTransaction = drizzleTx;
-    }
-    async query(sql, params) {
-        const stmt = fromDollarParams(sql, params);
-        const result = await this.wrappedTransaction.execute(stmt);
-        return toIterableRows(result);
-    }
+  wrappedTransaction;
+  constructor(drizzleTx) {
+    this.wrappedTransaction = drizzleTx;
+  }
+  runQuery(ast, format, schema, serverSchema) {
+    return executePostgresQuery(
+      this,
+      ast,
+      format,
+      schema,
+      serverSchema
+    );
+  }
+  async query(sql2, params) {
+    const stmt = fromDollarParams(sql2, params);
+    const result = await this.wrappedTransaction.execute(stmt);
+    return toIterableRows(result);
+  }
 }
-/**
- * Turn `$1, $2...` placeholders into a Drizzle SQL object with bound params.
- */
-export function fromDollarParams(text, params) {
-    const re = /\$(\d+)/g;
-    const s = sql.empty();
-    let last = 0;
-    let m;
-    while ((m = re.exec(text)) !== null) {
-        const idx = Number(m[1]) - 1;
-        if (idx < 0 || idx >= params.length) {
-            throw new Error(`Missing param for $${m[1]}`);
-        }
-        if (m.index > last)
-            s.append(sql.raw(text.slice(last, m.index)));
-        s.append(sql `${params[idx]}`); // parameterized value
-        last = m.index + m[0].length;
+function fromDollarParams(text, params) {
+  const re = /\$(\d+)/g;
+  const s = sql.empty();
+  let last = 0;
+  let m;
+  while ((m = re.exec(text)) !== null) {
+    const idx = Number(m[1]) - 1;
+    if (idx < 0 || idx >= params.length) {
+      throw new Error(`Missing param for $${m[1]}`);
     }
-    if (last < text.length)
-        s.append(sql.raw(text.slice(last)));
-    return s;
+    if (m.index > last) s.append(sql.raw(text.slice(last, m.index)));
+    s.append(sql`${params[idx]}`);
+    last = m.index + m[0].length;
+  }
+  if (last < text.length) s.append(sql.raw(text.slice(last)));
+  return s;
 }
 function isIterable(value) {
-    return (
+  return (
     // oxlint-disable-next-line eqeqeq
-    value != null &&
-        typeof value[Symbol.iterator] === 'function');
+    value != null && typeof value[Symbol.iterator] === "function"
+  );
 }
-export function toIterableRows(result) {
-    if (result === null || result === undefined) {
-        return [];
-    }
-    if (Array.isArray(result)) {
-        return result;
+function toIterableRows(result) {
+  if (result === null || result === void 0) {
+    return [];
+  }
+  if (Array.isArray(result)) {
+    return result;
+  }
+  if (isIterable(result)) {
+    return result;
+  }
+  if (typeof result === "object") {
+    const rows = result.rows;
+    if (rows === null || rows === void 0) {
+      return [];
     }
-    if (isIterable(result)) {
-        return result;
+    if (Array.isArray(rows)) {
+      return rows;
     }
-    if (typeof result === 'object') {
-        const rows = result.rows;
-        if (rows === null || rows === undefined) {
-            return [];
-        }
-        if (Array.isArray(rows)) {
-            return rows;
-        }
-        if (isIterable(rows)) {
-            return rows;
-        }
+    if (isIterable(rows)) {
+      return rows;
     }
-    throw new TypeError('Drizzle query result is not iterable');
+  }
+  throw new TypeError("Drizzle query result is not iterable");
 }
-/**
- * Wrap a `drizzle-orm` database for Zero ZQL.
- *
- * Provides ZQL querying plus access to the underlying drizzle transaction.
- * Use {@link DrizzleTransaction} to type your server mutator transaction.
- *
- * @param schema - Zero schema.
- * @param client - Drizzle database.
- *
- * @example
- * ```ts
- * import {Pool} from 'pg';
- * import {drizzle} from 'drizzle-orm/node-postgres';
- * import type {ServerTransaction} from '@rocicorp/zero';
- *
- * const pool = new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!});
- * const drizzleDb = drizzle(pool, {schema: drizzleSchema});
- *
- * const zql = zeroDrizzle(schema, drizzleDb);
- *
- * // Define the server mutator transaction type using the helper
- * type ServerTx = ServerTransaction<Schema, DrizzleTransaction<typeof drizzleDb>>;
- *
- * async function createUser(
- *   tx: ServerTx,
- *   {id, name}: {id: string; name: string},
- * ) {
- *   await tx.dbTransaction.wrappedTransaction
- *     .insert(drizzleSchema.user)
- *     .values({id, name})
- * }
- * ```
- */
-export function zeroDrizzle(schema, client) {
-    return new ZQLDatabase(new DrizzleConnection(client), schema);
+function zeroDrizzle(schema, client) {
+  return new ZQLDatabase(
+    new DrizzleConnection(client),
+    schema
+  );
 }
-//# sourceMappingURL=drizzle.js.map
+export {
+  DrizzleConnection,
+  fromDollarParams,
+  toIterableRows,
+  zeroDrizzle
+};
+//# sourceMappingURL=drizzle.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"drizzle.js","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"drizzle.js","sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"sourcesContent":["import {sql, type SQL} from 'drizzle-orm';\nimport type {\n  PgDatabase,\n  PgQueryResultHKT,\n  PgTransaction,\n} from 'drizzle-orm/pg-core';\nimport type {ExtractTablesWithRelations} from 'drizzle-orm/relations';\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\nexport type DrizzleDatabase<\n  TQueryResult extends PgQueryResultHKT = PgQueryResultHKT,\n  TSchema extends Record<string, unknown> = Record<string, unknown>,\n> = PgDatabase<TQueryResult, TSchema>;\n\n/**\n * Helper type for the wrapped transaction used by drizzle-orm.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, DrizzleTransaction<typeof drizzleDb>>`.\n */\nexport type DrizzleTransaction<\n  TDbOrSchema extends DrizzleDatabase | Record<string, unknown>,\n  TSchema extends Record<string, unknown> = TDbOrSchema extends PgDatabase<\n    PgQueryResultHKT,\n    infer TInferredSchema\n  >\n    ? TInferredSchema\n    : TDbOrSchema,\n> = PgTransaction<\n  PgQueryResultHKT,\n  TSchema,\n  ExtractTablesWithRelations<TSchema>\n>;\n\nexport class DrizzleConnection<\n  TDrizzle extends DrizzleDatabase,\n  TTransaction extends\n    DrizzleTransaction<TDrizzle> = DrizzleTransaction<TDrizzle>,\n> implements DBConnection<TTransaction>\n{\n  readonly #drizzle: TDrizzle;\n\n  constructor(drizzle: TDrizzle) {\n    this.#drizzle = drizzle;\n  }\n\n  transaction<T>(\n    fn: (tx: DBTransaction<TTransaction>) => Promise<T>,\n  ): Promise<T> {\n    return this.#drizzle.transaction(drizzleTx =>\n      fn(\n        new DrizzleInternalTransaction(\n          drizzleTx,\n        ) as DBTransaction<TTransaction>,\n      ),\n    );\n  }\n}\n\nclass DrizzleInternalTransaction<\n  TTransaction extends DrizzleTransaction<DrizzleDatabase>,\n> implements DBTransaction<TTransaction>\n{\n  readonly wrappedTransaction: TTransaction;\n\n  constructor(drizzleTx: TTransaction) {\n    this.wrappedTransaction = drizzleTx;\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<Iterable<Row>> {\n    const stmt = fromDollarParams(sql, params);\n    const result = await this.wrappedTransaction.execute(stmt);\n    return toIterableRows(result);\n  }\n}\n\n/**\n * Turn `$1, $2...` placeholders into a Drizzle SQL object with bound params.\n */\nexport function fromDollarParams(text: string, params: unknown[]): SQL {\n  const re = /\\$(\\d+)/g;\n  const s = sql.empty();\n  let last = 0;\n  let m: RegExpExecArray | null;\n\n  while ((m = re.exec(text)) !== null) {\n    const idx = Number(m[1]) - 1;\n    if (idx < 0 || idx >= params.length) {\n      throw new Error(`Missing param for $${m[1]}`);\n    }\n    if (m.index > last) s.append(sql.raw(text.slice(last, m.index)));\n    s.append(sql`${params[idx]}`); // parameterized value\n    last = m.index + m[0].length;\n  }\n  if (last < text.length) s.append(sql.raw(text.slice(last)));\n  return s;\n}\n\nfunction isIterable(value: unknown): value is Iterable<unknown> {\n  return (\n    // oxlint-disable-next-line eqeqeq\n    value != null &&\n    typeof (value as Iterable<unknown>)[Symbol.iterator] === 'function'\n  );\n}\n\nexport function toIterableRows(result: unknown): Iterable<Row> {\n  if (result === null || result === undefined) {\n    return [] as Row[];\n  }\n  if (Array.isArray(result)) {\n    return result as Row[];\n  }\n  if (isIterable(result)) {\n    return result as Iterable<Row>;\n  }\n  if (typeof result === 'object') {\n    const rows = (result as {rows?: unknown}).rows;\n    if (rows === null || rows === undefined) {\n      return [] as Row[];\n    }\n    if (Array.isArray(rows)) {\n      return rows as Row[];\n    }\n    if (isIterable(rows)) {\n      return rows as Iterable<Row>;\n    }\n  }\n  throw new TypeError('Drizzle query result is not iterable');\n}\n\n/**\n * Wrap a `drizzle-orm` database for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying drizzle transaction.\n * Use {@link DrizzleTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param client - Drizzle database.\n *\n * @example\n * ```ts\n * import {Pool} from 'pg';\n * import {drizzle} from 'drizzle-orm/node-postgres';\n * import type {ServerTransaction} from '@rocicorp/zero';\n *\n * const pool = new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!});\n * const drizzleDb = drizzle(pool, {schema: drizzleSchema});\n *\n * const zql = zeroDrizzle(schema, drizzleDb);\n *\n * // Define the server mutator transaction type using the helper\n * type ServerTx = ServerTransaction<Schema, DrizzleTransaction<typeof drizzleDb>>;\n *\n * async function createUser(\n *   tx: ServerTx,\n *   {id, name}: {id: string; name: string},\n * ) {\n *   await tx.dbTransaction.wrappedTransaction\n *     .insert(drizzleSchema.user)\n *     .values({id, name})\n * }\n * ```\n */\nexport function zeroDrizzle<\n  TSchema extends Schema,\n  TDrizzle extends DrizzleDatabase,\n>(\n  schema: TSchema,\n  client: TDrizzle,\n): ZQLDatabase<TSchema, DrizzleTransaction<TDrizzle>> {\n  return new ZQLDatabase(\n    new DrizzleConnection<TDrizzle, DrizzleTransaction<TDrizzle>>(client),\n    schema,\n  );\n}\n"],"names":["sql"],"mappings":";;;AA8CO,MAAM,kBAKb;AAAA,EACW;AAAA,EAET,YAAY,SAAmB;AAC7B,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,YACE,IACY;AACZ,WAAO,KAAK,SAAS;AAAA,MAAY,CAAA,cAC/B;AAAA,QACE,IAAI;AAAA,UACF;AAAA,QAAA;AAAA,MACF;AAAA,IACF;AAAA,EAEJ;AACF;AAEA,MAAM,2BAGN;AAAA,EACW;AAAA,EAET,YAAY,WAAyB;AACnC,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,MAAMA,MAAa,QAA2C;AAClE,UAAM,OAAO,iBAAiBA,MAAK,MAAM;AACzC,UAAM,SAAS,MAAM,KAAK,mBAAmB,QAAQ,IAAI;AACzD,WAAO,eAAe,MAAM;AAAA,EAC9B;AACF;AAKO,SAAS,iBAAiB,MAAc,QAAwB;AACrE,QAAM,KAAK;AACX,QAAM,IAAI,IAAI,MAAA;AACd,MAAI,OAAO;AACX,MAAI;AAEJ,UAAQ,IAAI,GAAG,KAAK,IAAI,OAAO,MAAM;AACnC,UAAM,MAAM,OAAO,EAAE,CAAC,CAAC,IAAI;AAC3B,QAAI,MAAM,KAAK,OAAO,OAAO,QAAQ;AACnC,YAAM,IAAI,MAAM,sBAAsB,EAAE,CAAC,CAAC,EAAE;AAAA,IAC9C;AACA,QAAI,EAAE,QAAQ,KAAM,GAAE,OAAO,IAAI,IAAI,KAAK,MAAM,MAAM,EAAE,KAAK,CAAC,CAAC;AAC/D,MAAE,OAAO,MAAM,OAAO,GAAG,CAAC,EAAE;AAC5B,WAAO,EAAE,QAAQ,EAAE,CAAC,EAAE;AAAA,EACxB;AACA,MAAI,OAAO,KAAK,OAAQ,GAAE,OAAO,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC;AAC1D,SAAO;AACT;AAEA,SAAS,WAAW,OAA4C;AAC9D;AAAA;AAAA,IAEE,SAAS,QACT,OAAQ,MAA4B,OAAO,QAAQ,MAAM;AAAA;AAE7D;AAEO,SAAS,eAAe,QAAgC;AAC7D,MAAI,WAAW,QAAQ,WAAW,QAAW;AAC3C,WAAO,CAAA;AAAA,EACT;AACA,MAAI,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAO;AAAA,EACT;AACA,MAAI,WAAW,MAAM,GAAG;AACtB,WAAO;AAAA,EACT;AACA,MAAI,OAAO,WAAW,UAAU;AAC9B,UAAM,OAAQ,OAA4B;AAC1C,QAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,aAAO,CAAA;AAAA,IACT;AACA,QAAI,MAAM,QAAQ,IAAI,GAAG;AACvB,aAAO;AAAA,IACT;AACA,QAAI,WAAW,IAAI,GAAG;AACpB,aAAO;AAAA,IACT;AAAA,EACF;AACA,QAAM,IAAI,UAAU,sCAAsC;AAC5D;AAmCO,SAAS,YAId,QACA,QACoD;AACpD,SAAO,IAAI;AAAA,IACT,IAAI,kBAA0D,MAAM;AAAA,IACpE;AAAA,EAAA;AAEJ;"}

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

@@ -1,6 +1,11 @@
-import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
+import type { Client } from 'pg';
+import { 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 { Client, Pool, type PoolClient } from 'pg';
+import type { HumanReadable } from '../../../zql/src/query/query.ts';
 import { ZQLDatabase } from '../zql-database.ts';
 export type { ZQLDatabase };
 /**
@@ -17,6 +22,7 @@ export declare class NodePgConnection implements DBConnection<NodePgTransaction>
 export declare class NodePgTransactionInternal implements DBTransaction<NodePgTransaction> {
     readonly wrappedTransaction: NodePgTransaction;
     constructor(client: NodePgTransaction);
+    runQuery<TReturn>(ast: AST, format: Format, schema: Schema, serverSchema: ServerSchema): Promise<HumanReadable<TReturn>>;
     query(sql: string, params: unknown[]): Promise<Row[]>;
 }
 /**