@spinajs/orm 2.0.481 → 2.0.484

package/lib/mjs/resilience.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Lifecycle state of a driver's connection to its database.
+ */
+export declare enum ConnectionState {
+    Disconnected = "disconnected",
+    Connecting = "connecting",
+    Connected = "connected",
+    /** Reachable but failing health probes, or mid-reconnect. Queries are still attempted. */
+    Degraded = "degraded"
+}
+export interface IConnectionResilienceOptions {
+    /**
+     * Milliseconds between health probes. 0 disables the periodic probe. Default 30000.
+     */
+    HealthCheckInterval?: number;
+    /**
+     * Reconnect attempts per outage before giving up. Default 5.
+     */
+    MaxRetries?: number;
+    /**
+     * First backoff delay in ms; doubles each attempt. Default 200.
+     */
+    RetryDelay?: number;
+    /**
+     * Upper bound on the backoff delay in ms. Default 5000.
+     */
+    MaxRetryDelay?: number;
+}
+/**
+ * Error codes that mean the transport died rather than the statement being wrong. Retrying a
+ * statement that the server rejected only multiplies the failure, so this set is deliberately
+ * narrow: connection-level Node socket errors plus the mysql2 protocol codes for a lost or
+ * exhausted connection.
+ */
+export declare const RETRYABLE_ERROR_CODES: ReadonlySet<string>;
+/**
+ * Backoff delay for attempt `n` (0-based), doubling from `base` and clamped to `max`.
+ */
+export declare function backoffDelay(attempt: number, base: number, max: number): number;
+/**
+ * Promise-returning sleep used by the retry loop.
+ */
+export declare function delay(ms: number): Promise<void>;
+/**
+ * Walks an error and its `inner` / `cause` chain looking for a retryable code. Driver errors are
+ * frequently wrapped ( OrmException carries the original in `inner` ), so a shallow check misses
+ * exactly the cases that matter.
+ */
+export declare function isRetryableErrorCode(err: unknown): boolean;
+//# sourceMappingURL=resilience.d.ts.map

package/lib/mjs/resilience.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resilience.d.ts","sourceRoot":"","sources":["../../src/resilience.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,eAAe;IACzB,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,SAAS,cAAc;IAEvB,0FAA0F;IAC1F,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,4BAA4B;IAC3C;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,EAAE,WAAW,CAAC,MAAM,CAepD,CAAC;AAEH;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/E;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAe1D"}

package/lib/mjs/resilience.js

@@ -0,0 +1,64 @@
+/**
+ * Lifecycle state of a driver's connection to its database.
+ */
+export var ConnectionState;
+(function (ConnectionState) {
+    ConnectionState["Disconnected"] = "disconnected";
+    ConnectionState["Connecting"] = "connecting";
+    ConnectionState["Connected"] = "connected";
+    /** Reachable but failing health probes, or mid-reconnect. Queries are still attempted. */
+    ConnectionState["Degraded"] = "degraded";
+})(ConnectionState || (ConnectionState = {}));
+/**
+ * Error codes that mean the transport died rather than the statement being wrong. Retrying a
+ * statement that the server rejected only multiplies the failure, so this set is deliberately
+ * narrow: connection-level Node socket errors plus the mysql2 protocol codes for a lost or
+ * exhausted connection.
+ */
+export const RETRYABLE_ERROR_CODES = new Set([
+    'ECONNRESET',
+    'ECONNREFUSED',
+    'EPIPE',
+    'ETIMEDOUT',
+    'EHOSTUNREACH',
+    'ENETUNREACH',
+    'ENOTFOUND',
+    'PROTOCOL_CONNECTION_LOST',
+    'PROTOCOL_SEQUENCE_TIMEOUT',
+    'PROTOCOL_ENQUEUE_AFTER_FATAL_ERROR',
+    'PROTOCOL_ENQUEUE_AFTER_QUIT',
+    'ER_CON_COUNT_ERROR',
+    'ER_LOCK_WAIT_TIMEOUT',
+    'SQLITE_BUSY',
+]);
+/**
+ * Backoff delay for attempt `n` (0-based), doubling from `base` and clamped to `max`.
+ */
+export function backoffDelay(attempt, base, max) {
+    return Math.min(base * Math.pow(2, attempt), max);
+}
+/**
+ * Promise-returning sleep used by the retry loop.
+ */
+export function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/**
+ * Walks an error and its `inner` / `cause` chain looking for a retryable code. Driver errors are
+ * frequently wrapped ( OrmException carries the original in `inner` ), so a shallow check misses
+ * exactly the cases that matter.
+ */
+export function isRetryableErrorCode(err) {
+    let current = err;
+    let depth = 0;
+    while (current && depth < 5) {
+        const code = current.code ?? current.errno;
+        if (typeof code === 'string' && RETRYABLE_ERROR_CODES.has(code)) {
+            return true;
+        }
+        current = current.inner ?? current.cause;
+        depth++;
+    }
+    return false;
+}
+//# sourceMappingURL=resilience.js.map

