typhex 0.1.0-alpha.0 → 0.1.0-alpha.2

package/CHANGELOG.md

@@ -7,6 +7,21 @@ Typhex follows semantic versioning for the documented public API. During the
 
 ## Unreleased
 
+## 0.1.0-alpha.2 - 2026-08-30
+
+- Query terminals (`toArray`, `first`, `count`, `findById`, `update`, `delete`, and inserts) now return a lazy `Statement`: `await` to execute, `.toSql()` to compile without running.
+- Add `TYPHEX_COMPILE_ONLY` to compile queries without a live database.
+- Query builder chains are immutable.
+- Nested queries are planned before SQL compilation.
+- `Db` can own an explicit `entities` collection for migrate/validate/generate; the process registry remains the fallback.
+- Keep `update()` and `patch()` as distinct operations.
+- Remove pre-release compatibility aliases.
+- Bump `better-sqlite3`, `pg`, and `acorn`.
+
+## 0.1.0-alpha.1 - 2026-06-15
+
+- Switch release workflow to npm Trusted Publishing (OIDC) instead of `NPM_TOKEN`.
+
 ## 0.1.0-alpha.0 - 2026-06-15
 
 - Initial public alpha preview.

package/README.md

@@ -109,7 +109,7 @@ await User.query()
   .delete();
 ```
 
-`update()` returns the number of rows changed. `patch()` performs the update and returns the updated row.
+`update()` returns the number of rows changed. `patch()` applies a partial update and returns the updated row.
 
 ## Runtime vs Transformer Mode
 

package/dist/arrow/aggregates.d.ts

@@ -3,10 +3,14 @@
  * identifiers (e.g. `groupConcat`) to IR func names (`GROUP_CONCAT`).
  * Shared by runtime parser and compile-time transformer.
  */
+import type { IrAggregate, IrNode } from "../ir/types.js";
 /** Recognized aggregate function names in IR. */
-export declare const AGGREGATE_FUNCS: Set<string>;
+export declare const AGGREGATE_FUNCS: ReadonlySet<IrAggregate["func"]>;
 /** Map a JS identifier (e.g. `count`, `groupConcat`) to the canonical IR func name. */
 export declare function toIrFuncName(rawName: string): string;
 /** True if `name` is a known aggregate after normalization. */
 export declare function isAggregateFunc(name: string): boolean;
+export declare function toIrAggregateFunc(rawName: string): IrAggregate["func"] | null;
+export declare function getAggregateSeparatorArgIndex(func: IrAggregate["func"]): number | null;
+export declare function buildIrAggregate(func: IrAggregate["func"], arg: IrNode | null, distinct: boolean, separator?: string): IrAggregate;
 //# sourceMappingURL=aggregates.d.ts.map

package/dist/arrow/aggregates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregates.d.ts","sourceRoot":"","sources":["../../src/arrow/aggregates.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,iDAAiD;AACjD,eAAO,MAAM,eAAe,aAU1B,CAAC;AASH,uFAAuF;AACvF,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,+DAA+D;AAC/D,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD"}
+{"version":3,"file":"aggregates.d.ts","sourceRoot":"","sources":["../../src/arrow/aggregates.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE1D,iDAAiD;AACjD,eAAO,MAAM,eAAe,EAAE,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAU3D,CAAC;AAcH,uFAAuF;AACvF,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,+DAA+D;AAC/D,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAG7E;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAEtF;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EACzB,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,MAAM,GACjB,WAAW,CAUb"}

package/dist/arrow/aggregates.js

@@ -15,6 +15,10 @@ export const AGGREGATE_FUNCS = new Set([
     "ARRAY_AGG",
     "JSON_AGG",
 ]);
+const SEPARATOR_ARG_INDEX = {
+    GROUP_CONCAT: 1,
+    STRING_AGG: 1,
+};
 const AGGREGATE_FUNC_MAP = {
     groupconcat: "GROUP_CONCAT",
     stringagg: "STRING_AGG",
@@ -27,6 +31,24 @@ export function toIrFuncName(rawName) {
 }
 /** True if `name` is a known aggregate after normalization. */
 export function isAggregateFunc(name) {
-    return AGGREGATE_FUNCS.has(toIrFuncName(name));
+    return toIrAggregateFunc(name) !== null;
+}
+export function toIrAggregateFunc(rawName) {
+    const func = toIrFuncName(rawName);
+    return AGGREGATE_FUNCS.has(func) ? func : null;
+}
+export function getAggregateSeparatorArgIndex(func) {
+    return SEPARATOR_ARG_INDEX[func] ?? null;
+}
+export function buildIrAggregate(func, arg, distinct, separator) {
+    return {
+        kind: "aggregate",
+        func,
+        arg,
+        ...(distinct ? { distinct: true } : {}),
+        ...(getAggregateSeparatorArgIndex(func) !== null && separator !== undefined
+            ? { separator }
+            : {}),
+    };
 }
 //# sourceMappingURL=aggregates.js.map

package/dist/arrow/aggregates.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregates.js","sourceRoot":"","sources":["../../src/arrow/aggregates.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,iDAAiD;AACjD,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC;IACrC,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,OAAO;IACP,cAAc;IACd,YAAY;IACZ,WAAW;IACX,UAAU;CACX,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAA2B;IACjD,WAAW,EAAE,cAAc;IAC3B,SAAS,EAAE,YAAY;IACvB,QAAQ,EAAE,WAAW;IACrB,OAAO,EAAE,UAAU;CACpB,CAAC;AAEF,uFAAuF;AACvF,MAAM,UAAU,YAAY,CAAC,OAAe;IAC1C,OAAO,kBAAkB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;AAC5E,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;AACjD,CAAC"}
+{"version":3,"file":"aggregates.js","sourceRoot":"","sources":["../../src/arrow/aggregates.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,iDAAiD;AACjD,MAAM,CAAC,MAAM,eAAe,GAAqC,IAAI,GAAG,CAAC;IACvE,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,OAAO;IACP,cAAc;IACd,YAAY;IACZ,WAAW;IACX,UAAU;CACX,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAiD;IACxE,YAAY,EAAE,CAAC;IACf,UAAU,EAAE,CAAC;CACd,CAAC;AAEF,MAAM,kBAAkB,GAA2B;IACjD,WAAW,EAAE,cAAc;IAC3B,SAAS,EAAE,YAAY;IACvB,QAAQ,EAAE,WAAW;IACrB,OAAO,EAAE,UAAU;CACpB,CAAC;AAEF,uFAAuF;AACvF,MAAM,UAAU,YAAY,CAAC,OAAe;IAC1C,OAAO,kBAAkB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;AAC5E,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,iBAAiB,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACnC,OAAO,eAAe,CAAC,GAAG,CAAC,IAA2B,CAAC,CAAC,CAAC,CAAE,IAA4B,CAAC,CAAC,CAAC,IAAI,CAAC;AACjG,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,IAAyB;IACrE,OAAO,mBAAmB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAyB,EACzB,GAAkB,EAClB,QAAiB,EACjB,SAAkB;IAElB,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,IAAI;QACJ,GAAG;QACH,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,GAAG,CAAC,6BAA6B,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS;YACzE,CAAC,CAAC,EAAE,SAAS,EAAE;YACf,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC"}

package/dist/arrow/index.d.ts

@@ -1,7 +1,11 @@
 /**
- * Barrel re-export for shared arrow-expression language rules (constants,
- * aggregate naming). Imported by `src/parser/*` and `src/transformer/*`.
+ * Shared arrow-expression language rules and semantic IR builders. The
+ * parser and transformer keep their AST-specific traversal in their own
+ * modules and converge here only after child expressions are resolved.
  */
