@nextage/nx-frame-be 1.0.34 → 1.0.36

package/build/common/base/__test__/base.model.test.js

@@ -202,33 +202,37 @@ it('updates bulk items', () => __awaiter(void 0, void 0, void 0, function* () {
     expect(foundtems[2].version).toEqual(ce3.version + 1);
 }));
 it('adds an array item', () => __awaiter(void 0, void 0, void 0, function* () {
-    var _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e;
     const { ceItem: ce1 } = yield createItem();
+    const initialVersion = (_a = ce1 === null || ce1 === void 0 ? void 0 : ce1.version) !== null && _a !== void 0 ? _a : 0;
     const updateData = {
         arrayPath: 'data.items',
         item: { id: (0, utils_1.uuid)(), value: 100 }
     };
     const updatedItem = yield (coded_entity_model_1.ceModel === null || coded_entity_model_1.ceModel === void 0 ? void 0 : coded_entity_model_1.ceModel.addArrayItem(ce1 === null || ce1 === void 0 ? void 0 : ce1.id, updateData, {}, {}));
-    const itemsLength = ((_h = (_g = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _g === void 0 ? void 0 : _g.items) === null || _h === void 0 ? void 0 : _h.length) || 0;
+    const itemsLength = ((_c = (_b = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c.length) || 0;
     expect(itemsLength).toEqual(((ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items) || []).length + 1);
-    expect((_j = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _j === void 0 ? void 0 : _j.items[itemsLength - 1].id).toEqual(updateData.item.id);
-    expect((_k = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _k === void 0 ? void 0 : _k.items[itemsLength - 1].value).toEqual(updateData.item.value);
+    expect((_d = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _d === void 0 ? void 0 : _d.items[itemsLength - 1].id).toEqual(updateData.item.id);
+    expect((_e = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _e === void 0 ? void 0 : _e.items[itemsLength - 1].value).toEqual(updateData.item.value);
+    expect(updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.version).toEqual(initialVersion + 1);
 }));
 it('updates an array item', () => __awaiter(void 0, void 0, void 0, function* () {
-    var _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     const { ceItem: ce1 } = yield createItem();
+    const initialVersion = (_a = ce1 === null || ce1 === void 0 ? void 0 : ce1.version) !== null && _a !== void 0 ? _a : 0;
     const updateData = {
         arrayPath: 'data.items',
         arrayFilter: { id: ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id },
         item: { id: ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id, value: 50, newattr: 'AAA' }
     };
     let updatedItem = yield (coded_entity_model_1.ceModel === null || coded_entity_model_1.ceModel === void 0 ? void 0 : coded_entity_model_1.ceModel.updateArrayItem(ce1 === null || ce1 === void 0 ? void 0 : ce1.id, updateData, {}, {}));
-    let itemsLength = ((_m = (_l = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _l === void 0 ? void 0 : _l.items) === null || _m === void 0 ? void 0 : _m.length) || 0;
+    let itemsLength = ((_c = (_b = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c.length) || 0;
     expect(itemsLength).toEqual(((ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items) || []).length);
-    expect((_o = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _o === void 0 ? void 0 : _o.items[1].id).toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id);
-    expect((_p = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _p === void 0 ? void 0 : _p.items[1].id).toEqual(updateData.item.id);
-    expect((_q = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _q === void 0 ? void 0 : _q.items[1].value).toEqual(updateData.item.value);
-    expect((_r = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _r === void 0 ? void 0 : _r.items[1].newattr).toEqual(updateData.item.newattr);
+    expect((_d = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _d === void 0 ? void 0 : _d.items[1].id).toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id);
+    expect((_e = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _e === void 0 ? void 0 : _e.items[1].id).toEqual(updateData.item.id);
+    expect((_f = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _f === void 0 ? void 0 : _f.items[1].value).toEqual(updateData.item.value);
+    expect((_g = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _g === void 0 ? void 0 : _g.items[1].newattr).toEqual(updateData.item.newattr);
+    expect(updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.version).toEqual(initialVersion + 1);
     const updateData2 = {
         arrayPath: 'data.items',
         partial: true,
@@ -236,11 +240,12 @@ it('updates an array item', () => __awaiter(void 0, void 0, void 0, function* ()
         item: { value: 51, newattr: 'AAA' }
     };
     updatedItem = yield (coded_entity_model_1.ceModel === null || coded_entity_model_1.ceModel === void 0 ? void 0 : coded_entity_model_1.ceModel.updateArrayItem(ce1 === null || ce1 === void 0 ? void 0 : ce1.id, updateData2, {}, {}));
-    itemsLength = ((_t = (_s = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _s === void 0 ? void 0 : _s.items) === null || _t === void 0 ? void 0 : _t.length) || 0;
+    itemsLength = ((_j = (_h = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _h === void 0 ? void 0 : _h.items) === null || _j === void 0 ? void 0 : _j.length) || 0;
     expect(itemsLength).toEqual(((ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items) || []).length);
-    expect((_u = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _u === void 0 ? void 0 : _u.items[1].id).toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id);
-    expect((_v = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _v === void 0 ? void 0 : _v.items[1].value).toEqual(updateData2.item.value);
-    expect((_w = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _w === void 0 ? void 0 : _w.items[1].newattr).toEqual(updateData2.item.newattr);
+    expect((_k = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _k === void 0 ? void 0 : _k.items[1].id).toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id);
+    expect((_l = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _l === void 0 ? void 0 : _l.items[1].value).toEqual(updateData2.item.value);
+    expect((_m = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _m === void 0 ? void 0 : _m.items[1].newattr).toEqual(updateData2.item.newattr);
+    expect(updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.version).toEqual(initialVersion + 2);
     const updateData3 = {
         arrayPath: 'data.items',
         updateAttr: 'newattr',
@@ -248,25 +253,28 @@ it('updates an array item', () => __awaiter(void 0, void 0, void 0, function* ()
         item: { value: 55, newattr: 'BBB' }
     };
     updatedItem = yield (coded_entity_model_1.ceModel === null || coded_entity_model_1.ceModel === void 0 ? void 0 : coded_entity_model_1.ceModel.updateArrayItem(ce1 === null || ce1 === void 0 ? void 0 : ce1.id, updateData3, {}, {}));
-    itemsLength = ((_y = (_x = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _x === void 0 ? void 0 : _x.items) === null || _y === void 0 ? void 0 : _y.length) || 0;
+    itemsLength = ((_p = (_o = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _o === void 0 ? void 0 : _o.items) === null || _p === void 0 ? void 0 : _p.length) || 0;
     expect(itemsLength).toEqual(((ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items) || []).length);
-    expect((_z = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _z === void 0 ? void 0 : _z.items[1].id).toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id);
-    expect((_0 = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _0 === void 0 ? void 0 : _0.items[1].value).toEqual(updateData2.item.value);
-    expect((_1 = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _1 === void 0 ? void 0 : _1.items[1].newattr).toEqual(updateData3.item.newattr);
+    expect((_q = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _q === void 0 ? void 0 : _q.items[1].id).toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id);
+    expect((_r = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _r === void 0 ? void 0 : _r.items[1].value).toEqual(updateData2.item.value);
+    expect((_s = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _s === void 0 ? void 0 : _s.items[1].newattr).toEqual(updateData3.item.newattr);
+    expect(updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.version).toEqual(initialVersion + 3);
 }));
 it('removes an array item', () => __awaiter(void 0, void 0, void 0, function* () {
-    var _2, _3, _4, _5, _6;
+    var _a, _b, _c, _d, _e, _f;
     const { ceItem: ce1 } = yield createItem();
+    const initialVersion = (_a = ce1 === null || ce1 === void 0 ? void 0 : ce1.version) !== null && _a !== void 0 ? _a : 0;
     const updateData = {
         arrayPath: 'data.items',
         item: (0, utils_1.clone)(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1])
     };
     let updatedItem = yield (coded_entity_model_1.ceModel === null || coded_entity_model_1.ceModel === void 0 ? void 0 : coded_entity_model_1.ceModel.removeArrayItem(ce1 === null || ce1 === void 0 ? void 0 : ce1.id, updateData, {}, {}));
-    let itemsLength = ((_3 = (_2 = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _2 === void 0 ? void 0 : _2.items) === null || _3 === void 0 ? void 0 : _3.length) || 0;
+    let itemsLength = ((_c = (_b = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c.length) || 0;
     expect(itemsLength).toEqual(((ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items) || []).length - 1);
-    expect((_4 = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _4 === void 0 ? void 0 : _4.items[1].id).not.toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id);
-    expect((_5 = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _5 === void 0 ? void 0 : _5.items[1].id).toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[2].id);
-    (_6 = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _6 === void 0 ? void 0 : _6.items.forEach(di => {
+    expect((_d = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _d === void 0 ? void 0 : _d.items[1].id).not.toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id);
+    expect((_e = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _e === void 0 ? void 0 : _e.items[1].id).toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[2].id);
+    expect(updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.version).toEqual(initialVersion + 1);
+    (_f = updatedItem === null || updatedItem === void 0 ? void 0 : updatedItem.data) === null || _f === void 0 ? void 0 : _f.items.forEach(di => {
         expect(di.id).not.toEqual(ce1 === null || ce1 === void 0 ? void 0 : ce1.data.items[1].id);
     });
 }));

package/build/common/base/base.controller.d.ts

@@ -1,28 +1,3 @@
-/// <reference types="mongoose/types/aggregate" />
-/// <reference types="mongoose/types/callback" />
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/cursor" />
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/expressions" />
-/// <reference types="mongoose/types/helpers" />
-/// <reference types="mongoose/types/middlewares" />
-/// <reference types="mongoose/types/indexes" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/mongooseoptions" />
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/populate" />
-/// <reference types="mongoose/types/query" />
-/// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
-/// <reference types="mongoose/types/session" />
-/// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/validation" />
-/// <reference types="mongoose/types/virtuals" />
-/// <reference types="mongoose/types/inferschematype" />
-/// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { NxContext, NxObject } from '../interfaces';
 import { BaseModel } from './base.model';

package/build/common/base/base.interfaces.d.ts

@@ -1,28 +1,3 @@
-/// <reference types="mongoose/types/aggregate" />
-/// <reference types="mongoose/types/callback" />
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/cursor" />
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/expressions" />
-/// <reference types="mongoose/types/helpers" />
-/// <reference types="mongoose/types/middlewares" />
-/// <reference types="mongoose/types/indexes" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/mongooseoptions" />
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/populate" />
-/// <reference types="mongoose/types/query" />
-/// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
-/// <reference types="mongoose/types/session" />
-/// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/validation" />
-/// <reference types="mongoose/types/virtuals" />
-/// <reference types="mongoose/types/inferschematype" />
-/// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { ModelCrudEventType } from '../enums';
 import { NxObject } from '../interfaces';

package/build/common/base/base.model.d.ts

@@ -1,29 +1,3 @@
-/// <reference types="node" />
-/// <reference types="mongoose/types/aggregate" />
-/// <reference types="mongoose/types/callback" />
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/cursor" />
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/expressions" />
-/// <reference types="mongoose/types/helpers" />
-/// <reference types="mongoose/types/middlewares" />
-/// <reference types="mongoose/types/indexes" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/mongooseoptions" />
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/populate" />
-/// <reference types="mongoose/types/query" />
-/// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
-/// <reference types="mongoose/types/session" />
-/// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/validation" />
-/// <reference types="mongoose/types/virtuals" />
-/// <reference types="mongoose/types/inferschematype" />
-/// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { EventEmitter } from 'events';
 import { NxContext, NxObject } from '../interfaces';
@@ -42,11 +16,7 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
     /**
      *
      */
-    get schema(): {
-        id?: mongoose.SchemaDefinitionProperty<string | undefined, BaseMongoDoc> | undefined;
-        _id?: mongoose.SchemaDefinitionProperty<unknown, BaseMongoDoc> | undefined;
-        __v?: mongoose.SchemaDefinitionProperty<any, BaseMongoDoc> | undefined;
-    };
+    get schema(): any;
     /**
      * Get mongodb collection name
      */
@@ -95,9 +65,13 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
      * @param {*} fields
      * @param {*} options
      */
-    find(params: FilterParams, fields: NxObject, options: mongoose.QueryOptions<TDoc>): Promise<(mongoose.Document<unknown, {}, BaseMongoDoc> & BaseMongoDoc & Required<{
-        _id: unknown;
-    }>)[]>;
+    find(params: FilterParams, fields: NxObject, options: mongoose.QueryOptions<TDoc>): Promise<(mongoose.Document<unknown, {}, BaseMongoDoc, {}, mongoose.DefaultSchemaOptions> & BaseMongoDoc & Required<{
+        _id: mongoose.Types.ObjectId;
+    }> & {
+        __v: number;
+    } & {
+        id: string;
+    })[]>;
     list(params?: FilterParams, fields?: mongoose.ProjectionType<BaseMongoDoc>, pagination?: QueryPagination, context?: NxContext): Promise<TDoc[]>;
     list(params: FilterParams, fields: mongoose.ProjectionType<BaseMongoDoc>, pagination: QueryPagination, queryActions: NxObject, context: NxContext): Promise<TDoc[]>;
     /**
@@ -106,7 +80,7 @@ export declare class BaseModel<TAttrs, TDoc extends BaseMongoDoc, TMongoModel ex
      * @param {*} params
      * @param {*} callback
      */
-    listNative(params?: FilterParams, options?: mongoose.mongo.FindOptions<mongoose.mongo.BSON.Document>): mongoose.mongo.FindCursor<mongoose.mongo.WithId<mongoose.mongo.BSON.Document>>;
+    listNative(params?: FilterParams, options?: mongoose.mongo.FindOptions): mongoose.mongo.FindCursor<mongoose.mongo.WithId<mongoose.mongo.BSON.Document>>;
     /**
      *
      * @param params

package/build/common/base/base.model.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseModel = void 0;
 const events_1 = require("events");
@@ -517,8 +528,9 @@ class BaseModel extends events_1.EventEmitter {
                 return null;
             const fiAttrs = foundItem.toObject();
             delete fiAttrs.id;
-            delete fiAttrs._id;
-            item = Object.assign(fiAttrs, item);
+            // delete fiAttrs._id;
+            const { _id } = fiAttrs, cleanAttrs = __rest(fiAttrs, ["_id"]);
+            item = Object.assign(cleanAttrs, item);
             item = yield this.beforeCopy(item, context);
             const newItem = this.mgModel.build(item);
             const res = yield (newItem === null || newItem === void 0 ? void 0 : newItem.save());

package/build/common/base/mongo-utils.d.ts

@@ -1,28 +1,3 @@
-/// <reference types="mongoose/types/aggregate" />
-/// <reference types="mongoose/types/callback" />
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/cursor" />
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/expressions" />
-/// <reference types="mongoose/types/helpers" />
-/// <reference types="mongoose/types/middlewares" />
-/// <reference types="mongoose/types/indexes" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/mongooseoptions" />
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/populate" />
-/// <reference types="mongoose/types/query" />
-/// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
-/// <reference types="mongoose/types/session" />
-/// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/validation" />
-/// <reference types="mongoose/types/virtuals" />
-/// <reference types="mongoose/types/inferschematype" />
-/// <reference types="mongoose/types/inferrawdoctype" />
 import mongoose from 'mongoose';
 import { BaseDBItem } from '../types';
 import { ModelDef } from './mongo.types';

package/build/common/base/mongo-utils.js

@@ -3,9 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSameId = exports.isValidObjectId = exports.genObjectId = exports.toObjectIds = exports.toObjectId = exports.loadMongoModel = exports.createModel = exports.loadModel = exports.foldedSchema = exports.codedEntitySchema = void 0;
+exports.foldedSchema = exports.codedEntitySchema = void 0;
+exports.loadModel = loadModel;
+exports.createModel = createModel;
+exports.loadMongoModel = loadMongoModel;
+exports.toObjectId = toObjectId;
+exports.toObjectIds = toObjectIds;
+exports.genObjectId = genObjectId;
+exports.isValidObjectId = isValidObjectId;
+exports.isSameId = isSameId;
 const mongoose_1 = __importDefault(require("mongoose"));
-const mongoose_update_if_current_1 = require("mongoose-update-if-current");
 const constants_1 = require("../constants");
 const base_model_1 = require("./base.model");
 exports.codedEntitySchema = {
@@ -37,7 +44,6 @@ function loadModel(model) {
     if (model.collectionName)
         constants_1.APP.mongoModels[model.collectionName] = model;
 }
-exports.loadModel = loadModel;
 /**
  * name        - name of the Model to be created
  * classDef    - (optional) class to be used to create model
@@ -70,7 +76,29 @@ function createModel({ name, classDef, modelName, modelParams, collection, schem
     //console.log(`created model ${modelName} (load: ${!!load})`);
     return model;
 }
-exports.createModel = createModel;
+function enableQueryVersioning(mgSchema, version) {
+    if (!version)
+        return;
+    const versionKey = mgSchema.get('versionKey');
+    if (!versionKey || typeof versionKey !== 'string')
+        return;
+    const addVersionIncrement = function () {
+        const update = this.getUpdate();
+        if (!update || Array.isArray(update))
+            return;
+        const nextUpdate = update;
+        const versionOperators = [nextUpdate, nextUpdate.$set, nextUpdate.$unset, nextUpdate.$inc];
+        const touchesVersion = versionOperators.some(operator => !!operator && Object.keys(operator).includes(versionKey));
+        if (touchesVersion)
+            return;
+        nextUpdate.$inc = nextUpdate.$inc ? Object.assign(Object.assign({}, nextUpdate.$inc), { [versionKey]: 1 }) : { [versionKey]: 1 };
+        this.setUpdate(nextUpdate);
+    };
+    mgSchema.pre('findOneAndUpdate', addVersionIncrement);
+    mgSchema.pre('updateOne', addVersionIncrement);
+    mgSchema.pre('updateMany', addVersionIncrement);
+}
+;
 /**
  *
  * @param {*} modelName
@@ -79,6 +107,8 @@ exports.createModel = createModel;
  */
 function loadMongoModel(modelName, schema, collection, version = true) {
     const mgSchema = new mongoose_1.default.Schema(schema, {
+        optimisticConcurrency: version,
+        versionKey: 'version',
         minimize: false,
         toJSON: {
             // convert _id to a standard id attribute
@@ -90,9 +120,7 @@ function loadMongoModel(modelName, schema, collection, version = true) {
     });
     // change documents' version key from __v to version
     mgSchema.set('versionKey', 'version');
-    // apply version increment to every document update
-    if (version)
-        mgSchema.plugin(mongoose_update_if_current_1.updateIfCurrentPlugin);
+    enableQueryVersioning(mgSchema, version);
     mgSchema.statics.build = (attrs) => {
         const item = { _id: attrs.id };
         delete attrs.id;
@@ -112,7 +140,6 @@ function loadMongoModel(modelName, schema, collection, version = true) {
     const MGModel = (constants_1.APP.mongoose || mongoose_1.default).model(modelName, mgSchema, collection);
     return MGModel;
 }
-exports.loadMongoModel = loadMongoModel;
 /**
  *
  * @param {*} baseSchema
@@ -135,7 +162,6 @@ function toObjectId(value, generate = false) {
         return generate ? genObjectId() : value;
     return (value instanceof mongoose_1.default.Types.ObjectId) ? value : mongoose_1.default.Types.ObjectId.createFromHexString(value);
 }
-exports.toObjectId = toObjectId;
 /**
  *
  * @param values
@@ -145,7 +171,6 @@ exports.toObjectId = toObjectId;
 function toObjectIds(values, generate = false) {
     return values.map(v => toObjectId(v));
 }
-exports.toObjectIds = toObjectIds;
 /**
  * return a new ObjectId value
  *
@@ -154,7 +179,6 @@ exports.toObjectIds = toObjectIds;
 function genObjectId() {
     return new mongoose_1.default.Types.ObjectId();
 }
-exports.genObjectId = genObjectId;
 // /**
 //  * 
 //  * @param {*} period 
@@ -212,7 +236,6 @@ function isValidObjectId(value) {
         return value.every(v => mongoose_1.default.isValidObjectId(v));
     return mongoose_1.default.isValidObjectId(value);
 }
-exports.isValidObjectId = isValidObjectId;
 /**
  *
  * @param {*} id1
@@ -222,7 +245,6 @@ exports.isValidObjectId = isValidObjectId;
 function isSameId(id1, id2) {
     return (id1 === null || id1 === void 0 ? void 0 : id1.toString()) === (id2 === null || id2 === void 0 ? void 0 : id2.toString());
 }
-exports.isSameId = isSameId;
 // /**
 //  * 
 //  * @param {*} cursor 

package/build/common/base/sql-utils.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadSQLModel = exports.TABLE_SYNC_PROMISES = exports.codedEntitySQLSchema = void 0;
+exports.TABLE_SYNC_PROMISES = exports.codedEntitySQLSchema = void 0;
+exports.loadSQLModel = loadSQLModel;
 const sequelize_1 = __importDefault(require("sequelize"));
 const constants_1 = require("../constants");
 exports.codedEntitySQLSchema = {
@@ -43,7 +44,6 @@ function loadSQLModel(modelName, modelDef, schema, tableName, schemaName, params
     }
     return model;
 }
-exports.loadSQLModel = loadSQLModel;
 // /**
 //  * 
 //  * @param {*} period 

package/build/common/constants.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { AppData } from './types';
 import { CryptoUtils } from './crypto';
 export declare const APP: AppData;
@@ -20,7 +18,7 @@ export declare const REGEX: {
     email: RegExp;
     dataurl: RegExp;
 };
-export declare const BUFFER_NULL: Buffer;
+export declare const BUFFER_NULL: Buffer<ArrayBuffer>;
 export declare const EVENT_TYPE: {};
 export declare const MODEL_CRUD_EVENT = "crudEvent";
 export declare const cryptoUtils: CryptoUtils;

package/build/common/crypto/crypto.classes.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import crypto from 'crypto';
 import { Stream } from 'stream';
 import { NxObject } from '../interfaces';

package/build/common/crypto/crypto.interfaces.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import crypto from 'crypto';
 import { NxObject } from '../interfaces';
 import { BaseModel } from '../base/base.model';

package/build/common/crypto/crypto.utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Stream } from 'stream';
 import { NxObject } from '../interfaces';
 import { BlindIndexOptions } from './crypto.interfaces';

package/build/common/crypto/encryption.plugin.d.ts

@@ -0,0 +1,10 @@
+import { Schema } from 'mongoose';
+type Path = string;
+interface EncryptionPluginOptions {
+    fields: Path[];
+    getKey: (keyId?: string) => Buffer;
+    currentKeyId: string;
+    algorithm?: string;
+}
+export declare function encryptionPlugin(schema: Schema, options: EncryptionPluginOptions): void;
+export {};

package/build/common/crypto/encryption.plugin.js

@@ -0,0 +1,93 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encryptionPlugin = encryptionPlugin;
+// encryptionPlugin.ts
+const node_crypto_1 = __importDefault(require("node:crypto"));
+function encryptionPlugin(schema, options) {
+    const { fields, getKey, currentKeyId, algorithm = 'aes-256-cbc' } = options;
+    // --- utils nested ---
+    const getNested = (obj, path) => path.split('.').reduce((o, k) => (o ? o[k] : undefined), obj);
+    const setNested = (obj, path, value) => {
+        const keys = path.split('.');
+        const last = keys.pop();
+        const target = keys.reduce((o, k) => {
+            if (!o[k])
+                o[k] = {};
+            return o[k];
+        }, obj);
+        target[last] = value;
+    };
+    // --- crypto ---
+    const encrypt = (data) => {
+        const iv = node_crypto_1.default.randomBytes(16);
+        const key = getKey(currentKeyId);
+        const cipher = node_crypto_1.default.createCipheriv(algorithm, key, iv);
+        const json = JSON.stringify(data);
+        let encrypted = cipher.update(json);
+        encrypted = Buffer.concat([encrypted, cipher.final()]);
+        return {
+            _enc: true,
+            v: encrypted.toString('hex'),
+            iv: iv.toString('hex'),
+            k: currentKeyId
+        };
+    };
+    const decrypt = (payload) => {
+        const key = getKey(payload.k);
+        const iv = Buffer.from(payload.iv, 'hex');
+        const encryptedText = Buffer.from(payload.v, 'hex');
+        const decipher = node_crypto_1.default.createDecipheriv(algorithm, key, iv);
+        let decrypted = decipher.update(encryptedText);
+        decrypted = Buffer.concat([decrypted, decipher.final()]);
+        return JSON.parse(decrypted.toString());
+    };
+    const isEncrypted = (val) => (val === null || val === void 0 ? void 0 : val._enc) === true;
+    // --- encrypt fields ---
+    const encryptFields = (obj) => {
+        for (const path of fields) {
+            const value = getNested(obj, path);
+            if (value && !isEncrypted(value))
+                setNested(obj, path, encrypt(value));
+        }
+    };
+    // --- decrypt fields ---
+    const decryptFields = (obj) => {
+        for (const path of fields) {
+            const value = getNested(obj, path);
+            if (isEncrypted(value)) {
+                try {
+                    setNested(obj, path, decrypt(value));
+                }
+                catch (e) {
+                    //console.log(e);
+                    // fallback safe
+                }
+            }
+        }
+    };
+    // --- hooks ---
+    // schema.pre('save', function (next) {
+    //   encryptFields(this);
+    //   next();
+    // });
+    // schema.post('init', function (doc) {
+    //   decryptFields(doc);
+    // });
+    // schema.post('save', function (doc) {
+    //   decryptFields(doc);
+    // });
+    // // update hooks
+    // schema.pre(['updateOne', 'findOneAndUpdate'], (next: Function) => {
+    //   const update: any = this.getUpdate();
+    //   if (!update) return next();
+    //   // support $set
+    //   if (update.$set)
+    //     encryptFields(update.$set);
+    //   else
+    //     encryptFields(update);
+    //   next();
+    // });
+}

package/build/common/crypto/index.d.ts

@@ -1,3 +1,4 @@
 export * from './crypto.interfaces';
 export * from './crypto.classes';
 export * from './crypto.utils';
+export * from './encryption.plugin';

package/build/common/crypto/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./crypto.interfaces"), exports);
 __exportStar(require("./crypto.classes"), exports);
 __exportStar(require("./crypto.utils"), exports);
+__exportStar(require("./encryption.plugin"), exports);

package/build/common/express/express.utils.js

@@ -12,7 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allowMethods = exports.sendJSONResponse = exports.validateSchema = void 0;
+exports.validateSchema = validateSchema;
+exports.sendJSONResponse = sendJSONResponse;
+exports.allowMethods = allowMethods;
 const http_errors_1 = __importDefault(require("http-errors"));
 const express_validator_1 = require("express-validator");
 /**
@@ -30,7 +32,6 @@ function validateSchema(schema, errorFormatter = (err, req) => err) {
         res.status(400).json(errorFormatter(errors, req));
     });
 }
-exports.validateSchema = validateSchema;
 /**
  *
  * @param {*} res
@@ -44,7 +45,6 @@ function sendJSONResponse(res, status = 200, content = {}) {
     res.status(status);
     res.json(content);
 }
-exports.sendJSONResponse = sendJSONResponse;
 /**
  * Create an Express middleware function which errors if an HTTP method is not allowed.
  *
@@ -66,7 +66,6 @@ function allowMethods(methods = [], message = 'Method Not Allowed') {
         next();
     };
 }
-exports.allowMethods = allowMethods;
 ;
 /**
  * Normalise an array of HTTP methods.