@spinajs/orm 2.0.519 → 2.0.521

package/lib/cjs/model.d.ts

@@ -5,7 +5,7 @@ import { RawQuery, UpdateQueryBuilder, TruncateTableQueryBuilder, SelectQueryBui
 import { Op } from './enums.js';
 import { Wrap } from './statements.js';
 import { OrmDriver } from './driver.js';
-import { IModelSnapshot } from './snapshot.js';
+import { IModelChange, IModelSnapshot } from './snapshot.js';
 import { IContainer, Constructor } from '@spinajs/di';
 import { DateTime } from 'luxon';
 /**
@@ -18,22 +18,13 @@ import { DateTime } from 'luxon';
  */
 export declare function updateModelDescriptor(targetOrForward: any, callback: (descriptor: IModelDescriptor) => void): void;
 export declare class ModelBase<M = unknown> implements IModelBase {
-    private __is_dirty__;
-    /**
-     * Marks model as dirty. It means that model have unsaved changes
-     */
-    get IsDirty(): boolean;
-    set IsDirty(val: boolean);
     private _container;
     /**
-     * prop to track model props that changeded since last update
-     */
-    private __dirty_props__;
-    /**
-     * Diff baseline, captured when this instance was hydrated from a database row.
-     * `null` means "this model has never been in the database", which is what `save()`
-     * uses to classify it as an INSERT — not the presence of a primary key, because
-     * `setDefaults()` pre-fills @Uuid keys on construction.
+     * Diff baseline: a value copy of every persisted column, taken when the row was last read
+     * from or written to the database. `null` means the row has never been in the database, which
+     * is what classifies it as an INSERT - not the presence of a primary key, because
+     * `setDefaults()` pre-fills @Uuid keys on construction. Written only by `takeSnapshot()` and
+     * `clearSnapshot()`.
      */
     private __snapshot__;
     static readonly _queryScopes: QueryScope;
@@ -84,14 +75,45 @@ export declare class ModelBase<M = unknown> implements IModelBase {
      * dies. A relation's baseline is `snapshotRelation()`'s job, and it stores primary keys.
      */
     private snapshotColumns;
+    /**
+     * The value this model writes for every foreign key a @BelongsTo currently manages, keyed by
+     * column name. A relation holding a target owns its foreign key: `toSql()` writes the target's
+     * join-column value ( `Relation.PrimaryKey` — the target's primary key unless `@BelongsTo`
+     * names another column ), so a direct write to the column never reaches the database. A
+     * relation holding null or undefined owns nothing and is absent here, leaving the column to
+     * speak for itself: NULL after a `detach()`, untouched after a `populate()` that found no row.
+     *
+     * A @Recursive relation is excluded whatever it holds: `toSql()` writes its foreign key from
+     * the raw column, overriding the relation, so the column is what reaches the database.
+     *
+     * The single place that answers "what does this model persist for this column", so the
+     * snapshot baseline and the diff can never read the question differently.
+     */
+    private effectiveForeignKeys;
     /**
      * Captures the current value of every column as the diff baseline, discarding any
      * previous baseline and any relation keys recorded against it.
      *
+     * Reads the raw columns, deliberately: a snapshot is taken after an INSERT too, and an INSERT
+     * may omit a foreign key on purpose ( a deferred self-reference, whose target had no key yet ).
+     * Recording what the relation now holds would claim that key had been written and suppress the
+     * follow-up UPDATE that actually writes it. `writeBackRelationKeys()` is what brings a column
+     * in line with its relation, and it runs only where the key really was written.
+     *
      * Values are copied, never aliased — see `snapshotValue`. An aliased snapshot makes
      * every diff empty and `save()` a silent no-op.
      */
     takeSnapshot(): void;
+    /**
+     * Copies the value each @BelongsTo relation just wrote back onto its foreign-key column, so
+     * the model agrees with the row. Call it after a statement that wrote those keys, before
+     * `takeSnapshot()`.
+     *
+     * Without it a foreign key written directly and then overridden by its relation keeps the
+     * overridden value in the column, the snapshot records that value as the baseline, and the
+     * model reads dirty forever - every `save()` minting an UPDATE that changes nothing.
+     */
+    private writeBackRelationKeys;
     /**
      * Records the primary keys of the members currently in relation `name` as that
      * relation's baseline. A no-op when the model has no snapshot — an unhydrated model
@@ -105,49 +127,48 @@ export declare class ModelBase<M = unknown> implements IModelBase {
      */
     clearSnapshot(): void;
     /**
-     * Names of the columns whose current value differs from the snapshot.
-     *
-     * With no snapshot every column is reported as changed, which is the right answer for a
-     * model that is about to be inserted.
-     *
-     * This is deliberately independent of `__dirty_props__`: the proxy records a property as
-     * dirty on any write, including one that puts the original value back, so the snapshot
-     * diff is the more precise answer and the one the UPDATE payload is built from.
+     * `true` until the row has been in the database: the diff baseline is `null`. This is what
+     * classifies the model as an INSERT - not the presence of a primary key, because
+     * `setDefaults()` pre-fills @Uuid keys on construction.
+     */
+    get IsNew(): boolean;
+    /**
+     * Whether `save()` would write anything: a model that has never been in the database, or one
+     * with at least one column ( or re-pointed foreign key ) differing from its baseline.
      *
-     * Reads the same column set `takeSnapshot()` wrote, and must keep doing so: comparing a column
-     * the baseline never covered means comparing its live value against `undefined`, which reports it
-     * changed on every single save.
+     * Derived from the snapshot on every read - there is no write observer - so it costs one
+     * comparison per column until the first difference. There is deliberately no setter: the only
+     * way to make a model clean is to persist it or to re-baseline it with `takeSnapshot()`.
      */
-    changedColumns(): string[];
+    get IsDirty(): boolean;
     /**
-     * Foreign-key columns a relation object reported as rewritten, via {@link markDirty}.
+     * Every persisted column whose current value differs from the baseline, in descriptor column
+     * order, followed by any @BelongsTo foreign key the descriptor declares no column for. On a
+     * model with no baseline every column is reported with `OldValue: undefined`.
      *
-     * These are the only columns the snapshot diff cannot see. `SingleRelation.attach()` stores
-     * the new target on the relation wrapper and marks the foreign key dirty, but never writes
-     * the column on the model — the value is materialised from the relation later, by
-     * `StandardModelToSqlConverter`. So `changedColumns()` compares the column against its
-     * snapshot, finds it untouched, and reports no change even though the relation was
-     * re-pointed. Detaching a relation and calling `update()` would then emit nothing at all.
+     * Computed on demand - nothing observes writes - so an in-place mutation of a JSON column is
+     * seen exactly like an assignment. Call it once and reuse the result rather than polling it
+     * in a loop.
      *
-     * Restricted to declared relation foreign keys on purpose. `__dirty_props__` also collects
-     * ordinary property writes, and folding those in wholesale would undo the precision the
-     * diff exists for: a column written A -> B -> A is in `__dirty_props__` but has no net
-     * change, and must not be written back.
+     * Named `changeSet` - not `changes` - because model members and columns share a namespace and
+     * `changes` is a real column name in downstream schemas.
      */
-    protected relationDirtyColumns(): string[];
+    changeSet(): IModelChange[];
     /**
-     * Records `prop` as changed and marks the model dirty.
-     *
-     * This is the supported way for relation objects to report that they rewrote one of the
-     * owner's foreign keys. It replaces the `(owner as any).__dirty_props__.push(...)` casts
-     * that reached into a private field from outside the class ( A6 ).
+     * The single diff. `stopAtFirst` lets a boolean question return as soon as one change is found.
      *
-     * The push comes before `IsDirty = true` so the method stays correct even if the
-     * `IsDirty` setter ever starts clearing `__dirty_props__` on a truthy assignment too.
+     * Every foreign key is resolved to ONE effective value before anything is compared, so
+     * `IsDirty` and `changeSet()` can never disagree and the short-circuit can never skip a
+     * decision the full diff would have made.
      *
-     * @param prop - column name
+     * The rule: a @BelongsTo holding a target decides its foreign key, because that is what
+     * `toSql()` writes - the target's join-column value, `Relation.PrimaryKey`, which is the
+     * target's own primary key unless `@BelongsTo` names another column. A direct write to the
+     * column is therefore overridden and never reaches the database, and the diff has to say so.
+     * A relation holding null or undefined decides nothing and the column stands: NULL after a
+     * `detach()`, untouched after a `populate()` that found no row.
      */
-    markDirty(prop: string): void;
+    private diff;
     valueOf(): any;
     driver(): OrmDriver;
     /**
@@ -328,11 +349,9 @@ export declare class ModelBase<M = unknown> implements IModelBase {
     /**
      * Writes the columns that differ from the snapshot.
      *
-     * The change set comes from `changedColumns()` — the snapshot diff — and not from the
-     * proxy's `__dirty_props__`, which records a property as dirty on ANY write including one
-     * that puts the original value straight back. `save()` has always used the diff, and
-     * `changedColumns()` documents it as the more precise answer; this path used the imprecise
-     * one, so the same edit produced a different UPDATE depending on which method you called.
+     * The change set is `changeSet()` - the snapshot diff, which also covers a foreign key that was
+     * re-pointed through its relation - so re-assigning a column its current value produces no
+     * UPDATE, and a column written A -> B -> A is not written back.
      *
      * A model with no snapshot ( never hydrated ) reports every column as changed, which is the
      * right answer: there is no baseline to be more precise than.

package/lib/cjs/model.d.ts.map

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

package/lib/cjs/model.js

@@ -21,19 +21,6 @@ const lodash_1 = __importDefault(require("lodash"));
 const uuid_1 = require("uuid");
 const descriptor_js_1 = require("./descriptor.js");
 const primary_keys_js_1 = require("./primary-keys.js");
-const MODEL_PROXY_HANDLER = {
-    set: (target, p, value) => {
-        if (target[p] !== value) {
-            target[p] = value;
-            if (p !== 'IsDirty' && target.ModelDescriptor?.Columns.find((x) => x.Name === p)) {
-                target.IsDirty = true;
-                // HACK to access private prop ( internal use )
-                target.__dirty_props__.push(p);
-            }
-        }
-        return true;
-    },
-};
 /**
  *
  * Updates model descriptor
@@ -59,18 +46,6 @@ function updateModelDescriptor(targetOrForward, callback) {
     callback(descriptor);
 }
 class ModelBase {
-    /**
-     * Marks model as dirty. It means that model have unsaved changes
-     */
-    get IsDirty() {
-        return this.__is_dirty__;
-    }
-    set IsDirty(val) {
-        this.__is_dirty__ = val;
-        if (!val) {
-            this.__dirty_props__ = [];
-        }
-    }
     /**
      * Gets descriptor for this model. It contains information about relations, orm driver, connection properties,
      * db table attached, column information and others.
@@ -161,10 +136,43 @@ class ModelBase {
     snapshotColumns() {
         return (this.ModelDescriptor?.Columns ?? []).filter((c) => !c.Virtual);
     }
+    /**
+     * The value this model writes for every foreign key a @BelongsTo currently manages, keyed by
+     * column name. A relation holding a target owns its foreign key: `toSql()` writes the target's
+     * join-column value ( `Relation.PrimaryKey` — the target's primary key unless `@BelongsTo`
+     * names another column ), so a direct write to the column never reaches the database. A
+     * relation holding null or undefined owns nothing and is absent here, leaving the column to
+     * speak for itself: NULL after a `detach()`, untouched after a `populate()` that found no row.
+     *
+     * A @Recursive relation is excluded whatever it holds: `toSql()` writes its foreign key from
+     * the raw column, overriding the relation, so the column is what reaches the database.
+     *
+     * The single place that answers "what does this model persist for this column", so the
+     * snapshot baseline and the diff can never read the question differently.
+     */
+    effectiveForeignKeys() {
+        const effective = new Map();
+        for (const [, r] of this.ModelDescriptor?.Relations ?? []) {
+            if (r.Type !== interfaces_js_1.RelationType.One || !r.ForeignKey || r.Recursive) {
+                continue;
+            }
+            const rel = this[r.Name];
+            if (rel?.Value) {
+                effective.set(r.ForeignKey, rel.Value[r.PrimaryKey]);
+            }
+        }
+        return effective;
+    }
     /**
      * Captures the current value of every column as the diff baseline, discarding any
      * previous baseline and any relation keys recorded against it.
      *
+     * Reads the raw columns, deliberately: a snapshot is taken after an INSERT too, and an INSERT
+     * may omit a foreign key on purpose ( a deferred self-reference, whose target had no key yet ).
+     * Recording what the relation now holds would claim that key had been written and suppress the
+     * follow-up UPDATE that actually writes it. `writeBackRelationKeys()` is what brings a column
+     * in line with its relation, and it runs only where the key really was written.
+     *
      * Values are copied, never aliased — see `snapshotValue`. An aliased snapshot makes
      * every diff empty and `save()` a silent no-op.
      */
@@ -175,6 +183,20 @@ class ModelBase {
         }
         this.__snapshot__ = snapshot;
     }
+    /**
+     * Copies the value each @BelongsTo relation just wrote back onto its foreign-key column, so
+     * the model agrees with the row. Call it after a statement that wrote those keys, before
+     * `takeSnapshot()`.
+     *
+     * Without it a foreign key written directly and then overridden by its relation keeps the
+     * overridden value in the column, the snapshot records that value as the baseline, and the
+     * model reads dirty forever - every `save()` minting an UPDATE that changes nothing.
+     */
+    writeBackRelationKeys() {
+        for (const [name, value] of this.effectiveForeignKeys()) {
+            this[name] = value;
+        }
+    }
     /**
      * Records the primary keys of the members currently in relation `name` as that
      * relation's baseline. A no-op when the model has no snapshot — an unhydrated model
@@ -206,72 +228,82 @@ class ModelBase {
         this.__snapshot__ = null;
     }
     /**
-     * Names of the columns whose current value differs from the snapshot.
-     *
-     * With no snapshot every column is reported as changed, which is the right answer for a
-     * model that is about to be inserted.
-     *
-     * This is deliberately independent of `__dirty_props__`: the proxy records a property as
-     * dirty on any write, including one that puts the original value back, so the snapshot
-     * diff is the more precise answer and the one the UPDATE payload is built from.
+     * `true` until the row has been in the database: the diff baseline is `null`. This is what
+     * classifies the model as an INSERT - not the presence of a primary key, because
+     * `setDefaults()` pre-fills @Uuid keys on construction.
+     */
+    get IsNew() {
+        return this.__snapshot__ === null;
+    }
+    /**
+     * Whether `save()` would write anything: a model that has never been in the database, or one
+     * with at least one column ( or re-pointed foreign key ) differing from its baseline.
      *
-     * Reads the same column set `takeSnapshot()` wrote, and must keep doing so: comparing a column
-     * the baseline never covered means comparing its live value against `undefined`, which reports it
-     * changed on every single save.
+     * Derived from the snapshot on every read - there is no write observer - so it costs one
+     * comparison per column until the first difference. There is deliberately no setter: the only
+     * way to make a model clean is to persist it or to re-baseline it with `takeSnapshot()`.
      */
-    changedColumns() {
-        const columns = this.snapshotColumns();
-        if (!this.__snapshot__) {
-            return columns.map((c) => c.Name);
-        }
-        const snapshot = this.__snapshot__;
-        return columns.filter((c) => !(0, snapshot_js_1.snapshotEquals)(snapshot.Columns.get(c.Name), this[c.Name], c.Converter)).map((c) => c.Name);
+    get IsDirty() {
+        return this.IsNew || this.diff(true).length > 0;
     }
     /**
-     * Foreign-key columns a relation object reported as rewritten, via {@link markDirty}.
+     * Every persisted column whose current value differs from the baseline, in descriptor column
+     * order, followed by any @BelongsTo foreign key the descriptor declares no column for. On a
+     * model with no baseline every column is reported with `OldValue: undefined`.
      *
-     * These are the only columns the snapshot diff cannot see. `SingleRelation.attach()` stores
-     * the new target on the relation wrapper and marks the foreign key dirty, but never writes
-     * the column on the model — the value is materialised from the relation later, by
-     * `StandardModelToSqlConverter`. So `changedColumns()` compares the column against its
-     * snapshot, finds it untouched, and reports no change even though the relation was
-     * re-pointed. Detaching a relation and calling `update()` would then emit nothing at all.
+     * Computed on demand - nothing observes writes - so an in-place mutation of a JSON column is
+     * seen exactly like an assignment. Call it once and reuse the result rather than polling it
+     * in a loop.
      *
-     * Restricted to declared relation foreign keys on purpose. `__dirty_props__` also collects
-     * ordinary property writes, and folding those in wholesale would undo the precision the
-     * diff exists for: a column written A -> B -> A is in `__dirty_props__` but has no net
-     * change, and must not be written back.
+     * Named `changeSet` - not `changes` - because model members and columns share a namespace and
+     * `changes` is a real column name in downstream schemas.
      */
-    relationDirtyColumns() {
-        const descriptor = this.ModelDescriptor;
-        if (!descriptor) {
-            return [];
-        }
-        const relationKeys = new Set();
-        for (const [, relation] of descriptor.Relations) {
-            if (relation.ForeignKey) {
-                relationKeys.add(relation.ForeignKey);
-            }
-        }
-        return this.__dirty_props__.filter((p) => relationKeys.has(p));
+    changeSet() {
+        return this.diff(false);
     }
     /**
-     * Records `prop` as changed and marks the model dirty.
+     * The single diff. `stopAtFirst` lets a boolean question return as soon as one change is found.
      *
-     * This is the supported way for relation objects to report that they rewrote one of the
-     * owner's foreign keys. It replaces the `(owner as any).__dirty_props__.push(...)` casts
-     * that reached into a private field from outside the class ( A6 ).
+     * Every foreign key is resolved to ONE effective value before anything is compared, so
+     * `IsDirty` and `changeSet()` can never disagree and the short-circuit can never skip a
+     * decision the full diff would have made.
      *
-     * The push comes before `IsDirty = true` so the method stays correct even if the
-     * `IsDirty` setter ever starts clearing `__dirty_props__` on a truthy assignment too.
-     *
-     * @param prop - column name
+     * The rule: a @BelongsTo holding a target decides its foreign key, because that is what
+     * `toSql()` writes - the target's join-column value, `Relation.PrimaryKey`, which is the
+     * target's own primary key unless `@BelongsTo` names another column. A direct write to the
+     * column is therefore overridden and never reaches the database, and the diff has to say so.
+     * A relation holding null or undefined decides nothing and the column stands: NULL after a
+     * `detach()`, untouched after a `populate()` that found no row.
      */
-    markDirty(prop) {
-        if (!this.__dirty_props__.includes(prop)) {
-            this.__dirty_props__.push(prop);
+    diff(stopAtFirst) {
+        const columns = this.snapshotColumns();
+        const snap = this.__snapshot__?.Columns;
+        const out = [];
+        const effective = this.effectiveForeignKeys();
+        for (const c of columns) {
+            const current = effective.has(c.Name) ? effective.get(c.Name) : this[c.Name];
+            if (!snap || !(0, snapshot_js_1.snapshotEquals)(snap.get(c.Name), current, c.Converter)) {
+                out.push({ Column: c.Name, OldValue: (0, snapshot_js_1.baselineValue)(snap?.get(c.Name)), NewValue: current });
+                if (stopAtFirst) {
+                    return out;
+                }
+            }
+        }
+        // A relation-managed foreign key the descriptor has no column for - the loop above never
+        // saw it, and there is no converter to compare it through.
+        const declared = new Set(columns.map((c) => c.Name));
+        for (const [name, current] of effective) {
+            if (declared.has(name)) {
+                continue;
+            }
+            if (!snap || !(0, snapshot_js_1.snapshotEquals)(snap.get(name), current)) {
+                out.push({ Column: name, OldValue: (0, snapshot_js_1.baselineValue)(snap?.get(name)), NewValue: current });
+                if (stopAtFirst) {
+                    return out;
+                }
+            }
         }
-        this.IsDirty = true;
+        return out;
     }
     valueOf() {
         return this.PrimaryKeyValue;
@@ -458,23 +490,18 @@ class ModelBase {
         throw new Error('Not implemented');
     }
     constructor(data) {
-        this.__is_dirty__ = false;
         /**
-         * prop to track model props that changeded since last update
-         */
-        this.__dirty_props__ = [];
-        /**
-         * Diff baseline, captured when this instance was hydrated from a database row.
-         * `null` means "this model has never been in the database", which is what `save()`
-         * uses to classify it as an INSERT — not the presence of a primary key, because
-         * `setDefaults()` pre-fills @Uuid keys on construction.
+         * Diff baseline: a value copy of every persisted column, taken when the row was last read
+         * from or written to the database. `null` means the row has never been in the database, which
+         * is what classifies it as an INSERT - not the presence of a primary key, because
+         * `setDefaults()` pre-fills @Uuid keys on construction. Written only by `takeSnapshot()` and
+         * `clearSnapshot()`.
          */
         this.__snapshot__ = null;
         this.setDefaults();
         if (data) {
             this.hydrate(data);
         }
-        return new Proxy(this, MODEL_PROXY_HANDLER);
     }
     /**
      * Fills model with data. It only fills properties that exists in database
@@ -503,7 +530,6 @@ class ModelBase {
             switch (v.Type) {
                 case interfaces_js_1.RelationType.One:
                     this[v.Name].attach(data);
-                    this.markDirty(v.ForeignKey);
                     break;
                 case interfaces_js_1.RelationType.Many: {
                     // Set the child's back-reference to this owner, when the child declares one.
@@ -525,7 +551,6 @@ class ModelBase {
                     break;
             }
         }
-        this.IsDirty = true;
     }
     /**
      * Extracts all data from model. It takes only properties that exists in DB
@@ -555,7 +580,7 @@ class ModelBase {
     toSql(onlyDirty) {
         const vals = this.Container.resolve(interfaces_js_1.ModelToSqlConverter).toSql(this);
         if (onlyDirty) {
-            return lodash_1.default.pick(vals, this.__dirty_props__);
+            return lodash_1.default.pick(vals, this.changeSet().map((c) => c.Column));
         }
         return vals;
     }
@@ -571,7 +596,6 @@ class ModelBase {
             return;
         }
         const result = await this.constructor.destroy(pk);
-        this.IsDirty = false;
         return result;
     }
     /**
@@ -587,16 +611,18 @@ class ModelBase {
         const { query } = this.createUpdateQuery();
         query.update(this.toSql());
         (0, primary_keys_js_1.wherePk)(query, this.ModelDescriptor, this.PrimaryKeyValue);
-        return await query;
+        const result = await query;
+        // The whole model is in the database now - that is the baseline for the next update().
+        this.writeBackRelationKeys();
+        this.takeSnapshot();
+        return result;
     }
     /**
      * Writes the columns that differ from the snapshot.
      *
-     * The change set comes from `changedColumns()` — the snapshot diff — and not from the
-     * proxy's `__dirty_props__`, which records a property as dirty on ANY write including one
-     * that puts the original value straight back. `save()` has always used the diff, and
-     * `changedColumns()` documents it as the more precise answer; this path used the imprecise
-     * one, so the same edit produced a different UPDATE depending on which method you called.
+     * The change set is `changeSet()` - the snapshot diff, which also covers a foreign key that was
+     * re-pointed through its relation - so re-assigning a column its current value produces no
+     * UPDATE, and a column written A -> B -> A is not written back.
      *
      * A model with no snapshot ( never hydrated ) reports every column as changed, which is the
      * right answer: there is no baseline to be more precise than.
@@ -612,11 +638,12 @@ class ModelBase {
             this.hydrate(data);
         }
         const keyColumns = this.ModelDescriptor.PrimaryKey ?? [];
-        const changed = lodash_1.default.union(this.changedColumns(), this.relationDirtyColumns()).filter((c) => !keyColumns.includes(c));
+        const changed = this.changeSet()
+            .map((c) => c.Column)
+            .filter((c) => !keyColumns.includes(c));
         // Nothing to write. Checked against the diff, so re-assigning a column its current value
         // no longer produces an UPDATE that sets it to what it already was.
         if (changed.length === 0) {
-            this.IsDirty = false;
             return result;
         }
         const updatedAt = this.ModelDescriptor.Timestamps.UpdatedAt;
@@ -630,7 +657,7 @@ class ModelBase {
         query.update(lodash_1.default.pick(this.toSql(), changed));
         (0, primary_keys_js_1.wherePk)(query, this.ModelDescriptor, this.PrimaryKeyValue);
         const updateResult = await query;
-        this.IsDirty = false;
+        this.writeBackRelationKeys();
         this.takeSnapshot();
         return updateResult;
     }
@@ -683,8 +710,12 @@ class ModelBase {
             modelCreation: () => null,
             afterHydration: () => null,
         });
-        const result = query.values(this.toSql());
-        this.IsDirty = false;
+        // Awaited here, not by the caller: the afterQuery middleware above backfills a generated key
+        // during execution, and the snapshot must include it. Taken only after the await - a throw
+        // leaves the model exactly as dirty as it was.
+        const result = await query.values(this.toSql());
+        this.writeBackRelationKeys();
+        this.takeSnapshot();
         return result;
     }
     /**
@@ -746,7 +777,9 @@ class ModelBase {
         for (const c of this.ModelDescriptor.Columns) {
             this[c.Name] = model[c.Name];
         }
-        this.IsDirty = false;
+        // Every column now holds what the database holds - that is the new baseline, not the one
+        // captured before the refresh.
+        this.takeSnapshot();
     }
     toJSON() {
         return this.dehydrate();
@@ -1113,6 +1146,24 @@ exports.MODEL_STATIC_MIXINS = {
                 // supplied and generated keys, a statement the server did not insert one row per input
                 // row for — cannot be mapped positionally, so nothing is assigned. Callers needing the
                 // keys there must re-select or insert the models one at a time.
+                // Every persist path re-baselines after its statement, and the baseline is taken after
+                // the backfill above so it carries whatever key the statement produced: the model is
+                // re-baselined to exactly what the statement wrote, no more. The relation keys are
+                // written back first because the payload took them from the relation ( `toSql()` reads
+                // the target's join column ) and not from the model's own foreign-key column - without
+                // the write-back the baseline would record a column value the row does not hold, and the
+                // model would read dirty right after a successful insert.
+                //
+                // A plain-object payload is not a model and has nothing to snapshot; a model whose key
+                // could not be mapped positionally is still in the database, so it is re-baselined too -
+                // it just carries no key, and cannot be updated through this instance until one is set.
+                rows.forEach((v) => {
+                    if (v instanceof ModelBase) {
+                        // Private instance member - the static side of the class cannot see it.
+                        v.writeBackRelationKeys();
+                        v.takeSnapshot();
+                    }
+                });
                 return result;
             },
             modelCreation: () => null,