+import type { IrCase, IrExists, IrNode } from "../ir/types.js";
 export { DEFAULT_ROW_PARAM, ALLOWED_METHODS, RELATION_QUERY_METHODS, ACORN_BINARY_OPS, } from "./constants.js";
-export { AGGREGATE_FUNCS, toIrFuncName, isAggregateFunc } from "./aggregates.js";
+export { AGGREGATE_FUNCS, buildIrAggregate, getAggregateSeparatorArgIndex, isAggregateFunc, toIrAggregateFunc, toIrFuncName, } from "./aggregates.js";
+export declare function buildIrCase(when: IrNode, then: IrNode, alternate: IrNode): IrCase;
+export declare function buildIrExists(quantifier: "some" | "every", rootParam: string, relationKey: string, innerParam: string, innerWhere: IrNode): IrExists;
 //# sourceMappingURL=index.d.ts.map

package/dist/arrow/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/arrow/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/arrow/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,6BAA6B,EAC7B,eAAe,EACf,iBAAiB,EACjB,YAAY,GACb,MAAM,iBAAiB,CAAC;AAEzB,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CASjF;AAED,wBAAgB,aAAa,CAC3B,UAAU,EAAE,MAAM,GAAG,OAAO,EAC5B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,QAAQ,CASV"}

