@rocicorp/zero 0.26.1 → 0.26.2-canary.4

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

@@ -1,34 +1,19 @@
 import { assert } from "../../shared/src/asserts.js";
 import { must } from "../../shared/src/must.js";
-import { sql, formatPg } from "../../z2s/src/sql.js";
-import { Enum } from "../../zero-cache/src/db/postgres-type-class-enum.js";
 import { dataTypeToZqlValueType } from "../../zero-cache/src/types/pg-data-type.js";
+import { formatPg, sql } from "../../z2s/src/sql.js";
+//#region ../zero-server/src/schema.ts
 async function getServerSchema(dbTransaction, schema) {
-  const schemaTablePairs = Object.values(schema.tables).map(
-    ({ name, serverName }) => {
-      let schemaTablePair = ["public", serverName ?? name];
-      if (serverName) {
-        const firstPeriod = serverName.indexOf(".");
-        if (firstPeriod > -1) {
-          schemaTablePair = [
-            serverName.substring(0, firstPeriod),
-            serverName.substring(firstPeriod + 1, serverName.length)
-          ];
-        }
-      }
-      return schemaTablePair;
-    }
-  );
-  if (schemaTablePairs.length === 0) {
-    return {};
-  }
-  const inClause = sql.join(
-    schemaTablePairs.map(
-      ([schema2, table]) => sql`(${schema2}::text, ${table}::text)`
-    ),
-    ","
-  );
-  const query = sql`
+	const schemaTablePairs = Object.values(schema.tables).map(({ name, serverName }) => {
+		let schemaTablePair = ["public", serverName ?? name];
+		if (serverName) {
+			const firstPeriod = serverName.indexOf(".");
+			if (firstPeriod > -1) schemaTablePair = [serverName.substring(0, firstPeriod), serverName.substring(firstPeriod + 1, serverName.length)];
+		}
+		return schemaTablePair;
+	});
+	if (schemaTablePairs.length === 0) return {};
+	const { text, values } = formatPg(sql`
       SELECT
           c.table_schema::text AS schema,
           c.table_name::text AS table,
@@ -50,125 +35,94 @@ async function getServerSchema(dbTransaction, schema) {
       JOIN
           pg_catalog.pg_namespace n ON t.typnamespace = n.oid
       WHERE
-          (c.table_schema, c.table_name) IN (${inClause})
-    `;
-  const { text, values } = formatPg(query);
-  const results = await dbTransaction.query(
-    text,
-    values
-  );
-  const serverSchema = {};
-  for (const row of results) {
-    const tableName = row.schema === "public" ? row.table : `${row.schema}.${row.table}`;
-    let tableSchema = serverSchema[tableName];
-    if (!tableSchema) {
-      tableSchema = {};
-      serverSchema[tableName] = tableSchema;
-    }
-    const isArray = row.elemTyptype !== null;
-    const isEnum = (row.elemTyptype ?? row.typtype) === Enum;
-    let type = row.dataType.toLowerCase();
-    if (isArray) {
-      type = must(
-        row.elemTypname,
-        `Array column "${row.column}" in table "${tableName}" is missing element type name`
-      );
-    } else if (isEnum) {
-      type = row.typename;
-    }
-    if ((type === "bpchar" || type === "character" || type === "character varying" || type === "varchar") && row.length) {
-      type = `${type}(${row.length})`;
-    }
-    if ((type === "numeric" || type === "decimal") && row.precision !== null && row.scale !== null) {
-      type = `${type}(${row.precision}, ${row.scale})`;
-    }
-    tableSchema[row.column] = {
-      type,
-      isEnum,
-      isArray
-    };
-  }
-  const errors = checkSchemasAreCompatible(schema, serverSchema);
-  assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));
-  return serverSchema;
+          (c.table_schema, c.table_name) IN (${sql.join(schemaTablePairs.map(([schema, table]) => sql`(${schema}::text, ${table}::text)`), ",")})
+    `);
+	const results = await dbTransaction.query(text, values);
+	const serverSchema = {};
+	for (const row of results) {
+		const tableName = row.schema === "public" ? row.table : `${row.schema}.${row.table}`;
+		let tableSchema = serverSchema[tableName];
+		if (!tableSchema) {
+			tableSchema = {};
+			serverSchema[tableName] = tableSchema;
+		}
+		const isArray = row.elemTyptype !== null;
+		const isEnum = (row.elemTyptype ?? row.typtype) === "e";
+		let type = row.dataType.toLowerCase();
+		if (isArray) type = must(row.elemTypname, `Array column "${row.column}" in table "${tableName}" is missing element type name`);
+		else if (isEnum) type = row.typename;
+		if ((type === "bpchar" || type === "character" || type === "character varying" || type === "varchar") && row.length) type = `${type}(${row.length})`;
+		if ((type === "numeric" || type === "decimal") && row.precision !== null && row.scale !== null) type = `${type}(${row.precision}, ${row.scale})`;
+		tableSchema[row.column] = {
+			type,
+			isEnum,
+			isArray
+		};
+	}
+	const errors = checkSchemasAreCompatible(schema, serverSchema);
+	assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));
+	return serverSchema;
 }
 function makeSchemaIncompatibleErrorMessage(errors) {
-  if (errors.length === 0) {
-    return "No schema incompatibilities found.";
-  }
-  const messages = [];
-  for (const error of errors) {
-    switch (error.type) {
-      case "missingTable":
-        messages.push(
-          `Table "${error.table}" is defined in your zero schema but does not exist in the database.`
-        );
-        break;
-      case "missingColumn":
-        messages.push(
-          `Column "${error.column}" in table "${error.table}" is defined in your zero schema but does not exist in the database.`
-        );
-        break;
-      case "typeError":
-        messages.push(
-          `Type mismatch for column "${error.column}" in table "${error.table}": ${error.requiredType === void 0 ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`
-        );
-        break;
-    }
-  }
-  return [
-    "Schema incompatibility detected between your zero schema definition and the database:",
-    "",
-    ...messages.map((msg) => `  - ${msg}`),
-    "",
-    "Please update your schema definition to match the database or migrate your database to match the schema."
-  ].join("\n");
+	if (errors.length === 0) return "No schema incompatibilities found.";
+	const messages = [];
+	for (const error of errors) switch (error.type) {
+		case "missingTable":
+			messages.push(`Table "${error.table}" is defined in your zero schema but does not exist in the database.`);
+			break;
+		case "missingColumn":
+			messages.push(`Column "${error.column}" in table "${error.table}" is defined in your zero schema but does not exist in the database.`);
+			break;
+		case "typeError":
+			messages.push(`Type mismatch for column "${error.column}" in table "${error.table}": ${error.requiredType === void 0 ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`);
+			break;
+	}
+	return [
+		"Schema incompatibility detected between your zero schema definition and the database:",
+		"",
+		...messages.map((msg) => `  - ${msg}`),
+		"",
+		"Please update your schema definition to match the database or migrate your database to match the schema."
+	].join("\n");
 }
 function checkSchemasAreCompatible(schema, serverSchema) {
-  const errors = [];
-  for (const table of Object.values(schema.tables)) {
-    const serverTableName = table.serverName ?? table.name;
-    if (!serverSchema[serverTableName]) {
-      errors.push({
-        type: "missingTable",
-        table: serverTableName
-      });
-      continue;
-    }
-    for (const [columnName, column] of Object.entries(table.columns)) {
-      const serverColumnName = column.serverName ?? columnName;
-      if (!serverSchema[serverTableName][serverColumnName]) {
-        errors.push({
-          type: "missingColumn",
-          table: serverTableName,
-          column: serverColumnName
-        });
-        continue;
-      }
-      const serverColumn = serverSchema[serverTableName][serverColumnName];
-      const declaredType = column.type;
-      const pgType = serverColumn.type;
-      const requiredType = dataTypeToZqlValueType(
-        pgType,
-        serverColumn.isEnum,
-        serverColumn.isArray
-      );
-      if (requiredType !== declaredType) {
-        errors.push({
-          type: "typeError",
-          table: serverTableName,
-          column: serverColumnName,
-          pgType,
-          declaredType,
-          requiredType
-        });
-      }
-    }
-  }
-  return errors;
+	const errors = [];
+	for (const table of Object.values(schema.tables)) {
+		const serverTableName = table.serverName ?? table.name;
+		if (!serverSchema[serverTableName]) {
+			errors.push({
+				type: "missingTable",
+				table: serverTableName
+			});
+			continue;
+		}
+		for (const [columnName, column] of Object.entries(table.columns)) {
+			const serverColumnName = column.serverName ?? columnName;
+			if (!serverSchema[serverTableName][serverColumnName]) {
+				errors.push({
+					type: "missingColumn",
+					table: serverTableName,
+					column: serverColumnName
+				});
+				continue;
+			}
+			const serverColumn = serverSchema[serverTableName][serverColumnName];
+			const declaredType = column.type;
+			const pgType = serverColumn.type;
+			const requiredType = dataTypeToZqlValueType(pgType, serverColumn.isEnum, serverColumn.isArray);
+			if (requiredType !== declaredType) errors.push({
+				type: "typeError",
+				table: serverTableName,
+				column: serverColumnName,
+				pgType,
+				declaredType,
+				requiredType
+			});
+		}
+	}
+	return errors;
 }
