@rocicorp/zero 1.4.0-canary.2 → 1.4.0-canary.4

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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-client/src/mod.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-client/src/mod.ts"],"names":[],"mappings":"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"}

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

@@ -9,6 +9,7 @@ import "../../zero-schema/src/builder/relationship-builder.js";
 import "../../zero-schema/src/builder/table-builder.js";
 import "../../zero-schema/src/builder/schema-builder.js";
 import "../../zero-schema/src/permissions.js";
+import "../../zql/src/query/validate-input.js";
 import "../../zql/src/mutate/mutator.js";
 import "../../zql/src/mutate/mutator-registry.js";
 import "../../zql/src/query/create-builder.js";

package/out/zero-react/src/zero.js

@@ -9,6 +9,7 @@ import "../../zero-schema/src/builder/relationship-builder.js";
 import "../../zero-schema/src/builder/table-builder.js";
 import "../../zero-schema/src/builder/schema-builder.js";
 import "../../zero-schema/src/permissions.js";
+import "../../zql/src/query/validate-input.js";
 import "../../zql/src/mutate/mutator.js";
 import "../../zql/src/mutate/mutator-registry.js";
 import "../../zql/src/query/create-builder.js";

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

@@ -0,0 +1,69 @@
+import type { Kysely, Transaction as WrappedKyselyTransaction } from 'kysely';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { DBConnection, DBTransaction } from '../../../zql/src/mutate/custom.ts';
+import { ZQLDatabase } from '../zql-database.ts';
+export type { ZQLDatabase };
+export type KyselyDatabase<TDatabase = unknown> = Kysely<TDatabase>;
+/**
+ * Helper type for the wrapped transaction used by Kysely.
+ *
+ * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, KyselyTransaction<typeof db>>`.
+ */
+export type KyselyTransaction<TDbOrSchema = KyselyDatabase> = TDbOrSchema extends Kysely<infer TInferredDatabase> ? WrappedKyselyTransaction<TInferredDatabase> : WrappedKyselyTransaction<TDbOrSchema>;
+export declare class KyselyConnection<TDatabase> implements DBConnection<WrappedKyselyTransaction<TDatabase>> {
+    #private;
+    constructor(client: Kysely<TDatabase>);
+    transaction<T>(fn: (tx: DBTransaction<WrappedKyselyTransaction<TDatabase>>) => Promise<T>): Promise<T>;
+}
+/**
+ * Wrap a Postgres-backed Kysely client for Zero ZQL.
+ *
+ * Provides ZQL querying plus access to the underlying Kysely transaction.
+ * Use {@link KyselyTransaction} to type your server mutator transaction.
+ *
+ * @param schema - Zero schema.
+ * @param client - Kysely client.
+ *
+ * @example
+ * ```ts
+ * import {Pool} from 'pg';
+ * import {Kysely, PostgresDialect} from 'kysely';
+ * import {defineMutator, defineMutators} from '@rocicorp/zero';
+ * import {zeroKysely} from '@rocicorp/zero/server/adapters/kysely';
+ * import {z} from 'zod/mini';
+ *
+ * interface Database {
+ *   user: {
+ *     id: string;
+ *     name: string | null;
+ *     status: 'active' | 'inactive';
+ *   };
+ * }
+ *
+ * const db = new Kysely<Database>({
+ *   dialect: new PostgresDialect({
+ *     pool: new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!}),
+ *   }),
+ * });
+ * const zql = zeroKysely(schema, db);
+ *
+ * export const serverMutators = defineMutators({
+ *   user: {
+ *     create: defineMutator(
+ *       z.object({id: z.string(), name: z.string()}),
+ *       async ({tx, args}) => {
+ *         if (tx.location !== 'server') {
+ *           throw new Error('Server-only mutator');
+ *         }
+ *         await tx.dbTransaction.wrappedTransaction
+ *           .insertInto('user')
+ *           .values({id: args.id, name: args.name, status: 'active'})
+ *           .execute();
+ *       },
+ *     ),
+ *   },
+ * });
+ * ```
+ */
+export declare function zeroKysely<TSchema extends Schema, TDatabase>(schema: TSchema, client: Kysely<TDatabase>): ZQLDatabase<TSchema, WrappedKyselyTransaction<TDatabase>>;
+//# sourceMappingURL=kysely.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"kysely.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/kysely.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,IAAI,wBAAwB,EAAC,MAAM,QAAQ,CAAC;AAG5E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EAEd,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B,MAAM,MAAM,cAAc,CAAC,SAAS,GAAG,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC;AAEpE;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,CAAC,WAAW,GAAG,cAAc,IACxD,WAAW,SAAS,MAAM,CAAC,MAAM,iBAAiB,CAAC,GAC/C,wBAAwB,CAAC,iBAAiB,CAAC,GAC3C,wBAAwB,CAAC,WAAW,CAAC,CAAC;AAE5C,qBAAa,gBAAgB,CAAC,SAAS,CAAE,YAAW,YAAY,CAC9D,wBAAwB,CAAC,SAAS,CAAC,CACpC;;gBAGa,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC;IAIrC,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GACzE,OAAO,CAAC,CAAC,CAAC;CAKd;AAkCD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,wBAAgB,UAAU,CAAC,OAAO,SAAS,MAAM,EAAE,SAAS,EAC1D,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,GACxB,WAAW,CAAC,OAAO,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAE3D"}

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

