metal-orm 1.1.9 → 1.1.10

package/src/orm/relations/morph-many.ts

@@ -0,0 +1,156 @@
+import { HasManyCollection } from '../../schema/types.js';
+import { EntityContext } from '../entity-context.js';
+import { RelationKey } from '../runtime-types.js';
+import { MorphManyRelation } from '../../schema/relation.js';
+import { TableDef } from '../../schema/table.js';
+import { EntityMeta, getHydrationRows } from '../entity-meta.js';
+
+type Rows = Record<string, unknown>[];
+
+const toKey = (value: unknown): string => (value === null || value === undefined ? '' : String(value));
+
+const hideInternal = (obj: object, keys: string[]): void => {
+  for (const key of keys) {
+    Object.defineProperty(obj, key, {
+      value: obj[key],
+      writable: false,
+      configurable: false,
+      enumerable: false
+    });
+  }
+};
+
+const hideWritable = (obj: object, keys: string[]): void => {
+  for (const key of keys) {
+    const value = obj[key as keyof typeof obj];
+    Object.defineProperty(obj, key, {
+      value,
+      writable: true,
+      configurable: true,
+      enumerable: false
+    });
+  }
+};
+
+export class DefaultMorphManyCollection<TChild> implements HasManyCollection<TChild> {
+  private loaded = false;
+  private items: TChild[] = [];
+  private readonly added = new Set<TChild>();
+  private readonly removed = new Set<TChild>();
+
+  constructor(
+    private readonly ctx: EntityContext,
+    private readonly meta: EntityMeta<TableDef>,
+    private readonly root: unknown,
+    private readonly relationName: string,
+    private readonly relation: MorphManyRelation,
+    private readonly rootTable: TableDef,
+    private readonly loader: () => Promise<Map<string, Rows>>,
+    private readonly createEntity: (row: Record<string, unknown>) => TChild,
+    private readonly localKey: string
+  ) {
+    hideInternal(this, ['ctx', 'meta', 'root', 'relationName', 'relation', 'rootTable', 'loader', 'createEntity', 'localKey']);
+    hideWritable(this, ['loaded', 'items', 'added', 'removed']);
+    this.hydrateFromCache();
+  }
+
+  async load(): Promise<TChild[]> {
+    if (this.loaded) return this.items;
+    const map = await this.loader();
+    const key = toKey((this.root as Record<string, unknown>)[this.localKey]);
+    const rows = map.get(key) ?? [];
+    this.items = rows.map(row => this.createEntity(row));
+    this.loaded = true;
+    return this.items;
+  }
+
+  getItems(): TChild[] {
+    return this.items;
+  }
+
+  get length(): number {
+    return this.items.length;
+  }
+
+  [Symbol.iterator](): Iterator<TChild> {
+    return this.items[Symbol.iterator]();
+  }
+
+  add(data: Partial<TChild>): TChild {
+    const keyValue = (this.root as Record<string, unknown>)[this.localKey];
+    const childRow: Record<string, unknown> = {
+      ...data,
+      [this.relation.idField]: keyValue,
+      [this.relation.typeField]: this.relation.typeValue
+    };
+    const entity = this.createEntity(childRow);
+    this.added.add(entity);
+    this.items.push(entity);
+    this.ctx.registerRelationChange(
+      this.root,
+      this.relationKey,
+      this.rootTable,
+      this.relationName,
+      this.relation,
+      { kind: 'add', entity }
+    );
+    return entity;
+  }
+
+  attach(entity: TChild): void {
+    const keyValue = (this.root as Record<string, unknown>)[this.localKey];
+    (entity as Record<string, unknown>)[this.relation.idField] = keyValue;
+    (entity as Record<string, unknown>)[this.relation.typeField] = this.relation.typeValue;
+    this.ctx.markDirty(entity as object);
+    this.items.push(entity);
+    this.ctx.registerRelationChange(
+      this.root,
+      this.relationKey,
+      this.rootTable,
+      this.relationName,
+      this.relation,
+      { kind: 'attach', entity }
+    );
+  }
+
+  remove(entity: TChild): void {
+    this.items = this.items.filter(item => item !== entity);
+    this.removed.add(entity);
+    this.ctx.registerRelationChange(
+      this.root,
+      this.relationKey,
+      this.rootTable,
+      this.relationName,
+      this.relation,
+      { kind: 'remove', entity }
+    );
+  }
+
+  clear(): void {
+    for (const entity of [...this.items]) {
+      this.remove(entity);
+    }
+  }
+
+  private get relationKey(): RelationKey {
+    return `${this.rootTable.name}.${this.relationName}`;
+  }
+
+  private hydrateFromCache(): void {
+    const keyValue = (this.root as Record<string, unknown>)[this.localKey];
+    if (keyValue === undefined || keyValue === null) return;
+    const rows = getHydrationRows(this.meta, this.relationName, keyValue);
+    if (!rows?.length) return;
+    this.items = rows.map(row => this.createEntity(row));
+    this.loaded = true;
+  }
+
+  toJSON(): unknown[] {
+    return this.items.map(item => {
+      const entityWithToJSON = item as { toJSON?: () => unknown };
+      return typeof entityWithToJSON.toJSON === 'function'
+        ? entityWithToJSON.toJSON()
+        : item;
+    });
+  }
+}

