@spinajs/orm 2.0.480 → 2.0.482

package/lib/cjs/driver.js

@@ -16,9 +16,20 @@ const interfaces_js_1 = require("./interfaces.js");
 const di_1 = require("@spinajs/di");
 const builders_js_1 = require("./builders.js");
 const converters_js_1 = require("./converters.js");
+const exceptions_js_1 = require("./exceptions.js");
+const async_hooks_1 = require("async_hooks");
+const resilience_js_1 = require("./resilience.js");
+const metrics_js_1 = require("./metrics.js");
 require("./hydrators.js");
 require("./dehydrators.js");
 class OrmDriver extends di_1.SyncService {
+    /**
+     * The transaction currently in scope on this async execution path, or `undefined` outside
+     * a transaction.
+     */
+    get CurrentTransaction() {
+        return this.TransactionStorage.getStore();
+    }
     constructor(options) {
         super();
         /**
@@ -30,6 +41,22 @@ class OrmDriver extends di_1.SyncService {
             Name: 'orm-driver',
             DefaultConnection: false,
         };
+        /**
+         * Ambient transaction context.
+         *
+         * Statements executed inside a `transaction()` callback must run on that transaction's
+         * connection. This lives on the abstract driver — rather than being a MySQL implementation
+         * detail, as it used to be — so the guarantee is part of the contract and every driver
+         * inherits it.
+         */
+        this.TransactionStorage = new async_hooks_1.AsyncLocalStorage();
+        /**
+         * Isolation levels this driver honours. Empty by default: a driver that declares nothing
+         * rejects every explicitly requested isolation level rather than quietly ignoring it.
+         */
+        this.SupportedIsolationLevels = [];
+        this._state = resilience_js_1.ConnectionState.Disconnected;
+        this._healthCheckTimer = null;
         this.Options = Object.assign(this.Options, options);
     }
     resolve() {
@@ -44,6 +71,207 @@ class OrmDriver extends di_1.SyncService {
         this.Container.register(converters_js_1.UuidConverter).as(converters_js_1.UuidConverter);
         this.Container.register(converters_js_1.UniversalValueConverter).as(converters_js_1.UniversalValueConverter);
     }
+    /**
+     * Effective pool settings: `Pool.*` when given, then the deprecated `PoolLimit` for `Max`,
+     * then the defaults. Resolved in one place so every driver agrees on what "unset" means.
+     */
+    resolvedPoolOptions() {
+        const pool = this.Options.Pool ?? {};
+        return {
+            Min: pool.Min ?? 0,
+            Max: pool.Max ?? this.Options.PoolLimit ?? 10,
+            IdleTimeout: pool.IdleTimeout ?? 30000,
+            AcquireTimeout: pool.AcquireTimeout ?? 10000,
+        };
+    }
+    /**
+     * Current connection lifecycle state.
+     */
+    get State() {
+        return this._state;
+    }
+    /**
+     * Records a state transition and logs it. Repeat transitions to the same state are ignored.
+     */
+    setState(state) {
+        if (this._state === state) {
+            return;
+        }
+        const previous = this._state;
+        this._state = state;
+        if (state === resilience_js_1.ConnectionState.Connected) {
+            this.Log.info(`connection ${this.Options.Name} is ${state} (was ${previous})`);
+        }
+        else if (state === resilience_js_1.ConnectionState.Degraded || state === resilience_js_1.ConnectionState.Disconnected) {
+            this.Log.warn(`connection ${this.Options.Name} is ${state} (was ${previous})`);
+        }
+        else {
+            this.Log.trace(`connection ${this.Options.Name} is ${state} (was ${previous})`);
+        }
+    }
+    /**
+     * Effective resilience settings with defaults applied.
+     */
+    resolvedResilienceOptions() {
+        const r = this.Options.Resilience ?? {};
+        return {
+            HealthCheckInterval: r.HealthCheckInterval ?? 30000,
+            MaxRetries: r.MaxRetries ?? 5,
+            RetryDelay: r.RetryDelay ?? 200,
+            MaxRetryDelay: r.MaxRetryDelay ?? 5000,
+        };
+    }
+    /**
+     * True when the error means the transport died rather than the statement being wrong.
+     * Drivers override to add dialect-specific codes.
+     */
+    isRetryableError(err) {
+        return (0, resilience_js_1.isRetryableErrorCode)(err);
+    }
+    /**
+     * Runs `operation`, and on a retryable transport failure reconnects and retries with bounded
+     * exponential backoff. Query errors propagate on the first attempt untouched.
+     */
+    async withReconnect(operation) {
+        const { MaxRetries, RetryDelay, MaxRetryDelay } = this.resolvedResilienceOptions();
+        let lastError;
+        for (let attempt = 0; attempt <= MaxRetries; attempt++) {
+            try {
+                const result = await operation();
+                this.setState(resilience_js_1.ConnectionState.Connected);
+                return result;
+            }
+            catch (err) {
+                if (!this.isRetryableError(err)) {
+                    throw err;
+                }
+                lastError = err;
+                this.setState(resilience_js_1.ConnectionState.Degraded);
+                if (attempt === MaxRetries) {
+                    break;
+                }
+                const wait = (0, resilience_js_1.backoffDelay)(attempt, RetryDelay, MaxRetryDelay);
+                this.Log.warn(`connection ${this.Options.Name} lost (${err.message}); reconnect attempt ${attempt + 1}/${MaxRetries} in ${wait}ms`);
+                await (0, resilience_js_1.delay)(wait);
+                try {
+                    this.setState(resilience_js_1.ConnectionState.Connecting);
+                    await this.connect();
+                }
+                catch (reconnectErr) {
+                    this.Log.warn(`reconnect attempt ${attempt + 1} for ${this.Options.Name} failed: ${reconnectErr.message}`);
+                    this.setState(resilience_js_1.ConnectionState.Degraded);
+                }
+            }
+        }
+        this.setState(resilience_js_1.ConnectionState.Disconnected);
+        throw lastError;
+    }
+    /**
+     * Starts the periodic health probe. Replaces the single startup `ping()` — a connection that
+     * was healthy at boot tells you nothing about a pool holding sockets to a database that has
+     * since restarted. No-op when `Resilience.HealthCheckInterval` is 0. Idempotent.
+     */
+    startHealthCheck() {
+        const { HealthCheckInterval } = this.resolvedResilienceOptions();
+        if (HealthCheckInterval <= 0 || this._healthCheckTimer !== null) {
+            return;
+        }
+        this._healthCheckTimer = setInterval(() => {
+            void this.runHealthCheck();
+        }, HealthCheckInterval);
+        // Never hold the process open just to probe a database.
+        if (typeof this._healthCheckTimer.unref === 'function') {
+            this._healthCheckTimer.unref();
+        }
+    }
+    /**
+     * Stops the periodic health probe. Idempotent.
+     */
+    stopHealthCheck() {
+        if (this._healthCheckTimer !== null) {
+            clearInterval(this._healthCheckTimer);
+            this._healthCheckTimer = null;
+        }
+    }
+    /**
+     * One health probe. A failed probe degrades the driver and attempts a single reconnect; it
+     * never throws, because it runs on a timer with no caller to receive the error.
+     */
+    async runHealthCheck() {
+        this.publishPoolMetrics();
+        let alive = false;
+        try {
+            alive = await this.ping();
+        }
+        catch {
+            alive = false;
+        }
+        if (alive) {
+            this.setState(resilience_js_1.ConnectionState.Connected);
+            return;
+        }
+        this.setState(resilience_js_1.ConnectionState.Degraded);
+        try {
+            // The driver stays DEGRADED even when reconnecting succeeds: a fresh handle is not
+            // evidence that queries work. Only the next successful probe promotes it back to
+            // Connected — drivers whose own connect() verifies the link ( mysql takes and releases
+            // a real connection ) set the state themselves.
+            await this.connect();
+        }
+        catch (err) {
+            this.Log.warn(`health check reconnect for ${this.Options.Name} failed: ${err.message}`);
+        }
+    }
+    /**
+     * Point-in-time pool state. The base implementation reports an empty pool; drivers that own a
+     * real pool override it. Must never throw — it runs on the health-check timer.
+     */
+    poolMetrics() {
+        return { Size: 0, InUse: 0, Waiting: 0 };
+    }
+    /**
+     * Pushes the current pool state and connection state to the shared `Metrics` registry from
+     * `@spinajs/telemetry-common`. Nothing has to be wired for this to work — `Metrics` owns a
+     * private registry and `@spinajs/telemetry`'s `/metrics` endpoint renders that same singleton.
+     */
+    publishPoolMetrics() {
+        try {
+            const metrics = (0, metrics_js_1.ormMetrics)();
+            if (!metrics) {
+                return;
+            }
+            const labels = { connection: this.Options.Name };
+            const pool = this.poolMetrics();
+            (0, metrics_js_1.ormGauge)(metrics, metrics_js_1.ORM_METRIC_KEY_POOL_SIZE).set(labels, pool.Size);
+            (0, metrics_js_1.ormGauge)(metrics, metrics_js_1.ORM_METRIC_KEY_POOL_IN_USE).set(labels, pool.InUse);
+            (0, metrics_js_1.ormGauge)(metrics, metrics_js_1.ORM_METRIC_KEY_POOL_WAITING).set(labels, pool.Waiting);
+            (0, metrics_js_1.ormGauge)(metrics, metrics_js_1.ORM_METRIC_KEY_CONNECTION_STATE).set(labels, this.State === resilience_js_1.ConnectionState.Connected ? 1 : 0);
+        }
+        catch (err) {
+            // Telemetry must never break a connection. This runs first on every health tick, so a
+            // registry that throws — or a driver built outside DI, as tooling and tests do — would
+            // otherwise stop the probe that follows it from ever running.
+            this.Log?.trace(`publishing pool metrics for ${this.Options.Name} failed: ${err.message}`);
+        }
+    }
+    /**
+     * Records one pool-acquire wait, in SECONDS ( prometheus convention ). Drivers that own a real
+     * pool call this from the acquire callback; keeping the prom-client objects behind this method
+     * is what stops every driver from needing to know about `@spinajs/telemetry-common`. Never
+     * throws, for the same reason `publishPoolMetrics` never throws.
+     */
+    observeAcquireSeconds(seconds) {
+        try {
+            const metrics = (0, metrics_js_1.ormMetrics)();
+            if (!metrics) {
+                return;
+            }
+            (0, metrics_js_1.ormHistogram)(metrics, metrics_js_1.ORM_METRIC_KEY_ACQUIRE_SECONDS).observe({ connection: this.Options.Name }, seconds);
+        }
+        catch (err) {
+            this.Log?.trace(`observing pool acquire time for ${this.Options.Name} failed: ${err.message}`);
+        }
+    }
     /**
      * Creates select query builder associated with this connection.
      * This can be used to execute raw queries to db without orm model layer
@@ -94,6 +322,57 @@ class OrmDriver extends di_1.SyncService {
     index() {
         return this.Container.resolve(builders_js_1.IndexQueryBuilder, [this]);
     }
+    /**
+     * Runs `cb` inside a transaction and owns its whole lifecycle: commits when the callback
+     * resolves, rolls back when it throws, and releases the connection exactly once either way.
+     * Resolves with whatever the callback returned.
+     *
+     * Statements issued inside the callback run on this transaction's connection automatically —
+     * the context is carried through `AsyncLocalStorage`, so nothing has to be threaded through
+     * by hand.
+     *
+     * Calling it again while a transaction is already in scope on this async path does **not**
+     * open a second, independent transaction: it takes a savepoint, so a failing nested block
+     * rolls back only its own work.
+     *
+     * @param cb - the transaction body
+     * @param options - optional isolation level, validated against {@link SupportedIsolationLevels}
+     */
+    async transaction(cb, options) {
+        if (options?.isolation && !this.SupportedIsolationLevels.includes(options.isolation)) {
+            throw new exceptions_js_1.OrmException(`isolation level ${options.isolation} not supported by driver ${this.Options.Driver}`);
+        }
+        const active = this.TransactionStorage.getStore();
+        // already inside a transaction — nest with a savepoint rather than opening a second one
+        if (active) {
+            const name = `sp_${++active.depth}`;
+            await this._savepoint(active, name);
+            try {
+                const result = await cb(this);
+                await this._releaseSavepoint(active, name);
+                return result;
+            }
+            catch (err) {
+                await this._rollbackToSavepoint(active, name);
+                throw err;
+            }
+        }
+        const ctx = await this._begin(options);
+        ctx.depth = 0;
+        try {
+            const result = await this.TransactionStorage.run(ctx, () => cb(this));
+            await this._commit(ctx);
+            return result;
+        }
+        catch (err) {
+            // swallow a rollback failure so it cannot mask whatever actually went wrong
+            await this._rollback(ctx).catch(() => undefined);
+            throw err;
+        }
+        finally {
+            await this._dispose(ctx);
+        }
+    }
 }
 exports.OrmDriver = OrmDriver;
 __decorate([

package/lib/cjs/driver.js.map

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

package/lib/cjs/existsRelationHandlers.d.ts

@@ -0,0 +1,29 @@
+import { IRelationDescriptor, ISelectQueryBuilder, RelationType } from './interfaces.js';
+import type { WhereBuilder } from './builders.js';
+import { WhereFunction } from './types.js';
+/**
+ * Strategy that builds the EXISTS / NOT EXISTS clause for one relation type.
+ *
+ * Resolved via `Array.ofType(ExistsRelationHandler)` and dispatched by `rel.Type` from
+ * `WhereBuilder.buildExistsClause`. Implementations either:
+ *  - mutate the outer builder directly and return `undefined` (eg. {@link RelationType.One}
+ *    adds `WHERE FK IS NOT NULL` plus a right-join, no EXISTS sub-query is generated), or
+ *  - return a correlated sub-query that the caller wraps in EXISTS/NOT EXISTS.
+ */
+export declare abstract class ExistsRelationHandler {
+    abstract get Type(): RelationType;
+    abstract apply<R>(builder: WhereBuilder<any>, rel: IRelationDescriptor, relationName: string, callback?: WhereFunction<R>): ISelectQueryBuilder | undefined;
+}
+export declare class OneExistsRelationHandler extends ExistsRelationHandler {
+    get Type(): RelationType;
+    apply<R>(builder: WhereBuilder<any>, rel: IRelationDescriptor, _relationName: string, callback?: WhereFunction<R>): undefined;
+}
+export declare class ManyExistsRelationHandler extends ExistsRelationHandler {
+    get Type(): RelationType;
+    apply<R>(builder: WhereBuilder<any>, rel: IRelationDescriptor, _relationName: string, callback?: WhereFunction<R>): ISelectQueryBuilder;
+}
+export declare class ManyToManyExistsRelationHandler extends ExistsRelationHandler {
+    get Type(): RelationType;
+    apply<R>(builder: WhereBuilder<any>, rel: IRelationDescriptor, _relationName: string, callback?: WhereFunction<R>): ISelectQueryBuilder;
+}
+//# sourceMappingURL=existsRelationHandlers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"existsRelationHandlers.d.ts","sourceRoot":"","sources":["../../src/existsRelationHandlers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAgB,mBAAmB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEvG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C;;;;;;;;GAQG;AACH,8BAAsB,qBAAqB;IACzC,aAAoB,IAAI,IAAI,YAAY,CAAC;aAEzB,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,mBAAmB,GAAG,SAAS;CACnK;AAYD,qBACa,wBAAyB,SAAQ,qBAAqB;IACjE,IAAW,IAAI,IAAI,YAAY,CAE9B;IAEM,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,SAAS;CAUrI;AAED,qBACa,yBAA0B,SAAQ,qBAAqB;IAClE,IAAW,IAAI,IAAI,YAAY,CAE9B;IAEM,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,mBAAmB;CAmB/I;AAED,qBACa,+BAAgC,SAAQ,qBAAqB;IACxE,IAAW,IAAI,IAAI,YAAY,CAE9B;IAEM,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,mBAAmB;CAuB/I"}

package/lib/cjs/existsRelationHandlers.js

@@ -0,0 +1,104 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyExistsRelationHandler = exports.ManyExistsRelationHandler = exports.OneExistsRelationHandler = exports.ExistsRelationHandler = void 0;
+/* eslint-disable prettier/prettier */
+const di_1 = require("@spinajs/di");
+const util_1 = require("@spinajs/util");
+const interfaces_js_1 = require("./interfaces.js");
+const builders_js_1 = require("./builders.js");
+/**
+ * Strategy that builds the EXISTS / NOT EXISTS clause for one relation type.
+ *
+ * Resolved via `Array.ofType(ExistsRelationHandler)` and dispatched by `rel.Type` from
+ * `WhereBuilder.buildExistsClause`. Implementations either:
+ *  - mutate the outer builder directly and return `undefined` (eg. {@link RelationType.One}
+ *    adds `WHERE FK IS NOT NULL` plus a right-join, no EXISTS sub-query is generated), or
+ *  - return a correlated sub-query that the caller wraps in EXISTS/NOT EXISTS.
+ */
+class ExistsRelationHandler {
+}
+exports.ExistsRelationHandler = ExistsRelationHandler;
+/**
+ * Resolves the correlated source primary key column reference, eg. `` `users`.`Id` ``.
+ * Falls back to the source descriptor's `TableName` when neither the builder nor its parent
+ * has an alias set, matching the legacy behaviour of `whereExist` / `whereNotExists`.
+ */
+function sourcePKeyRef(builder, tDesc) {
+    const sourceAlias = builder.TableAlias ?? tDesc.TableName;
+    return `\`${sourceAlias}\`.\`${tDesc.PrimaryKey[0]}\``;
+}
+let OneExistsRelationHandler = class OneExistsRelationHandler extends ExistsRelationHandler {
+    get Type() {
+        return interfaces_js_1.RelationType.One;
+    }
+    apply(builder, rel, _relationName, callback) {
+        builder.whereNotNull(rel.ForeignKey);
+        // simply use right join for condition check
+        if (callback) {
+            // TODO: cast fix
+            builder.rightJoin(rel.TargetModel, callback);
+        }
+        return undefined;
+    }
+};
+exports.OneExistsRelationHandler = OneExistsRelationHandler;
+exports.OneExistsRelationHandler = OneExistsRelationHandler = __decorate([
+    (0, di_1.Injectable)(ExistsRelationHandler)
+], OneExistsRelationHandler);
+let ManyExistsRelationHandler = class ManyExistsRelationHandler extends ExistsRelationHandler {
+    get Type() {
+        return interfaces_js_1.RelationType.Many;
+    }
+    apply(builder, rel, _relationName, callback) {
+        const tDesc = builder.Model.getModelDescriptor();
+        const tableName = rel.TargetModel.getModelDescriptor().TableName;
+        // set alias to avoid conflicts in case of multiple relations to same model and to make
+        // sure that relation query is correct even if source query has alias
+        const relQuery = rel.TargetModel.query().setAlias(`${tableName}_exists`);
+        relQuery.where(util_1.Lazy.oF(function () {
+            relQuery.where(new builders_js_1.RawQuery(`${rel.ForeignKey} = ${sourcePKeyRef(builder, tDesc)}`));
+        }));
+        if (callback) {
+            callback.apply(relQuery);
+        }
+        return relQuery;
+    }
+};
+exports.ManyExistsRelationHandler = ManyExistsRelationHandler;
+exports.ManyExistsRelationHandler = ManyExistsRelationHandler = __decorate([
+    (0, di_1.Injectable)(ExistsRelationHandler)
+], ManyExistsRelationHandler);
+let ManyToManyExistsRelationHandler = class ManyToManyExistsRelationHandler extends ExistsRelationHandler {
+    get Type() {
+        return interfaces_js_1.RelationType.ManyToMany;
+    }
+    apply(builder, rel, _relationName, callback) {
+        const tDesc = builder.Model.getModelDescriptor();
+        const junctionModel = rel.JunctionModel;
+        const junctionTableName = junctionModel.getModelDescriptor().TableName;
+        const relQuery = junctionModel.query().setAlias(`${junctionTableName}_exists`);
+        relQuery.where(util_1.Lazy.oF(function () {
+            relQuery.where(new builders_js_1.RawQuery(`${rel.JunctionModelSourceModelFKey_Name} = ${sourcePKeyRef(builder, tDesc)}`));
+        }));
+        if (callback) {
+            relQuery.rightJoin({
+                joinModel: rel.TargetModel,
+                joinTableForeignKey: rel.PrimaryKey,
+                sourceTablePrimaryKey: rel.JunctionModelTargetModelFKey_Name,
+                callback: callback,
+            });
+        }
+        return relQuery;
+    }
+};
+exports.ManyToManyExistsRelationHandler = ManyToManyExistsRelationHandler;
+exports.ManyToManyExistsRelationHandler = ManyToManyExistsRelationHandler = __decorate([
+    (0, di_1.Injectable)(ExistsRelationHandler)
+], ManyToManyExistsRelationHandler);
+//# sourceMappingURL=existsRelationHandlers.js.map

package/lib/cjs/existsRelationHandlers.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"fp.d.ts","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAiB,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,oBAAY,WAAW;IACrB,kBAAkB,IAAA;CACnB;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,sBAY1G;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAUvF;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,EAAE,SAAS,CAAC,EAAE,eAAe,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAuB9G;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAU/E;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAUvE"}
+{"version":3,"file":"fp.d.ts","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAiB,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,oBAAY,WAAW;IACrB,kBAAkB,IAAA;CACnB;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,sBAY1G;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAMvF;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,EAAE,SAAS,CAAC,EAAE,eAAe,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAyB9G;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAK/E;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAUvE"}

package/lib/cjs/fp.js

@@ -43,12 +43,9 @@ function _get_entity(idOrEntity, c, fresh) {
  */
 function _update(data) {
     return (model) => {
-        return model.update(data).then((res) => {
-            if (res.LastInsertId <= 0 || res.RowsAffected <= 0) {
-                return Promise.reject(new exceptions_1.ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
-            }
-            return model;
-        });
+        // A clean model short-circuits to { RowsAffected: 0 } - that is a no-op success,
+        // not a failure, so we always resolve the model.
+        return model.update(data).then(() => model);
     };
 }
 /**
@@ -64,14 +61,16 @@ function _insert(behaviour) {
                 return Promise.resolve(model);
             }
             return model[0].constructor.insert(model, behaviour).then((res) => {
-                if (res.LastInsertId <= 0 || res.RowsAffected <= 0) {
+                // `uuid` and `assigned` primary keys report LastInsertId 0 on a successful insert, so
+                // only RowsAffected signals failure. See @Primary({ generated }) in the ORM docs.
+                if (res.RowsAffected <= 0) {
                     return Promise.reject(new exceptions_1.ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
                 }
                 return model;
             });
         }
         return model.insert(behaviour).then((res) => {
-            if (res.LastInsertId <= 0 || res.RowsAffected <= 0) {
+            if (res.RowsAffected <= 0) {
                 return Promise.reject(new exceptions_1.ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
             }
             return model;
@@ -80,12 +79,8 @@ function _insert(behaviour) {
 }
 function _insertOrUpdate() {
     return (model) => {
-        return model.insertOrUpdate().then((res) => {
-            if (res.LastInsertId <= 0 || res.RowsAffected <= 0) {
-                return Promise.reject(new exceptions_1.ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
-            }
-            return model;
-        });
+        // insertOrUpdate on a clean model is a no-op success (RowsAffected 0) - resolve the model.
+        return model.insertOrUpdate().then(() => model);
     };
 }
 /**
@@ -97,7 +92,7 @@ function _insertOrUpdate() {
 function _delete() {
     return (model) => {
         return model.destroy().then((res) => {
-            if (res.LastInsertId <= 0 || res.RowsAffected <= 0) {
+            if (res.RowsAffected <= 0) {
                 return Promise.reject(new exceptions_1.ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
             }
             return model;

package/lib/cjs/fp.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"hydrators.d.ts","sourceRoot":"","sources":["../../src/hydrators.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,8BAAsB,aAAa;aACjB,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CACxD;AAED,qBACa,kBAAmB,SAAQ,aAAa;IAC5C,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CAuBrD;AAED,qBACa,qBAAsB,SAAQ,aAAa;IAC/C,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CAYrD;AAED,qBACa,yBAA0B,SAAQ,aAAa;IACnD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CA2BrD;AAED,qBACa,wBAAyB,SAAQ,aAAa;IAClD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CAyBrD;AAED,qBACa,6BAA8B,SAAQ,aAAa;IACvD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CAarD"}
+{"version":3,"file":"hydrators.d.ts","sourceRoot":"","sources":["../../src/hydrators.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,8BAAsB,aAAa;aACjB,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CACxD;AAED,qBACa,kBAAmB,SAAQ,aAAa;IAC5C,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CAiCrD;AAED,qBACa,qBAAsB,SAAQ,aAAa;IAC/C,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CAYrD;AAED,qBACa,yBAA0B,SAAQ,aAAa;IACnD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CA+BrD;AAED,qBACa,wBAAyB,SAAQ,aAAa;IAClD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CAuCrD;AAED,qBACa,6BAA8B,SAAQ,aAAa;IACvD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;CAarD"}

package/lib/cjs/hydrators.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JunctionModelPropertyHydrator = exports.OneToOneRelationHydrator = exports.OneToManyRelationHydrator = exports.NonDbPropertyHydrator = exports.DbPropertyHydrator = exports.ModelHydrator = void 0;
 /* eslint-disable prettier/prettier */
 const interfaces_js_1 = require("./interfaces.js");
+const model_js_1 = require("./model.js");
 const di_1 = require("@spinajs/di");
 const relation_objects_js_1 = require("./relation-objects.js");
 class ModelHydrator {
@@ -26,12 +27,22 @@ let DbPropertyHydrator = class DbPropertyHydrator extends ModelHydrator {
         keys.forEach((k) => {
             // skip if column is primary key & is null
             // we dont want to override pkey of target model
-            if (k === descriptor.PrimaryKey && !values[k]) {
+            if (descriptor.PrimaryKey.includes(k) && (values[k] === null || values[k] === undefined)) {
                 return;
             }
             const column = descriptor.Columns?.find((c) => c.Name === k);
             if (values[k] !== undefined) {
-                target[k] = column?.Converter ? column.Converter.fromDB(values[k], values, descriptor.Converters.get(column.Name)?.Options) : values[k];
+                const incoming = values[k];
+                // A relation FK column may receive either a raw scalar id or an
+                // already-resolved model instance (eg. from a DTO @Relation field).
+                // When a model instance arrives, translate it to its primary key value
+                // so the FK column stores the id, not the object.
+                if (incoming instanceof model_js_1.ModelBase) {
+                    target[k] = incoming.PrimaryKeyValue;
+                }
+                else {
+                    target[k] = column?.Converter ? column.Converter.fromDB(incoming, values, descriptor.Converters.get(column.Name)?.Options) : incoming;
+                }
             }
         });
     }
@@ -76,7 +87,11 @@ let OneToManyRelationHydrator = class OneToManyRelationHydrator extends ModelHyd
                     return tEntity;
                 });
                 const rel = new relation_objects_js_1.OneToManyRelationList(target, val, mapRel);
+                // Only reached under `values[key] != null`, i.e. only when the row actually carried
+                // relation data — so this never marks a relation the query did not ask for.
+                rel.Populated = true;
                 entity[key] = rel;
+                target.snapshotRelation(key);
                 delete target[val.ForeignKey];
             }
         }
@@ -98,6 +113,14 @@ let OneToOneRelationHydrator = class OneToOneRelationHydrator extends ModelHydra
             }
             if (values[key] != null) {
                 const entity = target;
+                // Accept an already-resolved model instance passed under the relation
+                // name: attach it directly and translate its PK into the FK column,
+                // instead of trying to re-hydrate it from a plain data object.
+                if (values[key] instanceof model_js_1.ModelBase) {
+                    entity[key] = new relation_objects_js_1.SingleRelation(target, val.TargetModel, val, values[key]);
+                    target[val.ForeignKey] = values[key].PrimaryKeyValue;
+                    continue;
+                }
                 let tEntity = undefined;
                 if (!Object.values(values[key]).every((x) => x === null)) {
                     tEntity = !(0, di_1.isConstructor)(val.TargetModel) ? new (val.TargetModel())() : new val.TargetModel();
@@ -105,7 +128,11 @@ let OneToOneRelationHydrator = class OneToOneRelationHydrator extends ModelHydra
                     tEntity['__relationKey__'] = key;
                 }
                 const rel = new relation_objects_js_1.SingleRelation(target, val.TargetModel, val, tEntity);
+                // Same guard as OneToManyRelationHydrator: `values[key] != null` means the query
+                // joined this relation in.
+                rel.Populated = true;
                 entity[key] = rel;
+                target.snapshotRelation(key);
             }
         }
     }