metal-orm 1.0.65 → 1.0.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metal-orm",
-  "version": "1.0.65",
+  "version": "1.0.66",
   "type": "module",
   "types": "./dist/index.d.ts",
   "engines": {

package/src/orm/identity-map.ts

@@ -1,5 +1,6 @@
 import type { TableDef } from '../schema/table.js';
 import type { TrackedEntity } from './runtime-types.js';
+import type { PrimaryKey } from './entity-context.js';
 
 /**
  * Simple identity map for tracking entities within a session.
@@ -18,7 +19,7 @@ export class IdentityMap {
    * @param pk The primary key value.
    * @returns The entity instance if found, undefined otherwise.
    */
-  getEntity(table: TableDef, pk: string | number): object | undefined {
+  getEntity(table: TableDef, pk: PrimaryKey): object | undefined {
     const bucket = this.buckets.get(table.name);
     return bucket?.get(this.toIdentityKey(pk))?.entity;
   }
@@ -54,7 +55,7 @@ export class IdentityMap {
     this.buckets.clear();
   }
 
-  private toIdentityKey(pk: string | number): string {
+  private toIdentityKey(pk: PrimaryKey): string {
     return String(pk);
   }
 }

package/src/orm/save-graph.ts

@@ -20,6 +20,7 @@ import { createEntityFromRow } from './entity.js';
 import type { EntityConstructor } from './entity-metadata.js';
 import { getTableDefFromEntity } from '../decorators/bootstrap.js';
 import type { OrmSession } from './orm-session.js';
+import type { PrimaryKey } from './entity-context.js';
 
 /**
  * Options for controlling the behavior of save graph operations.
@@ -36,9 +37,6 @@ export interface SaveGraphOptions {
 }
 
 /** Represents an entity object with arbitrary properties. */
-
-/** Represents an entity object with arbitrary properties. */
-
 type AnyEntity = Record<string, unknown>;
 
 /**
@@ -102,7 +100,7 @@ const ensureEntity = <TTable extends TableDef>(
   const pkValue = payload[pk];
 
   if (pkValue !== undefined && pkValue !== null) {
-    const tracked = session.getEntity(table, pkValue as string | number);
+    const tracked = session.getEntity(table, pkValue as PrimaryKey);
     if (tracked) {
       return tracked as EntityInstance<TTable>;
     }
@@ -159,7 +157,7 @@ const handleHasMany = async (
 
     const current =
       findInCollectionByPk(existing, targetPk, pkValue) ??
-      (pkValue !== undefined && pkValue !== null ? session.getEntity(targetTable, pkValue as string | number) : undefined);
+      (pkValue !== undefined && pkValue !== null ? session.getEntity(targetTable, pkValue as PrimaryKey) : undefined);
 
     const entity = current ?? ensureEntity(session, targetTable, asObj, options);
     assignColumns(targetTable, entity as AnyEntity, asObj, options);
@@ -202,7 +200,7 @@ const handleHasOne = async (
   if (typeof payload === 'number' || typeof payload === 'string') {
     const entity = ref.set({ [pk]: payload });
     if (entity) {
-      await applyGraphToEntity(session, relation.target, entity as AnyEntity, { [pk]: payload }, options);
+      await applyGraphToEntity(session, relation.target, entity as AnyEntity, { [pk]: payload as PrimaryKey }, options);
     }
     return;
   }
@@ -230,7 +228,7 @@ const handleBelongsTo = async (
   if (typeof payload === 'number' || typeof payload === 'string') {
     const entity = ref.set({ [pk]: payload });
     if (entity) {
-      await applyGraphToEntity(session, relation.target, entity as AnyEntity, { [pk]: payload }, options);
+      await applyGraphToEntity(session, relation.target, entity as AnyEntity, { [pk]: payload as PrimaryKey }, options);
     }
     return;
   }
@@ -268,7 +266,7 @@ const handleBelongsToMany = async (
     const asObj = item as AnyEntity;
     const pkValue = asObj[targetPk];
     const entity = pkValue !== undefined && pkValue !== null
-      ? session.getEntity(targetTable, pkValue as string | number) ?? ensureEntity(session, targetTable, asObj, options)
+      ? session.getEntity(targetTable, pkValue as PrimaryKey) ?? ensureEntity(session, targetTable, asObj, options)
       : ensureEntity(session, targetTable, asObj, options);
 
     assignColumns(targetTable, entity as AnyEntity, asObj, options);

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

@@ -1,5 +1,5 @@
-import { ColumnNode, eq } from '../core/ast/expression.js';
-import type { ValueOperandInput } from '../core/ast/expression.js';
+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';
@@ -10,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<object, TrackedEntity>();
+export class UnitOfWork {
+  private readonly trackedEntities = new Map<object, TrackedEntity>();
 
   /**
    * Creates a new UnitOfWork instance.
@@ -52,9 +53,9 @@ export class UnitOfWork {
    * @param pk - The primary key value
    * @returns The entity or undefined if not found
    */
-  getEntity(table: TableDef, pk: string | number): object | undefined {
-    return this.identityMap.getEntity(table, pk);
-  }
+  getEntity(table: TableDef, pk: PrimaryKey): object | undefined {
+    return this.identityMap.getEntity(table, pk);
+  }
 
   /**
    * Gets all tracked entities for a specific table.
@@ -70,9 +71,9 @@ export class UnitOfWork {
    * @param entity - The entity to find
    * @returns The tracked entity or undefined if not found
    */
-  findTracked(entity: object): TrackedEntity | undefined {
-    return this.trackedEntities.get(entity);
-  }
+  findTracked(entity: object): TrackedEntity | undefined {
+    return this.trackedEntities.get(entity);
+  }
 
   /**
    * Sets an entity in the identity map.
@@ -80,9 +81,9 @@ export class UnitOfWork {
    * @param pk - The primary key value
    * @param entity - The entity instance
    */
-  setEntity(table: TableDef, pk: string | number, entity: object): void {
-    if (pk === null || pk === undefined) return;
-    let tracked = this.trackedEntities.get(entity);
+  setEntity(table: TableDef, pk: PrimaryKey, entity: object): void {
+    if (pk === null || pk === undefined) return;
+    let tracked = this.trackedEntities.get(entity);
     if (!tracked) {
       tracked = {
         table,
@@ -105,7 +106,7 @@ export class UnitOfWork {
    * @param entity - The entity instance
    * @param pk - Optional primary key value
    */
-  trackNew(table: TableDef, entity: object, pk?: string | number): void {
+  trackNew(table: TableDef, entity: object, pk?: PrimaryKey): void {
     const tracked: TrackedEntity = {
       table,
       entity,
@@ -125,7 +126,7 @@ export class UnitOfWork {
    * @param pk - The primary key value
    * @param entity - The entity instance
    */
-  trackManaged(table: TableDef, pk: string | number, entity: object): void {
+  trackManaged(table: TableDef, pk: PrimaryKey, entity: object): void {
     const tracked: TrackedEntity = {
       table,
       entity,
@@ -141,22 +142,22 @@ export class UnitOfWork {
    * Marks an entity as dirty (modified).
    * @param entity - The entity to mark as dirty
    */
-  markDirty(entity: object): void {
-    const tracked = this.trackedEntities.get(entity);
-    if (!tracked) return;
-    if (tracked.status === EntityStatus.New || tracked.status === EntityStatus.Removed) return;
-    tracked.status = EntityStatus.Dirty;
-  }
+  markDirty(entity: object): void {
+    const tracked = this.trackedEntities.get(entity);
+    if (!tracked) return;
+    if (tracked.status === EntityStatus.New || tracked.status === EntityStatus.Removed) return;
+    tracked.status = EntityStatus.Dirty;
+  }
 
   /**
    * Marks an entity as removed.
    * @param entity - The entity to mark as removed
    */
-  markRemoved(entity: object): void {
-    const tracked = this.trackedEntities.get(entity);
-    if (!tracked) return;
-    tracked.status = EntityStatus.Removed;
-  }
+  markRemoved(entity: object): void {
+    const tracked = this.trackedEntities.get(entity);
+    if (!tracked) return;
+    tracked.status = EntityStatus.Removed;
+  }
 
   /**
    * Flushes pending changes to the database.
@@ -195,8 +196,8 @@ export class UnitOfWork {
   private async flushInsert(tracked: TrackedEntity): Promise<void> {
     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 as Record<string, ValueOperandInput>);
+    const payload = this.extractColumns(tracked.table, tracked.entity as Record<string, unknown>);
+    let builder = new InsertQueryBuilder(tracked.table).values(payload as Record<string, ValueOperandInput>);
     if (this.dialect.supportsReturning()) {
       builder = builder.returning(...this.getReturningColumns(tracked.table));
     }
@@ -288,16 +289,16 @@ export class UnitOfWork {
    * @param tracked - The tracked entity
    * @returns Object with changed column values
    */
-  private computeChanges(tracked: TrackedEntity): Record<string, unknown> {
-    const snapshot = tracked.original ?? {};
-    const changes: Record<string, unknown> = {};
-    for (const column of Object.keys(tracked.table.columns)) {
-      const current = (tracked.entity as Record<string, unknown>)[column];
-      if (snapshot[column] !== current) {
-        changes[column] = current;
-      }
-    }
-    return changes;
+  private computeChanges(tracked: TrackedEntity): Record<string, unknown> {
+    const snapshot = tracked.original ?? {};
+    const changes: Record<string, unknown> = {};
+    for (const column of Object.keys(tracked.table.columns)) {
+      const current = (tracked.entity as Record<string, unknown>)[column];
+      if (snapshot[column] !== current) {
+        changes[column] = current;
+      }
+    }
+    return changes;
   }
 
   /**
@@ -343,18 +344,18 @@ export class UnitOfWork {
    * @param tracked - The tracked entity
    * @param results - Query results
    */
-  private applyReturningResults(tracked: TrackedEntity, results: QueryResult[]): void {
-    if (!this.dialect.supportsReturning()) return;
-    const first = results[0];
-    if (!first || first.values.length === 0) return;
-
-    const row = first.values[0];
-    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 as Record<string, unknown>)[columnName] = row[i];
-    }
-  }
+  private applyReturningResults(tracked: TrackedEntity, results: QueryResult[]): void {
+    if (!this.dialect.supportsReturning()) return;
+    const first = results[0];
+    if (!first || first.values.length === 0) return;
+
+    const row = first.values[0];
+    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 as Record<string, unknown>)[columnName] = row[i];
+    }
+  }
 
   /**
    * Normalizes a column name by removing quotes and table prefixes.
@@ -395,11 +396,11 @@ export class UnitOfWork {
    * @param tracked - The tracked entity
    * @returns Primary key value or null
    */
-  private getPrimaryKeyValue(tracked: TrackedEntity): string | number | null {
-    const key = findPrimaryKey(tracked.table);
-    const val = (tracked.entity as Record<string, unknown>)[key];
-    if (val === undefined || val === null) return null;
-    if (typeof val !== 'string' && typeof val !== 'number') return null;
-    return val;
-  }
-}
+  private getPrimaryKeyValue(tracked: TrackedEntity): PrimaryKey | null {
+    const key = findPrimaryKey(tracked.table);
+    const val = (tracked.entity as Record<string, unknown>)[key];
+    if (val === undefined || val === null) return null;
+    if (typeof val !== 'string' && typeof val !== 'number') return null;
+    return val as PrimaryKey;
+  }
+}