package/dist/arrow/index.js

@@ -1,7 +1,28 @@
 /**
- * Barrel re-export for shared arrow-expression language rules (constants,
- * aggregate naming). Imported by `src/parser/*` and `src/transformer/*`.
+ * Shared arrow-expression language rules and semantic IR builders. The
+ * parser and transformer keep their AST-specific traversal in their own
+ * modules and converge here only after child expressions are resolved.
  */
 export { DEFAULT_ROW_PARAM, ALLOWED_METHODS, RELATION_QUERY_METHODS, ACORN_BINARY_OPS, } from "./constants.js";
-export { AGGREGATE_FUNCS, toIrFuncName, isAggregateFunc } from "./aggregates.js";
+export { AGGREGATE_FUNCS, buildIrAggregate, getAggregateSeparatorArgIndex, isAggregateFunc, toIrAggregateFunc, toIrFuncName, } from "./aggregates.js";
+export function buildIrCase(when, then, alternate) {
+    if (alternate.kind === "case") {
+        return {
+            kind: "case",
+            branches: [{ when, then }, ...alternate.branches],
+            ...(alternate.else !== undefined ? { else: alternate.else } : {}),
+        };
+    }
+    return { kind: "case", branches: [{ when, then }], else: alternate };
+}
+export function buildIrExists(quantifier, rootParam, relationKey, innerParam, innerWhere) {
+    return {
+        kind: "exists",
+        ...(quantifier === "every" ? { negated: true } : {}),
+        rootParam,
+        relationKey,
+        innerParam,
+        innerWhere,
+    };
+}
 //# sourceMappingURL=index.js.map

package/dist/arrow/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/arrow/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/arrow/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,6BAA6B,EAC7B,eAAe,EACf,iBAAiB,EACjB,YAAY,GACb,MAAM,iBAAiB,CAAC;AAEzB,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,IAAY,EAAE,SAAiB;IACvE,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC9B,OAAO;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC;YACjD,GAAG,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,UAA4B,EAC5B,SAAiB,EACjB,WAAmB,EACnB,UAAkB,EAClB,UAAkB;IAElB,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,GAAG,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,SAAS;QACT,WAAW;QACX,UAAU;QACV,UAAU;KACX,CAAC;AACJ,CAAC"}

package/dist/dbs/base-migrator.d.ts

@@ -14,7 +14,6 @@ export declare abstract class BaseMigrator implements DbMigrator {
     diffSchema(driver: ResolvedDriver, entities: readonly RegisteredEntity[]): Promise<DiffAction[]>;
     private diffColumns;
     protected static normalizeDefault(value: string | null): string | null;
-    protected static extractDefault(def: string): string | null;
     protected static computeColumnChanges(dbCol: DbColumnInfo, entityDef: string): ColumnChange[];
 }
 //# sourceMappingURL=base-migrator.d.ts.map