package/lib/mjs/resilience.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resilience.js","sourceRoot":"","sources":["../../src/resilience.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAN,IAAY,eAOX;AAPD,WAAY,eAAe;IACzB,gDAA6B,CAAA;IAC7B,4CAAyB,CAAA;IACzB,0CAAuB,CAAA;IAEvB,0FAA0F;IAC1F,wCAAqB,CAAA;AACvB,CAAC,EAPW,eAAe,KAAf,eAAe,QAO1B;AAwBD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAwB,IAAI,GAAG,CAAC;IAChE,YAAY;IACZ,cAAc;IACd,OAAO;IACP,WAAW;IACX,cAAc;IACd,aAAa;IACb,WAAW;IACX,0BAA0B;IAC1B,2BAA2B;IAC3B,oCAAoC;IACpC,6BAA6B;IAC7B,oBAAoB;IACpB,sBAAsB;IACtB,aAAa;CACd,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,OAAe,EAAE,IAAY,EAAE,GAAW;IACrE,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;AACpD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,KAAK,CAAC,EAAU;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAY;IAC/C,IAAI,OAAO,GAAQ,GAAG,CAAC;IACvB,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,OAAO,OAAO,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;QAC3C,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;QACzC,KAAK,EAAE,CAAC;IACV,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/mjs/snapshot.d.ts

@@ -0,0 +1,58 @@
+import { IModelDescriptor, IValueConverter } from './interfaces.js';
+/**
+ * The diff baseline for one model instance.
+ *
+ * `Columns` holds a *value copy* of every column at the moment the model was hydrated from
+ * the database. `Relations` holds, per relation name, the primary keys of the members that
+ * were present when that relation was populated.
+ *
+ * Both must be copies. If a snapshot aliases live state, a later mutation changes the
+ * baseline as well, the diff is empty, and `save()` silently does nothing.
+ */
+export interface IModelSnapshot {
+    Columns: Map<string, unknown>;
+    Relations: Map<string, unknown[]>;
+}
+export declare function createSnapshot(): IModelSnapshot;
+/**
+ * Marker held in a snapshot in place of a value the ORM cannot copy.
+ *
+ * A baseline that ALIASES a mutable object is the worst possible answer: the baseline
+ * mutates along with the model, the diff comes out empty, and `save()` silently drops the
+ * caller's edit. This marker is never equal to anything, so such a column is reported as
+ * changed on every save — a redundant write instead of a lost one. A converter opts out of
+ * the redundancy by implementing `snapshotValue` / `snapshotEquals`.
+ */
+export declare const UNCOPYABLE: unique symbol;
+/**
+ * Takes a value copy suitable for a diff baseline.
+ *
+ * Immutable values (primitives, luxon `DateTime`) are returned as-is. Everything the ORM can
+ * put in a column and that can be mutated in place — `Buffer` (binary/UUID columns), `Date`,
+ * arrays and plain objects (JSON columns) — is copied.
+ *
+ * A mutable instance of a class the ORM does not own cannot be copied safely: cloning it
+ * could break its invariants. Such a value is replaced by {@link UNCOPYABLE} unless its
+ * column's converter supplies a `snapshotValue` hook.
+ *
+ * @param value - the in-memory column value
+ * @param converter - the column's converter, when it has one
+ */
+export declare function snapshotValue(value: unknown, converter?: IValueConverter | null): unknown;
+/**
+ * Value equality for a diff. Deliberately stricter than `==`: `null` and `undefined` are
+ * different (one is "explicitly cleared", the other "never set"), and `0`/`''`/`false` are
+ * never equal to each other.
+ *
+ * @param a - baseline value
+ * @param b - current value
+ * @param converter - the column's converter, when it has one
+ */
+export declare function snapshotEquals(a: unknown, b: unknown, converter?: IValueConverter | null): boolean;
+/**
+ * Builds a column snapshot straight from a raw database row, applying the same converters
+ * hydration applies. Used by `save({ reload: true })`, which needs the *database's* current
+ * values as the baseline without disturbing the user's in-memory edits.
+ */
+export declare function snapshotFromRow(descriptor: IModelDescriptor, row: Record<string, unknown>): Map<string, unknown>;
+//# sourceMappingURL=snapshot.d.ts.map

