@cosmicdrift/kumiko-framework 0.14.0 → 0.15.0

package/src/db/dialect.ts

@@ -1,89 +1,477 @@
-// Central re-export for all PostgreSQL-specific imports.
-// No other file in the framework should import from "drizzle-orm/pg-core" directly.
-
-import { customType } from "drizzle-orm/pg-core";
-
-export type {
-  PgSelect as SelectQuery,
-  PgTableWithColumns as TableColumns,
-} from "drizzle-orm/pg-core";
-export {
-  bigint,
-  bigserial,
-  boolean,
-  index,
-  integer,
-  jsonb,
-  numeric,
-  pgTable as table,
-  primaryKey,
-  serial,
-  text,
-  timestamp,
-  uniqueIndex,
-  uuid,
-} from "drizzle-orm/pg-core";
-
-/**
- * Money column: BIGINT storing the integer minor unit (cents for EUR, yen
- * for JPY). Range ±9.2e18 in the DB; JS `number` is safe to 2^53 ≈ 9e15
- * minor units = ~90 trillion EUR. INTEGER would cap at ~21 million EUR per
- * row which is too tight for real-world invoices, bank balances, or bills
- * of sale — hence bigint.
- */
-export const moneyAmount = customType<{ data: number; driverData: string | number }>({
-  dataType() {
-    return "bigint";
-  },
-  fromDriver(value: string | number): number {
-    // node-postgres returns BIGINT as string by default; Bun's pg returns
-    // number. Cast via Number() either way — safe because we stay under 2^53.
-    return typeof value === "number" ? value : Number(value);
-  },
-  toDriver(value: number): number {
-    return value;
-  },
-});
-
-/**
- * Instant column: TIMESTAMPTZ storing a UTC instant, surfaced to JS as
- * `Temporal.Instant`. Replaces the old dual-mode situation (`mode:"date"`
- * for base fields vs `mode:"string"` for user-defined timestamp fields)
- * with a single round-trip type. See sprint-f-temporal.md for the migration.
- *
- * Driver-data is the ISO-8601 string the postgres driver actually exchanges.
- * `fromDriver` reads what the driver returns (postgres-js gives strings for
- * timestamptz) and parses through Temporal. `toDriver` writes the canonical
- * Temporal.Instant.toString() — the spike confirmed `eq/lte/gt/orderBy/
- * returning` accept Temporal.Instant directly without manual `.toString()`
- * at the call site.
- *
- * Boot-order note: `Temporal` must exist on globalThis before any
- * fromDriver/toDriver call. `ensureTemporalPolyfill()` runs at framework
- * boot. The closures here are lazy — they fire on read/write, not on
- * module load — so importing this file before the polyfill is safe.
- *
- * Optional `precision` (0..6) — fractional-second digits. Default 6 matches
- * PG's default `timestamptz`. Pass 3 for the events-table (ms precision —
- * matches what asOf-queries can compare reliably). Affects only CREATE TABLE
- * DDL via drizzle-kit; runtime parse handles any precision via Temporal.
- */
-// Forgiving overload: payloads from custom write-handlers sometimes
-// arrive as ISO strings rather than Temporal.Instant (Zod insert-
-// schemas use z.iso.datetime, not a Temporal validator). Coerce here
-// at the boundary so the DB always sees a normalised string — and
-// Temporal.Instant.from throws on bad input, which is the right failure
-// mode (vs. the obscure "x.toString is not a function" crash that hit
-// feature authors before this overload existed).
+// Native dialect — replaces drizzle-orm/pg-core re-exports.
 //