@@ -0,0 +1,82 @@
+import { executePostgresQuery } from "../pg-query-executor.js";
+import { ZQLDatabase } from "../zql-database.js";
+import { CompiledQuery } from "kysely";
+//#region ../zero-server/src/adapters/kysely.ts
+var KyselyConnection = class {
+	#client;
+	constructor(client) {
+		this.#client = client;
+	}
+	transaction(fn) {
+		return this.#client.transaction().execute((kyselyTx) => fn(new KyselyInternalTransaction(kyselyTx)));
+	}
+};
+var KyselyInternalTransaction = class {
+	wrappedTransaction;
+	constructor(kyselyTx) {
+		this.wrappedTransaction = kyselyTx;
+	}
+	runQuery(ast, format, schema, serverSchema) {
+		return executePostgresQuery(this, ast, format, schema, serverSchema);
+	}
+	async query(sql, params) {
+		return (await this.wrappedTransaction.executeQuery(CompiledQuery.raw(sql, params))).rows;
+	}
+};
+/**
+* Wrap a Postgres-backed Kysely client for Zero ZQL.
+*
+* Provides ZQL querying plus access to the underlying Kysely transaction.
+* Use {@link KyselyTransaction} to type your server mutator transaction.
+*
+* @param schema - Zero schema.
+* @param client - Kysely client.
+*
+* @example
+* ```ts
+* import {Pool} from 'pg';
+* import {Kysely, PostgresDialect} from 'kysely';
+* import {defineMutator, defineMutators} from '@rocicorp/zero';
+* import {zeroKysely} from '@rocicorp/zero/server/adapters/kysely';
+* import {z} from 'zod/mini';
+*
+* interface Database {
+*   user: {
+*     id: string;
+*     name: string | null;
+*     status: 'active' | 'inactive';
+*   };
+* }
+*
+* const db = new Kysely<Database>({
+*   dialect: new PostgresDialect({
+*     pool: new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!}),
+*   }),
+* });
+* const zql = zeroKysely(schema, db);
+*
+* export const serverMutators = defineMutators({
+*   user: {
+*     create: defineMutator(
+*       z.object({id: z.string(), name: z.string()}),
+*       async ({tx, args}) => {
+*         if (tx.location !== 'server') {
+*           throw new Error('Server-only mutator');
+*         }
+*         await tx.dbTransaction.wrappedTransaction
+*           .insertInto('user')
+*           .values({id: args.id, name: args.name, status: 'active'})
+*           .execute();
+*       },
+*     ),
+*   },
+* });
+* ```
+*/
+function zeroKysely(schema, client) {
+	return new ZQLDatabase(new KyselyConnection(client), schema);
+}
+//#endregion
+export { KyselyConnection, zeroKysely };
+
+//# sourceMappingURL=kysely.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"kysely.js","names":["#client"],"sources":["../../../../../zero-server/src/adapters/kysely.ts"],"sourcesContent":["import {CompiledQuery} from 'kysely';\nimport type {Kysely, Transaction as WrappedKyselyTransaction} from 'kysely';\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 KyselyDatabase<TDatabase = unknown> = Kysely<TDatabase>;\n\n/**\n * Helper type for the wrapped transaction used by Kysely.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, KyselyTransaction<typeof db>>`.\n */\nexport type KyselyTransaction<TDbOrSchema = KyselyDatabase> =\n  TDbOrSchema extends Kysely<infer TInferredDatabase>\n    ? WrappedKyselyTransaction<TInferredDatabase>\n    : WrappedKyselyTransaction<TDbOrSchema>;\n\nexport class KyselyConnection<TDatabase> implements DBConnection<\n  WrappedKyselyTransaction<TDatabase>\n> {\n  readonly #client: Kysely<TDatabase>;\n\n  constructor(client: Kysely<TDatabase>) {\n    this.#client = client;\n  }\n\n  transaction<T>(\n    fn: (tx: DBTransaction<WrappedKyselyTransaction<TDatabase>>) => Promise<T>,\n  ): Promise<T> {\n    return this.#client\n      .transaction()\n      .execute(kyselyTx => fn(new KyselyInternalTransaction(kyselyTx)));\n  }\n}\n\nclass KyselyInternalTransaction<TDatabase> implements DBTransaction<\n  WrappedKyselyTransaction<TDatabase>\n> {\n  readonly wrappedTransaction: WrappedKyselyTransaction<TDatabase>;\n\n  constructor(kyselyTx: WrappedKyselyTransaction<TDatabase>) {\n    this.wrappedTransaction = kyselyTx;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  async query(sql: string, params: unknown[]): Promise<Row[]> {\n    const result = await this.wrappedTransaction.executeQuery<Row>(\n      CompiledQuery.raw(sql, params),\n    );\n    return result.rows;\n  }\n}\n\n/**\n * Wrap a Postgres-backed Kysely client for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying Kysely transaction.\n * Use {@link KyselyTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param client - Kysely client.\n *\n * @example\n * ```ts\n * import {Pool} from 'pg';\n * import {Kysely, PostgresDialect} from 'kysely';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroKysely} from '@rocicorp/zero/server/adapters/kysely';\n * import {z} from 'zod/mini';\n *\n * interface Database {\n *   user: {\n *     id: string;\n *     name: string | null;\n *     status: 'active' | 'inactive';\n *   };\n * }\n *\n * const db = new Kysely<Database>({\n *   dialect: new PostgresDialect({\n *     pool: new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!}),\n *   }),\n * });\n * const zql = zeroKysely(schema, db);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction\n *           .insertInto('user')\n *           .values({id: args.id, name: args.name, status: 'active'})\n *           .execute();\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroKysely<TSchema extends Schema, TDatabase>(\n  schema: TSchema,\n  client: Kysely<TDatabase>,\n): ZQLDatabase<TSchema, WrappedKyselyTransaction<TDatabase>> {\n  return new ZQLDatabase(new KyselyConnection(client), schema);\n}\n"],"mappings":";;;;AA6BA,IAAa,mBAAb,MAEE;CACA;CAEA,YAAY,QAA2B;AACrC,QAAA,SAAe;;CAGjB,YACE,IACY;AACZ,SAAO,MAAA,OACJ,aAAa,CACb,SAAQ,aAAY,GAAG,IAAI,0BAA0B,SAAS,CAAC,CAAC;;;AAIvE,IAAM,4BAAN,MAEE;CACA;CAEA,YAAY,UAA+C;AACzD,OAAK,qBAAqB;;CAG5B,SACE,KACA,QACA,QACA,cACiC;AACjC,SAAO,qBACL,MACA,KACA,QACA,QACA,aACD;;CAGH,MAAM,MAAM,KAAa,QAAmC;AAI1D,UAHe,MAAM,KAAK,mBAAmB,aAC3C,cAAc,IAAI,KAAK,OAAO,CAC/B,EACa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsDlB,SAAgB,WACd,QACA,QAC2D;AAC3D,QAAO,IAAI,YAAY,IAAI,iBAAiB,OAAO,EAAE,OAAO"}

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