-export {
-  checkSchemasAreCompatible,
-  getServerSchema
-};
-//# sourceMappingURL=schema.js.map
+//#endregion
+export { getServerSchema };
+
+//# sourceMappingURL=schema.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sources":["../../../../zero-server/src/schema.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport type {Enum} from '../../shared/src/enum.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport * as PostgresTypeClass from '../../zero-cache/src/db/postgres-type-class-enum.ts';\nimport {dataTypeToZqlValueType} from '../../zero-cache/src/types/pg-data-type.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';\n\ntype PostgresTypeClass = Enum<typeof PostgresTypeClass>;\n\ntype ServerSchemaRow = {\n  schema: string;\n  table: string;\n  column: string;\n  dataType: string;\n  length: string | null;\n  precision: string | null;\n  scale: string | null;\n  typtype: PostgresTypeClass;\n  typename: string;\n  elemTyptype: PostgresTypeClass | null;\n  elemTypname: string | null;\n};\n\nexport async function getServerSchema<S extends Schema>(\n  dbTransaction: DBTransaction<unknown>,\n  schema: S,\n): Promise<ServerSchema> {\n  const schemaTablePairs: [string, string][] = Object.values(schema.tables).map(\n    ({name, serverName}) => {\n      let schemaTablePair: [string, string] = ['public', serverName ?? name];\n      if (serverName) {\n        const firstPeriod = serverName.indexOf('.');\n        if (firstPeriod > -1) {\n          schemaTablePair = [\n            serverName.substring(0, firstPeriod),\n            serverName.substring(firstPeriod + 1, serverName.length),\n          ];\n        }\n      }\n      return schemaTablePair;\n    },\n  );\n\n  if (schemaTablePairs.length === 0) {\n    return {}; // No pairs to query for\n  }\n\n  // Cast all inputs to text and all outputs to text to avoid\n  // any conversions customer's DBTransaction impl has on other types.\n  const inClause = sql.join(\n    schemaTablePairs.map(\n      ([schema, table]) => sql`(${schema}::text, ${table}::text)`,\n    ),\n    ',',\n  );\n  const query = sql`\n      SELECT\n          c.table_schema::text AS schema,\n          c.table_name::text AS table,\n          c.column_name::text AS column,\n          c.data_type::text AS \"dataType\",\n          c.character_maximum_length AS length,\n          c.numeric_precision AS precision,\n          c.numeric_scale AS scale,\n          t.typtype::text AS typtype,\n          t.typname::text AS typename,\n          CASE WHEN t.typelem <> 0 THEN et.typtype::text ELSE NULL END AS \"elemTyptype\",\n          CASE WHEN t.typelem <> 0 THEN et.typname::text ELSE NULL END AS \"elemTypname\"\n      FROM\n          information_schema.columns c\n      JOIN\n          pg_catalog.pg_type t ON c.udt_name = t.typname\n      LEFT JOIN\n          pg_catalog.pg_type et ON t.typelem = et.oid\n      JOIN\n          pg_catalog.pg_namespace n ON t.typnamespace = n.oid\n      WHERE\n          (c.table_schema, c.table_name) IN (${inClause})\n    `;\n  const {text, values} = formatPg(query);\n  const results: Iterable<ServerSchemaRow> = (await dbTransaction.query(\n    text,\n    values,\n  )) as Iterable<ServerSchemaRow>;\n\n  const serverSchema: ServerSchema = {};\n\n  for (const row of results) {\n    const tableName =\n      row.schema === 'public' ? row.table : `${row.schema}.${row.table}`;\n    let tableSchema = serverSchema[tableName];\n    if (!tableSchema) {\n      tableSchema = {};\n      serverSchema[tableName] = tableSchema;\n    }\n    const isArray = row.elemTyptype !== null;\n    const isEnum = (row.elemTyptype ?? row.typtype) === PostgresTypeClass.Enum;\n    let type = row.dataType.toLowerCase();\n    if (isArray) {\n      type = must(\n        row.elemTypname,\n        `Array column \"${row.column}\" in table \"${tableName}\" is missing element type name`,\n      );\n    } else if (isEnum) {\n      type = row.typename;\n    }\n    if (\n      (type === 'bpchar' ||\n        type === 'character' ||\n        type === 'character varying' ||\n        type === 'varchar') &&\n      row.length\n    ) {\n      type = `${type}(${row.length})`;\n    }\n    if (\n      (type === 'numeric' || type === 'decimal') &&\n      row.precision !== null &&\n      row.scale !== null\n    ) {\n      type = `${type}(${row.precision}, ${row.scale})`;\n    }\n    tableSchema[row.column] = {\n      type,\n      isEnum,\n      isArray,\n    };\n  }\n\n  const errors = checkSchemasAreCompatible(schema, serverSchema);\n  assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));\n\n  return serverSchema;\n}\n\nfunction makeSchemaIncompatibleErrorMessage(\n  errors: SchemaIncompatibilityError[],\n) {\n  if (errors.length === 0) {\n    return 'No schema incompatibilities found.';\n  }\n\n  const messages: string[] = [];\n\n  for (const error of errors) {\n    switch (error.type) {\n      case 'missingTable':\n        messages.push(\n          `Table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'missingColumn':\n        messages.push(\n          `Column \"${error.column}\" in table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'typeError':\n        messages.push(\n          `Type mismatch for column \"${error.column}\" in table \"${error.table}\": ${error.requiredType === undefined ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`,\n        );\n        break;\n    }\n  }\n\n  return [\n    'Schema incompatibility detected between your zero schema definition and the database:',\n    '',\n    ...messages.map(msg => `  - ${msg}`),\n    '',\n    'Please update your schema definition to match the database or migrate your database to match the schema.',\n  ].join('\\n');\n}\n\nexport type SchemaIncompatibilityError =\n  | {\n      type: 'typeError';\n      table: string;\n      column: string;\n      pgType: string;\n      declaredType: string;\n      requiredType: string | undefined;\n    }\n  | {\n      type: 'missingColumn';\n      table: string;\n      column: string;\n    }\n  | {\n      type: 'missingTable';\n      table: string;\n    };\n\nexport function checkSchemasAreCompatible(\n  schema: Schema,\n  serverSchema: ServerSchema,\n): SchemaIncompatibilityError[] {\n  const errors: SchemaIncompatibilityError[] = [];\n  // Check that all tables in schema exist in serverSchema\n  for (const table of Object.values(schema.tables)) {\n    const serverTableName = table.serverName ?? table.name;\n\n    if (!serverSchema[serverTableName]) {\n      errors.push({\n        type: 'missingTable',\n        table: serverTableName,\n      });\n      continue;\n    }\n\n    // Check that all columns in the table exist in serverSchema\n    for (const [columnName, column] of Object.entries(table.columns)) {\n      const serverColumnName = column.serverName ?? columnName;\n\n      if (!serverSchema[serverTableName][serverColumnName]) {\n        errors.push({\n          type: 'missingColumn',\n          table: serverTableName,\n          column: serverColumnName,\n        });\n        continue;\n      }\n\n      // Check type compatibility\n      const serverColumn = serverSchema[serverTableName][serverColumnName];\n      const declaredType = column.type;\n      const pgType = serverColumn.type;\n      const requiredType = dataTypeToZqlValueType(\n        pgType,\n        serverColumn.isEnum,\n        serverColumn.isArray,\n      );\n      if (requiredType !== declaredType) {\n        errors.push({\n          type: 'typeError',\n          table: serverTableName,\n          column: serverColumnName,\n          pgType,\n          declaredType,\n          requiredType,\n        });\n      }\n    }\n  }\n\n  return errors;\n}\n"],"names":["schema","PostgresTypeClass.Enum"],"mappings":"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"}
+{"version":3,"file":"schema.js","names":[],"sources":["../../../../zero-server/src/schema.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport type {Enum} from '../../shared/src/enum.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport * as PostgresTypeClass from '../../zero-cache/src/db/postgres-type-class-enum.ts';\nimport {dataTypeToZqlValueType} from '../../zero-cache/src/types/pg-data-type.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';\n\ntype PostgresTypeClass = Enum<typeof PostgresTypeClass>;\n\ntype ServerSchemaRow = {\n  schema: string;\n  table: string;\n  column: string;\n  dataType: string;\n  length: string | null;\n  precision: string | null;\n  scale: string | null;\n  typtype: PostgresTypeClass;\n  typename: string;\n  elemTyptype: PostgresTypeClass | null;\n  elemTypname: string | null;\n};\n\nexport async function getServerSchema<S extends Schema>(\n  dbTransaction: DBTransaction<unknown>,\n  schema: S,\n): Promise<ServerSchema> {\n  const schemaTablePairs: [string, string][] = Object.values(schema.tables).map(\n    ({name, serverName}) => {\n      let schemaTablePair: [string, string] = ['public', serverName ?? name];\n      if (serverName) {\n        const firstPeriod = serverName.indexOf('.');\n        if (firstPeriod > -1) {\n          schemaTablePair = [\n            serverName.substring(0, firstPeriod),\n            serverName.substring(firstPeriod + 1, serverName.length),\n          ];\n        }\n      }\n      return schemaTablePair;\n    },\n  );\n\n  if (schemaTablePairs.length === 0) {\n    return {}; // No pairs to query for\n  }\n\n  // Cast all inputs to text and all outputs to text to avoid\n  // any conversions customer's DBTransaction impl has on other types.\n  const inClause = sql.join(\n    schemaTablePairs.map(\n      ([schema, table]) => sql`(${schema}::text, ${table}::text)`,\n    ),\n    ',',\n  );\n  const query = sql`\n      SELECT\n          c.table_schema::text AS schema,\n          c.table_name::text AS table,\n          c.column_name::text AS column,\n          c.data_type::text AS \"dataType\",\n          c.character_maximum_length AS length,\n          c.numeric_precision AS precision,\n          c.numeric_scale AS scale,\n          t.typtype::text AS typtype,\n          t.typname::text AS typename,\n          CASE WHEN t.typelem <> 0 THEN et.typtype::text ELSE NULL END AS \"elemTyptype\",\n          CASE WHEN t.typelem <> 0 THEN et.typname::text ELSE NULL END AS \"elemTypname\"\n      FROM\n          information_schema.columns c\n      JOIN\n          pg_catalog.pg_type t ON c.udt_name = t.typname\n      LEFT JOIN\n          pg_catalog.pg_type et ON t.typelem = et.oid\n      JOIN\n          pg_catalog.pg_namespace n ON t.typnamespace = n.oid\n      WHERE\n          (c.table_schema, c.table_name) IN (${inClause})\n    `;\n  const {text, values} = formatPg(query);\n  const results: Iterable<ServerSchemaRow> = (await dbTransaction.query(\n    text,\n    values,\n  )) as Iterable<ServerSchemaRow>;\n\n  const serverSchema: ServerSchema = {};\n\n  for (const row of results) {\n    const tableName =\n      row.schema === 'public' ? row.table : `${row.schema}.${row.table}`;\n    let tableSchema = serverSchema[tableName];\n    if (!tableSchema) {\n      tableSchema = {};\n      serverSchema[tableName] = tableSchema;\n    }\n    const isArray = row.elemTyptype !== null;\n    const isEnum = (row.elemTyptype ?? row.typtype) === PostgresTypeClass.Enum;\n    let type = row.dataType.toLowerCase();\n    if (isArray) {\n      type = must(\n        row.elemTypname,\n        `Array column \"${row.column}\" in table \"${tableName}\" is missing element type name`,\n      );\n    } else if (isEnum) {\n      type = row.typename;\n    }\n    if (\n      (type === 'bpchar' ||\n        type === 'character' ||\n        type === 'character varying' ||\n        type === 'varchar') &&\n      row.length\n    ) {\n      type = `${type}(${row.length})`;\n    }\n    if (\n      (type === 'numeric' || type === 'decimal') &&\n      row.precision !== null &&\n      row.scale !== null\n    ) {\n      type = `${type}(${row.precision}, ${row.scale})`;\n    }\n    tableSchema[row.column] = {\n      type,\n      isEnum,\n      isArray,\n    };\n  }\n\n  const errors = checkSchemasAreCompatible(schema, serverSchema);\n  assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));\n\n  return serverSchema;\n}\n\nfunction makeSchemaIncompatibleErrorMessage(\n  errors: SchemaIncompatibilityError[],\n) {\n  if (errors.length === 0) {\n    return 'No schema incompatibilities found.';\n  }\n\n  const messages: string[] = [];\n\n  for (const error of errors) {\n    switch (error.type) {\n      case 'missingTable':\n        messages.push(\n          `Table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'missingColumn':\n        messages.push(\n          `Column \"${error.column}\" in table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'typeError':\n        messages.push(\n          `Type mismatch for column \"${error.column}\" in table \"${error.table}\": ${error.requiredType === undefined ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`,\n        );\n        break;\n    }\n  }\n\n  return [\n    'Schema incompatibility detected between your zero schema definition and the database:',\n    '',\n    ...messages.map(msg => `  - ${msg}`),\n    '',\n    'Please update your schema definition to match the database or migrate your database to match the schema.',\n  ].join('\\n');\n}\n\nexport type SchemaIncompatibilityError =\n  | {\n      type: 'typeError';\n      table: string;\n      column: string;\n      pgType: string;\n      declaredType: string;\n      requiredType: string | undefined;\n    }\n  | {\n      type: 'missingColumn';\n      table: string;\n      column: string;\n    }\n  | {\n      type: 'missingTable';\n      table: string;\n    };\n\nexport function checkSchemasAreCompatible(\n  schema: Schema,\n  serverSchema: ServerSchema,\n): SchemaIncompatibilityError[] {\n  const errors: SchemaIncompatibilityError[] = [];\n  // Check that all tables in schema exist in serverSchema\n  for (const table of Object.values(schema.tables)) {\n    const serverTableName = table.serverName ?? table.name;\n\n    if (!serverSchema[serverTableName]) {\n      errors.push({\n        type: 'missingTable',\n        table: serverTableName,\n      });\n      continue;\n    }\n\n    // Check that all columns in the table exist in serverSchema\n    for (const [columnName, column] of Object.entries(table.columns)) {\n      const serverColumnName = column.serverName ?? columnName;\n\n      if (!serverSchema[serverTableName][serverColumnName]) {\n        errors.push({\n          type: 'missingColumn',\n          table: serverTableName,\n          column: serverColumnName,\n        });\n        continue;\n      }\n\n      // Check type compatibility\n      const serverColumn = serverSchema[serverTableName][serverColumnName];\n      const declaredType = column.type;\n      const pgType = serverColumn.type;\n      const requiredType = dataTypeToZqlValueType(\n        pgType,\n        serverColumn.isEnum,\n        serverColumn.isArray,\n      );\n      if (requiredType !== declaredType) {\n        errors.push({\n          type: 'typeError',\n          table: serverTableName,\n          column: serverColumnName,\n          pgType,\n          declaredType,\n          requiredType,\n        });\n      }\n    }\n  }\n\n  return errors;\n}\n"],"mappings":"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"}