package/dist/dbs/base-migrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-migrator.d.ts","sourceRoot":"","sources":["../../src/dbs/base-migrator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,YAAY,EAEZ,UAAU,EACV,YAAY,EACZ,UAAU,EACV,WAAW,EACX,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGzD,8BAAsB,YAAa,YAAW,UAAU;IAEpD,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;gBADtC,WAAW,EAAE,WAAW,EACd,aAAa,EAAE,aAAa;IAGjD,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAC/D,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAE/E,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,SAAS,gBAAgB,EAAE,GACpC,OAAO,CAAC,UAAU,EAAE,CAAC;YAuBV,WAAW;IAuCzB,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI;IActE,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAM3D,SAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE;CAiC9F"}
+{"version":3,"file":"base-migrator.d.ts","sourceRoot":"","sources":["../../src/dbs/base-migrator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,YAAY,EAEZ,UAAU,EACV,YAAY,EACZ,UAAU,EACV,WAAW,EACX,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIzD,8BAAsB,YAAa,YAAW,UAAU;IAEpD,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;gBADtC,WAAW,EAAE,WAAW,EACd,aAAa,EAAE,aAAa;IAGjD,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAC/D,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAE/E,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,SAAS,gBAAgB,EAAE,GACpC,OAAO,CAAC,UAAU,EAAE,CAAC;YAuBV,WAAW;IAuCzB,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI;IActE,SAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE;CAkC9F"}

package/dist/dbs/base-migrator.js

@@ -3,6 +3,7 @@
  * Each dialect subclasses this and overrides dialect-specific hooks.
  */
 import { getColumnDef } from "./types.js";
+import { parseColumnDefinition } from "../schema/column-definition.js";
 import { extractBaseType } from "../utils.js";
 export class BaseMigrator {
     dialectName;
@@ -76,21 +77,18 @@ export class BaseMigrator {
             return null;
         return normalized;
     }
-    static extractDefault(def) {
-        const match = /\bdefault\s+(.+?)(?:\s+not\s+null|\s+primary\s+key|\s+unique|\s+references\b|$)/i.exec(def);
-        return BaseMigrator.normalizeDefault(match?.[1] ?? null);
-    }
     static computeColumnChanges(dbCol, entityDef) {
         const changes = [];
+        const metadata = parseColumnDefinition(entityDef);
         const dbBaseType = extractBaseType(dbCol.type);
         const entityBaseType = extractBaseType(entityDef);
         if (dbBaseType !== entityBaseType) {
             changes.push({ kind: "type", from: dbBaseType, to: entityBaseType });
         }
         const dbPk = dbCol.pk > 0;
-        const entityPk = /\bprimary\s+key\b/i.test(entityDef);
+        const entityPk = metadata.primaryKey;
         const dbNotNull = dbCol.notnull === 1 || dbPk;
-        const entityNotNull = /\bnot\s+null\b/i.test(entityDef) || entityPk;
+        const entityNotNull = metadata.notNull || entityPk;
         if (dbNotNull !== entityNotNull) {
             changes.push({
                 kind: entityNotNull ? "not_null" : "nullable",
@@ -99,7 +97,7 @@ export class BaseMigrator {
             });
         }
         const dbDefault = BaseMigrator.normalizeDefault(dbCol.dflt_value);
-        const entityDefault = BaseMigrator.extractDefault(entityDef);
+        const entityDefault = BaseMigrator.normalizeDefault(metadata.defaultValue);
         if (dbDefault !== entityDefault) {
             changes.push({ kind: "default", from: dbDefault, to: entityDefault });
         }

package/dist/dbs/base-migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-migrator.js","sourceRoot":"","sources":["../../src/dbs/base-migrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-migrator.js","sourceRoot":"","sources":["../../src/dbs/base-migrator.ts"],"names":[],"mappings":"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"}

package/dist/dbs/postgres/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../../src/dbs/postgres/driver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,EACV,MAAM,EAKP,MAAM,uBAAuB,CAAC;AAuB/B,wGAAwG;AACxG,MAAM,WAAW,qBAAqB;IACpC,+EAA+E;IAC/E,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gDAAgD;IAChD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qBAAqB;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,GAAG,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACjC,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6EAA6E;IAC7E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yEAAyE;IACzE,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC;CACvD;AAED,kDAAkD;AAClD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,MAAM,CAkG3E"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../../src/dbs/postgres/driver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,EACV,MAAM,EAKP,MAAM,uBAAuB,CAAC;AAwB/B,wGAAwG;AACxG,MAAM,WAAW,qBAAqB;IACpC,+EAA+E;IAC/E,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gDAAgD;IAChD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qBAAqB;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,GAAG,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACjC,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6EAA6E;IAC7E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yEAAyE;IACzE,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC;CACvD;AAED,kDAAkD;AAClD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,MAAM,CAmG3E"}

package/dist/dbs/postgres/driver.js

@@ -6,6 +6,7 @@ import pg from "pg";
 import { PostgresTrx } from "./trx.js";
 import { postgresDialect } from "./dialect.js";
 import { isRecord } from "../../utils.js";
+import { createCompileOnlyDriver, isCompileOnlyEnabled } from "../../driver/compile-only.js";
 const { Pool } = pg;
 function toBindable(value) {
     if (value === undefined || value === null)
@@ -25,6 +26,8 @@ function toBindable(value) {
 }
 /** Creates a PostgreSQL driver backed by `pg`. */
 export function createPostgresDriver(options) {
+    if (isCompileOnlyEnabled())
+        return createCompileOnlyDriver(postgresDialect);
     const connectionString = options.connectionString ?? options.url;
     const baseConfig = connectionString
         ? { connectionString }

package/dist/dbs/postgres/driver.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../src/dbs/postgres/driver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../src/dbs/postgres/driver.ts"],"names":[],"mappings":"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"}

package/dist/dbs/postgres/query-compiler.d.ts

@@ -1,11 +1,15 @@
 import { BaseQueryCompiler } from "../query-compiler.js";
 import type { CompileResult, DiffAction, ExpandPlaceholdersResult, CompiledCteBody } from "../types.js";
-import type { ExprAggregate, JoinSpec } from "../../orm/expr.js";
+import type { ExprAggregate } from "../../orm/expr.js";
+import type { JoinType } from "../../ir/types.js";
 type AlterColumnAction = Extract<DiffAction, {
     kind: "alter_column";
 }>;
 export declare class PostgresQueryCompiler extends BaseQueryCompiler {
     protected readonly dialect: "postgres";
+    protected placeholder(index: number): string;
+    protected compileXorSql(left: string, right: string): string;
+    protected shiftUpdateWherePlaceholders(whereSql: string, offset: number): string;
     compileNextSequenceValues(): CompileResult;
     compileTrackingTable(): CompileResult;
     compileListTables(): CompileResult;
@@ -14,7 +18,7 @@ export declare class PostgresQueryCompiler extends BaseQueryCompiler {
     protected compileWithClause(coreSql: string, coreParams: unknown[], bodies: CompiledCteBody[], paramStartIndex: number): CompileResult;
     private shiftPlaceholders;
     compileAggregate(agg: ExprAggregate, params?: unknown[]): string;
-    protected buildJoinClause(join: JoinSpec, mainAlias: string, onSql?: string): string;
+    protected joinKeyword(joinType: JoinType): string;
     protected compileAlterColumn(action: AlterColumnAction, reverse: boolean): string;
 }
 export declare const postgresQueryCompiler: PostgresQueryCompiler;

package/dist/dbs/postgres/query-compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-compiler.d.ts","sourceRoot":"","sources":["../../../src/dbs/postgres/query-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,wBAAwB,EACxB,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEjE,KAAK,iBAAiB,GAAG,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC,CAAC;AAEvE,qBAAa,qBAAsB,SAAQ,iBAAiB;IAC1D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAG,UAAU,CAAU;IAEjD,yBAAyB,IAAI,aAAa;IAI1C,oBAAoB,IAAI,aAAa;IAWrC,iBAAiB,IAAI,aAAa;IAalC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa;IAwBhD,SAAS,CAAC,kBAAkB,CAC1B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,OAAO,EAAE,EACzB,QAAQ,SAAI,GACX,wBAAwB;IAgB3B,SAAS,CAAC,iBAAiB,CACzB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,OAAO,EAAE,EACrB,MAAM,EAAE,eAAe,EAAE,EACzB,eAAe,EAAE,MAAM,GACtB,aAAa;IAiBhB,OAAO,CAAC,iBAAiB;IAKzB,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,GAAE,OAAO,EAAO,GAAG,MAAM;IAapE,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM;IAiBpF,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM;CA8BlF;AAED,eAAO,MAAM,qBAAqB,uBAA8B,CAAC"}
+{"version":3,"file":"query-compiler.d.ts","sourceRoot":"","sources":["../../../src/dbs/postgres/query-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,wBAAwB,EACxB,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,KAAK,iBAAiB,GAAG,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC,CAAC;AAEvE,qBAAa,qBAAsB,SAAQ,iBAAiB;IAC1D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAG,UAAU,CAAU;IAEjD,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI5C,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAI5D,SAAS,CAAC,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAIhF,yBAAyB,IAAI,aAAa;IAI1C,oBAAoB,IAAI,aAAa;IAWrC,iBAAiB,IAAI,aAAa;IAalC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa;IAwBhD,SAAS,CAAC,kBAAkB,CAC1B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,OAAO,EAAE,EACzB,QAAQ,SAAI,GACX,wBAAwB;IAgB3B,SAAS,CAAC,iBAAiB,CACzB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,OAAO,EAAE,EACrB,MAAM,EAAE,eAAe,EAAE,EACzB,eAAe,EAAE,MAAM,GACtB,aAAa;IAiBhB,OAAO,CAAC,iBAAiB;IAKzB,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,GAAE,OAAO,EAAO,GAAG,MAAM;IAapE,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM;IAIjD,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM;CA8BlF;AAED,eAAO,MAAM,qBAAqB,uBAA8B,CAAC"}

package/dist/dbs/postgres/query-compiler.js

@@ -1,6 +1,15 @@
 import { BaseQueryCompiler } from "../query-compiler.js";
 export class PostgresQueryCompiler extends BaseQueryCompiler {
     dialect = "postgres";
+    placeholder(index) {
+        return `$${index}`;
+    }
+    compileXorSql(left, right) {
+        return `(${left} # ${right})`;
+    }
+    shiftUpdateWherePlaceholders(whereSql, offset) {
+        return whereSql.replaceAll(/\$(\d+)/g, (_, n) => `$${Number.parseInt(n, 10) + offset}`);
+    }
     compileNextSequenceValues() {
         throw new Error("Postgres sequence allocation is not configured for this dialect yet");
     }
@@ -95,17 +104,8 @@ export class PostgresQueryCompiler extends BaseQueryCompiler {
                 return super.compileAggregate(agg, params);
         }
     }
-    buildJoinClause(join, mainAlias, onSql) {
-        const kw = join.joinType === "cross"
-            ? "INNER JOIN"
-            : (BaseQueryCompiler.JOIN_SQL_KEYWORDS[join.joinType] ?? "LEFT JOIN");
-        if (join.on) {
-            return ` ${kw} ${this.escapeIdentifier(join.targetTable)} AS ${this.escapeIdentifier(join.alias)} ON ${onSql}`;
-        }
-        const on = join.foreignKeys
-            .map((fk, i) => `${this.escapeIdentifier(mainAlias)}.${this.escapeIdentifier(fk)} = ${this.escapeIdentifier(join.alias)}.${this.escapeIdentifier(join.targetPkColumns[i] ?? join.targetPkColumns[0])}`)
-            .join(" AND ");
-        return ` ${kw} ${this.escapeIdentifier(join.targetTable)} AS ${this.escapeIdentifier(join.alias)} ON ${on}`;
+    joinKeyword(joinType) {
+        return joinType === "cross" ? "INNER JOIN" : super.joinKeyword(joinType);
     }
     compileAlterColumn(action, reverse) {
         const table = this.escapeIdentifier(action.table);

package/dist/dbs/postgres/query-compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-compiler.js","sourceRoot":"","sources":["../../../src/dbs/postgres/query-compiler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query-compiler.js","sourceRoot":"","sources":["../../../src/dbs/postgres/query-compiler.ts"],"names":[],"mappings":"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"}

package/dist/dbs/query-compiler.d.ts

@@ -4,11 +4,10 @@
  * The public surface compiles complete query/migration operations. Dialect
  * subclasses override protected pieces where SQL differs.
  */
-import type { ColumnDef, CompileQueryOpts, CompileResult, CompileSelectOpts, DiffAction, ExpandPlaceholdersResult, OnConflictClause, QueryCompiler, CompiledCteBody } from "./types.js";
+import type { DialectColumnDef, CompileQueryOpts, CompileResult, CompileSelectOpts, DiffAction, ExpandPlaceholdersResult, OnConflictClause, QueryCompiler, CompiledCteBody } from "./types.js";
 import type { Expr, ExprAggregate, ExprCase, ExprColumn, BinaryOp, GroupByItem, JoinSpec } from "../orm/expr.js";
-import type { QueryPlan } from "../orm/helpers/query-plan/query-plan.js";
-import type { FromSource } from "../orm/query-state.js";
-import type { DialectName, WithClause } from "./types.js";
+import type { QueryPlan, QueryPlanCte, QueryPlanFromSource } from "../orm/helpers/query-plan/query-plan.js";
+import type { DialectName } from "./types.js";
 import type { JoinType } from "../ir/types.js";
 type AlterColumnAction = Extract<DiffAction, {
     kind: "alter_column";
@@ -32,7 +31,7 @@ export declare abstract class BaseQueryCompiler implements QueryCompiler {
     protected abstract readonly dialect: DialectName;
     protected renderColumn(col: ExprColumn): string;
     protected compileUnarySql(op: "!" | "~", operandSql: string): string;
-    protected compileXorSql(left: string, right: string): string;
+    protected abstract compileXorSql(left: string, right: string): string;
     protected compileBinarySql(op: BinaryOp, left: string, right: string): string;
     protected compileInlineExpr(arg: Expr | null, params: unknown[]): string;
     protected inlineConstLiteral(value: unknown): string;
@@ -48,12 +47,12 @@ export declare abstract class BaseQueryCompiler implements QueryCompiler {
     compileGroupBy(items: GroupByItem[]): string;
     compilePlan(plan: QueryPlan, options?: CompileQueryOpts): CompileResult;
     compileResultSize(plan: QueryPlan): CompileResult;
-    protected compileCteBodies(ctes: WithClause[] | undefined, allowedCteNames?: string[]): CompiledCteBody[];
+    protected compileCteBodies(ctes: QueryPlanCte[] | undefined): CompiledCteBody[];
     protected resolvePlanFromClause(plan: {
         tableName: string;
         tableAlias: string;
-        fromSource?: FromSource;
-    }, allowedCteNames: string[], paramStartIndex: number, compileOptions?: CompileQueryOpts): {
+        fromSource?: QueryPlanFromSource;
+    }, paramStartIndex: number): {
         fromClause: string;
         fromParams: unknown[];
     };
@@ -63,7 +62,7 @@ export declare abstract class BaseQueryCompiler implements QueryCompiler {
     protected attachCteBodies(core: CompileResult, bodies: CompiledCteBody[], paramStartIndex: number): CompileResult;
     compileMigrationUp(action: DiffAction): string;
     compileMigrationDown(action: DiffAction): string;
-    compileCreateTableIfNotExists(table: string, schema: Record<string, ColumnDef>): string;
+    compileCreateTableIfNotExists(table: string, schema: Record<string, DialectColumnDef>): string;
     compileAppliedMigrations(): CompileResult;
     compileRecordMigration(name: string): CompileResult;
     compileDeleteMigration(name: string): CompileResult;
@@ -72,9 +71,9 @@ export declare abstract class BaseQueryCompiler implements QueryCompiler {
     abstract compileListTables(): CompileResult;
     abstract compileListColumns(table: string): CompileResult;
     protected escapeIdentifier(name: string): string;
-    protected placeholder(index: number): string;
+    protected abstract placeholder(index: number): string;
     protected abstract expandPlaceholders(sql: string, resolvedParams: unknown[], startIdx?: number): ExpandPlaceholdersResult;
-    protected toColumnDef(def: ColumnDef): string;
+    protected toColumnDef(def: DialectColumnDef): string;
     protected compileSelectPlan(plan: QueryPlan, options: CompileQueryOpts): CompileResult;
     protected compileUpdatePlan(plan: QueryPlan): CompileResult;
     protected compileDeletePlan(plan: QueryPlan): CompileResult;
@@ -104,6 +103,7 @@ export declare abstract class BaseQueryCompiler implements QueryCompiler {
     protected compileLike(receiver: string, arg: string, mode: "startsWith" | "endsWith" | "includes"): string;
     compileAggregate(agg: ExprAggregate, params?: unknown[]): string;
     protected buildJoinClause(join: JoinSpec, mainAlias: string, onSql?: string): string;
+    protected joinKeyword(joinType: JoinType): string;
     protected appendOnConflict(baseSql: string, onConflict: OnConflictClause, insertColumns: string[]): string;
     protected excludedTableName(): string;
     protected singleInsertReturnsRows(hasPk: boolean): boolean;
@@ -111,10 +111,10 @@ export declare abstract class BaseQueryCompiler implements QueryCompiler {
         sql: string;
         params: unknown[];
     };
-    protected renumberUpdateWhereParams(whereSql: string, offset: number): string;
+    protected abstract shiftUpdateWherePlaceholders(whereSql: string, offset: number): string;
     protected registeredCteNames(plan: QueryPlan): Set<string>;
     protected fixMutationWhereAlias(table: string, whereSql: string, alias?: string, keepAlias?: boolean): string;
-    protected compileCreateTable(table: string, schema: Record<string, ColumnDef>, ifNotExists: boolean): string;
+    protected compileCreateTable(table: string, schema: Record<string, DialectColumnDef>, ifNotExists: boolean): string;
     protected compileRecreateDroppedTable(table: string, columnInfos: Array<{
         name: string;
         type: string;

package/dist/dbs/query-compiler.d.ts.map

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