durcno 1.0.0-alpha.5 → 1.0.0-alpha.7

package/dist/bin.cjs

@@ -12063,13 +12063,16 @@ var Column = class {
 };
 
 // src/constraints/check.ts
+function isExprColumnRef(value) {
+  return typeof value === "object" && value !== null && value.type === "col";
+}
 function snapshotExprToSQL(expr) {
   if (expr.type === "raw") {
     return expr.sql;
   }
   if (expr.type === "comparison") {
-    const left = typeof expr.left === "string" ? `"${expr.left}"` : snapshotExprToSQL(expr.left);
-    const right = formatSnapshotValue(expr.right);
+    const left = isExprColumnRef(expr.left) ? `"${expr.left.name}"` : snapshotExprToSQL(expr.left);
+    const right = isExprColumnRef(expr.right) ? `"${expr.right.name}"` : expr.right;
     return `${left} ${expr.op} ${right}`;
   }
   if (expr.type === "logical") {
@@ -12078,23 +12081,113 @@ function snapshotExprToSQL(expr) {
     return wrappedParts.join(` ${expr.op} `);
   }
   if (expr.type === "function") {
-    const args = expr.args.map(
-      (a) => typeof a === "string" ? `"${a}"` : formatSnapshotValue(a)
-    );
+    const args = expr.args.map((a) => isExprColumnRef(a) ? `"${a.name}"` : a);
     return `${expr.name}(${args.join(", ")})`;
   }
   throw new Error("Unknown expression type");
 }
-function formatSnapshotValue(value) {
-  if (value === null) return "NULL";
-  if (Array.isArray(value)) {
-    const list = value.map((v) => formatSnapshotValue(v)).join(", ");
-    return `(${list})`;
+var opToMethod = {
+  "=": "eq",
+  "<>": "neq",
+  ">": "gt",
+  ">=": "gte",
+  "<": "lt",
+  "<=": "lte",
+  LIKE: "like",
+  "SIMILAR TO": "similarTo",
+  "~": "regex",
+  IN: "in",
+  "NOT IN": "notIn"
+};
+var fnOpToMethod = {
+  "=": "fnEq",
+  "<>": "fnNeq",
+  ">": "fnGt",
+  ">=": "fnGte",
+  "<": "fnLt",
+  "<=": "fnLte"
+};
+var reservedMethodAlias = {
+  in: "inOp"
+};
+function wrapSql(value) {
+  return `sql\`${value.replace(/`/g, "\\`")}\``;
+}
+function collectMethods(expr, names) {
+  if (expr.type === "raw") {
+    names.add("raw");
+    return;
   }
-  if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
-  if (typeof value === "number") return String(value);
-  if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
-  return String(value);
+  if (expr.type === "comparison") {
+    if (isExprColumnRef(expr.right)) {
+      names.add("raw");
+      return;
+    }
+    if (expr.left.type === "function") {
+      names.add(fnOpToMethod[expr.op] ?? "fnEq");
+      names.add(expr.left.name);
+    } else {
+      names.add(opToMethod[expr.op] ?? "eq");
+    }
+    return;
+  }
+  if (expr.type === "logical") {
+    names.add(expr.op === "AND" ? "and" : "or");
+    for (const e of expr.expressions) {
+      collectMethods(e, names);
+    }
+    return;
+  }
+  if (expr.type === "function") {
+    names.add(expr.name);
+  }
+}
+function buildDestructure(names) {
+  return [...names].sort().map((name) => {
+    const alias = reservedMethodAlias[name];
+    return alias ? `${name}: ${alias}` : name;
+  }).join(", ");
+}
+function callName(method) {
+  return reservedMethodAlias[method] ?? method;
+}
+function renderFunctionExpr(fn) {
+  const args = fn.args.map(
+    (a) => typeof a === "string" ? wrapSql(a) : isExprColumnRef(a) ? JSON.stringify(a.name) : wrapSql(snapshotExprToSQL(a))
+  );
+  return `${fn.name}(${args.join(", ")})`;
+}
+function renderExpr(expr) {
+  if (expr.type === "raw") {
+    return `raw(${JSON.stringify(expr.sql)})`;
+  }
+  if (expr.type === "comparison") {
+    if (isExprColumnRef(expr.right)) {
+      return `raw(${JSON.stringify(snapshotExprToSQL(expr))})`;
+    }
+    if (expr.left.type === "function") {
+      const method2 = fnOpToMethod[expr.op] ?? "fnEq";
+      return `${callName(method2)}(${renderFunctionExpr(expr.left)}, ${wrapSql(expr.right)})`;
+    }
+    const method = opToMethod[expr.op] ?? "eq";
+    return `${callName(method)}(${JSON.stringify(expr.left.name)}, ${wrapSql(expr.right)})`;
+  }
+  if (expr.type === "logical") {
+    const method = expr.op === "AND" ? "and" : "or";
+    const parts = expr.expressions.map((e) => renderExpr(e)).join(", ");
+    return `${method}(${parts})`;
+  }
+  if (expr.type === "function") {
+    return renderFunctionExpr(expr);
+  }
+  throw new Error("Unknown SnapshotCheckExpr type");
+}
+function snapshotExprToCheckBuilderCode(expr) {
+  const names = /* @__PURE__ */ new Set();
+  collectMethods(expr, names);
+  const destructure = buildDestructure(names);
+  const body = renderExpr(expr);
+  return `({ ${destructure} }) => ${body}`;
 }
 
 // src/cli/utils.ts
@@ -12489,7 +12582,9 @@ function generateMigration(prev, curr, direction, renamedTables = {}, renamedCol
         );
       }
       for (const chk of Object.values(currTable.checkConstraints)) {
-        tableBuilder.push(`.check("${chk.name}", ${JSON.stringify(chk.expr)})`);
+        tableBuilder.push(
+          `.check("${chk.name}", ${snapshotExprToCheckBuilderCode(chk.expr)})`
+        );
       }
       for (const uc of Object.values(currTable.uniqueConstraints ?? {})) {
         const cols = uc.columns.map((c) => `"${c}"`).join(", ");
@@ -12524,9 +12619,9 @@ function generateMigration(prev, curr, direction, renamedTables = {}, renamedCol
     }
   }
   if (statements.length === 0) return null;