package/src/orm/relations/morph-one.ts

@@ -0,0 +1,151 @@
+import { HasOneReferenceApi } from '../../schema/types.js';
+import { EntityContext } from '../entity-context.js';
+import { RelationKey } from '../runtime-types.js';
+import { MorphOneRelation } from '../../schema/relation.js';
+import { TableDef } from '../../schema/table.js';
+import { EntityMeta, getHydrationRecord, hasEntityMeta } from '../entity-meta.js';
+
+type Row = Record<string, unknown>;
+
+const toKey = (value: unknown): string => (value === null || value === undefined ? '' : String(value));
+
+const hideInternal = (obj: object, keys: string[]): void => {
+  for (const key of keys) {
+    Object.defineProperty(obj, key, {
+      value: obj[key],
+      writable: false,
+      configurable: false,
+      enumerable: false
+    });
+  }
+};
+
+const hideWritable = (obj: object, keys: string[]): void => {
+  for (const key of keys) {
+    const value = obj[key as keyof typeof obj];
+    Object.defineProperty(obj, key, {
+      value,
+      writable: true,
+      configurable: true,
+      enumerable: false
+    });
+  }
+};
+
+export class DefaultMorphOneReference<TChild extends object> implements HasOneReferenceApi<TChild> {
+  private loaded = false;
+  private current: TChild | null = null;
+
+  constructor(
+    private readonly ctx: EntityContext,
+    private readonly meta: EntityMeta<TableDef>,
+    private readonly root: unknown,
+    private readonly relationName: string,
+    private readonly relation: MorphOneRelation,
+    private readonly rootTable: TableDef,
+    private readonly loader: () => Promise<Map<string, Row>>,
+    private readonly createEntity: (row: Row) => TChild,
+    private readonly localKey: string
+  ) {
+    hideInternal(this, [
+      'ctx', 'meta', 'root', 'relationName', 'relation',
+      'rootTable', 'loader', 'createEntity', 'localKey'
+    ]);
+    hideWritable(this, ['loaded', 'current']);
+    this.populateFromHydrationCache();
+  }
+
+  async load(): Promise<TChild | null> {
+    if (this.loaded) return this.current;
+    const map = await this.loader();
+    const keyValue = (this.root as Record<string, unknown>)[this.localKey];
+    if (keyValue === undefined || keyValue === null) {
+      this.loaded = true;
+      return this.current;
+    }
+    const row = map.get(toKey(keyValue));
+    this.current = row ? this.createEntity(row) : null;
+    this.loaded = true;
+    return this.current;
+  }
+
+  get(): TChild | null {
+    return this.current;
+  }
+
+  set(data: Partial<TChild> | TChild | null): TChild | null {
+    if (data === null) {
+      return this.detachCurrent();
+    }
+
+    const entity = hasEntityMeta(data) ? (data as TChild) : this.createEntity(data as Row);
+    if (this.current && this.current !== entity) {
+      this.ctx.registerRelationChange(
+        this.root,
+        this.relationKey,
+        this.rootTable,
+        this.relationName,
+        this.relation,
+        { kind: 'remove', entity: this.current }
+      );
+    }
+
+    this.assignMorphKeys(entity);
+    this.current = entity;
+    this.loaded = true;
+
+    this.ctx.registerRelationChange(
+      this.root,
+      this.relationKey,
+      this.rootTable,
+      this.relationName,
+      this.relation,
+      { kind: 'attach', entity }
+    );
+
+    return entity;
+  }
+
+  toJSON(): unknown {
+    if (!this.current) return null;
+    const entityWithToJSON = this.current as { toJSON?: () => unknown };
+    return typeof entityWithToJSON.toJSON === 'function'
+      ? entityWithToJSON.toJSON()
+      : this.current;
+  }
+
+  private detachCurrent(): TChild | null {
+    const previous = this.current;
+    if (!previous) return null;
+    this.current = null;
+    this.loaded = true;
+    this.ctx.registerRelationChange(
+      this.root,
+      this.relationKey,
+      this.rootTable,
+      this.relationName,
+      this.relation,
+      { kind: 'remove', entity: previous }
+    );
+    return null;
+  }
+
+  private assignMorphKeys(entity: TChild): void {
+    const keyValue = (this.root as Record<string, unknown>)[this.localKey];
+    (entity as Row)[this.relation.idField] = keyValue;
+    (entity as Row)[this.relation.typeField] = this.relation.typeValue;
+  }
+
+  private get relationKey(): RelationKey {
+    return `${this.rootTable.name}.${this.relationName}`;
+  }
+
+  private populateFromHydrationCache(): void {
+    const keyValue = (this.root as Record<string, unknown>)[this.localKey];
+    if (keyValue === undefined || keyValue === null) return;
+    const row = getHydrationRecord(this.meta, this.relationName, keyValue);
+    if (!row) return;
+    this.current = this.createEntity(row);
+    this.loaded = true;
+  }
+}