@@ -9,6 +9,7 @@ import "../../zero-schema/src/builder/relationship-builder.js";
 import "../../zero-schema/src/builder/table-builder.js";
 import "../../zero-schema/src/builder/schema-builder.js";
 import "../../zero-schema/src/permissions.js";
+import "../../zql/src/query/validate-input.js";
 import "../../zql/src/mutate/mutator.js";
 import "../../zql/src/mutate/mutator-registry.js";
 import "../../zql/src/query/create-builder.js";

package/out/zql/src/query/validate-input.d.ts

@@ -1,4 +1,12 @@
 import type { StandardSchemaV1 } from '@standard-schema/spec';
+export declare class InputValidationError extends Error {
+    readonly result: StandardSchemaV1.FailureResult;
+    readonly details: {
+        type: 'InputValidationError';
+        result: StandardSchemaV1.FailureResult;
+    };
+    constructor(message: string, result: StandardSchemaV1.FailureResult);
+}
 /**
  * Validates input using a StandardSchema validator if provided.
  * This is shared validation logic used by both defineQuery and defineMutator.

package/out/zql/src/query/validate-input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-input.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/validate-input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAE5D;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAC3C,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EACxD,IAAI,EAAE,OAAO,GAAG,SAAS,GACxB,OAAO,CAoBT"}
+{"version":3,"file":"validate-input.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/validate-input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAE5D,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,aAAa,CAAC;IAGhD,QAAQ,CAAC,OAAO,EAAE;QAChB,IAAI,EAAE,sBAAsB,CAAC;QAC7B,MAAM,EAAE,gBAAgB,CAAC,aAAa,CAAC;KACxC,CAAC;gBAEU,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,aAAa;CAMpE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAC3C,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EACxD,IAAI,EAAE,OAAO,GAAG,SAAS,GACxB,OAAO,CAqBT"}

package/out/zql/src/query/validate-input.js

@@ -1,4 +1,17 @@
 //#region ../zql/src/query/validate-input.ts
+var InputValidationError = class extends Error {
+	result;
+	details;
+	constructor(message, result) {
+		super(message);
+		this.name = "InputValidationError";
+		this.result = result;
+		this.details = {
+			type: "InputValidationError",
+			result
+		};
+	}
+};
 /**
 * Validates input using a StandardSchema validator if provided.
 * This is shared validation logic used by both defineQuery and defineMutator.
@@ -15,13 +28,13 @@ function validateInput(name, input, validator, kind) {
 	if (!validator) return input;
 	const result = validator["~standard"].validate(input);
 	if (result instanceof Promise) throw new Error(`Async validators are not supported. ${titleCase(kind)} name ${name}`);
-	if (result.issues) throw new Error(`Validation failed for ${kind} ${name}: ${result.issues.map((issue) => issue.message).join(", ")}`);
+	if (result.issues) throw new InputValidationError(`Validation failed for ${kind} ${name}: ${result.issues.map((issue) => issue.message).join(", ")}`, result);
 	return result.value;
 }
 function titleCase(kind) {
 	return kind.charAt(0).toUpperCase() + kind.slice(1);
 }
 //#endregion
-export { validateInput };
+export { InputValidationError, validateInput };
 
 //# sourceMappingURL=validate-input.js.map

package/out/zql/src/query/validate-input.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-input.js","names":[],"sources":["../../../../../zql/src/query/validate-input.ts"],"sourcesContent":["import type {StandardSchemaV1} from '@standard-schema/spec';\n\n/**\n * Validates input using a StandardSchema validator if provided.\n * This is shared validation logic used by both defineQuery and defineMutator.\n *\n * @param name - The name of the query or mutator (for error messages)\n * @param input - The input value to validate\n * @param validator - Optional StandardSchema validator\n * @param kind - Type of definition ('query' or 'mutator') for error messages\n * @returns The validated output (either transformed by validator or input as-is)\n * @throws Error if validation fails or if an async validator is used\n * @internal\n */\nexport function validateInput<TInput, TOutput>(\n  name: string,\n  input: TInput,\n  validator: StandardSchemaV1<TInput, TOutput> | undefined,\n  kind: 'query' | 'mutator',\n): TOutput {\n  if (!validator) {\n    // No validator, so input and output are the same\n    return input as unknown as TOutput;\n  }\n\n  const result = validator['~standard'].validate(input);\n  if (result instanceof Promise) {\n    throw new Error(\n      `Async validators are not supported. ${titleCase(kind)} name ${name}`,\n    );\n  }\n  if (result.issues) {\n    throw new Error(\n      `Validation failed for ${kind} ${name}: ${result.issues\n        .map(issue => issue.message)\n        .join(', ')}`,\n    );\n  }\n  return result.value;\n}\n\nfunction titleCase(kind: string): string {\n  return kind.charAt(0).toUpperCase() + kind.slice(1);\n}\n"],"mappings":";;;;;;;;;;;;;AAcA,SAAgB,cACd,MACA,OACA,WACA,MACS;AACT,KAAI,CAAC,UAEH,QAAO;CAGT,MAAM,SAAS,UAAU,aAAa,SAAS,MAAM;AACrD,KAAI,kBAAkB,QACpB,OAAM,IAAI,MACR,uCAAuC,UAAU,KAAK,CAAC,QAAQ,OAChE;AAEH,KAAI,OAAO,OACT,OAAM,IAAI,MACR,yBAAyB,KAAK,GAAG,KAAK,IAAI,OAAO,OAC9C,KAAI,UAAS,MAAM,QAAQ,CAC3B,KAAK,KAAK,GACd;AAEH,QAAO,OAAO;;AAGhB,SAAS,UAAU,MAAsB;AACvC,QAAO,KAAK,OAAO,EAAE,CAAC,aAAa,GAAG,KAAK,MAAM,EAAE"}
+{"version":3,"file":"validate-input.js","names":[],"sources":["../../../../../zql/src/query/validate-input.ts"],"sourcesContent":["import type {StandardSchemaV1} from '@standard-schema/spec';\n\nexport class InputValidationError extends Error {\n  readonly result: StandardSchemaV1.FailureResult;\n\n  // will get picked up by `getErrorDetails` when mapping to an `ApplicationError`\n  readonly details: {\n    type: 'InputValidationError';\n    result: StandardSchemaV1.FailureResult;\n  };\n\n  constructor(message: string, result: StandardSchemaV1.FailureResult) {\n    super(message);\n    this.name = 'InputValidationError';\n    this.result = result;\n    this.details = {type: 'InputValidationError', result};\n  }\n}\n\n/**\n * Validates input using a StandardSchema validator if provided.\n * This is shared validation logic used by both defineQuery and defineMutator.\n *\n * @param name - The name of the query or mutator (for error messages)\n * @param input - The input value to validate\n * @param validator - Optional StandardSchema validator\n * @param kind - Type of definition ('query' or 'mutator') for error messages\n * @returns The validated output (either transformed by validator or input as-is)\n * @throws Error if validation fails or if an async validator is used\n * @internal\n */\nexport function validateInput<TInput, TOutput>(\n  name: string,\n  input: TInput,\n  validator: StandardSchemaV1<TInput, TOutput> | undefined,\n  kind: 'query' | 'mutator',\n): TOutput {\n  if (!validator) {\n    // No validator, so input and output are the same\n    return input as unknown as TOutput;\n  }\n\n  const result = validator['~standard'].validate(input);\n  if (result instanceof Promise) {\n    throw new Error(\n      `Async validators are not supported. ${titleCase(kind)} name ${name}`,\n    );\n  }\n  if (result.issues) {\n    throw new InputValidationError(\n      `Validation failed for ${kind} ${name}: ${result.issues\n        .map(issue => issue.message)\n        .join(', ')}`,\n      result,\n    );\n  }\n  return result.value;\n}\n\nfunction titleCase(kind: string): string {\n  return kind.charAt(0).toUpperCase() + kind.slice(1);\n}\n"],"mappings":";AAEA,IAAa,uBAAb,cAA0C,MAAM;CAC9C;CAGA;CAKA,YAAY,SAAiB,QAAwC;AACnE,QAAM,QAAQ;AACd,OAAK,OAAO;AACZ,OAAK,SAAS;AACd,OAAK,UAAU;GAAC,MAAM;GAAwB;GAAO;;;;;;;;;;;;;;;AAgBzD,SAAgB,cACd,MACA,OACA,WACA,MACS;AACT,KAAI,CAAC,UAEH,QAAO;CAGT,MAAM,SAAS,UAAU,aAAa,SAAS,MAAM;AACrD,KAAI,kBAAkB,QACpB,OAAM,IAAI,MACR,uCAAuC,UAAU,KAAK,CAAC,QAAQ,OAChE;AAEH,KAAI,OAAO,OACT,OAAM,IAAI,qBACR,yBAAyB,KAAK,GAAG,KAAK,IAAI,OAAO,OAC9C,KAAI,UAAS,MAAM,QAAQ,CAC3B,KAAK,KAAK,IACb,OACD;AAEH,QAAO,OAAO;;AAGhB,SAAS,UAAU,MAAsB;AACvC,QAAO,KAAK,OAAO,EAAE,CAAC,aAAa,GAAG,KAAK,MAAM,EAAE"}

package/out/zqlite/src/query-builder.js

@@ -62,6 +62,14 @@ function toSQLiteType(v, type) {
 		case "json": return JSON.stringify(v);
 	}
 }
+function nullableAwareEquality(field, value, columnType) {
+	return columnType.optional === true ? sql`${sql.ident(field)} IS ${value}` : sql`${sql.ident(field)} = ${value}`;
+}
+function nullableAwareRangeComparison(field, value, operator, columnType) {
+	const comparison = sql`${sql.ident(field)} ${sql.__dangerous__rawValue(operator)} ${value}`;
+	if (columnType.optional !== true) return comparison;
+	return operator === ">" ? sql`(${value} IS NULL OR ${comparison})` : sql`(${sql.ident(field)} IS NULL OR ${comparison})`;
+}
 /**
 * The ordering could be complex such as:
 * `ORDER BY a ASC, b DESC, c ASC`
@@ -85,18 +93,22 @@ function gatherStartConstraints(start, reverse, order, columnTypes) {
 		const group = [];
 		const [iField, iDirection] = order[i];
 		for (let j = 0; j <= i; j++) if (j === i) {
-			const constraintValue = toSQLiteType(from[iField], columnTypes[iField].type);
-			if (iDirection === "asc") if (!reverse) group.push(sql`(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`);
-			else group.push(sql`(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`);
-			else if (!reverse) group.push(sql`(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`);
-			else group.push(sql`(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`);
+			const columnType = columnTypes[iField];
+			const constraintValue = toSQLiteType(from[iField], columnType.type);
+			const operator = iDirection === "asc" ? reverse ? "<" : ">" : reverse ? ">" : "<";
+			group.push(nullableAwareRangeComparison(iField, constraintValue, operator, columnType));
 		} else {
 			const [jField] = order[j];
-			group.push(sql`${sql.ident(jField)} IS ${toSQLiteType(from[jField], columnTypes[jField].type)}`);
+			const columnType = columnTypes[jField];
+			const value = toSQLiteType(from[jField], columnType.type);
+			group.push(nullableAwareEquality(jField, value, columnType));
 		}
 		constraints.push(sql`(${sql.join(group, sql` AND `)})`);
 	}
-	if (basis === "at") constraints.push(sql`(${sql.join(order.map((s) => sql`${sql.ident(s[0])} IS ${toSQLiteType(from[s[0]], columnTypes[s[0]].type)}`), sql` AND `)})`);
+	if (basis === "at") constraints.push(sql`(${sql.join(order.map(([field]) => {
+		const columnType = columnTypes[field];
+		return nullableAwareEquality(field, toSQLiteType(from[field], columnType.type), columnType);
+	}), sql` AND `)})`);
 	return sql`(${sql.join(constraints, sql` OR `)})`;
 }
 //#endregion

package/out/zqlite/src/query-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-builder.js","names":[],"sources":["../../../../zqlite/src/query-builder.ts"],"sourcesContent":["import type {SQLQuery} from '@databases/sql';\nimport {assert} from '../../shared/src/asserts.ts';\nimport type {\n  Condition,\n  Ordering,\n  SimpleCondition,\n  ValuePosition,\n} from '../../zero-protocol/src/ast.ts';\nimport type {\n  SchemaValue,\n  ValueType,\n} from '../../zero-schema/src/table-schema.ts';\nimport type {Constraint} from '../../zql/src/ivm/constraint.ts';\nimport type {Start} from '../../zql/src/ivm/operator.ts';\nimport {sql} from './internal/sql.ts';\n\n/**\n * Condition type without correlated subqueries.\n * This matches the output of transformFilters from zql/builder/filter.ts\n */\nexport type NoSubqueryCondition = Exclude<\n  Condition,\n  {type: 'correlatedSubquery'}\n>;\n\nexport function buildSelectQuery(\n  tableName: string,\n  columns: Record<string, SchemaValue>,\n  constraint: Constraint | undefined,\n  filters: NoSubqueryCondition | undefined,\n  order: Ordering | undefined,\n  reverse: boolean | undefined,\n  start: Start | undefined,\n) {\n  let query = sql`SELECT ${sql.join(\n    Object.keys(columns).map(c => sql.ident(c)),\n    sql`,`,\n  )} FROM ${sql.ident(tableName)}`;\n  const constraints: SQLQuery[] = constraintsToSQL(constraint, columns);\n\n  if (start) {\n    assert(order !== undefined, 'start requires ordering');\n    constraints.push(gatherStartConstraints(start, reverse, order, columns));\n  }\n\n  if (filters) {\n    constraints.push(filtersToSQL(filters));\n  }\n\n  if (constraints.length > 0) {\n    query = sql`${query} WHERE ${sql.join(constraints, sql` AND `)}`;\n  }\n\n  if (order && order.length > 0) {\n    return sql`${query} ${orderByToSQL(order, !!reverse)}`;\n  }\n  return query;\n}\n\nexport function constraintsToSQL(\n  constraint: Constraint | undefined,\n  columns: Record<string, SchemaValue>,\n) {\n  if (!constraint) {\n    return [];\n  }\n\n  const constraints: SQLQuery[] = [];\n  for (const [key, value] of Object.entries(constraint)) {\n    constraints.push(\n      sql`${sql.ident(key)} = ${toSQLiteType(value, columns[key].type)}`,\n    );\n  }\n\n  return constraints;\n}\n\nexport function orderByToSQL(order: Ordering, reverse: boolean): SQLQuery {\n  if (reverse) {\n    return sql`ORDER BY ${sql.join(\n      order.map(\n        s =>\n          sql`${sql.ident(s[0])} ${sql.__dangerous__rawValue(\n            s[1] === 'asc' ? 'desc' : 'asc',\n          )}`,\n      ),\n      sql`, `,\n    )}`;\n  } else {\n    return sql`ORDER BY ${sql.join(\n      order.map(\n        s => sql`${sql.ident(s[0])} ${sql.__dangerous__rawValue(s[1])}`,\n      ),\n      sql`, `,\n    )}`;\n  }\n}\n\n/**\n * Converts filters (conditions) to SQL WHERE clause.\n * This applies all filters present in the AST for a query to the source.\n */\nexport function filtersToSQL(filters: NoSubqueryCondition): SQLQuery {\n  switch (filters.type) {\n    case 'simple':\n      return simpleConditionToSQL(filters);\n    case 'and':\n      return filters.conditions.length > 0\n        ? sql`(${sql.join(\n            filters.conditions.map(condition =>\n              filtersToSQL(condition as NoSubqueryCondition),\n            ),\n            sql` AND `,\n          )})`\n        : sql`TRUE`;\n    case 'or':\n      return filters.conditions.length > 0\n        ? sql`(${sql.join(\n            filters.conditions.map(condition =>\n              filtersToSQL(condition as NoSubqueryCondition),\n            ),\n            sql` OR `,\n          )})`\n        : sql`FALSE`;\n  }\n}\n\nfunction simpleConditionToSQL(filter: SimpleCondition): SQLQuery {\n  const {op} = filter;\n  if (op === 'IN' || op === 'NOT IN') {\n    switch (filter.right.type) {\n      case 'literal':\n        return sql`${valuePositionToSQL(\n          filter.left,\n        )} ${sql.__dangerous__rawValue(\n          filter.op,\n        )} (SELECT value FROM json_each(${JSON.stringify(\n          filter.right.value,\n        )}))`;\n      case 'static':\n        throw new Error(\n          'Static parameters must be replaced before conversion to SQL',\n        );\n    }\n  }\n  return sql`${valuePositionToSQL(filter.left)} ${sql.__dangerous__rawValue(\n    // SQLite's LIKE operator is case-insensitive by default, so we\n    // convert ILIKE to LIKE and NOT ILIKE to NOT LIKE.\n    filter.op === 'ILIKE'\n      ? 'LIKE'\n      : filter.op === 'NOT ILIKE'\n        ? 'NOT LIKE'\n        : filter.op,\n  )} ${valuePositionToSQL(filter.right)}`;\n}\n\nfunction valuePositionToSQL(value: ValuePosition): SQLQuery {\n  switch (value.type) {\n    case 'column':\n      return sql.ident(value.name);\n    case 'literal':\n      return sql`${toSQLiteType(value.value, getJsType(value.value))}`;\n    case 'static':\n      throw new Error(\n        'Static parameters must be replaced before conversion to SQL',\n      );\n  }\n}\n\nfunction getJsType(value: unknown): ValueType {\n  if (value === null) {\n    return 'null';\n  }\n  return typeof value === 'string'\n    ? 'string'\n    : typeof value === 'number'\n      ? 'number'\n      : typeof value === 'boolean'\n        ? 'boolean'\n        : 'json';\n}\n\nexport function toSQLiteType(v: unknown, type: ValueType): unknown {\n  switch (type) {\n    case 'boolean':\n      return v === null ? null : v ? 1 : 0;\n    case 'number':\n    case 'string':\n    case 'null':\n      return v;\n    case 'json':\n      return JSON.stringify(v);\n  }\n}\n\n/**\n * The ordering could be complex such as:\n * `ORDER BY a ASC, b DESC, c ASC`\n *\n * In those cases, we need to encode the constraints as various\n * `OR` clauses.\n *\n * E.g.,\n *\n * to get the row after (a = 1, b = 2, c = 3) would be:\n *\n * `WHERE a > 1 OR (a = 1 AND b < 2) OR (a = 1 AND b = 2 AND c > 3)`\n *\n * - after vs before flips the comparison operators.\n * - inclusive adds a final `OR` clause for the exact match.\n */\nfunction gatherStartConstraints(\n  start: Start,\n  reverse: boolean | undefined,\n  order: Ordering,\n  columnTypes: Record<string, SchemaValue>,\n): SQLQuery {\n  const constraints: SQLQuery[] = [];\n  const {row: from, basis} = start;\n\n  for (let i = 0; i < order.length; i++) {\n    const group: SQLQuery[] = [];\n    const [iField, iDirection] = order[i];\n    for (let j = 0; j <= i; j++) {\n      if (j === i) {\n        const constraintValue = toSQLiteType(\n          from[iField],\n          columnTypes[iField].type,\n        );\n        if (iDirection === 'asc') {\n          if (!reverse) {\n            group.push(\n              sql`(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`,\n            );\n          } else {\n            reverse satisfies true;\n            group.push(\n              sql`(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`,\n            );\n          }\n        } else {\n          iDirection satisfies 'desc';\n          if (!reverse) {\n            group.push(\n              sql`(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`,\n            );\n          } else {\n            reverse satisfies true;\n            group.push(\n              sql`(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`,\n            );\n          }\n        }\n      } else {\n        const [jField] = order[j];\n        group.push(\n          sql`${sql.ident(jField)} IS ${toSQLiteType(\n            from[jField],\n            columnTypes[jField].type,\n          )}`,\n        );\n      }\n    }\n    constraints.push(sql`(${sql.join(group, sql` AND `)})`);\n  }\n\n  if (basis === 'at') {\n    constraints.push(\n      sql`(${sql.join(\n        order.map(\n          s =>\n            sql`${sql.ident(s[0])} IS ${toSQLiteType(\n              from[s[0]],\n              columnTypes[s[0]].type,\n            )}`,\n        ),\n        sql` AND `,\n      )})`,\n    );\n  }\n\n  return sql`(${sql.join(constraints, sql` OR `)})`;\n}\n"],"mappings":"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"}
+{"version":3,"file":"query-builder.js","names":[],"sources":["../../../../zqlite/src/query-builder.ts"],"sourcesContent":["import type {SQLQuery} from '@databases/sql';\nimport {assert} from '../../shared/src/asserts.ts';\nimport type {\n  Condition,\n  Ordering,\n  SimpleCondition,\n  ValuePosition,\n} from '../../zero-protocol/src/ast.ts';\nimport type {\n  SchemaValue,\n  ValueType,\n} from '../../zero-schema/src/table-schema.ts';\nimport type {Constraint} from '../../zql/src/ivm/constraint.ts';\nimport type {Start} from '../../zql/src/ivm/operator.ts';\nimport {sql} from './internal/sql.ts';\n\n/**\n * Condition type without correlated subqueries.\n * This matches the output of transformFilters from zql/builder/filter.ts\n */\nexport type NoSubqueryCondition = Exclude<\n  Condition,\n  {type: 'correlatedSubquery'}\n>;\n\nexport function buildSelectQuery(\n  tableName: string,\n  columns: Record<string, SchemaValue>,\n  constraint: Constraint | undefined,\n  filters: NoSubqueryCondition | undefined,\n  order: Ordering | undefined,\n  reverse: boolean | undefined,\n  start: Start | undefined,\n) {\n  let query = sql`SELECT ${sql.join(\n    Object.keys(columns).map(c => sql.ident(c)),\n    sql`,`,\n  )} FROM ${sql.ident(tableName)}`;\n  const constraints: SQLQuery[] = constraintsToSQL(constraint, columns);\n\n  if (start) {\n    assert(order !== undefined, 'start requires ordering');\n    constraints.push(gatherStartConstraints(start, reverse, order, columns));\n  }\n\n  if (filters) {\n    constraints.push(filtersToSQL(filters));\n  }\n\n  if (constraints.length > 0) {\n    query = sql`${query} WHERE ${sql.join(constraints, sql` AND `)}`;\n  }\n\n  if (order && order.length > 0) {\n    return sql`${query} ${orderByToSQL(order, !!reverse)}`;\n  }\n  return query;\n}\n\nexport function constraintsToSQL(\n  constraint: Constraint | undefined,\n  columns: Record<string, SchemaValue>,\n) {\n  if (!constraint) {\n    return [];\n  }\n\n  const constraints: SQLQuery[] = [];\n  for (const [key, value] of Object.entries(constraint)) {\n    constraints.push(\n      sql`${sql.ident(key)} = ${toSQLiteType(value, columns[key].type)}`,\n    );\n  }\n\n  return constraints;\n}\n\nexport function orderByToSQL(order: Ordering, reverse: boolean): SQLQuery {\n  if (reverse) {\n    return sql`ORDER BY ${sql.join(\n      order.map(\n        s =>\n          sql`${sql.ident(s[0])} ${sql.__dangerous__rawValue(\n            s[1] === 'asc' ? 'desc' : 'asc',\n          )}`,\n      ),\n      sql`, `,\n    )}`;\n  } else {\n    return sql`ORDER BY ${sql.join(\n      order.map(\n        s => sql`${sql.ident(s[0])} ${sql.__dangerous__rawValue(s[1])}`,\n      ),\n      sql`, `,\n    )}`;\n  }\n}\n\n/**\n * Converts filters (conditions) to SQL WHERE clause.\n * This applies all filters present in the AST for a query to the source.\n */\nexport function filtersToSQL(filters: NoSubqueryCondition): SQLQuery {\n  switch (filters.type) {\n    case 'simple':\n      return simpleConditionToSQL(filters);\n    case 'and':\n      return filters.conditions.length > 0\n        ? sql`(${sql.join(\n            filters.conditions.map(condition =>\n              filtersToSQL(condition as NoSubqueryCondition),\n            ),\n            sql` AND `,\n          )})`\n        : sql`TRUE`;\n    case 'or':\n      return filters.conditions.length > 0\n        ? sql`(${sql.join(\n            filters.conditions.map(condition =>\n              filtersToSQL(condition as NoSubqueryCondition),\n            ),\n            sql` OR `,\n          )})`\n        : sql`FALSE`;\n  }\n}\n\nfunction simpleConditionToSQL(filter: SimpleCondition): SQLQuery {\n  const {op} = filter;\n  if (op === 'IN' || op === 'NOT IN') {\n    switch (filter.right.type) {\n      case 'literal':\n        return sql`${valuePositionToSQL(\n          filter.left,\n        )} ${sql.__dangerous__rawValue(\n          filter.op,\n        )} (SELECT value FROM json_each(${JSON.stringify(\n          filter.right.value,\n        )}))`;\n      case 'static':\n        throw new Error(\n          'Static parameters must be replaced before conversion to SQL',\n        );\n    }\n  }\n  return sql`${valuePositionToSQL(filter.left)} ${sql.__dangerous__rawValue(\n    // SQLite's LIKE operator is case-insensitive by default, so we\n    // convert ILIKE to LIKE and NOT ILIKE to NOT LIKE.\n    filter.op === 'ILIKE'\n      ? 'LIKE'\n      : filter.op === 'NOT ILIKE'\n        ? 'NOT LIKE'\n        : filter.op,\n  )} ${valuePositionToSQL(filter.right)}`;\n}\n\nfunction valuePositionToSQL(value: ValuePosition): SQLQuery {\n  switch (value.type) {\n    case 'column':\n      return sql.ident(value.name);\n    case 'literal':\n      return sql`${toSQLiteType(value.value, getJsType(value.value))}`;\n    case 'static':\n      throw new Error(\n        'Static parameters must be replaced before conversion to SQL',\n      );\n  }\n}\n\nfunction getJsType(value: unknown): ValueType {\n  if (value === null) {\n    return 'null';\n  }\n  return typeof value === 'string'\n    ? 'string'\n    : typeof value === 'number'\n      ? 'number'\n      : typeof value === 'boolean'\n        ? 'boolean'\n        : 'json';\n}\n\nexport function toSQLiteType(v: unknown, type: ValueType): unknown {\n  switch (type) {\n    case 'boolean':\n      return v === null ? null : v ? 1 : 0;\n    case 'number':\n    case 'string':\n    case 'null':\n      return v;\n    case 'json':\n      return JSON.stringify(v);\n  }\n}\n\nfunction nullableAwareEquality(\n  field: string,\n  value: unknown,\n  columnType: SchemaValue,\n): SQLQuery {\n  // Use = instead of IS for non-nullable columns to enable better\n  // index usage in SQLite.\n  return columnType.optional === true\n    ? sql`${sql.ident(field)} IS ${value}`\n    : sql`${sql.ident(field)} = ${value}`;\n}\n\nfunction nullableAwareRangeComparison(\n  field: string,\n  value: unknown,\n  operator: '>' | '<',\n  columnType: SchemaValue,\n): SQLQuery {\n  // For non-nullable columns, skip IS NULL checks to avoid breaking\n  // SQLite's MULTI-INDEX OR optimization, which falls back to a full\n  // table scan when any OR branch involves NULL.\n  // See: https://github.com/rocicorp/mono/pull/5542\n  const comparison = sql`${sql.ident(field)} ${sql.__dangerous__rawValue(\n    operator,\n  )} ${value}`;\n  if (columnType.optional !== true) {\n    return comparison;\n  }\n\n  return operator === '>'\n    ? sql`(${value} IS NULL OR ${comparison})`\n    : sql`(${sql.ident(field)} IS NULL OR ${comparison})`;\n}\n\n/**\n * The ordering could be complex such as:\n * `ORDER BY a ASC, b DESC, c ASC`\n *\n * In those cases, we need to encode the constraints as various\n * `OR` clauses.\n *\n * E.g.,\n *\n * to get the row after (a = 1, b = 2, c = 3) would be:\n *\n * `WHERE a > 1 OR (a = 1 AND b < 2) OR (a = 1 AND b = 2 AND c > 3)`\n *\n * - after vs before flips the comparison operators.\n * - inclusive adds a final `OR` clause for the exact match.\n */\nfunction gatherStartConstraints(\n  start: Start,\n  reverse: boolean | undefined,\n  order: Ordering,\n  columnTypes: Record<string, SchemaValue>,\n): SQLQuery {\n  const constraints: SQLQuery[] = [];\n  const {row: from, basis} = start;\n\n  for (let i = 0; i < order.length; i++) {\n    const group: SQLQuery[] = [];\n    const [iField, iDirection] = order[i];\n    for (let j = 0; j <= i; j++) {\n      if (j === i) {\n        const columnType = columnTypes[iField];\n        const constraintValue = toSQLiteType(from[iField], columnType.type);\n        const operator =\n          iDirection === 'asc' ? (reverse ? '<' : '>') : reverse ? '>' : '<';\n        group.push(\n          nullableAwareRangeComparison(\n            iField,\n            constraintValue,\n            operator,\n            columnType,\n          ),\n        );\n      } else {\n        const [jField] = order[j];\n        const columnType = columnTypes[jField];\n        const value = toSQLiteType(from[jField], columnType.type);\n        group.push(nullableAwareEquality(jField, value, columnType));\n      }\n    }\n    constraints.push(sql`(${sql.join(group, sql` AND `)})`);\n  }\n\n  if (basis === 'at') {\n    constraints.push(\n      sql`(${sql.join(\n        order.map(([field]) => {\n          const columnType = columnTypes[field];\n          const value = toSQLiteType(from[field], columnType.type);\n          return nullableAwareEquality(field, value, columnType);\n        }),\n        sql` AND `,\n      )})`,\n    );\n  }\n\n  return sql`(${sql.join(constraints, sql` OR `)})`;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocicorp/zero",
-  "version": "1.4.0-canary.2",
+  "version": "1.4.0-canary.4",
   "description": "Zero is a web framework for serverless web development.",
   "homepage": "https://zero.rocicorp.dev",
   "bugs": {
@@ -76,6 +76,10 @@
       "types": "./out/zero/src/adapters/drizzle.d.ts",
       "default": "./out/zero/src/adapters/drizzle.js"
     },
+    "./server/adapters/kysely": {
+      "types": "./out/zero/src/adapters/kysely.d.ts",
+      "default": "./out/zero/src/adapters/kysely.js"
+    },
     "./server/adapters/prisma": {
       "types": "./out/zero/src/adapters/prisma.d.ts",
       "default": "./out/zero/src/adapters/prisma.js"
@@ -191,9 +195,13 @@
   },
   "peerDependencies": {
     "@op-engineering/op-sqlite": ">=15",
-    "expo-sqlite": ">=15"
+    "expo-sqlite": ">=15",
+    "kysely": "^0.28.16"
   },
   "peerDependenciesMeta": {
+    "kysely": {
+      "optional": true
+    },
     "expo-sqlite": {
       "optional": true
     },

package/out/analyze-query/src/explain-queries.d.ts

@@ -1,4 +0,0 @@
-import type { RowCountsBySource } from '../../zero-protocol/src/analyze-query-result.ts';
-import type { Database } from '../../zqlite/src/db.ts';
-export declare function explainQueries(counts: RowCountsBySource, db: Database): Record<string, string[]>;
-//# sourceMappingURL=explain-queries.d.ts.map

package/out/analyze-query/src/explain-queries.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"explain-queries.d.ts","sourceRoot":"","sources":["../../../../analyze-query/src/explain-queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iDAAiD,CAAC;AACvF,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAErD,wBAAgB,cAAc,CAAC,MAAM,EAAE,iBAAiB,EAAE,EAAE,EAAE,QAAQ,4BAiBrE"}

package/out/analyze-query/src/explain-queries.js

@@ -1,13 +0,0 @@
-//#region ../analyze-query/src/explain-queries.ts
-function explainQueries(counts, db) {
-	const plans = {};
-	for (const querySet of Object.values(counts)) {
-		const queries = Object.keys(querySet);
-		for (const query of queries) plans[query] = db.prepare(`EXPLAIN QUERY PLAN ${query.replaceAll("?", "'sdfse'")}`).all().map((r) => r.detail);
-	}
-	return plans;
-}
-//#endregion
-export { explainQueries };
-
-//# sourceMappingURL=explain-queries.js.map

package/out/analyze-query/src/explain-queries.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"explain-queries.js","names":[],"sources":["../../../../analyze-query/src/explain-queries.ts"],"sourcesContent":["import type {RowCountsBySource} from '../../zero-protocol/src/analyze-query-result.ts';\nimport type {Database} from '../../zqlite/src/db.ts';\n\nexport function explainQueries(counts: RowCountsBySource, db: Database) {\n  const plans: Record<string, string[]> = {};\n  for (const querySet of Object.values(counts)) {\n    const queries = Object.keys(querySet);\n    for (const query of queries) {\n      const plan = db\n        // we should be more intelligent about value replacement.\n        // Different values result in different plans. E.g., picking a value at the start\n        // of an index will result in `scan` vs `search`. The scan is fine in that case.\n        .prepare(`EXPLAIN QUERY PLAN ${query.replaceAll('?', \"'sdfse'\")}`)\n        .all<{detail: string}>()\n        .map(r => r.detail);\n      plans[query] = plan;\n    }\n  }\n\n  return plans;\n}\n"],"mappings":";AAGA,SAAgB,eAAe,QAA2B,IAAc;CACtE,MAAM,QAAkC,EAAE;AAC1C,MAAK,MAAM,YAAY,OAAO,OAAO,OAAO,EAAE;EAC5C,MAAM,UAAU,OAAO,KAAK,SAAS;AACrC,OAAK,MAAM,SAAS,QAQlB,OAAM,SAPO,GAIV,QAAQ,sBAAsB,MAAM,WAAW,KAAK,UAAU,GAAG,CACjE,KAAuB,CACvB,KAAI,MAAK,EAAE,OAAO;;AAKzB,QAAO"}

package/out/otel/src/test-log-config.d.ts

@@ -1,8 +0,0 @@
-export declare const testLogConfig: {
-    format: "text";
-    level: "debug";
-    ivmSampling: number;
-    slowRowThreshold: number;
-    slowHydrateThreshold: number;
-};
-//# sourceMappingURL=test-log-config.d.ts.map

package/out/otel/src/test-log-config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"test-log-config.d.ts","sourceRoot":"","sources":["../../../../otel/src/test-log-config.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa;;;;;;CAMzB,CAAC"}

package/out/otel/src/test-log-config.js

@@ -1,12 +0,0 @@
-//#region ../otel/src/test-log-config.ts
-var testLogConfig = {
-	format: "text",
-	level: "debug",
-	ivmSampling: 0,
-	slowRowThreshold: 0,
-	slowHydrateThreshold: 0
-};
-//#endregion
-export { testLogConfig };
-
-//# sourceMappingURL=test-log-config.js.map

package/out/otel/src/test-log-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test-log-config.js","names":[],"sources":["../../../../otel/src/test-log-config.ts"],"sourcesContent":["export const testLogConfig = {\n  format: 'text' as const,\n  level: 'debug' as const,\n  ivmSampling: 0,\n  slowRowThreshold: 0,\n  slowHydrateThreshold: 0,\n};\n"],"mappings":";AAAA,IAAa,gBAAgB;CAC3B,QAAQ;CACR,OAAO;CACP,aAAa;CACb,kBAAkB;CAClB,sBAAsB;CACvB"}