package/out/zero-server/src/zql-database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAG5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAgB,MAAM,gCAAgC,CAAC;AAChF,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAqB,KAAK,eAAe,EAAC,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;GAMG;AACH,qBAAa,WAAW,CAAC,OAAO,SAAS,MAAM,EAAE,mBAAmB,CAClE,YAAW,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;;IAElE,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAC;gBAG3C,UAAU,EAAE,YAAY,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,OAAO;IAK1E,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,EACjD,gBAAgB,EAAE,wBAAwB,KACvC,YAAY,CAAC,CAAC,CAAC,EACpB,gBAAgB,CAAC,EAAE,wBAAwB,GAC1C,OAAO,CAAC,CAAC,CAAC;IA8Eb,GAAG,CAAC,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,EAC1D,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CAGnC"}
+{"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAG5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAgB,MAAM,gCAAgC,CAAC;AAChF,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAqB,KAAK,eAAe,EAAC,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;GAMG;AACH,qBAAa,WAAW,CACtB,OAAO,SAAS,MAAM,EACtB,mBAAmB,CACnB,YAAW,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;;IAClE,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAC;gBAG3C,UAAU,EAAE,YAAY,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,OAAO;IAK1E,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,EACjD,gBAAgB,EAAE,wBAAwB,KACvC,YAAY,CAAC,CAAC,CAAC,EACpB,gBAAgB,CAAC,EAAE,wBAAwB,GAC1C,OAAO,CAAC,CAAC,CAAC;IA8Eb,GAAG,CAAC,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,EAC1D,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CAGnC"}