package/lib/mjs/snapshot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../src/snapshot.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEpE;;;;;;;;;GASG;AACH,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;CACnC;AAED,wBAAgB,cAAc,IAAI,cAAc,CAK/C;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,eAA4C,CAAC;AAEpE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,OAAO,CA+BzF;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,OAAO,CAoClG;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBhH"}

package/lib/mjs/snapshot.js

@@ -0,0 +1,115 @@
+/* eslint-disable prettier/prettier */
+import _ from 'lodash';
+import { DateTime } from 'luxon';
+export function createSnapshot() {
+    return {
+        Columns: new Map(),
+        Relations: new Map(),
+    };
+}
+/**
+ * Marker held in a snapshot in place of a value the ORM cannot copy.
+ *
+ * A baseline that ALIASES a mutable object is the worst possible answer: the baseline
+ * mutates along with the model, the diff comes out empty, and `save()` silently drops the
+ * caller's edit. This marker is never equal to anything, so such a column is reported as
+ * changed on every save — a redundant write instead of a lost one. A converter opts out of
+ * the redundancy by implementing `snapshotValue` / `snapshotEquals`.
+ */
+export const UNCOPYABLE = Symbol('spinajs.orm.snapshot.uncopyable');
+/**
+ * Takes a value copy suitable for a diff baseline.
+ *
+ * Immutable values (primitives, luxon `DateTime`) are returned as-is. Everything the ORM can
+ * put in a column and that can be mutated in place — `Buffer` (binary/UUID columns), `Date`,
+ * arrays and plain objects (JSON columns) — is copied.
+ *
+ * A mutable instance of a class the ORM does not own cannot be copied safely: cloning it
+ * could break its invariants. Such a value is replaced by {@link UNCOPYABLE} unless its
+ * column's converter supplies a `snapshotValue` hook.
+ *
+ * @param value - the in-memory column value
+ * @param converter - the column's converter, when it has one
+ */
+export function snapshotValue(value, converter) {
+    if (converter?.snapshotValue) {
+        return converter.snapshotValue(value);
+    }
+    if (value === null || value === undefined) {
+        return value;
+    }
+    if (typeof value !== 'object') {
+        return value;
+    }
+    if (DateTime.isDateTime(value)) {
+        // luxon DateTime is immutable; every "mutation" returns a new instance.
+        return value;
+    }
+    if (Buffer.isBuffer(value)) {
+        return Buffer.from(value);
+    }
+    if (value instanceof Date) {
+        return new Date(value.getTime());
+    }
+    if (Array.isArray(value) || _.isPlainObject(value)) {
+        return _.cloneDeep(value);
+    }
+    return UNCOPYABLE;
+}
+/**
+ * Value equality for a diff. Deliberately stricter than `==`: `null` and `undefined` are
+ * different (one is "explicitly cleared", the other "never set"), and `0`/`''`/`false` are
+ * never equal to each other.
+ *
+ * @param a - baseline value
+ * @param b - current value
+ * @param converter - the column's converter, when it has one
+ */
+export function snapshotEquals(a, b, converter) {
+    if (converter?.snapshotEquals) {
+        return converter.snapshotEquals(a, b);
+    }
+    // Set by `snapshotValue` for a value it could not copy. Never equal to anything, so the
+    // column is always reported as changed rather than silently never written.
+    if (a === UNCOPYABLE || b === UNCOPYABLE) {
+        return false;
+    }
+    if (a === b) {
+        return true;
+    }
+    if (a === null || a === undefined || b === null || b === undefined) {
+        return false;
+    }
+    if (DateTime.isDateTime(a) && DateTime.isDateTime(b)) {
+        return a.toMillis() === b.toMillis();
+    }
+    if (a instanceof Date && b instanceof Date) {
+        return a.getTime() === b.getTime();
+    }
+    if (Buffer.isBuffer(a) && Buffer.isBuffer(b)) {
+        return a.equals(b);
+    }
+    if (typeof a === 'object' && typeof b === 'object') {
+        return _.isEqual(a, b);
+    }
+    return false;
+}
+/**
+ * Builds a column snapshot straight from a raw database row, applying the same converters
+ * hydration applies. Used by `save({ reload: true })`, which needs the *database's* current
+ * values as the baseline without disturbing the user's in-memory edits.
+ */
+export function snapshotFromRow(descriptor, row) {
+    const columns = new Map();
+    for (const c of descriptor.Columns ?? []) {
+        if (!(c.Name in row)) {
+            continue;
+        }
+        // eslint-disable-next-line security/detect-object-injection
+        const raw = row[c.Name];
+        const converted = c.Converter ? c.Converter.fromDB(raw, row, descriptor.Converters.get(c.Name)?.Options) : raw;
+        columns.set(c.Name, snapshotValue(converted, c.Converter));
+    }
+    return columns;
+}
+//# sourceMappingURL=snapshot.js.map

