@spinajs/orm 2.0.521 → 2.0.522

package/lib/cjs/exceptions.d.ts

@@ -16,4 +16,11 @@ export declare class OrmException extends Exception {
  */
 export declare class OrmNotFoundException extends OrmException {
 }
+/**
+ * Exception thrown when insert / update / delete affected no rows
+ * eg. delete of an already deleted model
+ */
+export declare class NoRowsAffected extends OrmException {
+    constructor(message?: string);
+}
 //# sourceMappingURL=exceptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"exceptions.d.ts","sourceRoot":"","sources":["../../src/exceptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;GAEG;AACH,qBAAa,YAAa,SAAQ,SAAS;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC;IAAS,KAAK,CAAC,EAAE,MAAM;IAAS,QAAQ,CAAC,EAAG,GAAG;IAAS,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO;IAApJ,YAAY,OAAO,CAAC,EAAE,MAAM,EAAS,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,YAAA,EAAS,KAAK,CAAC,EAAE,MAAM,YAAA,EAAS,QAAQ,CAAC,EAAG,GAAG,EAAS,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,EAMnJ;IAEM,QAAQ,SAAK;CACrB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,YAAY;CAAG"}
+{"version":3,"file":"exceptions.d.ts","sourceRoot":"","sources":["../../src/exceptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;GAEG;AACH,qBAAa,YAAa,SAAQ,SAAS;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC;IAAS,KAAK,CAAC,EAAE,MAAM;IAAS,QAAQ,CAAC,EAAG,GAAG;IAAS,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO;IAApJ,YAAY,OAAO,CAAC,EAAE,MAAM,EAAS,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,YAAA,EAAS,KAAK,CAAC,EAAE,MAAM,YAAA,EAAS,QAAQ,CAAC,EAAG,GAAG,EAAS,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,EAMnJ;IAEM,QAAQ,SAAK;CACrB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,YAAY;CAAG;AAEzD;;;GAGG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC9C,YAAY,OAAO,SAAkC,EAEpD;CACF"}

package/lib/cjs/exceptions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OrmNotFoundException = exports.OrmException = void 0;
+exports.NoRowsAffected = exports.OrmNotFoundException = exports.OrmException = void 0;
 const exceptions_1 = require("@spinajs/exceptions");
 /**
  * Exception thrown when functionality is not supported
@@ -25,4 +25,14 @@ exports.OrmException = OrmException;
 class OrmNotFoundException extends OrmException {
 }
 exports.OrmNotFoundException = OrmNotFoundException;
+/**
+ * Exception thrown when insert / update / delete affected no rows
+ * eg. delete of an already deleted model
+ */
+class NoRowsAffected extends OrmException {
+    constructor(message = 'No rows affected by the query') {
+        super(message);
+    }
+}
+exports.NoRowsAffected = NoRowsAffected;
 //# sourceMappingURL=exceptions.js.map

package/lib/cjs/exceptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/exceptions.ts"],"names":[],"mappings":";;;AAAA,oDAAgD;AAGhD;;GAEG;AACH,kBAA0B,SAAQ,sBAAS;IACzC,YAAY,OAAgB,EAAS,MAAgC,EAAS,KAAc,EAAS,QAAe,EAAS,KAAuB;QAClJ,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;sBADa,MAAM;qBAAmC,KAAK;wBAAkB,QAAQ;qBAAgB,KAAK;QAGhI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,GAAG,kDAAkD,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,sBAAsB,IAAI,CAAC,KAAK,IAAI,MAAM,cAAc,OAAO,EAAE,CAAC;QAChM,CAAC;IACH,CAAC;IAEM,QAAQ,KAAI,CAAC;CACrB;;AAED;;GAEG;AACH,0BAAkC,SAAQ,YAAY;CAAG"}
+{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/exceptions.ts"],"names":[],"mappings":";;;AAAA,oDAAgD;AAGhD;;GAEG;AACH,kBAA0B,SAAQ,sBAAS;IACzC,YAAY,OAAgB,EAAS,MAAgC,EAAS,KAAc,EAAS,QAAe,EAAS,KAAuB;QAClJ,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;sBADa,MAAM;qBAAmC,KAAK;wBAAkB,QAAQ;qBAAgB,KAAK;QAGhI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,GAAG,kDAAkD,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,sBAAsB,IAAI,CAAC,KAAK,IAAI,MAAM,cAAc,OAAO,EAAE,CAAC;QAChM,CAAC;IACH,CAAC;IAEM,QAAQ,KAAI,CAAC;CACrB;;AAED;;GAEG;AACH,0BAAkC,SAAQ,YAAY;CAAG;;AAEzD;;;GAGG;AACH,oBAA4B,SAAQ,YAAY;IAC9C,YAAY,OAAO,GAAG,+BAA+B;QACnD,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;CACF"}

package/lib/cjs/fp.d.ts

@@ -1,9 +1,10 @@
 import { Constructor } from '@spinajs/di';
 import { InsertBehaviour } from './interfaces.js';
 import { ModelBase } from './model.js';
-export declare enum E_ORM_CODES {
-    E_NO_ROWS_AFFECTED = 0
-}
+/**
+ * Functional-style wrappers kept for compatibility and composability -
+ * each delegates to its imperative counterpart in helpers.ts.
+ */
 /**
  *
  * Gets entity from db
@@ -13,14 +14,14 @@ export declare enum E_ORM_CODES {
  * @param fresh - if entity, should it refresh from DB ?
  * @returns
  */
-export declare function _get_entity<T extends ModelBase>(idOrEntity: number | T, c: Constructor<T>, fresh?: boolean): () => Promise<any>;
+export declare function _getEntity<T extends ModelBase>(idOrEntity: number | T, c: Constructor<T>, fresh?: boolean): () => Promise<T>;
 /**
  * Update model with data
  *
  * @param data data to update
  * @returns
  */
-export declare function _update<T extends ModelBase>(data?: Partial<T>): (data: T) => Promise<T>;
+export declare function _update<T extends ModelBase>(data?: Partial<T>): (model: T) => Promise<T>;
 /**
  *
  * Insert model into database

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,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"}
+{"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,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC;;;GAGG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,oBAEzG;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAExF;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,CAE9G;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAE/E;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAEvE"}

package/lib/cjs/fp.js

@@ -1,20 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.E_ORM_CODES = void 0;
-exports._get_entity = _get_entity;
+exports._getEntity = _getEntity;
 exports._update = _update;
 exports._insert = _insert;
 exports._insertOrUpdate = _insertOrUpdate;
 exports._delete = _delete;
-const lodash_1 = __importDefault(require("lodash"));
-const exceptions_1 = require("@spinajs/exceptions");
-var E_ORM_CODES;
-(function (E_ORM_CODES) {
-    E_ORM_CODES[E_ORM_CODES["E_NO_ROWS_AFFECTED"] = 0] = "E_NO_ROWS_AFFECTED";
-})(E_ORM_CODES || (exports.E_ORM_CODES = E_ORM_CODES = {}));
+const helpers_js_1 = require("./helpers.js");
+/**
+ * Functional-style wrappers kept for compatibility and composability -
+ * each delegates to its imperative counterpart in helpers.ts.
+ */
 /**
  *
  * Gets entity from db
@@ -24,16 +19,8 @@ var E_ORM_CODES;
  * @param fresh - if entity, should it refresh from DB ?
  * @returns
  */
-function _get_entity(idOrEntity, c, fresh) {
-    return async () => {
-        if (lodash_1.default.isNumber(idOrEntity)) {
-            return c.get(idOrEntity);
-        }
-        if (fresh) {
-            return idOrEntity.fresh();
-        }
-        return Promise.resolve(idOrEntity);
-    };
+function _getEntity(idOrEntity, c, fresh) {
+    return () => (0, helpers_js_1.getEntity)(idOrEntity, c, fresh);
 }
 /**
  * Update model with data
@@ -42,11 +29,7 @@ function _get_entity(idOrEntity, c, fresh) {
  * @returns
  */
 function _update(data) {
-    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);
-    };
+    return (model) => (0, helpers_js_1.updateModel)(model, data);
 }
 /**
  *
@@ -55,33 +38,10 @@ function _update(data) {
  * @returns
  */
 function _insert(behaviour) {
-    return (model) => {
-        if (lodash_1.default.isArray(model)) {
-            if (model.length === 0) {
-                return Promise.resolve(model);
-            }
-            return model[0].constructor.insert(model, behaviour).then((res) => {
-                // `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.RowsAffected <= 0) {
-                return Promise.reject(new exceptions_1.ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
-            }
-            return model;
-        });
-    };
+    return (model) => (0, helpers_js_1.insertModel)(model, behaviour);
 }
 function _insertOrUpdate() {
-    return (model) => {
-        // insertOrUpdate on a clean model is a no-op success (RowsAffected 0) - resolve the model.
-        return model.insertOrUpdate().then(() => model);
-    };
+    return (model) => (0, helpers_js_1.insertOrUpdateModel)(model);
 }
 /**
  *
@@ -90,13 +50,6 @@ function _insertOrUpdate() {
  * @returns
  */
 function _delete() {
-    return (model) => {
-        return model.destroy().then((res) => {
-            if (res.RowsAffected <= 0) {
-                return Promise.reject(new exceptions_1.ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
-            }
-            return model;
-        });
-    };
+    return (model) => (0, helpers_js_1.deleteModel)(model);
 }
 //# sourceMappingURL=fp.js.map

package/lib/cjs/fp.js.map

@@ -1 +1 @@
-{"version":3,"file":"fp.js","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":";;;;;;;;;;;AAGA,oDAAuB;AACvB,oDAAgD;AAEhD,IAAY,WAEX;AAFD,WAAY,WAAW;IACrB,yEAAkB,CAAA;AACpB,CAAC,EAFW,WAAW,aAAX,WAAW,GAAX,WAAW,QAEtB;AAED;;;;;;;;GAQG;AACH,qBAAiD,UAAsB,EAAE,CAAiB,EAAE,KAAe;IACzG,OAAO,KAAK,IAAI,EAAE;QAChB,IAAI,gBAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3B,OAAQ,CAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,UAAU,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,iBAA6C,IAAiB;IAC5D,OAAO,CAAC,KAAQ,EAAE,EAAE;QAClB,iFAAiF;QACjF,iDAAiD;QACjD,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,iBAA6C,SAA2B;IACtE,OAAO,CAAC,KAAc,EAAE,EAAE;QACxB,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChC,CAAC;YACD,OAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAgC,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAkB,EAAE,EAAE;gBACrG,sFAAsF;gBACtF,kFAAkF;gBAClF,IAAI,GAAG,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC;oBAC1B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,sBAAS,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBACvE,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,CAAiB,CAAC;QACrB,CAAC;QAED,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAkB,EAAE,EAAE;YACzD,IAAI,GAAG,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC;gBAC1B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,sBAAS,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvE,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;IACE,OAAO,CAAC,KAAQ,EAAE,EAAE;QAClB,2FAA2F;QAC3F,OAAO,KAAK,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAA;AACH,CAAC;AAED;;;;;GAKG;AACH;IACE,OAAO,CAAC,KAAQ,EAAE,EAAE;QAClB,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,GAAkB,EAAE,EAAE;YACjD,IAAI,GAAG,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC;gBAC1B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,sBAAS,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvE,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"fp.js","sourceRoot":"","sources":["../../src/fp.ts"],"names":[],"mappings":";;;;;;;AAGA,6CAAqG;AAErG;;;GAGG;AAEH;;;;;;;;GAQG;AACH,oBAAgD,UAAsB,EAAE,CAAiB,EAAE,KAAe;IACxG,OAAO,GAAG,EAAE,CAAC,IAAA,sBAAS,EAAC,UAAU,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;GAKG;AACH,iBAA6C,IAAiB;IAC5D,OAAO,CAAC,KAAQ,EAAE,EAAE,CAAC,IAAA,wBAAW,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAChD,CAAC;AAED;;;;;GAKG;AACH,iBAA6C,SAA2B;IACtE,OAAO,CAAC,KAAc,EAAE,EAAE,CAAC,IAAA,wBAAW,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC3D,CAAC;AAED;IACE,OAAO,CAAC,KAAQ,EAAE,EAAE,CAAC,IAAA,gCAAmB,EAAC,KAAK,CAAC,CAAC;AAClD,CAAC;AAED;;;;;GAKG;AACH;IACE,OAAO,CAAC,KAAQ,EAAE,EAAE,CAAC,IAAA,wBAAW,EAAC,KAAK,CAAC,CAAC;AAC1C,CAAC"}

package/lib/cjs/helpers.d.ts

@@ -0,0 +1,40 @@
+import { Constructor } from '@spinajs/di';
+import { InsertBehaviour } from './interfaces.js';
+import { ModelBase } from './model.js';
+/**
+ *
+ * Gets entity from db
+ *
+ * @param idOrEntity - pkey or entity
+ * @param c - entity class constructor
+ * @param fresh - if entity, should it refresh from DB ?
+ * @returns
+ */
+export declare function getEntity<T extends ModelBase>(idOrEntity: number | T, c: Constructor<T>, fresh?: boolean): Promise<T>;
+/**
+ * Update model with data
+ *
+ * @param model model to update
+ * @param data data to update
+ * @returns
+ */
+export declare function updateModel<T extends ModelBase>(model: T, data?: Partial<T>): Promise<T>;
+/**
+ *
+ * Insert model into database
+ *
+ * @param model model or models to insert
+ * @param behaviour insert behaviour
+ * @returns
+ */
+export declare function insertModel<T extends ModelBase>(model: T | T[], behaviour?: InsertBehaviour): Promise<T | T[]>;
+export declare function insertOrUpdateModel<T extends ModelBase>(model: T): Promise<T>;
+/**
+ *
+ * Delete model from database
+ *
+ * @param model model to delete
+ * @returns
+ */
+export declare function deleteModel<T extends ModelBase>(model: T): Promise<T>;
+//# sourceMappingURL=helpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/helpers.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;;;;;;;;GAQG;AACH,wBAAsB,SAAS,CAAC,CAAC,SAAS,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAU3H;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAK9F;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAuBpH;AAED,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAInF;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAO3E"}

package/lib/cjs/helpers.js

@@ -0,0 +1,90 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEntity = getEntity;
+exports.updateModel = updateModel;
+exports.insertModel = insertModel;
+exports.insertOrUpdateModel = insertOrUpdateModel;
+exports.deleteModel = deleteModel;
+const lodash_1 = __importDefault(require("lodash"));
+const exceptions_js_1 = require("./exceptions.js");
+/**
+ *
+ * Gets entity from db
+ *
+ * @param idOrEntity - pkey or entity
+ * @param c - entity class constructor
+ * @param fresh - if entity, should it refresh from DB ?
+ * @returns
+ */
+async function getEntity(idOrEntity, c, fresh) {
+    if (lodash_1.default.isNumber(idOrEntity)) {
+        return c.get(idOrEntity);
+    }
+    if (fresh) {
+        return idOrEntity.fresh();
+    }
+    return idOrEntity;
+}
+/**
+ * Update model with data
+ *
+ * @param model model to update
+ * @param data data to update
+ * @returns
+ */
+async function updateModel(model, data) {
+    // A clean model short-circuits to { RowsAffected: 0 } - that is a no-op success,
+    // not a failure, so we always resolve the model.
+    await model.update(data);
+    return model;
+}
+/**
+ *
+ * Insert model into database
+ *
+ * @param model model or models to insert
+ * @param behaviour insert behaviour
+ * @returns
+ */
+async function insertModel(model, behaviour) {
+    if (lodash_1.default.isArray(model)) {
+        if (model.length === 0) {
+            return model;
+        }
+        const res = await model[0].constructor.insert(model, behaviour);
+        // `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) {
+            throw new exceptions_js_1.NoRowsAffected();
+        }
+        return model;
+    }
+    const res = await model.insert(behaviour);
+    if (res.RowsAffected <= 0) {
+        throw new exceptions_js_1.NoRowsAffected();
+    }
+    return model;
+}
+async function insertOrUpdateModel(model) {
+    // insertOrUpdate on a clean model is a no-op success (RowsAffected 0) - resolve the model.
+    await model.insertOrUpdate();
+    return model;
+}
+/**
+ *
+ * Delete model from database
+ *
+ * @param model model to delete
+ * @returns
+ */
+async function deleteModel(model) {
+    const res = (await model.destroy());
+    if (res.RowsAffected <= 0) {
+        throw new exceptions_js_1.NoRowsAffected();
+    }
+    return model;
+}
+//# sourceMappingURL=helpers.js.map

package/lib/cjs/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":";;;;;;;;;;AAGA,oDAAuB;AACvB,mDAAiD;AAEjD;;;;;;;;GAQG;AACI,KAAK,oBAAyC,UAAsB,EAAE,CAAiB,EAAE,KAAe;IAC7G,IAAI,gBAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,OAAQ,CAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,UAAU,CAAC,KAAK,EAAgB,CAAC;IAC1C,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;;GAMG;AACI,KAAK,sBAA2C,KAAQ,EAAE,IAAiB;IAChF,iFAAiF;IACjF,iDAAiD;IACjD,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,sBAA2C,KAAc,EAAE,SAA2B;IAChG,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,GAAG,GAAkB,MAAO,KAAK,CAAC,CAAC,CAAC,CAAC,WAAgC,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErG,sFAAsF;QACtF,kFAAkF;QAClF,IAAI,GAAG,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,8BAAc,EAAE,CAAC;QAC7B,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,GAAG,GAAkB,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACzD,IAAI,GAAG,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,8BAAc,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAEM,KAAK,8BAAmD,KAAQ;IACrE,2FAA2F;IAC3F,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;IAC7B,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACI,KAAK,sBAA2C,KAAQ;IAC7D,MAAM,GAAG,GAAG,CAAC,MAAM,KAAK,CAAC,OAAO,EAAE,CAAkB,CAAC;IACrD,IAAI,GAAG,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,8BAAc,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/cjs/index.d.ts

@@ -38,6 +38,7 @@ export * from './unit-of-work.js';
 export * from './driver.js';
 export * from './quoting.js';
 export * from './wrappers.js';
+export * from './helpers.js';
 export * from './fp.js';
 export * from './bootstrap.js';
 export * from './metadata.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC"}

package/lib/cjs/index.js

@@ -54,6 +54,7 @@ __exportStar(require("./unit-of-work.js"), exports);
 __exportStar(require("./driver.js"), exports);
 __exportStar(require("./quoting.js"), exports);
 __exportStar(require("./wrappers.js"), exports);
+__exportStar(require("./helpers.js"), exports);
 __exportStar(require("./fp.js"), exports);
 __exportStar(require("./bootstrap.js"), exports);
 __exportStar(require("./metadata.js"), exports);

package/lib/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,6CAA2B;AAC3B,+CAA6B;AAC7B,mDAAiC;AACjC,6DAA2C;AAC3C,yDAAuC;AACvC,kDAAgC;AAChC,oDAAkC;AAClC,kDAAgC;AAChC,+CAA6B;AAC7B,8CAA4B;AAC5B,wDAAsC;AACtC,kDAAgC;AAChC,kDAAgC;AAChC,kDAAgC;AAChC,kDAAgC;AAChC,gDAA8B;AAC9B,8DAA4C;AAC5C,6CAA2B;AAC3B,iDAA+B;AAC/B,wDAAsC;AACtC,mDAAiC;AACjC,yDAAuC;AACvC,wDAAsC;AACtC,iEAA+C;AAC/C,2CAAyB;AACzB,6CAA2B;AAC3B,iDAA+B;AAC/B,mDAAiC;AACjC,gDAA8B;AAC9B,oDAAkC;AAClC,8CAA4B;AAC5B,+CAA6B;AAC7B,uDAAqC;AACrC,sDAAoC;AACpC,wDAAsC;AACtC,oDAAkC;AAClC,8CAA4B;AAC5B,+CAA6B;AAC7B,gDAA8B;AAC9B,0CAAwB;AACxB,iDAA+B;AAC/B,gDAA8B;AAE9B,mFAAmF;AACnF,kDAAkD;AAClD,sFAAsF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,6CAA2B;AAC3B,+CAA6B;AAC7B,mDAAiC;AACjC,6DAA2C;AAC3C,yDAAuC;AACvC,kDAAgC;AAChC,oDAAkC;AAClC,kDAAgC;AAChC,+CAA6B;AAC7B,8CAA4B;AAC5B,wDAAsC;AACtC,kDAAgC;AAChC,kDAAgC;AAChC,kDAAgC;AAChC,kDAAgC;AAChC,gDAA8B;AAC9B,8DAA4C;AAC5C,6CAA2B;AAC3B,iDAA+B;AAC/B,wDAAsC;AACtC,mDAAiC;AACjC,yDAAuC;AACvC,wDAAsC;AACtC,iEAA+C;AAC/C,2CAAyB;AACzB,6CAA2B;AAC3B,iDAA+B;AAC/B,mDAAiC;AACjC,gDAA8B;AAC9B,oDAAkC;AAClC,8CAA4B;AAC5B,+CAA6B;AAC7B,uDAAqC;AACrC,sDAAoC;AACpC,wDAAsC;AACtC,oDAAkC;AAClC,8CAA4B;AAC5B,+CAA6B;AAC7B,gDAA8B;AAC9B,+CAA6B;AAC7B,0CAAwB;AACxB,iDAA+B;AAC/B,gDAA8B;AAE9B,mFAAmF;AACnF,kDAAkD;AAClD,sFAAsF"}

package/lib/mjs/exceptions.d.ts

@@ -16,4 +16,11 @@ export declare class OrmException extends Exception {
  */
 export declare class OrmNotFoundException extends OrmException {
 }
+/**
+ * Exception thrown when insert / update / delete affected no rows
+ * eg. delete of an already deleted model
+ */
+export declare class NoRowsAffected extends OrmException {
+    constructor(message?: string);
+}
 //# sourceMappingURL=exceptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"exceptions.d.ts","sourceRoot":"","sources":["../../src/exceptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;GAEG;AACH,qBAAa,YAAa,SAAQ,SAAS;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC;IAAS,KAAK,CAAC,EAAE,MAAM;IAAS,QAAQ,CAAC,EAAG,GAAG;IAAS,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO;IAApJ,YAAY,OAAO,CAAC,EAAE,MAAM,EAAS,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,YAAA,EAAS,KAAK,CAAC,EAAE,MAAM,YAAA,EAAS,QAAQ,CAAC,EAAG,GAAG,EAAS,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,EAMnJ;IAEM,QAAQ,SAAK;CACrB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,YAAY;CAAG"}
+{"version":3,"file":"exceptions.d.ts","sourceRoot":"","sources":["../../src/exceptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;GAEG;AACH,qBAAa,YAAa,SAAQ,SAAS;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC;IAAS,KAAK,CAAC,EAAE,MAAM;IAAS,QAAQ,CAAC,EAAG,GAAG;IAAS,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO;IAApJ,YAAY,OAAO,CAAC,EAAE,MAAM,EAAS,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,YAAA,EAAS,KAAK,CAAC,EAAE,MAAM,YAAA,EAAS,QAAQ,CAAC,EAAG,GAAG,EAAS,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,EAMnJ;IAEM,QAAQ,SAAK;CACrB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,YAAY;CAAG;AAEzD;;;GAGG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC9C,YAAY,OAAO,SAAkC,EAEpD;CACF"}

package/lib/mjs/exceptions.js

@@ -20,4 +20,13 @@ export class OrmException extends Exception {
  */
 export class OrmNotFoundException extends OrmException {
 }
+/**
+ * Exception thrown when insert / update / delete affected no rows
+ * eg. delete of an already deleted model
+ */
+export class NoRowsAffected extends OrmException {
+    constructor(message = 'No rows affected by the query') {
+        super(message);
+    }
+}
 //# sourceMappingURL=exceptions.js.map

package/lib/mjs/exceptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/exceptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,SAAS;IACzC,YAAY,OAAgB,EAAS,MAAgC,EAAS,KAAc,EAAS,QAAe,EAAS,KAAuB;QAClJ,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;sBADa,MAAM;qBAAmC,KAAK;wBAAkB,QAAQ;qBAAgB,KAAK;QAGhI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,GAAG,kDAAkD,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,sBAAsB,IAAI,CAAC,KAAK,IAAI,MAAM,cAAc,OAAO,EAAE,CAAC;QAChM,CAAC;IACH,CAAC;IAEM,QAAQ,KAAI,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,YAAY;CAAG"}
+{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../../src/exceptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,SAAS;IACzC,YAAY,OAAgB,EAAS,MAAgC,EAAS,KAAc,EAAS,QAAe,EAAS,KAAuB;QAClJ,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;sBADa,MAAM;qBAAmC,KAAK;wBAAkB,QAAQ;qBAAgB,KAAK;QAGhI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,GAAG,kDAAkD,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,sBAAsB,IAAI,CAAC,KAAK,IAAI,MAAM,cAAc,OAAO,EAAE,CAAC;QAChM,CAAC;IACH,CAAC;IAEM,QAAQ,KAAI,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,YAAY;CAAG;AAEzD;;;GAGG;AACH,MAAM,OAAO,cAAe,SAAQ,YAAY;IAC9C,YAAY,OAAO,GAAG,+BAA+B;QACnD,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;CACF"}

package/lib/mjs/fp.d.ts

@@ -1,9 +1,10 @@
 import { Constructor } from '@spinajs/di';
 import { InsertBehaviour } from './interfaces.js';
 import { ModelBase } from './model.js';
-export declare enum E_ORM_CODES {
-    E_NO_ROWS_AFFECTED = 0
-}
+/**
+ * Functional-style wrappers kept for compatibility and composability -
+ * each delegates to its imperative counterpart in helpers.ts.
+ */
 /**
  *
  * Gets entity from db
@@ -13,14 +14,14 @@ export declare enum E_ORM_CODES {
  * @param fresh - if entity, should it refresh from DB ?
  * @returns
  */
-export declare function _get_entity<T extends ModelBase>(idOrEntity: number | T, c: Constructor<T>, fresh?: boolean): () => Promise<any>;
+export declare function _getEntity<T extends ModelBase>(idOrEntity: number | T, c: Constructor<T>, fresh?: boolean): () => Promise<T>;
 /**
  * Update model with data
  *
  * @param data data to update
  * @returns
  */
-export declare function _update<T extends ModelBase>(data?: Partial<T>): (data: T) => Promise<T>;
+export declare function _update<T extends ModelBase>(data?: Partial<T>): (model: T) => Promise<T>;
 /**
  *
  * Insert model into database

package/lib/mjs/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,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"}
+{"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,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC;;;GAGG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,oBAEzG;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAExF;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,CAE9G;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAE/E;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAEvE"}

package/lib/mjs/fp.js

@@ -1,9 +1,8 @@
-import _ from 'lodash';
-import { ErrorCode } from '@spinajs/exceptions';
-export var E_ORM_CODES;
-(function (E_ORM_CODES) {
-    E_ORM_CODES[E_ORM_CODES["E_NO_ROWS_AFFECTED"] = 0] = "E_NO_ROWS_AFFECTED";
-})(E_ORM_CODES || (E_ORM_CODES = {}));
+import { deleteModel, getEntity, insertModel, insertOrUpdateModel, updateModel } from './helpers.js';
+/**
+ * Functional-style wrappers kept for compatibility and composability -
+ * each delegates to its imperative counterpart in helpers.ts.
+ */
 /**
  *
  * Gets entity from db
@@ -13,16 +12,8 @@ export var E_ORM_CODES;
  * @param fresh - if entity, should it refresh from DB ?
  * @returns
  */
-export function _get_entity(idOrEntity, c, fresh) {
-    return async () => {
-        if (_.isNumber(idOrEntity)) {
-            return c.get(idOrEntity);
-        }
-        if (fresh) {
-            return idOrEntity.fresh();
-        }
-        return Promise.resolve(idOrEntity);
-    };
+export function _getEntity(idOrEntity, c, fresh) {
+    return () => getEntity(idOrEntity, c, fresh);
 }
 /**
  * Update model with data
@@ -31,11 +22,7 @@ export function _get_entity(idOrEntity, c, fresh) {
  * @returns
  */
 export function _update(data) {
-    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);
-    };
+    return (model) => updateModel(model, data);
 }
 /**
  *
@@ -44,33 +31,10 @@ export function _update(data) {
  * @returns
  */
 export function _insert(behaviour) {
-    return (model) => {
-        if (_.isArray(model)) {
-            if (model.length === 0) {
-                return Promise.resolve(model);
-            }
-            return model[0].constructor.insert(model, behaviour).then((res) => {
-                // `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 ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
-                }
-                return model;
-            });
-        }
-        return model.insert(behaviour).then((res) => {
-            if (res.RowsAffected <= 0) {
-                return Promise.reject(new ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
-            }
-            return model;
-        });
-    };
+    return (model) => insertModel(model, behaviour);
 }
 export function _insertOrUpdate() {
-    return (model) => {
-        // insertOrUpdate on a clean model is a no-op success (RowsAffected 0) - resolve the model.
-        return model.insertOrUpdate().then(() => model);
-    };
+    return (model) => insertOrUpdateModel(model);
 }
 /**
  *
@@ -79,13 +43,6 @@ export function _insertOrUpdate() {
  * @returns
  */
 export function _delete() {
-    return (model) => {
-        return model.destroy().then((res) => {
-            if (res.RowsAffected <= 0) {
-                return Promise.reject(new ErrorCode(E_ORM_CODES.E_NO_ROWS_AFFECTED));
-            }
-            return model;
-        });
-    };
+    return (model) => deleteModel(model);
 }
 //# sourceMappingURL=fp.js.map

package/lib/mjs/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":"AAGA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAErG;;;GAGG;AAEH;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CAAsB,UAAsB,EAAE,CAAiB,EAAE,KAAe;IACxG,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,OAAO,CAAsB,IAAiB;IAC5D,OAAO,CAAC,KAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAChD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,OAAO,CAAsB,SAA2B;IACtE,OAAO,CAAC,KAAc,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,CAAC,KAAQ,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAClD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,OAAO;IACrB,OAAO,CAAC,KAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC"}

package/lib/mjs/helpers.d.ts

@@ -0,0 +1,40 @@
+import { Constructor } from '@spinajs/di';
+import { InsertBehaviour } from './interfaces.js';
+import { ModelBase } from './model.js';
+/**
+ *
+ * Gets entity from db
+ *
+ * @param idOrEntity - pkey or entity
+ * @param c - entity class constructor
+ * @param fresh - if entity, should it refresh from DB ?
+ * @returns
+ */
+export declare function getEntity<T extends ModelBase>(idOrEntity: number | T, c: Constructor<T>, fresh?: boolean): Promise<T>;
+/**
+ * Update model with data
+ *
+ * @param model model to update
+ * @param data data to update
+ * @returns
+ */
+export declare function updateModel<T extends ModelBase>(model: T, data?: Partial<T>): Promise<T>;
+/**
+ *
+ * Insert model into database
+ *
+ * @param model model or models to insert
+ * @param behaviour insert behaviour
+ * @returns
+ */
+export declare function insertModel<T extends ModelBase>(model: T | T[], behaviour?: InsertBehaviour): Promise<T | T[]>;
+export declare function insertOrUpdateModel<T extends ModelBase>(model: T): Promise<T>;
+/**
+ *
+ * Delete model from database
+ *
+ * @param model model to delete
+ * @returns
+ */
+export declare function deleteModel<T extends ModelBase>(model: T): Promise<T>;
+//# sourceMappingURL=helpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/helpers.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;;;;;;;;GAQG;AACH,wBAAsB,SAAS,CAAC,CAAC,SAAS,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAU3H;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAK9F;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAuBpH;AAED,wBAAsB,mBAAmB,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAInF;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAO3E"}