-// Date-only strings (YYYY-MM-DD) coercen wir auf start-of-day UTC.
-// Hintergrund: type:"date" ist heute auf instant() aliased (table-
-// builder.ts TODO Sprint G), aber die Zod-Validation akzeptiert nur
-// YYYY-MM-DD. Ohne diesen Coerce wirft Temporal mit "Cannot parse:
-// 2026-04-10" und der Author bekommt einen internal_error 500 statt
-// einen sauberen DB-Roundtrip.
+// Produces table objects that simultaneously expose:
+//   1. EntityTableMeta shape (source/columns/indexes) for bun-db's
+//      extractTableInfo + the migrate-runner's renderTableDdl
+//   2. drizzle-compatible Symbol metadata so callers that introspect
+//      Symbol.for("kumiko:schema:Name") / Symbol.for("kumiko:schema:Columns") keep
+//      working (no caller updates needed)
+//   3. Top-level column-handle properties (table.id, table.tenantId, ...)
+//      so legacy code that does `table[field].name` still resolves to the
+//      snake_case SQL column name.
 //
-// Exportiert für Tests; production-call läuft über instantBuilder.
+// The framework no longer imports drizzle-orm at runtime — schema-files
+// use only this module.
+
+import type {
+  ColumnMeta,
+  CompositePrimaryKeyMeta,
+  EntityTableMeta,
+  IndexMeta,
+  PgType,
+} from "./entity-table-meta";
+
+// Public type aliases — historical compat for callers that used to import
+// these from drizzle-orm/pg-core. SelectQuery is no longer a meaningful
+// shape (no chain builder); TableColumns is the new SchemaTable union.
+// biome-ignore lint/suspicious/noExplicitAny: variadic table shape
+export type TableColumns<_T = any> = SchemaTable;
+// biome-ignore lint/suspicious/noExplicitAny: legacy type — chain API is gone
+export type SelectQuery = any;
+
+// Column handle exposed on the SchemaTable. The `name` is the SQL column
+// name (snake_case); legacy code accesses `table.fieldName.name` to
+// produce raw SQL.
+export type ColumnHandle = {
+  readonly name: string;
+  readonly pgType: PgType;
+  readonly getSQLType: () => string;
+};
+
+const KUMIKO_NAME_SYMBOL = Symbol.for("kumiko:schema:Name");
+const KUMIKO_COLUMNS_SYMBOL = Symbol.for("kumiko:schema:Columns");
+
+// SchemaTable — opaque shape with both EntityTableMeta + Symbol-based
+// introspection. Returned by `table(...)`.
+export type SchemaTable = EntityTableMeta & {
+  readonly [KUMIKO_NAME_SYMBOL]: string;
+  readonly [KUMIKO_COLUMNS_SYMBOL]: Record<string, ColumnHandle>;
+  readonly [field: string]: unknown;
+};
+
+export function pgTypeToSqlType(pgType: PgType): string {
+  switch (pgType) {
+    case "uuid":
+      return "uuid";
+    case "text":
+      return "text";
+    case "boolean":
+      return "boolean";
+    case "integer":
+      return "integer";
+    case "bigint":
+      return "bigint";
+    case "serial":
+      return "serial";
+    case "bigserial":
+      return "bigserial";
+    case "jsonb":
+      return "jsonb";
+    case "timestamptz":
+      return "timestamp with time zone";
+    case "timestamptz(3)":
+      return "timestamp(3) with time zone";
+  }
+}
+
+function _toSnakeCase(name: string): string {
+  return name.replace(/[A-Z]/g, (m) => `_${m.toLowerCase()}`).replace(/^_/, "");
+}
+
+// ---- Column builder ----
+//
+// Returned by uuid()/text()/etc. Chainable: notNull/primaryKey/default/unique.
+// Internal state captured in the builder; finalised when handed to table().
+// `name` is set explicitly on the first call (uuid("user_id")) and may be
+// overridden by `withCamel(jsField)` so the handle exposes both the SQL name
+// AND the JS field-name for type inference.
+
+type ColumnFinal = {
+  readonly sqlName: string;
+  readonly pgType: PgType;
+  readonly notNull: boolean;
+  readonly primaryKey: boolean;
+  readonly unique: boolean;
+  readonly identity: boolean;
+  readonly defaultSql?: string;
+};
+
+export type ColumnBuilder<TValue = unknown> = {
+  readonly __column: true;
+  readonly finalise: () => ColumnFinal;
+  notNull(): ColumnBuilder<TValue>;
+  primaryKey(): ColumnBuilder<TValue>;
+  default(
+    value: TValue | SqlExpression | readonly unknown[] | number | string | boolean | null,
+  ): ColumnBuilder<TValue>;
+  defaultRandom(): ColumnBuilder<TValue>;
+  defaultNow(): ColumnBuilder<TValue>;
+  generatedAlwaysAsIdentity(): ColumnBuilder<TValue>;
+  unique(name?: string): ColumnBuilder<TValue>;
+  $type<T>(): ColumnBuilder<T>;
+  $onUpdate(fn: () => unknown): ColumnBuilder<TValue>;
+};
+
+function buildColumn(sqlName: string, pgType: PgType): ColumnBuilder<unknown> {
+  let notNull = false;
+  let primaryKey = false;
+  let unique = false;
+  let identity = false;
+  let defaultSql: string | undefined;
+
+  function literalDefault(value: unknown): string | null {
+    if (value === undefined) return null;
+    if (value === null) return "NULL";
+    if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
+    if (typeof value === "number") return String(value);
+    if (typeof value === "boolean") return value ? "true" : "false";
+    if (typeof value === "bigint") return value.toString();
+    if (
+      value &&
+      typeof value === "object" &&
+      "kind" in value &&
+      (value as { kind: string }).kind === "sql-expr"
+    ) {
+      return (value as SqlExpression).text;
+    }
+    if (typeof value === "function") return null; // function-defaults stay JS-side
+    // Object/array → jsonb literal
+    const serialised = JSON.stringify(value);
+    if (serialised === undefined) return null;
+    return `'${serialised.replace(/'/g, "''")}'::jsonb`;
+  }
+
+  const builder: ColumnBuilder<unknown> = {
+    __column: true,
+    finalise(): ColumnFinal {
+      return {
+        sqlName,
+        pgType,
+        notNull,
+        primaryKey,
+        unique,
+        identity,
+        ...(defaultSql !== undefined && { defaultSql }),
+      };
+    },
+    notNull() {
+      notNull = true;
+      return builder;
+    },
+    primaryKey() {
+      primaryKey = true;
+      notNull = true;
+      return builder;
+    },
+    default(value: unknown) {
+      const rendered = literalDefault(value);
+      defaultSql = rendered === null ? undefined : rendered;
+      return builder;
+    },
+    defaultRandom() {
+      defaultSql = "gen_random_uuid()";
+      return builder;
+    },
+    defaultNow() {
+      defaultSql = "now()";
+      return builder;
+    },
+    generatedAlwaysAsIdentity() {
+      identity = true;
+      defaultSql = undefined;
+      return builder;
+    },
+    unique(_name?: string) {
+      unique = true;
+      return builder;
+    },
+    $type<T>() {
+      return builder as unknown as ColumnBuilder<T>;
+    },
+    $onUpdate(_fn: () => unknown) {
+      // Runtime $onUpdate is a no-op in the schema layer — the framework's
+      // event-driven projection write path sets modified_at explicitly.
+      return builder;
+    },
+  };
+  return builder;
+}
+
+// ---- Column factories ----
+
+export function uuid(name: string): ColumnBuilder<string> {
+  return buildColumn(name, "uuid") as ColumnBuilder<string>;
+}
+
+export function text(name: string): ColumnBuilder<string> {
+  return buildColumn(name, "text") as ColumnBuilder<string>;
+}
+
+export function boolean(name: string): ColumnBuilder<boolean> {
+  return buildColumn(name, "boolean") as ColumnBuilder<boolean>;
+}
+
+export function integer(name: string): ColumnBuilder<number> {
+  return buildColumn(name, "integer") as ColumnBuilder<number>;
+}
+
+export function serial(name: string): ColumnBuilder<number> {
+  return buildColumn(name, "serial") as ColumnBuilder<number>;
+}
+
+export function bigint(
+  name: string,
+  _opts?: { mode?: "bigint" | "number" },
+): ColumnBuilder<bigint> {
+  return buildColumn(name, "bigint") as ColumnBuilder<bigint>;
+}
+
+export function bigserial(
+  name: string,
+  _opts?: { mode?: "bigint" | "number" },
+): ColumnBuilder<bigint> {
+  return buildColumn(name, "bigserial") as ColumnBuilder<bigint>;
+}
+
+export function jsonb(name: string): ColumnBuilder<Record<string, unknown>> {
+  return buildColumn(name, "jsonb") as ColumnBuilder<Record<string, unknown>>;
+}
+
+// Legacy alias kept for compat — timestamptz with no precision.
+export function timestamp(
+  name: string,
+  _opts?: { withTimezone?: boolean; mode?: "string" | "date" },
+): ColumnBuilder<Temporal.Instant | string> {
+  return buildColumn(name, "timestamptz") as ColumnBuilder<Temporal.Instant | string>;
+}
+
+// numeric → text (we don't currently use Decimal); kept for compat with
+// legacy schema imports that won't actually instantiate at runtime.
+export function numeric(
+  name: string,
+  _opts?: { precision?: number; scale?: number },
+): ColumnBuilder<string> {
+  return buildColumn(name, "text") as ColumnBuilder<string>;
+}
+
+export function instant(
+  name: string,
+  opts?: { precision?: 0 | 1 | 2 | 3 | 4 | 5 | 6 },
+): ColumnBuilder<Temporal.Instant> {
+  const pgType: PgType = opts?.precision === 3 ? "timestamptz(3)" : "timestamptz";
+  return buildColumn(name, pgType) as ColumnBuilder<Temporal.Instant>;
+}
+
+// moneyAmount kept as a customType-style API but produces a bigint column.
+export const moneyAmount = (name: string): ColumnBuilder<number> =>
+  buildColumn(name, "bigint") as ColumnBuilder<number>;
+
+// ---- Index + primaryKey helpers ----
+
+export type IndexBuilder = {
+  readonly __index: true;
+  on(...cols: ColumnHandle[]): IndexBuilderWithCols;
+};
+
+export type IndexBuilderWithCols = {
+  readonly __index: true;
+  readonly name: string;
+  readonly unique: boolean;
+  readonly columns: readonly string[];
+  where(expr: SqlExpression): IndexBuilderWithCols;
+  readonly whereSql?: string;
+};
+
+function makeIndex(name: string, unique: boolean): IndexBuilder {
+  return {
+    __index: true,
+    on(...cols: ColumnHandle[]): IndexBuilderWithCols {
+      const colNames = cols.map((c) => c.name);
+      let whereSql: string | undefined;
+      const finalised: IndexBuilderWithCols = {
+        __index: true,
+        name,
+        unique,
+        columns: colNames,
+        get whereSql() {
+          return whereSql;
+        },
+        where(expr: SqlExpression) {
+          whereSql = expr.text;
+          return finalised;
+        },
+      };
+      return finalised;
+    },
+  };
+}
+
+export function index(name: string): IndexBuilder {
+  return makeIndex(name, false);
+}
+
+export function uniqueIndex(name: string): IndexBuilder {
+  return makeIndex(name, true);
+}
+
+export type PrimaryKeyDescriptor = {
+  readonly __pk: true;
+  readonly columns: readonly string[];
+  readonly name?: string;
+};
+
+export function primaryKey(opts: {
+  columns: readonly ColumnHandle[];
+  name?: string;
+}): PrimaryKeyDescriptor {
+  return {
+    __pk: true,
+    columns: opts.columns.map((c) => c.name),
+    ...(opts.name !== undefined && { name: opts.name }),
+  };
+}
+
+// ---- sql template ----
+//
+// A constrained sql template tag. Returns a SqlExpression carrying the
+// composed text + params. Used in DEFAULT expressions in schema files
+// (sql`now()`, sql`gen_random_uuid()`, sql`0`).
+//
+// Limits: no nested SqlExpression composition (drizzle's recursive
+// `sql\`${other}\``) — schema-files use single-level expressions only.
+
+export type SqlExpression = {
+  readonly kind: "sql-expr";
+  readonly text: string;
+  readonly params: readonly unknown[];
+};
+
+export function sql(strings: TemplateStringsArray, ...values: readonly unknown[]): SqlExpression {
+  const parts: string[] = [];
+  const params: unknown[] = [];
+  for (let i = 0; i < strings.length; i++) {
+    parts.push(strings[i] ?? "");
+    if (i < values.length) {
+      const v = values[i];
+      if (v && typeof v === "object" && "kind" in v && v.kind === "sql-expr") {
+        parts.push((v as SqlExpression).text);
+      } else {
+        parts.push(String(v));
+      }
+    }
+  }
+  return { kind: "sql-expr", text: parts.join(""), params };
+}
+
+sql.raw = (text: string): SqlExpression => ({ kind: "sql-expr", text, params: [] });
+
+// ---- table() — the schema-table factory ----
+//
+// Produces a SchemaTable with:
+//   - EntityTableMeta shape (source/tableName/columns/indexes)
+//   - Drizzle Symbol metadata for compat with bun-db's introspection
+//   - Top-level column-handle properties (table.fieldName → ColumnHandle)
+//
+// Second arg is an object whose keys are JS field-names; values are
+// ColumnBuilder. Third arg is the constraints/index callback receiving
+// a record of ColumnHandle (so existing `(t) => ({ idx: index(...).on(t.col) })`
+// patterns work).
+
+export type ColumnMap = Record<string, ColumnBuilder<unknown>>;
+
+type IndexOrPk = IndexBuilderWithCols | PrimaryKeyDescriptor;
+
+export function table<TCols extends ColumnMap>(
+  tableName: string,
+  cols: TCols,
+  optsFn?: (
+    t: { [K in keyof TCols]: ColumnHandle },
+  ) => Record<string, IndexOrPk> | ReadonlyArray<IndexOrPk>,
+): SchemaTable {
+  // Finalise columns + build the column-handle map.
+  const handles: Record<string, ColumnHandle> = {};
+  const columnMetas: ColumnMeta[] = [];
+  const indexes: IndexMeta[] = [];
+  for (const [field, builder] of Object.entries(cols)) {
+    const final = builder.finalise();
+    const handle: ColumnHandle = {
+      name: final.sqlName,
+      pgType: final.pgType,
+      getSQLType: () => pgTypeToSqlType(final.pgType),
+    };
+    handles[field] = handle;
+    const meta: ColumnMeta = {
+      name: final.sqlName,
+      pgType: final.pgType,
+      notNull: final.notNull,
+      ...(final.primaryKey && { primaryKey: true }),
+      ...(final.identity && { identity: true }),
+      ...(final.defaultSql !== undefined && { defaultSql: final.defaultSql }),
+    };
+    columnMetas.push(meta);
+
+    // Per-column .unique() → single-column unique index
+    if (final.unique) {
+      indexes.push({
+        name: `${tableName}_${final.sqlName}_unique`,
+        columns: [final.sqlName],
+        unique: true,
+      });
+    }
+  }
+
+  // Evaluate index/pk callback with the column handles.
+  let compositePrimaryKey: CompositePrimaryKeyMeta | undefined;
+  if (optsFn) {
+    const tHandle = handles as { [K in keyof TCols]: ColumnHandle };
+    const opts = optsFn(tHandle);
+    const entries: Array<[string, IndexOrPk | undefined]> = Array.isArray(opts)
+      ? (opts as ReadonlyArray<IndexOrPk>).map((v, i) => [String(i), v])
+      : Object.entries(opts);
+    for (const [key, value] of entries) {
+      if (!value) continue;
+      if ("__pk" in value && value.__pk === true) {
+        compositePrimaryKey = {
+          name: value.name ?? `${tableName}_pk`,
+          columns: value.columns,
+        };
+      } else if ("__index" in value && value.__index === true) {
+        const idx = value as IndexBuilderWithCols;
+        indexes.push({
+          name: idx.name,
+          columns: idx.columns,
+          ...(idx.unique && { unique: true }),
+          ...(idx.whereSql !== undefined && { whereSql: idx.whereSql }),
+        });
+      } else {
+        // Inline unique-column declaration via .unique() — not implemented yet.
+        // Schema files don't currently use that path; pinned by the table-types
+        // test fixture if it's ever added.
+        const _k = key;
+      }
+    }
+  }
+
+  // Build the SchemaTable. Object.assign to layer the column handles + symbols
+  // onto the EntityTableMeta-shaped object so introspection works.
+  const base: EntityTableMeta = {
+    tableName,
+    columns: columnMetas,
+    indexes,
+    ...(compositePrimaryKey !== undefined && { compositePrimaryKey }),
+    source: "unmanaged",
+  };
+  const out = Object.assign({}, base, handles, {
+    [KUMIKO_NAME_SYMBOL]: tableName,
+    [KUMIKO_COLUMNS_SYMBOL]: handles,
+  }) as SchemaTable;
+  return out;
+}
+
+// Helper used by `instantToDriver` callers in legacy code — kept identical
+// to the previous behaviour. The native dialect handles parse/serialize
+// implicitly via the Bun driver; this function is a defensive coerce at
+// the API boundary.
 export function instantToDriver(value: Temporal.Instant | string): string {
   if (typeof value === "string") {
     const dateOnly = /^\d{4}-\d{2}-\d{2}$/.test(value);
@@ -92,18 +480,3 @@ export function instantToDriver(value: Temporal.Instant | string): string {
   }
   return value.toString();
 }
-
-const instantBuilder = (config?: { precision?: 0 | 1 | 2 | 3 | 4 | 5 | 6 }) =>
-  customType<{ data: Temporal.Instant; driverData: string }>({
-    dataType() {
-      const p = config?.precision;
-      return p !== undefined ? `timestamp(${p}) with time zone` : "timestamptz";
-    },
-    fromDriver(value: string): Temporal.Instant {
-      return Temporal.Instant.from(value);
-    },
-    toDriver: instantToDriver,
-  });
-export function instant(name: string, config?: { precision?: 0 | 1 | 2 | 3 | 4 | 5 | 6 }) {
-  return instantBuilder(config)(name);
-}

package/src/db/eagerload.ts

@@ -23,9 +23,9 @@
 // keine framework-engine-Internals und kann auch von custom
 // query-handlern manuell aufgerufen werden.
 
-import { inArray } from "drizzle-orm";
+import { selectMany } from "../db/query";
 import type { EntityDefinition, FieldDefinition, ReferenceFieldDef } from "../engine/types";
-import { buildDrizzleTable } from "./table-builder";
+import { buildEntityTable } from "./table-builder";
 import type { TenantDb } from "./tenant-db";
 
 // Minimaler Registry-Lookup-Contract: pro entity-name → EntityDefinition.
@@ -121,18 +121,11 @@ export async function enrichWithReferences(
         // UUID zurück, kein Crash.
         return { fieldName: rf.fieldName, multiple: rf.multiple, map: new Map() };
       }
-      const refTable = buildDrizzleTable(rf.refEntityName, refEntity);
-      const idCol = refTable["id"];
-      if (idCol === undefined) {
-        return { fieldName: rf.fieldName, multiple: rf.multiple, map: new Map() };
-      }
+      const refTable = buildEntityTable(rf.refEntityName, refEntity);
       const idArray = [...ids];
-      const refRows = (await db
-        .select()
-        .from(refTable)
-        .where(inArray(idCol, idArray as never /* @cast-boundary db-operator */))) as Array<
+      const refRows = (await selectMany(db, refTable, { id: idArray })) as Array<
         Record<string, unknown>
-      >; // @cast-boundary db-row
+      >;
       const map = new Map<string, Record<string, unknown>>();
       for (const r of refRows) {
         const id = r["id"];