package/lib/mjs/snapshot.js.map

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

package/lib/mjs/statements.d.ts

@@ -1,6 +1,6 @@
 import { IJoinStatementOptions } from './interfaces.js';
 import type { SelectQueryBuilder, WhereBuilder, RawQuery, QueryBuilder } from './builders.js';
-import { ColumnMethods, SqlOperator } from './enums.js';
+import { ColumnMethods, SqlOperator, WhereBoolean } from './enums.js';
 import { Container, Class, Constructor, IContainer } from '@spinajs/di';
 import { IColumnDescriptor } from './interfaces.js';
 import { ModelBase } from './model.js';
@@ -11,13 +11,23 @@ export interface IQueryStatementResult {
 }
 export interface IQueryStatement {
     TableAlias: string;
+    /**
+     * Boolean connector that precedes this statement inside a WHERE/HAVING clause.
+     * The very first statement in a clause has no leading connector (the value is
+     * ignored). Subsequent statements are joined by their own connector, so
+     * `where(a).where(b).orWhere(c)` compiles to `a AND b OR c`.
+     */
+    Boolean: WhereBoolean;
     build(): IQueryStatementResult;
     clone(parent?: QueryBuilder | SelectQueryBuilder | WhereBuilder<any>): IQueryStatement;
 }
 export declare abstract class QueryStatement implements IQueryStatement {
     protected _tableAlias: string | undefined;
+    protected _boolean: WhereBoolean;
     get TableAlias(): string;
     set TableAlias(alias: string);
+    get Boolean(): WhereBoolean;
+    set Boolean(op: WhereBoolean);
     constructor(tableAlias?: string | null);
     abstract build(): IQueryStatementResult;
     abstract clone<T extends QueryBuilder | SelectQueryBuilder | WhereBuilder<any>>(parent?: T): IQueryStatement;

package/lib/mjs/statements.d.ts.map

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

package/lib/mjs/statements.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { ColumnMethods, SqlOperator } from './enums.js';
+import { ColumnMethods, SqlOperator, WhereBoolean } from './enums.js';
 import { NewInstance, Container, Inject } from '@spinajs/di';
 import _ from 'lodash';
 import { Lazy } from '@spinajs/util';
@@ -20,7 +20,14 @@ export class QueryStatement {
     set TableAlias(alias) {
         this._tableAlias = alias;
     }
+    get Boolean() {
+        return this._boolean;
+    }
+    set Boolean(op) {
+        this._boolean = op;
+    }
     constructor(tableAlias) {
+        this._boolean = WhereBoolean.AND;
         this._tableAlias = tableAlias ?? undefined;
     }
 }
@@ -127,7 +134,7 @@ let WhereStatement = class WhereStatement extends QueryStatement {
             const columnDesc = columnName && desc ? desc.Columns.find((x) => x.Name === columnName) : null;
             // Allow primary key columns and any model property even if not explicitly in Columns array
             // Some properties may be defined without decorators or only with @Primary
-            if (columnName && !columnDesc && columnName !== desc?.PrimaryKey && !(columnName in this._model.prototype)) {
+            if (columnName && !columnDesc && !desc?.PrimaryKey.includes(columnName) && !(columnName in this._model.prototype)) {
                 throw new InvalidArgument(`column ${columnName} not exists in model ${this._model.name}`);
             }
             this._isAggregate = columnDesc?.Aggregate ?? false;
@@ -187,7 +194,11 @@ let JoinStatement = class JoinStatement extends QueryStatement {
             if (_options.queryCallback) {
                 _options.queryCallback.call(this._whereBuilder);
             }
-            this._options.builder.mergeBuilder(this._whereBuilder);
+            // Merge columns/sort from the join sub-builder, but NOT its WHERE
+            // statements — those are emitted in the JOIN's ON clause by build() so a
+            // LEFT JOIN stays a LEFT JOIN (otherwise the condition lands in the main
+            // WHERE and filters out rows the outer join is meant to keep).
+            this._options.builder.mergeBuilder(this._whereBuilder, false);
         }
     }
 };

package/lib/mjs/statements.js.map

@@ -1 +1 @@
-{"version":3,"file":"statements.js","sourceRoot":"","sources":["../../src/statements.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"statements.js","sourceRoot":"","sources":["../../src/statements.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAsB,MAAM,EAAc,MAAM,aAAa,CAAC;AAC7F,OAAO,CAAC,MAAM,QAAQ,CAAC;AAGvB,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAuBzD,MAAM,OAAgB,cAAc;IAKlC,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,IAAW,UAAU,CAAC,KAAa;QACjC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAW,OAAO,CAAC,EAAgB;QACjC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,YAAY,UAA0B;QAlB5B,aAAQ,GAAiB,YAAY,CAAC,GAAG,CAAC;QAmBlD,IAAI,CAAC,WAAW,GAAG,UAAU,IAAI,SAAS,CAAC;IAC7C,CAAC;CAKF;AAGM,IAAe,iBAAiB,GAAhC,MAAe,iBAAkB,SAAQ,cAAc;IAI5D,YAAY,KAAa,EAAE,QAAgB;QACzC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,KAAK,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,QAAQ,IAAI,EAAE,CAAC;IAClC,CAAC;CAGF,CAAA;AAZqB,iBAAiB;IADtC,WAAW,EAAE;;GACQ,iBAAiB,CAYtC;;AAIM,IAAe,sBAAsB,GAArC,MAAe,sBAAuB,SAAQ,cAAc;IACjE,YAAsB,SAAqB,EAAY,KAAa,EAAY,MAA0B,EAAY,UAAkB,EAAY,OAAe;QACjK,KAAK,CAAC,IAAI,CAAC,CAAC;QADQ,cAAS,GAAT,SAAS,CAAY;QAAY,UAAK,GAAL,KAAK,CAAQ;QAAY,WAAM,GAAN,MAAM,CAAoB;QAAY,eAAU,GAAV,UAAU,CAAQ;QAAY,YAAO,GAAP,OAAO,CAAQ;IAEnK,CAAC;CAGF,CAAA;AANqB,sBAAsB;IAF3C,WAAW,EAAE;IACb,MAAM,CAAC,SAAS,CAAC;;GACI,sBAAsB,CAM3C;;AAEM,IAAe,gBAAgB,GAA/B,MAAe,gBAAiB,SAAQ,cAAc;IAG3D,YAAY,UAA6B,EAAE,UAAkB;QAC3D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;IAC1B,CAAC;CAGF,CAAA;AAVqB,gBAAgB;IADrC,WAAW,EAAE;;GACQ,gBAAgB,CAUrC;;AAGM,IAAe,gBAAgB,GAA/B,MAAe,gBAAiB,SAAQ,cAAc;IAK3D,YAAY,MAAc,EAAE,GAAU,EAAE,GAAY,EAAE,UAAkB;QACtE,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,EAAE,CAAC;IAC9B,CAAC;CAGF,CAAA;AAdqB,gBAAgB;IADrC,WAAW,EAAE;;GACQ,gBAAgB,CAcrC;;AAEM,IAAe,mBAAmB,GAAlC,MAAe,mBAAoB,SAAQ,cAAc;IAG9D,YAAY,OAA0B;QACpC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;CAGF,CAAA;AATqB,mBAAmB;IADxC,WAAW,EAAE;;GACQ,mBAAmB,CASxC;;AAGM,IAAe,kBAAkB,GAAjC,MAAe,kBAAmB,SAAQ,cAAc;IAE7D,YAAsB,QAAuB,EAAY,OAAiB;QACxE,KAAK,EAAE,CAAC;QADY,aAAQ,GAAR,QAAQ,CAAe;QAAY,YAAO,GAAP,OAAO,CAAU;IAE1E,CAAC;CAGF,CAAA;AAPqB,kBAAkB;IADvC,WAAW,EAAE;qCAGoB,IAAI;GAFhB,kBAAkB,CAOvC;;AAGM,IAAe,cAAc,GAA7B,MAAe,cAAe,SAAQ,cAAc;IASzD,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAGD,YAAY,MAAqB,EAAE,QAAqB,EAAE,KAAU,EAAE,OAA8B;QAClG,KAAK,EAAE,CAAC;QArBA,iBAAY,GAAY,KAAK,CAAC;QAsBtC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;QACpC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAExB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;YAC9D,MAAM,UAAU,GAAG,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAE/F,2FAA2F;YAC3F,0EAA0E;YAC1E,IAAI,UAAU,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gBAClH,MAAM,IAAI,eAAe,CAAC,UAAU,UAAU,wBAAwB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC5F,CAAC;YAED,IAAI,CAAC,YAAY,GAAG,UAAU,EAAE,SAAS,IAAI,KAAK,CAAC;QACrD,CAAC;IAEH,CAAC;CAGF,CAAA;AApDqB,cAAc;IADnC,WAAW,EAAE;;GACQ,cAAc,CAoDnC;;AAGM,IAAM,IAAI,GAAV,MAAM,IAAI;IAIf,YAAY,MAAc,EAAE,OAA6B;QACvD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF,CAAA;AARY,IAAI;IADhB,WAAW,EAAE;;GACD,IAAI,CAQhB;;AAGM,IAAe,aAAa,GAA5B,MAAe,aAAa;IAIjC,YAAY,KAAU,EAAE,UAAkB;QACxC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;CAGF,CAAA;AAVqB,aAAa;IADlC,WAAW,EAAE;;GACQ,aAAa,CAUlC;;AAGM,IAAe,WAAW,GAA1B,MAAe,WAAY,SAAQ,aAAa;CAAI,CAAA;AAArC,WAAW;IADhC,WAAW,EAAE;GACQ,WAAW,CAA0B;;AAGpD,IAAe,eAAe,GAA9B,MAAe,eAAgB,SAAQ,aAAa;CAAI,CAAA;AAAzC,eAAe;IADpC,WAAW,EAAE;GACQ,eAAe,CAA0B;;AAGxD,IAAe,aAAa,GAA5B,MAAe,aAAc,SAAQ,cAAc;IAOxD,YAAsB,QAA+B;QACnD,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QADb,aAAQ,GAAR,QAAQ,CAAuB;QAInD,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,QAAQ,YAAY,IAAI,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YAEjG,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACvE,MAAM,MAAM,GAAG,mBAAoB,CAAC,MAAO,CAAC;YAC5C,MAAM,SAAS,GAAG,mBAAoB,CAAC,MAAO,CAAC,SAAS,CAAC;YAEzD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAqB,oBAAoB,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;YACrH,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAS,CAAC,CAAC;YACtD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAS,CAAC,CAAC;YAE7C,IAAG,QAAQ,CAAC,aAAa,EAAC,CAAC;gBACzB,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAClD,CAAC;YAED,kEAAkE;YAClE,yEAAyE;YACzE,yEAAyE;YACzE,+DAA+D;YAC/D,IAAI,CAAC,QAAQ,CAAC,OAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;CAGF,CAAA;AAlCqB,aAAa;IADlC,WAAW,EAAE;;GACQ,aAAa,CAkClC;;AAGM,IAAe,WAAW,GAA1B,MAAe,WAAY,SAAQ,cAAc;IAMtD,YAAY,MAAc,EAAE,GAAU,EAAE,GAAY,EAAE,OAAgC;QACpF,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;CAGF,CAAA;AAhBqB,WAAW;IADhC,WAAW,EAAE;;GACQ,WAAW,CAgBhC;;AAGM,IAAe,oBAAoB,GAAnC,MAAe,oBAAqB,SAAQ,cAAc;IAE/D,YAAY,OAA2B,EAAE,UAAmB;QAC1D,KAAK,CAAC,UAAU,CAAC,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;CAGF,CAAA;AARqB,oBAAoB;IADzC,WAAW,EAAE;;GACQ,oBAAoB,CAQzC;;AAGM,IAAe,oBAAoB,GAAnC,MAAe,oBAAqB,SAAQ,oBAAoB;IAGrE,YAAY,OAA2B,EAAE,GAAY;QACnD,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC;IAC3B,CAAC;CAGF,CAAA;AAVqB,oBAAoB;IADzC,WAAW,EAAE;;GACQ,oBAAoB,CAUzC;;AAGM,IAAe,cAAc,GAA7B,MAAe,cAAe,SAAQ,cAAc;IAKzD,YAAY,MAAc,EAAE,GAAU,EAAE,GAAY,EAAE,UAAkB;QACtE,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,EAAE,CAAC;IAC9B,CAAC;CAGF,CAAA;AAdqB,cAAc;IADnC,WAAW,EAAE;;GACQ,cAAc,CAcnC;;AAEM,IAAe,eAAe,GAA9B,MAAe,eAAgB,SAAQ,cAAc;IAK1D,YAAY,MAAyB,EAAE,KAAa,EAAE,UAAkB,EAAE,UAAgD;QACxH,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,KAAK,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,IAAW,UAAU,CAAC,KAAa;QACjC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,IAAI,UAAU;QACZ,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACjD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,IAAK,IAAI,CAAC,OAAe,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC;IAC9D,CAAC;CAGF,CAAA;AA3CqB,eAAe;IADpC,WAAW,EAAE;;GACQ,eAAe,CA2CpC;;AAED,MAAM,OAAgB,kBAAmB,SAAQ,cAAc;IAC7D,YAAmB,QAAkB;QACnC,KAAK,EAAE,CAAC;QADS,aAAQ,GAAR,QAAQ,CAAU;IAErC,CAAC;CAGF;AAGM,IAAe,qBAAqB,GAApC,MAAe,qBAAsB,SAAQ,eAAe;IAGjE,YAAY,MAAyB,EAAE,MAAqB,EAAE,KAAa,EAAE,UAAkB;QAC7F,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;CAGF,CAAA;AATqB,qBAAqB;IAD1C,WAAW,EAAE;;GACQ,qBAAqB,CAS1C"}

package/lib/mjs/subject-builder.d.ts

@@ -0,0 +1,79 @@
+import { IIdentityMap } from './interfaces.js';
+import type { ModelBase } from './model.js';
+import { Subject, SubjectSet } from './subject.js';
+/**
+ * Turns a mutated object graph into a `SubjectSet` — the complete, unordered description of
+ * what one `save()` must do.
+ *
+ * Traversal rules:
+ *
+ * - a `belongsTo` is followed whenever its `Value` is set, populated or not, because
+ *   attaching a model to it is an explicit act;
+ * - a `hasMany` or `manyToMany` is followed **only when `Populated` is true**, so a relation
+ *   the caller never loaded is invisible and `Items: OrderItem[] = []` on a freshly
+ *   constructed model deletes nothing;
+ * - `Query` and `Virtual` relations are read-only projections and are never followed.
+ */
+export declare class SubjectBuilder {
+    protected identityMap: IIdentityMap;
+    private _visited;
+    constructor(identityMap: IIdentityMap);
+    build(root: ModelBase): SubjectSet;
+    /**
+     * Walks the graph breadth-first from `root`, canonicalizing every model through the
+     * identity map so a row reached by two paths yields one instance.
+     *
+     * @param root - the model `save()` was called on
+     */
+    collect(root: ModelBase): ModelBase[];
+    /**
+     * Models directly reachable from `model` under the traversal rules.
+     */
+    protected relatedOf(model: ModelBase): ModelBase[];
+    /**
+     * Diffs each collected model against its snapshot and records its `belongsTo` foreign keys.
+     * hasMany, manyToMany and orphan handling are layered on by later passes.
+     *
+     * @param models - output of `collect()`
+     */
+    buildFrom(models: ModelBase[]): SubjectSet;
+    /**
+     * Records, for every `belongsTo` with a `Value`, that this subject's foreign-key column
+     * takes the target's primary key. The value is *not* read here — the target may not have
+     * been inserted yet; the executor resolves it immediately before the statement.
+     */
+    protected buildBelongsTo(subject: Subject): void;
+    /**
+     * Diffs each populated `hasMany` on `subject` against the owner's relation snapshot and
+     * records the owner's foreign key as pending on every member that stays.
+     *
+     * A relation with `Populated === false` is skipped entirely — that is the anti-footgun
+     * guarantee, and it is why a freshly constructed model with `Items: OrderItem[] = []`
+     * deletes nothing.
+     *
+     * Both new *and* kept members get the pending foreign key. That is what makes re-parenting
+     * work: a clean child moved to another owner has its key rewritten and is promoted from a
+     * no-op to an UPDATE, instead of keeping its old owner id in the database ( B20 ).
+     */
+    protected buildHasMany(subject: Subject, set: SubjectSet): void;
+    /**
+     * Diffs each populated `manyToMany` against the owner's relation snapshot into junction
+     * rows to create and destroy.
+     *
+     * Only the *junction* row is created or destroyed. A target that is new gets its own insert
+     * subject from `collect()` so its key exists before the junction row references it; a target
+     * that is merely unlinked is left completely alone — removing a tag from an order must
+     * never delete the tag.
+     */
+    protected buildManyToMany(subject: Subject, set: SubjectSet): void;
+    /**
+     * Turns every `hasMany` removal recorded during the diff into an orphan action.
+     *
+     * Runs once over the whole set rather than per relation, because the decision needs global
+     * information: a child removed from one owner and pushed onto another is a re-parent, not
+     * an orphan, and only a set-wide view can tell the two apart. Every key that has a live
+     * subject of the same target model in this graph is therefore subtracted.
+     */
+    protected buildOrphans(set: SubjectSet): void;
+}
+//# sourceMappingURL=subject-builder.d.ts.map

package/lib/mjs/subject-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subject-builder.d.ts","sourceRoot":"","sources":["../../src/subject-builder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAA8B,MAAM,iBAAiB,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAI5C,OAAO,EAAgD,OAAO,EAAoB,UAAU,EAAE,MAAM,cAAc,CAAC;AAEnH;;;;;;;;;;;;GAYG;AACH,qBAAa,cAAc;IAGb,SAAS,CAAC,WAAW,EAAE,YAAY;IAF/C,OAAO,CAAC,QAAQ,CAAwB;gBAElB,WAAW,EAAE,YAAY;IAExC,KAAK,CAAC,IAAI,EAAE,SAAS,GAAG,UAAU;IAIzC;;;;;OAKG;IACI,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE;IA2B5C;;OAEG;IACH,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,EAAE;IAuClD;;;;;OAKG;IACI,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU;IA+BjD;;;;OAIG;IACH,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAgBhD;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI;IAkC/D;;;;;;;;OAQG;IACH,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI;IA0ClE;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI;CA0D9C"}