package/src/orm/relations/morph-to.ts

@@ -0,0 +1,162 @@
+import { BelongsToReferenceApi } from '../../schema/types.js';
+import { EntityContext } from '../entity-context.js';
+import { RelationKey } from '../runtime-types.js';
+import { MorphToRelation } from '../../schema/relation.js';
+import { TableDef } from '../../schema/table.js';
+import { EntityMeta, getHydrationRecord, hasEntityMeta } from '../entity-meta.js';
+
+type Row = Record<string, unknown>;
+
+const toKey = (value: unknown): string => (value === null || value === undefined ? '' : String(value));
+
+const hideInternal = (obj: object, keys: string[]): void => {
+  for (const key of keys) {
+    Object.defineProperty(obj, key, {
+      value: obj[key],
+      writable: false,
+      configurable: false,
+      enumerable: false
+    });
+  }
+};
+
+const hideWritable = (obj: object, keys: string[]): void => {
+  for (const key of keys) {
+    const value = obj[key as keyof typeof obj];
+    Object.defineProperty(obj, key, {
+      value,
+      writable: true,
+      configurable: true,
+      enumerable: false
+    });
+  }
+};
+
+export class DefaultMorphToReference<TParent extends object> implements BelongsToReferenceApi<TParent> {
+  private loaded = false;
+  private current: TParent | null = null;
+
+  constructor(
+    private readonly ctx: EntityContext,
+    private readonly meta: EntityMeta<TableDef>,
+    private readonly root: unknown,
+    private readonly relationName: string,
+    private readonly relation: MorphToRelation,
+    private readonly rootTable: TableDef,
+    private readonly loader: () => Promise<Map<string, Row>>,
+    private readonly createEntity: (table: TableDef, row: Row) => TParent,
+    private readonly resolveTargetTable: (typeValue: string) => TableDef | undefined
+  ) {
+    hideInternal(this, [
+      'ctx', 'meta', 'root', 'relationName', 'relation',
+      'rootTable', 'loader', 'createEntity', 'resolveTargetTable'
+    ]);
+    hideWritable(this, ['loaded', 'current']);
+    this.populateFromHydrationCache();
+  }
+
+  async load(): Promise<TParent | null> {
+    if (this.loaded) return this.current;
+    const rootObj = this.root as Row;
+    const typeValue = rootObj[this.relation.typeField];
+    const idValue = rootObj[this.relation.idField];
+    if (!typeValue || idValue === undefined || idValue === null) {
+      this.loaded = true;
+      return this.current;
+    }
+
+    const map = await this.loader();
+    const compositeKey = `${toKey(typeValue)}:${toKey(idValue)}`;
+    const row = map.get(compositeKey);
+    if (row) {
+      const targetTable = this.resolveTargetTable(toKey(typeValue));
+      if (targetTable) {
+        this.current = this.createEntity(targetTable, row);
+      }
+    }
+    this.loaded = true;
+    return this.current;
+  }
+
+  get(): TParent | null {
+    return this.current;
+  }
+
+  set(data: Partial<TParent> | TParent | null): TParent | null {
+    if (data === null) {
+      return this.detachCurrent();
+    }
+
+    const entity = hasEntityMeta(data) ? (data as TParent) : (data as TParent);
+    if (this.current && this.current !== entity) {
+      this.ctx.registerRelationChange(
+        this.root,
+        this.relationKey,
+        this.rootTable,
+        this.relationName,
+        this.relation,
+        { kind: 'remove', entity: this.current }
+      );
+    }
+
+    this.current = entity;
+    this.loaded = true;
+
+    this.ctx.registerRelationChange(
+      this.root,
+      this.relationKey,
+      this.rootTable,
+      this.relationName,
+      this.relation,
+      { kind: 'attach', entity }
+    );
+
+    return entity;
+  }
+
+  toJSON(): unknown {
+    if (!this.current) return null;
+    const entityWithToJSON = this.current as { toJSON?: () => unknown };
+    return typeof entityWithToJSON.toJSON === 'function'
+      ? entityWithToJSON.toJSON()
+      : this.current;
+  }
+
+  private detachCurrent(): TParent | null {
+    const previous = this.current;
+    if (!previous) return null;
+    this.current = null;
+    this.loaded = true;
+    const rootObj = this.root as Row;
+    rootObj[this.relation.typeField] = null;
+    rootObj[this.relation.idField] = null;
+    this.ctx.registerRelationChange(
+      this.root,
+      this.relationKey,
+      this.rootTable,
+      this.relationName,
+      this.relation,
+      { kind: 'remove', entity: previous }
+    );
+    return null;
+  }
+
+  private get relationKey(): RelationKey {
+    return `${this.rootTable.name}.${this.relationName}`;
+  }
+
+  private populateFromHydrationCache(): void {
+    const rootObj = this.root as Row;
+    const typeValue = rootObj[this.relation.typeField];
+    const idValue = rootObj[this.relation.idField];
+    if (!typeValue || idValue === undefined || idValue === null) return;
+    const compositeKey = `${toKey(typeValue)}:${toKey(idValue)}`;
+    const row = getHydrationRecord(this.meta, this.relationName, compositeKey);
+    if (!row) return;
+    const targetTable = this.resolveTargetTable(toKey(typeValue));
+    if (targetTable) {
+      this.current = this.createEntity(targetTable, row);
+      this.loaded = true;
+    }
+  }
+}