package/out/zero-server/src/zql-database.js

@@ -1,80 +1,65 @@
 import { formatPg, sql } from "../../z2s/src/sql.js";
 import { CRUDMutatorFactory } from "./custom.js";
-class ZQLDatabase {
-  connection;
-  #crudFactory;
-  constructor(connection, schema) {
-    this.connection = connection;
-    this.#crudFactory = new CRUDMutatorFactory(schema);
-  }
-  transaction(callback, transactionInput) {
-    const {
-      upstreamSchema = "",
-      clientGroupID = "",
-      clientID = "",
-      mutationID = 0
-    } = transactionInput ?? {};
-    return this.connection.transaction(async (dbTx) => {
-      const zeroTx = await this.#makeServerTransaction(
-        dbTx,
-        clientID,
-        mutationID
-      );
-      return callback(zeroTx, {
-        async updateClientMutationID() {
-          const formatted = formatPg(
-            sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients 
+//#region ../zero-server/src/zql-database.ts
+/**
+* Implements a Database for use with PushProcessor that is backed by Postgres.
+*
+* This implementation also implements the same ZQL interfaces for reading and
+* writing data that the Zero client does, so that mutator functions can be
+* shared across client and server.
+*/
+var ZQLDatabase = class {
+	connection;
+	#crudFactory;
+	constructor(connection, schema) {
+		this.connection = connection;
+		this.#crudFactory = new CRUDMutatorFactory(schema);
+	}
+	transaction(callback, transactionInput) {
+		const { upstreamSchema = "", clientGroupID = "", clientID = "", mutationID = 0 } = transactionInput ?? {};
+		return this.connection.transaction(async (dbTx) => {
+			return callback(await this.#makeServerTransaction(dbTx, clientID, mutationID), {
+				async updateClientMutationID() {
+					const formatted = formatPg(sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients 
                     as current ("clientGroupID", "clientID", "lastMutationID")
                         VALUES (${clientGroupID}, ${clientID}, ${1})
                     ON CONFLICT ("clientGroupID", "clientID")
                     DO UPDATE SET "lastMutationID" = current."lastMutationID" + 1
-                    RETURNING "lastMutationID"`
-          );
-          const [{ lastMutationID }] = await dbTx.query(
-            formatted.text,
-            formatted.values
-          );
-          return { lastMutationID };
-        },
-        async writeMutationResult(result) {
-          const formatted = formatPg(
-            sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations
+                    RETURNING "lastMutationID"`);
+					const [{ lastMutationID }] = await dbTx.query(formatted.text, formatted.values);
+					return { lastMutationID };
+				},
+				async writeMutationResult(result) {
+					const formatted = formatPg(sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations
                     ("clientGroupID", "clientID", "mutationID", "result")
-                VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(
-              result.result
-            )}::text::json)`
-          );
-          await dbTx.query(formatted.text, formatted.values);
-        },
-        async deleteMutationResults(args) {
-          if ("type" in args && args.type === "bulk") {
-            const formatted = formatPg(
-              sql`DELETE FROM ${sql.ident(upstreamSchema)}."mutations"
+                VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(result.result)}::text::json)`);
+					await dbTx.query(formatted.text, formatted.values);
+				},
+				async deleteMutationResults(args) {
+					if ("type" in args && args.type === "bulk") {
+						const formatted = formatPg(sql`DELETE FROM ${sql.ident(upstreamSchema)}."mutations"
                   WHERE "clientGroupID" = ${args.clientGroupID}
-                    AND "clientID" = ANY(${args.clientIDs})`
-            );
-            await dbTx.query(formatted.text, formatted.values);
-          } else {
-            const formatted = formatPg(
-              sql`DELETE FROM ${sql.ident(upstreamSchema)}."mutations"
+                    AND "clientID" = ANY(${args.clientIDs})`);
+						await dbTx.query(formatted.text, formatted.values);
+					} else {
+						const formatted = formatPg(sql`DELETE FROM ${sql.ident(upstreamSchema)}."mutations"
                   WHERE "clientGroupID" = ${args.clientGroupID}
                     AND "clientID" = ${args.clientID}
-                    AND "mutationID" <= ${args.upToMutationID}`
-            );
-            await dbTx.query(formatted.text, formatted.values);
-          }
-        }
-      });
-    });
-  }
-  #makeServerTransaction(dbTx, clientID, mutationID) {
-    return this.#crudFactory.createTransaction(dbTx, clientID, mutationID);
-  }
-  run(query, options) {
-    return this.transaction((tx) => tx.run(query, options));
-  }
-}
-export {
-  ZQLDatabase
+                    AND "mutationID" <= ${args.upToMutationID}`);
+						await dbTx.query(formatted.text, formatted.values);
+					}
+				}
+			});
+		});
+	}
+	#makeServerTransaction(dbTx, clientID, mutationID) {
+		return this.#crudFactory.createTransaction(dbTx, clientID, mutationID);
+	}
+	run(query, options) {
+		return this.transaction((tx) => tx.run(query, options));
+	}
 };
