metal-orm 1.0.64 → 1.0.66

package/src/orm/unit-of-work.ts

@@ -1,4 +1,5 @@
 import { ColumnNode, eq } from '../core/ast/expression.js';
+import type { ValueOperandInput } from '../core/ast/expression.js';
 import type { Dialect, CompiledQuery } from '../core/dialect/abstract.js';
 import { InsertQueryBuilder } from '../query-builder/insert.js';
 import { UpdateQueryBuilder } from '../query-builder/update.js';
@@ -9,12 +10,13 @@ import type { DbExecutor, QueryResult } from '../core/execution/db-executor.js';
 import { IdentityMap } from './identity-map.js';
 import { EntityStatus } from './runtime-types.js';
 import type { TrackedEntity } from './runtime-types.js';
+import type { PrimaryKey } from './entity-context.js';
 
 /**
  * Unit of Work pattern implementation for tracking entity changes.
  */
 export class UnitOfWork {
-  private readonly trackedEntities = new Map<unknown, TrackedEntity>();
+  private readonly trackedEntities = new Map<object, TrackedEntity>();
 
   /**
    * Creates a new UnitOfWork instance.
@@ -51,7 +53,7 @@ export class UnitOfWork {
    * @param pk - The primary key value
    * @returns The entity or undefined if not found
    */
-  getEntity(table: TableDef, pk: string | number): unknown | undefined {
+  getEntity(table: TableDef, pk: PrimaryKey): object | undefined {
     return this.identityMap.getEntity(table, pk);
   }
 
@@ -69,7 +71,7 @@ export class UnitOfWork {
    * @param entity - The entity to find
    * @returns The tracked entity or undefined if not found
    */
-  findTracked(entity: unknown): TrackedEntity | undefined {
+  findTracked(entity: object): TrackedEntity | undefined {
     return this.trackedEntities.get(entity);
   }
 
@@ -79,7 +81,7 @@ export class UnitOfWork {
    * @param pk - The primary key value
    * @param entity - The entity instance
    */
-  setEntity(table: TableDef, pk: string | number, entity: unknown): void {
+  setEntity(table: TableDef, pk: PrimaryKey, entity: object): void {
     if (pk === null || pk === undefined) return;
     let tracked = this.trackedEntities.get(entity);
     if (!tracked) {
@@ -104,7 +106,7 @@ export class UnitOfWork {
    * @param entity - The entity instance
    * @param pk - Optional primary key value
    */
-  trackNew(table: TableDef, entity: unknown, pk?: string | number): void {
+  trackNew(table: TableDef, entity: object, pk?: PrimaryKey): void {
     const tracked: TrackedEntity = {
       table,
       entity,
@@ -124,7 +126,7 @@ export class UnitOfWork {
    * @param pk - The primary key value
    * @param entity - The entity instance
    */
-  trackManaged(table: TableDef, pk: string | number, entity: unknown): void {
+  trackManaged(table: TableDef, pk: PrimaryKey, entity: object): void {
     const tracked: TrackedEntity = {
       table,
       entity,
@@ -140,7 +142,7 @@ export class UnitOfWork {
    * Marks an entity as dirty (modified).
    * @param entity - The entity to mark as dirty
    */
-  markDirty(entity: unknown): void {
+  markDirty(entity: object): void {
     const tracked = this.trackedEntities.get(entity);
     if (!tracked) return;
     if (tracked.status === EntityStatus.New || tracked.status === EntityStatus.Removed) return;
@@ -151,7 +153,7 @@ export class UnitOfWork {
    * Marks an entity as removed.
    * @param entity - The entity to mark as removed
    */
-  markRemoved(entity: unknown): void {
+  markRemoved(entity: object): void {
     const tracked = this.trackedEntities.get(entity);
     if (!tracked) return;
     tracked.status = EntityStatus.Removed;
@@ -195,7 +197,7 @@ export class UnitOfWork {
     await this.runHook(tracked.table.hooks?.beforeInsert, tracked);
 
     const payload = this.extractColumns(tracked.table, tracked.entity as Record<string, unknown>);
-    let builder = new InsertQueryBuilder(tracked.table).values(payload);
+    let builder = new InsertQueryBuilder(tracked.table).values(payload as Record<string, ValueOperandInput>);
     if (this.dialect.supportsReturning()) {
       builder = builder.returning(...this.getReturningColumns(tracked.table));
     }
@@ -291,7 +293,7 @@ export class UnitOfWork {
     const snapshot = tracked.original ?? {};
     const changes: Record<string, unknown> = {};
     for (const column of Object.keys(tracked.table.columns)) {
-      const current = tracked.entity[column];
+      const current = (tracked.entity as Record<string, unknown>)[column];
       if (snapshot[column] !== current) {
         changes[column] = current;
       }
@@ -351,7 +353,7 @@ export class UnitOfWork {
     for (let i = 0; i < first.columns.length; i++) {
       const columnName = this.normalizeColumnName(first.columns[i]);
       if (!(columnName in tracked.table.columns)) continue;
-      tracked.entity[columnName] = row[i];
+      (tracked.entity as Record<string, unknown>)[columnName] = row[i];
     }
   }
 
@@ -394,10 +396,11 @@ export class UnitOfWork {
    * @param tracked - The tracked entity
    * @returns Primary key value or null
    */
-  private getPrimaryKeyValue(tracked: TrackedEntity): string | number | null {
+  private getPrimaryKeyValue(tracked: TrackedEntity): PrimaryKey | null {
     const key = findPrimaryKey(tracked.table);
-    const val = tracked.entity[key];
+    const val = (tracked.entity as Record<string, unknown>)[key];
     if (val === undefined || val === null) return null;
-    return val;
+    if (typeof val !== 'string' && typeof val !== 'number') return null;
+    return val as PrimaryKey;
   }
 }

package/src/query-builder/insert-query-state.ts

@@ -1,161 +1,162 @@
-import { TableDef } from '../schema/table.js';
-import { InsertQueryNode, SelectQueryNode } from '../core/ast/query.js';
+import { TableDef } from '../schema/table.js';
+import { InsertQueryNode, SelectQueryNode } from '../core/ast/query.js';
 import {
   ColumnNode,
   OperandNode,
   isValueOperandInput,
   valueToOperand
 } from '../core/ast/expression.js';
-import {
-  buildColumnNodes,
-  createTableNode
-} from '../core/ast/builders.js';
-
-type InsertRows = Record<string, unknown>[];
-
-/**
- * Maintains immutable state for building INSERT queries
- */
-export class InsertQueryState {
-  public readonly table: TableDef;
-  public readonly ast: InsertQueryNode;
-
-  /**
-   * Creates a new InsertQueryState instance
-   * @param table - The table definition for the INSERT query
-   * @param ast - Optional initial AST node, defaults to a basic INSERT query
-   */
-  constructor(table: TableDef, ast?: InsertQueryNode) {
-    this.table = table;
-    this.ast = ast ?? {
-      type: 'InsertQuery',
-      into: createTableNode(table),
-      columns: [],
-      source: {
-        type: 'InsertValues',
-        rows: []
-      }
-    };
-  }
-
-  private clone(nextAst: InsertQueryNode): InsertQueryState {
-    return new InsertQueryState(this.table, nextAst);
-  }
-
-  private ensureColumnsFromRow(rows: InsertRows): ColumnNode[] {
-    if (this.ast.columns.length) return this.ast.columns;
-    return buildColumnNodes(this.table, Object.keys(rows[0]));
-  }
-
-  private appendValues(rows: OperandNode[][]): OperandNode[][] {
-    if (this.ast.source.type === 'InsertValues') {
-      return [...this.ast.source.rows, ...rows];
-    }
-    return rows;
-  }
-
-  private getTableColumns(): ColumnNode[] {
-    const names = Object.keys(this.table.columns);
-    if (!names.length) return [];
-    return buildColumnNodes(this.table, names);
-  }
-
-  /**
-   * Adds VALUES clause to the INSERT query
-   * @param rows - Array of row objects to insert
-   * @returns A new InsertQueryState with the VALUES clause added
-   * @throws Error if mixing VALUES with SELECT source
-   * @throws Error if invalid values are provided
-   */
-  withValues(rows: Record<string, unknown>[]): InsertQueryState {
-    if (!rows.length) return this;
-
-    if (this.ast.source.type === 'InsertSelect') {
-      throw new Error('Cannot mix INSERT ... VALUES with INSERT ... SELECT source.');
-    }
-
-    const definedColumns = this.ensureColumnsFromRow(rows);
-
-    const newRows: OperandNode[][] = rows.map((row, rowIndex) =>
-      definedColumns.map(column => {
-        const rawValue = row[column.name];
-
-        if (!isValueOperandInput(rawValue)) {
-          throw new Error(
-            `Invalid insert value for column "${column.name}" in row ${rowIndex}: only primitives, null, or OperandNodes are allowed`
-          );
-        }
-
-        return valueToOperand(rawValue);
-      })
-    );
-
-    return this.clone({
-      ...this.ast,
-      columns: definedColumns,
-      source: {
-        type: 'InsertValues',
-        rows: this.appendValues(newRows)
-      }
-    });
-  }
-
-  /**
-   * Sets the columns for the INSERT query
-   * @param columns - Column nodes to insert into
-   * @returns A new InsertQueryState with the specified columns
-   */
-  withColumns(columns: ColumnNode[]): InsertQueryState {
-    if (!columns.length) return this;
-    return this.clone({
-      ...this.ast,
-      columns: [...columns]
-    });
-  }
-
-  /**
-   * Adds SELECT source to the INSERT query
-   * @param query - The SELECT query to use as source
-   * @param columns - Target columns for the INSERT
-   * @returns A new InsertQueryState with the SELECT source
-   * @throws Error if mixing SELECT with VALUES source
-   * @throws Error if no destination columns specified
-   */
-  withSelect(query: SelectQueryNode, columns: ColumnNode[]): InsertQueryState {
-    const targetColumns =
-      columns.length
-        ? columns
-        : this.ast.columns.length
-          ? this.ast.columns
-          : this.getTableColumns();
-
-    if (!targetColumns.length) {
-      throw new Error('INSERT ... SELECT requires specifying destination columns.');
-    }
-
-    if (this.ast.source.type === 'InsertValues' && this.ast.source.rows.length) {
-      throw new Error('Cannot mix INSERT ... SELECT with INSERT ... VALUES source.');
-    }
-
-    return this.clone({
-      ...this.ast,
-      columns: [...targetColumns],
-      source: {
-        type: 'InsertSelect',
-        query
-      }
-    });
-  }
-
-  /**
-   * Adds a RETURNING clause to the INSERT query
-   * @param columns - Columns to return after insertion
-   * @returns A new InsertQueryState with the RETURNING clause added
-   */
-  withReturning(columns: ColumnNode[]): InsertQueryState {
-    return this.clone({
-      ...this.ast,
-      returning: [...columns]
-    });
-  }
-}
+import type { ValueOperandInput } from '../core/ast/expression.js';
+import {
+  buildColumnNodes,
+  createTableNode
+} from '../core/ast/builders.js';
+
+type InsertRows = Record<string, ValueOperandInput>[];
+
+/**
+ * Maintains immutable state for building INSERT queries
+ */
+export class InsertQueryState {
+  public readonly table: TableDef;
+  public readonly ast: InsertQueryNode;
+
+  /**
+   * Creates a new InsertQueryState instance
+   * @param table - The table definition for the INSERT query
+   * @param ast - Optional initial AST node, defaults to a basic INSERT query
+   */
+  constructor(table: TableDef, ast?: InsertQueryNode) {
+    this.table = table;
+    this.ast = ast ?? {
+      type: 'InsertQuery',
+      into: createTableNode(table),
+      columns: [],
+      source: {
+        type: 'InsertValues',
+        rows: []
+      }
+    };
+  }
+
+  private clone(nextAst: InsertQueryNode): InsertQueryState {
+    return new InsertQueryState(this.table, nextAst);
+  }
+
+  private ensureColumnsFromRow(rows: InsertRows): ColumnNode[] {
+    if (this.ast.columns.length) return this.ast.columns;
+    return buildColumnNodes(this.table, Object.keys(rows[0]));
+  }
+
+  private appendValues(rows: OperandNode[][]): OperandNode[][] {
+    if (this.ast.source.type === 'InsertValues') {
+      return [...this.ast.source.rows, ...rows];
+    }
+    return rows;
+  }
+
+  private getTableColumns(): ColumnNode[] {
+    const names = Object.keys(this.table.columns);
+    if (!names.length) return [];
+    return buildColumnNodes(this.table, names);
+  }
+
+  /**
+   * Adds VALUES clause to the INSERT query
+   * @param rows - Array of row objects to insert
+   * @returns A new InsertQueryState with the VALUES clause added
+   * @throws Error if mixing VALUES with SELECT source
+   * @throws Error if invalid values are provided
+   */
+  withValues(rows: InsertRows): InsertQueryState {
+    if (!rows.length) return this;
+
+    if (this.ast.source.type === 'InsertSelect') {
+      throw new Error('Cannot mix INSERT ... VALUES with INSERT ... SELECT source.');
+    }
+
+    const definedColumns = this.ensureColumnsFromRow(rows);
+
+    const newRows: OperandNode[][] = rows.map((row, rowIndex) =>
+      definedColumns.map(column => {
+        const rawValue = row[column.name];
+
+        if (!isValueOperandInput(rawValue)) {
+          throw new Error(
+            `Invalid insert value for column "${column.name}" in row ${rowIndex}: only primitives, null, or OperandNodes are allowed`
+          );
+        }
+
+        return valueToOperand(rawValue);
+      })
+    );
+
+    return this.clone({
+      ...this.ast,
+      columns: definedColumns,
+      source: {
+        type: 'InsertValues',
+        rows: this.appendValues(newRows)
+      }
+    });
+  }
+
+  /**
+   * Sets the columns for the INSERT query
+   * @param columns - Column nodes to insert into
+   * @returns A new InsertQueryState with the specified columns
+   */
+  withColumns(columns: ColumnNode[]): InsertQueryState {
+    if (!columns.length) return this;
+    return this.clone({
+      ...this.ast,
+      columns: [...columns]
+    });
+  }
+
+  /**
+   * Adds SELECT source to the INSERT query
+   * @param query - The SELECT query to use as source
+   * @param columns - Target columns for the INSERT
+   * @returns A new InsertQueryState with the SELECT source
+   * @throws Error if mixing SELECT with VALUES source
+   * @throws Error if no destination columns specified
+   */
+  withSelect(query: SelectQueryNode, columns: ColumnNode[]): InsertQueryState {
+    const targetColumns =
+      columns.length
+        ? columns
+        : this.ast.columns.length
+          ? this.ast.columns
+          : this.getTableColumns();
+
+    if (!targetColumns.length) {
+      throw new Error('INSERT ... SELECT requires specifying destination columns.');
+    }
+
+    if (this.ast.source.type === 'InsertValues' && this.ast.source.rows.length) {
+      throw new Error('Cannot mix INSERT ... SELECT with INSERT ... VALUES source.');
+    }
+
+    return this.clone({
+      ...this.ast,
+      columns: [...targetColumns],
+      source: {
+        type: 'InsertSelect',
+        query
+      }
+    });
+  }
+
+  /**
+   * Adds a RETURNING clause to the INSERT query
+   * @param columns - Columns to return after insertion
+   * @returns A new InsertQueryState with the RETURNING clause added
+   */
+  withReturning(columns: ColumnNode[]): InsertQueryState {
+    return this.clone({
+      ...this.ast,
+      returning: [...columns]
+    });
+  }
+}

package/src/query-builder/insert.ts

@@ -1,7 +1,8 @@
 import type { SelectQueryBuilder } from './select.js';
 import { TableDef } from '../schema/table.js';
 import { ColumnDef } from '../schema/column-types.js';
-import { ColumnNode } from '../core/ast/expression.js';
+import { ColumnNode } from '../core/ast/expression.js';
+import type { ValueOperandInput } from '../core/ast/expression.js';
 import { CompiledQuery, InsertCompiler, Dialect } from '../core/dialect/abstract.js';
 import { DialectKey, resolveDialectInput } from '../core/dialect/dialect-factory.js';
 import { InsertQueryNode, SelectQueryNode } from '../core/ast/query.js';
@@ -36,7 +37,9 @@ export class InsertQueryBuilder<T> {
    * @param rowOrRows - Single row object or array of row objects to insert
    * @returns A new InsertQueryBuilder with the VALUES clause added
    */
-  values(rowOrRows: Record<string, unknown> | Record<string, unknown>[]): InsertQueryBuilder<T> {
+  values(
+    rowOrRows: Record<string, ValueOperandInput> | Record<string, ValueOperandInput>[]
+  ): InsertQueryBuilder<T> {
     const rows = Array.isArray(rowOrRows) ? rowOrRows : [rowOrRows];
     if (!rows.length) return this;
     return this.clone(this.state.withValues(rows));