package/src/orm/save-graph.ts

@@ -12,7 +12,10 @@ import {
   type BelongsToRelation,
   type HasManyRelation,
   type HasOneRelation,
-  type RelationDef
+  type RelationDef,
+  type MorphOneRelation,
+  type MorphManyRelation,
+  type MorphToRelation
 } from '../schema/relation.js';
 import type { TableDef } from '../schema/table.js';
 import { findPrimaryKey } from '../query-builder/hydration-planner.js';
@@ -323,6 +326,112 @@ const handleBelongsToMany = async (
   }
 };
 
+const handleMorphOne = async (
+  session: OrmSession,
+  root: AnyEntity,
+  relationName: string,
+  relation: MorphOneRelation,
+  payload: unknown,
+  options: SaveGraphOptions
+): Promise<void> => {
+  const ref = root[relationName] as unknown as HasOneReference<object>;
+  if (payload === undefined) return;
+  if (payload === null) {
+    ref.set(null);
+    return;
+  }
+  const pk = findPrimaryKey(relation.target);
+  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 as PrimaryKey }, options);
+    }
+    return;
+  }
+  const attached = ref.set(payload as AnyEntity);
+  if (attached) {
+    await applyGraphToEntity(session, relation.target, attached as AnyEntity, payload as AnyEntity, options);
+  }
+};
+
+const handleMorphMany = async (
+  session: OrmSession,
+  root: AnyEntity,
+  relationName: string,
+  relation: MorphManyRelation,
+  payload: unknown,
+  options: SaveGraphOptions
+): Promise<void> => {
+  if (!Array.isArray(payload)) return;
+  const collection = root[relationName] as unknown as HasManyCollection<unknown>;
+  await collection.load();
+
+  const targetTable = relation.target;
+  const targetPk = findPrimaryKey(targetTable);
+  const existing = collection.getItems() as unknown as AnyEntity[];
+  const seen = new Set<string>();
+
+  for (const item of payload) {
+    if (item === null || item === undefined) continue;
+    const asObj = typeof item === 'object' ? (item as AnyEntity) : { [targetPk]: item };
+    const pkValue = asObj[targetPk];
+
+    const current =
+      findInCollectionByPk(existing, targetPk, pkValue) ??
+      (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);
+    await applyGraphToEntity(session, targetTable, entity as AnyEntity, asObj, options);
+
+    if (!isEntityInCollection(collection.getItems() as unknown as AnyEntity[], targetPk, entity as unknown as AnyEntity)) {
+      collection.attach(entity);
+    }
+
+    if (pkValue !== undefined && pkValue !== null) {
+      seen.add(toKey(pkValue));
+    }
+  }
+
+  if (options.pruneMissing) {
+    for (const item of [...collection.getItems()]) {
+      const pkValue = item[targetPk];
+      if (pkValue !== undefined && pkValue !== null && !seen.has(toKey(pkValue))) {
+        collection.remove(item);
+      }
+    }
+  }
+};
+
+const handleMorphTo = async (
+  session: OrmSession,
+  root: AnyEntity,
+  relationName: string,
+  relation: MorphToRelation,
+  payload: unknown,
+  options: SaveGraphOptions
+): Promise<void> => {
+  const ref = root[relationName] as unknown as BelongsToReference<object>;
+  if (payload === undefined) return;
+  if (payload === null) {
+    ref.set(null);
+    return;
+  }
+  // MorphTo set — the wrapper handles setting typeField/idField on the root
+  const attached = ref.set(payload as AnyEntity);
+  if (attached) {
+    // Try to find the right target table
+    for (const [, targetTable] of Object.entries(relation.targets)) {
+      const pk = relation.targetKey || findPrimaryKey(targetTable);
+      const pkValue = (attached as AnyEntity)[pk];
+      if (pkValue !== undefined && pkValue !== null) {
+        await applyGraphToEntity(session, targetTable, attached as AnyEntity, payload as AnyEntity, options);
+        break;
+      }
+    }
+  }
+};
+
 const applyRelation = async (
   session: OrmSession,
   table: TableDef,
@@ -341,6 +450,12 @@ const applyRelation = async (
       return handleBelongsTo(session, entity, relationName, relation, payload, options);
     case RelationKinds.BelongsToMany:
       return handleBelongsToMany(session, entity, relationName, relation, payload, options);
+    case RelationKinds.MorphOne:
+      return handleMorphOne(session, entity, relationName, relation as MorphOneRelation, payload, options);
+    case RelationKinds.MorphMany:
+      return handleMorphMany(session, entity, relationName, relation as MorphManyRelation, payload, options);
+    case RelationKinds.MorphTo:
+      return handleMorphTo(session, entity, relationName, relation as MorphToRelation, payload, options);
   }
 };
 

package/src/query-builder/expression-table-mapper.ts

@@ -34,6 +34,11 @@ const mapExpression = (expr: ExpressionNode, fromTable: string, toTable: string)
       if (nextOperands.every((op, i) => op === expr.operands[i])) return expr;
       return { ...expr, operands: nextOperands };
     }
+    case 'NotExpression': {
+      const operand = mapExpression(expr.operand, fromTable, toTable);
+      if (operand === expr.operand) return expr;
+      return { ...expr, operand };
+    }
     case 'NullExpression': {
       const left = mapOperand(expr.left, fromTable, toTable);
       if (left === expr.left) return expr;