-  return `import { type DDLStatement, ddl, type MigrationOptions } from "durcno/migration";
+  return `import { type DDLStatement, ddl, sql, type MigrationOptions } from "durcno/migration";
 
-export const options: MigrationOptions = ${stringifyMigrationOpts(defaultOptions ?? { transaction: true })};
+export const options: MigrationOptions = ${stringifyMigrationOpts(defaultOptions ?? {})};
 
 export const statements: DDLStatement[] = [
   ${statements.join(",\n  ")},
@@ -12536,7 +12631,7 @@ export const statements: DDLStatement[] = [
 function generateNoOpMigration(defaultOptions) {
   return `import { type DDLStatement, ddl, type MigrationOptions } from "durcno/migration";
 
-export const options: MigrationOptions = ${stringifyMigrationOpts(defaultOptions ?? { transaction: true })};
+export const options: MigrationOptions = ${stringifyMigrationOpts(defaultOptions ?? {})};
 
 export const statements: DDLStatement[] = [];
 `;
@@ -12646,14 +12741,14 @@ function generateAlterTableStmts(prevTable, currTable, tableName, curr, statemen
     const prevChk = prevTable.checkConstraints[chkName];
     if (!prevChk) {
       alterStatements.push(
-        `.addCheck("${chkName}", ${JSON.stringify(currChk.expr)})`
+        `.addCheck("${chkName}", ${snapshotExprToCheckBuilderCode(currChk.expr)})`
       );
     } else {
       const prevSql = snapshotExprToSQL(prevChk.expr);
       const currSql = snapshotExprToSQL(currChk.expr);
       if (prevSql !== currSql) {
         alterStatements.push(
-          `.addCheck("${chkName}", ${JSON.stringify(currChk.expr)})`
+          `.addCheck("${chkName}", ${snapshotExprToCheckBuilderCode(currChk.expr)})`
         );
       }
     }
@@ -13508,7 +13603,7 @@ async function status(options) {
 }
 
 // src/cli/index.ts
-program.version("1.0.0-alpha.4");
+program.version("1.0.0-alpha.6");
 var Options = {
   config: ["--config <path>", "Path to the config file"]
 };

package/dist/src/columns/bigint.d.mts

@@ -1,20 +1,20 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/bigint.d.ts
-type BigintValType = number;
+type BigintValType = bigint;
 type BigintConfig = ColumnConfig;
 declare class BigintColumn<TConfig extends BigintConfig> extends Column<TConfig, BigintValType> {
   static readonly id = "Column.Bigint";
   get sqlTypeScalar(): string;
   get sqlCastScalar(): null;
-  get zodTypeScaler(): z.ZodCoercedNumber<unknown>;
-  toDriverScalar(value: BigintValType | Sql | null): string | number | null;
-  toSQLScalar(value: number | Sql | null): string;
-  fromDriverScalar(value: number | string | null): BigintValType | null;
+  get zodTypeScaler(): z.ZodCoercedBigInt<unknown>;
+  toDriverScalar(value: BigintValType | Sql | null): string | null;
+  toSQLScalar(value: BigintValType | Sql | null): string;
+  fromDriverScalar(value: bigint | string | null): BigintValType | null;
 }
-/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `number`. */
+/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `bigint`. */
 declare function bigint<TConfig extends BigintConfig>(config: TConfig): BigintColumn<TConfig>;
 //#endregion
 export { BigintColumn, bigint };

package/dist/src/columns/bigint.mjs

@@ -11,11 +11,11 @@ var BigintColumn = class extends Column {
 		return null;
 	}
 	get zodTypeScaler() {
-		return z.coerce.number();
+		return z.coerce.bigint();
 	}
 	toDriverScalar(value) {
 		if (value === null) return null;
-		return value instanceof Sql ? value.string : value;
+		return value instanceof Sql ? value.string : value.toString();
 	}
 	toSQLScalar(value) {
 		if (value === null) return "NULL";
@@ -24,10 +24,10 @@ var BigintColumn = class extends Column {
 	}
 	fromDriverScalar(value) {
 		if (value === null) return null;
-		return typeof value === "string" ? parseInt(value, 10) : value;
+		return BigInt(value);
 	}
 };
-/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `number`. */
+/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `bigint`. */
 function bigint(config) {
 	return new BigintColumn(config);
 }

package/dist/src/columns/bigserial.d.mts

@@ -1,9 +1,9 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/bigserial.d.ts
-type BigserialValType = number;
+type BigserialValType = bigint;
 type BigserialConfig = Pick<ColumnConfig, "primaryKey" | "unique">;
 type BigserialInternalConfig<TConfig extends BigserialConfig> = TConfig & {
   generated: "BY DEFAULT";
@@ -14,12 +14,12 @@ declare class BigserialColumn<TConfig extends BigserialConfig> extends Column<Bi
   constructor(config: TConfig);
   get sqlTypeScalar(): string;
   get sqlCastScalar(): null;
-  get zodTypeScaler(): z.ZodCoercedNumber<unknown>;
-  toDriverScalar(value: BigserialValType | Sql | null): string | number | null;
-  toSQLScalar(value: number | Sql | null): string;
-  fromDriverScalar(value: number | string | null): BigserialValType | null;
+  get zodTypeScaler(): z.ZodCoercedBigInt<unknown>;
+  toDriverScalar(value: BigserialValType | Sql | null): string | null;
+  toSQLScalar(value: BigserialValType | Sql | null): string;
+  fromDriverScalar(value: BigserialValType | string | null): BigserialValType | null;
 }
-/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `number`. */
+/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `bigint`. */
 declare function bigserial<TConfig extends BigserialConfig>(config: TConfig): BigserialColumn<TConfig>;
 //#endregion
 export { bigserial };

package/dist/src/columns/bigserial.mjs

@@ -14,11 +14,11 @@ var BigserialColumn = class extends Column {
 		return null;
 	}
 	get zodTypeScaler() {
-		return z.coerce.number();
+		return z.coerce.bigint();
 	}
 	toDriverScalar(value) {
 		if (value === null) return null;
-		return value instanceof Sql ? value.string : value;
+		return value instanceof Sql ? value.string : value.toString();
 	}
 	toSQLScalar(value) {
 		if (value === null) return "NULL";
@@ -27,10 +27,10 @@ var BigserialColumn = class extends Column {
 	}
 	fromDriverScalar(value) {
 		if (value === null) return null;
-		return typeof value === "string" ? parseInt(value, 10) : value;
+		return BigInt(value);
 	}
 };
-/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `number`. */
+/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `bigint`. */
 function bigserial(config) {
 	return new BigserialColumn(config);
 }

package/dist/src/columns/boolean.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/boolean.d.ts

package/dist/src/columns/bytea.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/bytea.d.ts

package/dist/src/columns/char.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/char.d.ts

package/dist/src/columns/cidr.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/cidr.d.ts

package/dist/src/columns/common.d.mts

@@ -1,8 +1,8 @@
-import { Key } from "../types.mjs";
-import { Sql } from "../sql.mjs";
 import { entityType } from "../symbols.mjs";
-import { Arg } from "../query-builders/pre.mjs";
+import { Key } from "../types.mjs";
 import { StdTableColumn, TableColumn } from "../table.mjs";
+import { Arg } from "../query-builders/pre.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/common.d.ts

package/dist/src/columns/date.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/date.d.ts

package/dist/src/columns/enum.d.mts

@@ -1,6 +1,6 @@
-import { Sql } from "../sql.mjs";
-import { Enum } from "../enumtype.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Enum } from "../enumtype.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/enum.d.ts

package/dist/src/columns/inet.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/inet.d.ts

package/dist/src/columns/integer.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/integer.d.ts

package/dist/src/columns/json.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/json.d.ts

package/dist/src/columns/jsonb.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/jsonb.d.ts

package/dist/src/columns/macaddr.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/macaddr.d.ts

package/dist/src/columns/numeric.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/numeric.d.ts

package/dist/src/columns/postgis/geography/linestring.d.mts

@@ -1,6 +1,6 @@
 import { SelfOrReadonly } from "../../../types.mjs";
-import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
+import { Sql } from "../../../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/postgis/geography/linestring.d.ts

package/dist/src/columns/postgis/geography/multilinestring.d.mts

@@ -1,6 +1,6 @@
 import { SelfOrReadonly } from "../../../types.mjs";
-import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
+import { Sql } from "../../../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/postgis/geography/multilinestring.d.ts

package/dist/src/columns/postgis/geography/multipoint.d.mts

@@ -1,6 +1,6 @@
 import { SelfOrReadonly } from "../../../types.mjs";
-import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
+import { Sql } from "../../../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/postgis/geography/multipoint.d.ts

package/dist/src/columns/postgis/geography/multipolygon.d.mts

@@ -1,6 +1,6 @@
 import { SelfOrReadonly } from "../../../types.mjs";
-import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
+import { Sql } from "../../../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/postgis/geography/multipolygon.d.ts

package/dist/src/columns/postgis/geography/point.d.mts

@@ -1,6 +1,6 @@
 import { SelfOrReadonly } from "../../../types.mjs";
-import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
+import { Sql } from "../../../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/postgis/geography/point.d.ts

package/dist/src/columns/postgis/geography/polygon.d.mts

@@ -1,6 +1,6 @@
 import { SelfOrReadonly } from "../../../types.mjs";
-import { Sql } from "../../../sql.mjs";
 import { Column, ColumnConfig } from "../../common.mjs";
+import { Sql } from "../../../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/postgis/geography/polygon.d.ts

package/dist/src/columns/serial.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/serial.d.ts

package/dist/src/columns/smallint.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/smallint.d.ts

package/dist/src/columns/smallserial.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/smallserial.d.ts

package/dist/src/columns/text.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/text.d.ts

package/dist/src/columns/time.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/time.d.ts

package/dist/src/columns/timestamp.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/timestamp.d.ts

package/dist/src/columns/uuid.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/uuid.d.ts

package/dist/src/columns/varchar.d.mts

@@ -1,5 +1,5 @@
-import { Sql } from "../sql.mjs";
 import { Column, ColumnConfig } from "./common.mjs";
+import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
 //#region src/columns/varchar.d.ts