-//# sourceMappingURL=zql-database.js.map
+//#endregion
+export { ZQLDatabase };
+
+//# sourceMappingURL=zql-database.js.map

package/out/zero-server/src/zql-database.js.map

@@ -1 +1 @@
-{"version":3,"file":"zql-database.js","sources":["../../../../zero-server/src/zql-database.ts"],"sourcesContent":["import type {MaybePromise} from '../../shared/src/types.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport type {CleanupResultsArg} from '../../zero-protocol/src/push.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {DBConnection, DBTransaction} from '../../zql/src/mutate/custom.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport {CRUDMutatorFactory, type TransactionImpl} from './custom.ts';\nimport type {\n  Database,\n  TransactionProviderHooks,\n  TransactionProviderInput,\n} from './process-mutations.ts';\n\n/**\n * Implements a Database for use with PushProcessor that is backed by Postgres.\n *\n * This implementation also implements the same ZQL interfaces for reading and\n * writing data that the Zero client does, so that mutator functions can be\n * shared across client and server.\n */\nexport class ZQLDatabase<TSchema extends Schema, TWrappedTransaction>\n  implements Database<TransactionImpl<TSchema, TWrappedTransaction>>\n{\n  readonly connection: DBConnection<TWrappedTransaction>;\n  readonly #crudFactory: CRUDMutatorFactory<TSchema>;\n\n  constructor(connection: DBConnection<TWrappedTransaction>, schema: TSchema) {\n    this.connection = connection;\n    this.#crudFactory = new CRUDMutatorFactory(schema);\n  }\n\n  transaction<R>(\n    callback: (\n      tx: TransactionImpl<TSchema, TWrappedTransaction>,\n      transactionHooks: TransactionProviderHooks,\n    ) => MaybePromise<R>,\n    transactionInput?: TransactionProviderInput,\n  ): Promise<R> {\n    // Icky hack. This is just here to have user not have to do this.\n    // These interfaces need to be factored better.\n    const {\n      upstreamSchema = '',\n      clientGroupID = '',\n      clientID = '',\n      mutationID = 0,\n    } = transactionInput ?? {};\n    return this.connection.transaction(async dbTx => {\n      const zeroTx = await this.#makeServerTransaction(\n        dbTx,\n        clientID,\n        mutationID,\n      );\n\n      return callback(zeroTx, {\n        async updateClientMutationID() {\n          const formatted = formatPg(\n            sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients \n                    as current (\"clientGroupID\", \"clientID\", \"lastMutationID\")\n                        VALUES (${clientGroupID}, ${clientID}, ${1})\n                    ON CONFLICT (\"clientGroupID\", \"clientID\")\n                    DO UPDATE SET \"lastMutationID\" = current.\"lastMutationID\" + 1\n                    RETURNING \"lastMutationID\"`,\n          );\n\n          const [{lastMutationID}] = (await dbTx.query(\n            formatted.text,\n            formatted.values,\n          )) as {lastMutationID: bigint}[];\n\n          return {lastMutationID};\n        },\n\n        async writeMutationResult(result) {\n          const formatted = formatPg(\n            sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations\n                    (\"clientGroupID\", \"clientID\", \"mutationID\", \"result\")\n                VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(\n                  result.result,\n                )}::text::json)`,\n          );\n          await dbTx.query(formatted.text, formatted.values);\n        },\n\n        async deleteMutationResults(args: CleanupResultsArg) {\n          if ('type' in args && args.type === 'bulk') {\n            // Bulk deletion: delete all mutations for multiple clients\n            const formatted = formatPg(\n              sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ANY(${args.clientIDs})`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          } else {\n            // Single client (explicit 'single' or legacy without type): delete up to mutation ID\n            const formatted = formatPg(\n              sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ${args.clientID}\n                    AND \"mutationID\" <= ${args.upToMutationID}`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          }\n        },\n      });\n    });\n  }\n\n  #makeServerTransaction(\n    dbTx: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n  ) {\n    return this.#crudFactory.createTransaction(dbTx, clientID, mutationID);\n  }\n\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TTable, TSchema, TReturn>,\n    options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    return this.transaction(tx => tx.run(query, options));\n  }\n}\n"],"names":[],"mappings":";;AAwBO,MAAM,YAEb;AAAA,EACW;AAAA,EACA;AAAA,EAET,YAAY,YAA+C,QAAiB;AAC1E,SAAK,aAAa;AAClB,SAAK,eAAe,IAAI,mBAAmB,MAAM;AAAA,EACnD;AAAA,EAEA,YACE,UAIA,kBACY;AAGZ,UAAM;AAAA,MACJ,iBAAiB;AAAA,MACjB,gBAAgB;AAAA,MAChB,WAAW;AAAA,MACX,aAAa;AAAA,IAAA,IACX,oBAAoB,CAAA;AACxB,WAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;AAC/C,YAAM,SAAS,MAAM,KAAK;AAAA,QACxB;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAGF,aAAO,SAAS,QAAQ;AAAA,QACtB,MAAM,yBAAyB;AAC7B,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,kCAErB,aAAa,KAAK,QAAQ,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA,UAAA;AAMxD,gBAAM,CAAC,EAAC,eAAA,CAAe,IAAK,MAAM,KAAK;AAAA,YACrC,UAAU;AAAA,YACV,UAAU;AAAA,UAAA;AAGZ,iBAAO,EAAC,eAAA;AAAA,QACV;AAAA,QAEA,MAAM,oBAAoB,QAAQ;AAChC,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,0BAE7B,aAAa,KAAK,OAAO,GAAG,QAAQ,KAAK,OAAO,GAAG,EAAE,KAAK,KAAK;AAAA,cACvE,OAAO;AAAA,YAAA,CACR;AAAA,UAAA;AAEP,gBAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;AAAA,QACnD;AAAA,QAEA,MAAM,sBAAsB,MAAyB;AACnD,cAAI,UAAU,QAAQ,KAAK,SAAS,QAAQ;AAE1C,kBAAM,YAAY;AAAA,cAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA,4CACb,KAAK,aAAa;AAAA,2CACnB,KAAK,SAAS;AAAA,YAAA;AAE7C,kBAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;AAAA,UACnD,OAAO;AAEL,kBAAM,YAAY;AAAA,cAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA,4CACb,KAAK,aAAa;AAAA,uCACvB,KAAK,QAAQ;AAAA,0CACV,KAAK,cAAc;AAAA,YAAA;AAEjD,kBAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;AAAA,UACnD;AAAA,QACF;AAAA,MAAA,CACD;AAAA,IACH,CAAC;AAAA,EACH;AAAA,EAEA,uBACE,MACA,UACA,YACA;AACA,WAAO,KAAK,aAAa,kBAAkB,MAAM,UAAU,UAAU;AAAA,EACvE;AAAA,EAEA,IACE,OACA,SACiC;AACjC,WAAO,KAAK,YAAY,CAAA,OAAM,GAAG,IAAI,OAAO,OAAO,CAAC;AAAA,EACtD;AACF;"}
+{"version":3,"file":"zql-database.js","names":["#crudFactory","#makeServerTransaction"],"sources":["../../../../zero-server/src/zql-database.ts"],"sourcesContent":["import type {MaybePromise} from '../../shared/src/types.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport type {CleanupResultsArg} from '../../zero-protocol/src/push.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {DBConnection, DBTransaction} from '../../zql/src/mutate/custom.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport {CRUDMutatorFactory, type TransactionImpl} from './custom.ts';\nimport type {\n  Database,\n  TransactionProviderHooks,\n  TransactionProviderInput,\n} from './process-mutations.ts';\n\n/**\n * Implements a Database for use with PushProcessor that is backed by Postgres.\n *\n * This implementation also implements the same ZQL interfaces for reading and\n * writing data that the Zero client does, so that mutator functions can be\n * shared across client and server.\n */\nexport class ZQLDatabase<\n  TSchema extends Schema,\n  TWrappedTransaction,\n> implements Database<TransactionImpl<TSchema, TWrappedTransaction>> {\n  readonly connection: DBConnection<TWrappedTransaction>;\n  readonly #crudFactory: CRUDMutatorFactory<TSchema>;\n\n  constructor(connection: DBConnection<TWrappedTransaction>, schema: TSchema) {\n    this.connection = connection;\n    this.#crudFactory = new CRUDMutatorFactory(schema);\n  }\n\n  transaction<R>(\n    callback: (\n      tx: TransactionImpl<TSchema, TWrappedTransaction>,\n      transactionHooks: TransactionProviderHooks,\n    ) => MaybePromise<R>,\n    transactionInput?: TransactionProviderInput,\n  ): Promise<R> {\n    // Icky hack. This is just here to have user not have to do this.\n    // These interfaces need to be factored better.\n    const {\n      upstreamSchema = '',\n      clientGroupID = '',\n      clientID = '',\n      mutationID = 0,\n    } = transactionInput ?? {};\n    return this.connection.transaction(async dbTx => {\n      const zeroTx = await this.#makeServerTransaction(\n        dbTx,\n        clientID,\n        mutationID,\n      );\n\n      return callback(zeroTx, {\n        async updateClientMutationID() {\n          const formatted = formatPg(\n            sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients \n                    as current (\"clientGroupID\", \"clientID\", \"lastMutationID\")\n                        VALUES (${clientGroupID}, ${clientID}, ${1})\n                    ON CONFLICT (\"clientGroupID\", \"clientID\")\n                    DO UPDATE SET \"lastMutationID\" = current.\"lastMutationID\" + 1\n                    RETURNING \"lastMutationID\"`,\n          );\n\n          const [{lastMutationID}] = (await dbTx.query(\n            formatted.text,\n            formatted.values,\n          )) as {lastMutationID: bigint}[];\n\n          return {lastMutationID};\n        },\n\n        async writeMutationResult(result) {\n          const formatted = formatPg(\n            sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations\n                    (\"clientGroupID\", \"clientID\", \"mutationID\", \"result\")\n                VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(\n                  result.result,\n                )}::text::json)`,\n          );\n          await dbTx.query(formatted.text, formatted.values);\n        },\n\n        async deleteMutationResults(args: CleanupResultsArg) {\n          if ('type' in args && args.type === 'bulk') {\n            // Bulk deletion: delete all mutations for multiple clients\n            const formatted = formatPg(\n              sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ANY(${args.clientIDs})`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          } else {\n            // Single client (explicit 'single' or legacy without type): delete up to mutation ID\n            const formatted = formatPg(\n              sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ${args.clientID}\n                    AND \"mutationID\" <= ${args.upToMutationID}`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          }\n        },\n      });\n    });\n  }\n\n  #makeServerTransaction(\n    dbTx: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n  ) {\n    return this.#crudFactory.createTransaction(dbTx, clientID, mutationID);\n  }\n\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TTable, TSchema, TReturn>,\n    options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    return this.transaction(tx => tx.run(query, options));\n  }\n}\n"],"mappings":";;;;;;;;;;AAwBA,IAAa,cAAb,MAGqE;CACnE;CACA;CAEA,YAAY,YAA+C,QAAiB;AAC1E,OAAK,aAAa;AAClB,QAAA,cAAoB,IAAI,mBAAmB,OAAO;;CAGpD,YACE,UAIA,kBACY;EAGZ,MAAM,EACJ,iBAAiB,IACjB,gBAAgB,IAChB,WAAW,IACX,aAAa,MACX,oBAAoB,EAAE;AAC1B,SAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;AAO/C,UAAO,SANQ,MAAM,MAAA,sBACnB,MACA,UACA,WACD,EAEuB;IACtB,MAAM,yBAAyB;KAC7B,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;;kCAEtB,cAAc,IAAI,SAAS,IAAI,EAAE;;;gDAIxD;KAED,MAAM,CAAC,EAAC,oBAAoB,MAAM,KAAK,MACrC,UAAU,MACV,UAAU,OACX;AAED,YAAO,EAAC,gBAAe;;IAGzB,MAAM,oBAAoB,QAAQ;KAChC,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;;0BAE9B,cAAc,IAAI,OAAO,GAAG,SAAS,IAAI,OAAO,GAAG,GAAG,IAAI,KAAK,UACvE,OAAO,OACR,CAAC,eACP;AACD,WAAM,KAAK,MAAM,UAAU,MAAM,UAAU,OAAO;;IAGpD,MAAM,sBAAsB,MAAyB;AACnD,SAAI,UAAU,QAAQ,KAAK,SAAS,QAAQ;MAE1C,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;4CACd,KAAK,cAAc;2CACpB,KAAK,UAAU,GAC7C;AACD,YAAM,KAAK,MAAM,UAAU,MAAM,UAAU,OAAO;YAC7C;MAEL,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;4CACd,KAAK,cAAc;uCACxB,KAAK,SAAS;0CACX,KAAK,iBAClC;AACD,YAAM,KAAK,MAAM,UAAU,MAAM,UAAU,OAAO;;;IAGvD,CAAC;IACF;;CAGJ,uBACE,MACA,UACA,YACA;AACA,SAAO,MAAA,YAAkB,kBAAkB,MAAM,UAAU,WAAW;;CAGxE,IACE,OACA,SACiC;AACjC,SAAO,KAAK,aAAY,OAAM,GAAG,IAAI,OAAO,QAAQ,CAAC"}

package/out/zero-solid/src/bindings.js

@@ -0,0 +1,12 @@
+import "../../shared/src/asserts.js";
+import "../../shared/src/must.js";
+import "../../zql/src/query/query-internals.js";
+import "../../zql/src/query/query-impl.js";
+import "../../zql/src/query/query-registry.js";
+import "../../zql/src/ivm/operator.js";
+import "../../zql/src/ivm/stream.js";
+import "../../zql/src/ivm/view-apply-change.js";
+import "../../zql/src/query/ttl.js";
+import "../../shared/src/deep-clone.js";
+import "../../zero-client/src/client/bindings.js";
+export {};

package/out/zero-solid/src/mod.js

@@ -0,0 +1,5 @@
+import "./use-zero.js";
+import "./use-connection-state.js";
+import "./use-query.js";
+import "./use-zero-online.js";
+export {};