@klerick/json-api-nestjs-microorm 0.1.0-beta.6 → 0.1.0-beta.8

package/CHANGELOG.md

@@ -1,3 +1,35 @@
+## 0.1.0-beta.8 (2025-11-13)
+
+### 🚀 Features
+
+- **json-api-nestjs-microorm:** enhance `getOne` and `getAll` with transform toggles and additional query params, add relationship loading utility and improve logging ([bb808cd](https://github.com/klerick/nestjs-json-api/commit/bb808cd))
+- **json-api-nestjs-microorm:** fix after update nx ([03da82f](https://github.com/klerick/nestjs-json-api/commit/03da82f))
+- **json-api-nestjs-microorm:** fix after update nx ([5cdf997](https://github.com/klerick/nestjs-json-api/commit/5cdf997))
+- **json-api-nestjs-microorm:** improve type handling and simplify relation processing in utility service and `postOne` method ([1a47099](https://github.com/klerick/nestjs-json-api/commit/1a47099))
+
+### 🩹 Fixes
+
+- **json-api-nestjs-microorm:** replace deprecated faker methods and add PGlite compatibility in MikroORM setup ([1d0b83b](https://github.com/klerick/nestjs-json-api/commit/1d0b83b))
+
+### 🧱 Updated Dependencies
+
+- Updated json-api-nestjs-shared to 1.0.0-beta.4
+- Updated json-api-nestjs to 10.0.0-beta.6
+
+### ❤️ Thank You
+
+- Alex H
+
+## 0.1.0-beta.7 (2025-06-23)
+
+### 🩹 Fixes
+
+- **json-api-nestjs-microorm:** add format for mikroorm error ([c1cafc2](https://github.com/klerick/nestjs-json-api/commit/c1cafc2))
+
+### ❤️ Thank You
+
+- Alex H
+
 ## 0.1.0-beta.6 (2025-06-10)
 
 ### 🩹 Fixes

package/README.md

@@ -1,11 +1,12 @@
 # json-api-nestjs-microorm
+
 MocroOrm adapter for **[json-api-nestjs](https://github.com/klerick/nestjs-json-api/tree/master/libs/json-api/json-api-nestjs)**
 
 ## Installation
 
-```bash  
+```bash
 $ npm install @klerick/json-api-nestjs-microorm
-```  
+```
 
 ## Configuration params
 
@@ -15,17 +16,16 @@ The following interface is using for the configuration:
 export type MicroOrmParam = {
   arrayType?: string[]; //Custom type for indicate of array
 };
-
 ```
 
 ## NOTE: MikroORM Default Named Context Issue in NestJS
 
 [@mikro-orm/nestjs](https://github.com/mikro-orm/nestjs) does not create a [default named context](https://github.com/mikro-orm/nestjs/discussions/214).
 
-As a result, the module initialization behaves differently depending on whether a single or multiple connections are used. 
+As a result, the module initialization behaves differently depending on whether a single or multiple connections are used.
 More specifically, the [dependency injection token for MikroORM differs](https://github.com/mikro-orm/nestjs/issues/213) between one and multiple database connections.
 
-To maintain a consistent JSON:API module configuration across different database adapters, 
+To maintain a consistent JSON:API module configuration across different database adapters,
 I decided **not to add extra conditional checks** in the setup.
 
 For everything to work correctly, @mikro-orm/nestjs should be integrated using the following module:
@@ -47,6 +47,3 @@ export const config: Options = {
 })
 export class MicroOrmDatabaseModule {}
 ```
-
-
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@klerick/json-api-nestjs-microorm",
-  "version": "0.1.0-beta.6",
+  "version": "0.1.0-beta.8",
   "type": "commonjs",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -14,20 +14,9 @@
     "microorm",
     "CRUD"
   ],
-  "dependencies": {
-    "@mikro-orm/core": "^6.4.0",
-    "@mikro-orm/knex": "6.4.3",
-    "@mikro-orm/nestjs": "^6.1.0",
-    "@mikro-orm/sql-highlighter": "^1.0.0",
-    "@nestjs/common": "^11.1.0",
-    "change-case-commonjs": "^5.4.4",
-    "knex": "3.1.0",
-    "reflect-metadata": "^0.1.12 || ^0.2.0",
-    "rxjs": "^7.1.0",
-    "tslib": ">2.3.0"
-  },
   "peerDependencies": {
-    "@klerick/json-api-nestjs": "^10.0.0-beta.5"
+    "@klerick/json-api-nestjs": "^10.0.0-beta.6",
+    "@mikro-orm/nestjs": "^6.1.0"
   },
   "exports": {
     "./package.json": "./package.json",

package/src/lib/factory/index.js

@@ -21,9 +21,7 @@ const micro_orm_util_service_1 = require("../service/micro-orm-util.service");
 function CurrentMicroOrmProvider(connectionName) {
     return {
         provide: constants_1.CURRENT_DATA_SOURCE_TOKEN,
-        useFactory: (mikroORM) => {
-            return mikroORM;
-        },
+        useFactory: (mikroORM) => mikroORM,
         inject: [connectionName ? (0, nestjs_1.getMikroORMToken)(connectionName) : core_1.MikroORM],
     };
 }
@@ -87,9 +85,9 @@ function EntityPropsMap(entities) {
 function RunInTransactionFactory() {
     return {
         provide: json_api_nestjs_1.RUN_IN_TRANSACTION_FUNCTION,
-        inject: [],
-        useFactory() {
-            return async (callback) => callback();
+        inject: [constants_1.CURRENT_ENTITY_MANAGER_TOKEN],
+        useFactory(entityManager) {
+            return (callback) => entityManager.transactional(() => callback());
         },
     };
 }

package/src/lib/factory/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/factory/index.ts"],"names":[],"mappings":";;AA+CA,0DAUC;AAED,oDAMC;AAED,0DASC;AAED,sDAMC;AAED,4DAYC;AAED,wCA6BC;AAED,0DAQC;AAED,8CAKC;AACD,0DAiBC;AAnKD,0CAMyB;AACzB,+DAAiD;AACjD,8CAAqD;AAErD,8DAYkC;AAClC,4EAAgE;AAEhE,8CASuB;AAEvB,4CAKsB;AACtB,wCAA6C;AAE7C,8EAAwE;AAExE,SAAgB,uBAAuB,CACrC,cAAuB;IAEvB,OAAO;QACL,OAAO,EAAE,qCAAyB;QAClC,UAAU,EAAE,CAAC,QAAkB,EAAE,EAAE;YACjC,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,IAAA,yBAAgB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,eAAQ,CAAC;KACvE,CAAC;AACJ,CAAC;AAED,SAAgB,oBAAoB;IAClC,OAAO;QACL,OAAO,EAAE,wCAA4B;QACrC,UAAU,EAAE,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE;QAC/C,MAAM,EAAE,CAAC,qCAAyB,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,SAAgB,uBAAuB,CACrC,MAAS;IAET,OAAO;QACL,OAAO,EAAE,qCAAyB;QAClC,UAAU,EAAE,CAAC,aAA4B,EAAE,EAAE,CAC3C,aAAa,CAAC,aAAa,CAAI,MAAmC,CAAC;QACrE,MAAM,EAAE,CAAC,wCAA4B,CAAC;KACvC,CAAC;AACJ,CAAC;AAED,SAAgB,qBAAqB;IACnC,OAAO;QACL,OAAO,EAAE,iCAAqB;QAC9B,UAAU,EAAE,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE;QAC1D,MAAM,EAAE,CAAC,qCAAyB,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,SAAgB,wBAAwB;IAItC,OAAO;QACL,OAAO,EAAE,qCAAmB;QAC5B,MAAM,EAAE,CAAC,4CAAmB,CAAC;QAC7B,UAAU,CAAC,mBAAkD;YAC3D,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CACvB,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC;QACtE,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAAmB,QAA0B;IACzE,OAAO;QACL,OAAO,EAAE,kCAAgB;QACzB,MAAM,EAAE,CAAC,iCAAqB,EAAE,sCAAoB,CAAC;QACrD,UAAU,EAAE,CACV,eAAgC,EAChC,MAAoC,EACpC,EAAE;YACF,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkC,CAAC;YAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;YAC7C,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;gBAC5B,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAI,IAAI,CAAC,CAAC;gBAC9C,MAAM,SAAS,GAAG,IAAA,sCAAa,EAAC,IAAI,CAAC,CAAC;gBACtC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE;oBACpB,KAAK,EAAE,IAAA,qBAAQ,EAAC,QAAQ,CAAC;oBACzB,SAAS,EAAE,IAAA,yBAAY,EAAC,QAAQ,EAAE,WAAW,CAAC;oBAC9C,aAAa,EAAE,IAAA,6BAAgB,EAAC,QAAQ,CAAC;oBACzC,iBAAiB,EAAE,IAAA,iCAAoB,EAAC,QAAQ,CAAC;oBACjD,iBAAiB,EAAE,IAAA,iCAAoB,EAAC,QAAQ,CAAC;oBACjD,cAAc,EAAE,IAAA,yBAAY,EAAC,QAAQ,CAAC;oBACtC,QAAQ,EAAE,IAAA,gCAAS,EAAC,SAAS,CAAC;oBAC9B,SAAS,EAAE,SAAS;oBACpB,SAAS,EAAE,IAAA,wBAAW,EAAC,QAAQ,CAAC;oBAChC,gBAAgB,EAAE,IAAA,gCAAmB,EAAC,QAAQ,CAAC;iBAChD,CAAC,CAAC;YACL,CAAC;YACD,OAAO,WAAW,CAAC;QACrB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,uBAAuB;IACrC,OAAO;QACL,OAAO,EAAE,6CAA2B;QACpC,MAAM,EAAE,EAAE;QACV,UAAU;YACR,OAAO,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;QACxC,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,iBAAiB;IAC/B,OAAO;QACL,OAAO,EAAE,6BAAW;QACpB,QAAQ,EAAE,yBAAe;KAC1B,CAAC;AACJ,CAAC;AACD,SAAgB,uBAAuB;IAIrC,OAAO;QACL,OAAO,EAAE,qCAAmB;QAC5B,MAAM,EAAE,CAAC,4CAAmB,CAAC;QAC7B,UAAU,CAAC,mBAAkD;YAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;gBAC7B,MAAM,EAAE,GAAG,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;oBACxD,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,KAAK;iBAClD,CAAC,CAAC;gBACH,MAAM,EAAE,CAAC,YAAY,EAAE,CAAC;gBACxB,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC;YAC9B,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/factory/index.ts"],"names":[],"mappings":"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"}

package/src/lib/micro-orm-json-api.module.js

@@ -4,7 +4,7 @@ exports.MicroOrmJsonApiModule = void 0;
 const nestjs_1 = require("@mikro-orm/nestjs");
 const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
 const factory_1 = require("./factory");
-const micro_orm_util_service_1 = require("./service/micro-orm-util.service");
+const service_1 = require("./service");
 class MicroOrmJsonApiModule {
     static forRoot(options) {
         const optionProvider = {
@@ -20,6 +20,10 @@ class MicroOrmJsonApiModule {
             (0, factory_1.CurrentEntityMetadata)(),
             (0, factory_1.RunInTransactionFactory)(),
             (0, factory_1.EntityPropsMap)(options.entities),
+            {
+                provide: json_api_nestjs_1.ErrorFormatService,
+                useClass: service_1.MikroOrmFormatErrorService,
+            },
         ];
         const currentImport = [
             microOrmModule,
@@ -37,7 +41,7 @@ class MicroOrmJsonApiModule {
             (0, factory_1.CurrentEntityRepository)(entity),
             (0, factory_1.CheckRelationNameFactory)(),
             (0, factory_1.OrmServiceFactory)(),
-            micro_orm_util_service_1.MicroOrmUtilService,
+            service_1.MicroOrmUtilService,
             (0, factory_1.FindOneRowEntityFactory)(),
         ];
     }

package/src/lib/micro-orm-json-api.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"micro-orm-json-api.module.js","sourceRoot":"","sources":["../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/micro-orm-json-api.module.ts"],"names":[],"mappings":";;;AACA,8CAAmD;AACnD,8DAIkC;AAGlC,uCAUmB;AACnB,6EAAuE;AAEvE,MAAa,qBAAqB;IAChC,MAAM,CAAC,OAAO,CAAC,OAAqC;QAClD,MAAM,cAAc,GAAG;YACrB,OAAO,EAAE,sCAAoB;YAC7B,QAAQ,EAAE,OAAO;SAClB,CAAC;QAEF,MAAM,cAAc,GAAG,uBAAc,CAAC,UAAU,CAC9C,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,cAAc,CACvB,CAAC;QAEF,MAAM,eAAe,GAAG;YACtB,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;YAC5B,cAAc;YACd,IAAA,iCAAuB,EAAC,OAAO,CAAC,cAAc,CAAC;YAC/C,IAAA,8BAAoB,GAAE;YACtB,IAAA,+BAAqB,GAAE;YACvB,IAAA,iCAAuB,GAAE;YACzB,IAAA,wBAAc,EAAC,OAAO,CAAC,QAAQ,CAAC;SACjC,CAAC;QAEF,MAAM,aAAa,GAAG;YACpB,cAAc;YACd,GAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAqB;SAChD,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,qBAAqB;YAC7B,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,eAAe;YAC1B,OAAO,EAAE,CAAC,GAAG,eAAe,EAAE,GAAG,aAAa,CAAC;SAChD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,MAAc;QACpC,OAAO;YACL,IAAA,iCAAuB,EAAC,MAAM,CAAC;YAC/B,IAAA,kCAAwB,GAAE;YAC1B,IAAA,2BAAiB,GAAE;YACnB,4CAAmB;YACnB,IAAA,iCAAuB,GAAE;SAC1B,CAAC;IACJ,CAAC;CACF;AA5CD,sDA4CC"}
+{"version":3,"file":"micro-orm-json-api.module.js","sourceRoot":"","sources":["../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/micro-orm-json-api.module.ts"],"names":[],"mappings":";;;AACA,8CAAmD;AACnD,8DAKkC;AAGlC,uCAUmB;AACnB,uCAA4E;AAE5E,MAAa,qBAAqB;IAChC,MAAM,CAAC,OAAO,CAAC,OAAqC;QAClD,MAAM,cAAc,GAAG;YACrB,OAAO,EAAE,sCAAoB;YAC7B,QAAQ,EAAE,OAAO;SAClB,CAAC;QAEF,MAAM,cAAc,GAAG,uBAAc,CAAC,UAAU,CAC9C,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,cAAc,CACvB,CAAC;QAEF,MAAM,eAAe,GAAG;YACtB,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;YAC5B,cAAc;YACd,IAAA,iCAAuB,EAAC,OAAO,CAAC,cAAc,CAAC;YAC/C,IAAA,8BAAoB,GAAE;YACtB,IAAA,+BAAqB,GAAE;YACvB,IAAA,iCAAuB,GAAE;YACzB,IAAA,wBAAc,EAAC,OAAO,CAAC,QAAQ,CAAC;YAChC;gBACE,OAAO,EAAE,oCAAkB;gBAC3B,QAAQ,EAAE,oCAA0B;aACrC;SACF,CAAC;QAEF,MAAM,aAAa,GAAG;YACpB,cAAc;YACd,GAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAqB;SAChD,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,qBAAqB;YAC7B,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,eAAe;YAC1B,OAAO,EAAE,CAAC,GAAG,eAAe,EAAE,GAAG,aAAa,CAAC;SAChD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,MAAc;QACpC,OAAO;YACL,IAAA,iCAAuB,EAAC,MAAM,CAAC;YAC/B,IAAA,kCAAwB,GAAE;YAC1B,IAAA,2BAAiB,GAAE;YACnB,6BAAmB;YACnB,IAAA,iCAAuB,GAAE;SAC1B,CAAC;IACJ,CAAC;CACF;AAhDD,sDAgDC"}

package/src/lib/mock-utils/entities/addresses.js

@@ -5,10 +5,14 @@ const tslib_1 = require("tslib");
 const core_1 = require("@mikro-orm/core");
 const index_1 = require("./index");
 let Addresses = class Addresses {
-    constructor() {
-        this.createdAt = new Date();
-        this.updatedAt = new Date();
-    }
+    id;
+    city;
+    state;
+    country;
+    arrayField;
+    createdAt = new Date();
+    updatedAt = new Date();
+    user;
 };
 exports.Addresses = Addresses;
 tslib_1.__decorate([

package/src/lib/mock-utils/entities/addresses.js.map

@@ -1 +1 @@
-{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/addresses.ts"],"names":[],"mappings":";;;;AAAA,0CAMyB;AAEzB,mCAAwC;AAOjC,IAAM,SAAS,GAAf,MAAM,SAAS;IAAf;QA0CL,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAU7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAI/B,CAAC;CAAA,CAAA;AAxDY,8BAAS;AAIb;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;qCACiB;AAOZ;IALN,IAAA,eAAQ,EAAC;QACR,UAAU,EAAE,SAAS;QACrB,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,IAAI;KACf,CAAC;;uCACmB;AAOd;IALN,IAAA,eAAQ,EAAC;QACR,UAAU,EAAE,SAAS;QACrB,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,IAAI;KACf,CAAC;;wCACoB;AAOf;IALN,IAAA,eAAQ,EAAC;QACR,UAAU,EAAE,SAAS;QACrB,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,IAAI;KACf,CAAC;;0CACsB;AAQjB;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,gBAAS;QACf,UAAU,EAAE,WAAW;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;;6CAC2B;AAS7B;IAPC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;KAC7C,CAAC;sCACS,IAAI;4CAAc;AAU7B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gCAAgC;QAC5C,UAAU,EAAE,sBAAsB;KACnC,CAAC;sCACS,IAAI;4CAAc;AAGtB;IADN,IAAA,eAAQ,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;;uCAC3B;oBAvDV,SAAS;IAHrB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,WAAW;KACvB,CAAC;GACW,SAAS,CAwDrB"}
+{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/addresses.ts"],"names":[],"mappings":";;;;AAAA,0CAMyB;AAEzB,mCAAwC;AAOjC,IAAM,SAAS,GAAf,MAAM,SAAS;IAIb,EAAE,CAAU;IAOZ,IAAI,CAAU;IAOd,KAAK,CAAU;IAOf,OAAO,CAAU;IAQjB,UAAU,CAAY;IAS7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAU7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAGtB,IAAI,CAAU;CACtB,CAAA;AAxDY,8BAAS;AAIb;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;qCACiB;AAOZ;IALN,IAAA,eAAQ,EAAC;QACR,UAAU,EAAE,SAAS;QACrB,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,IAAI;KACf,CAAC;;uCACmB;AAOd;IALN,IAAA,eAAQ,EAAC;QACR,UAAU,EAAE,SAAS;QACrB,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,IAAI;KACf,CAAC;;wCACoB;AAOf;IALN,IAAA,eAAQ,EAAC;QACR,UAAU,EAAE,SAAS;QACrB,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,IAAI;KACf,CAAC;;0CACsB;AAQjB;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,gBAAS;QACf,UAAU,EAAE,WAAW;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;;6CAC2B;AAS7B;IAPC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;KAC7C,CAAC;sCACS,IAAI;4CAAc;AAU7B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gCAAgC;QAC5C,UAAU,EAAE,sBAAsB;KACnC,CAAC;sCACS,IAAI;4CAAc;AAGtB;IADN,IAAA,eAAQ,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;;uCAC3B;oBAvDV,SAAS;IAHrB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,WAAW;KACvB,CAAC;GACW,SAAS,CAwDrB"}

package/src/lib/mock-utils/entities/comments.js

@@ -11,10 +11,12 @@ var CommentKind;
 })(CommentKind || (exports.CommentKind = CommentKind = {}));
 const index_1 = require("./index");
 let Comments = class Comments {
-    constructor() {
-        this.createdAt = new Date();
-        this.updatedAt = new Date();
-    }
+    id;
+    text;
+    kind;
+    createdAt = new Date();
+    updatedAt = new Date();
+    createdBy;
 };
 exports.Comments = Comments;
 tslib_1.__decorate([

package/src/lib/mock-utils/entities/comments.js.map

@@ -1 +1 @@
-{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/comments.ts"],"names":[],"mappings":";;;;AAAA,0CAAgF;AAEhF,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,4BAAa,CAAA;AACf,CAAC,EAJW,WAAW,2BAAX,WAAW,QAItB;AAED,mCAAwC;AAOjC,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAAd;QAqBL,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAU7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAQ/B,CAAC;CAAA,CAAA;AAvCY,4BAAQ;AAIZ;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;oCACiB;AAKZ;IAHN,IAAA,eAAQ,EAAC;QACR,UAAU,EAAE,MAAM;KACnB,CAAC;;sCACmB;AAGd;IADN,IAAA,WAAI,EAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC;;sCAC9C;AAS1B;IAPC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;KAC7C,CAAC;sCACS,IAAI;2CAAc;AAU7B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gCAAgC;QAC5C,UAAU,EAAE,sBAAsB;KACnC,CAAC;sCACS,IAAI;2CAAc;AAO7B;IALC,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE;QACtB,qDAAqD;QACrD,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,YAAY;KACxB,CAAC;;2CACiB;mBAtCR,QAAQ;IAHpB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,UAAU;KACtB,CAAC;GACW,QAAQ,CAuCpB"}
+{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/comments.ts"],"names":[],"mappings":";;;;AAAA,0CAAgF;AAEhF,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,4BAAa,CAAA;AACf,CAAC,EAJW,WAAW,2BAAX,WAAW,QAItB;AAED,mCAAwC;AAOjC,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAIZ,EAAE,CAAU;IAKZ,IAAI,CAAU;IAGd,IAAI,CAAe;IAS1B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAU7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAO7B,SAAS,CAAU;CACpB,CAAA;AAvCY,4BAAQ;AAIZ;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;oCACiB;AAKZ;IAHN,IAAA,eAAQ,EAAC;QACR,UAAU,EAAE,MAAM;KACnB,CAAC;;sCACmB;AAGd;IADN,IAAA,WAAI,EAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC;;sCAC9C;AAS1B;IAPC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;KAC7C,CAAC;sCACS,IAAI;2CAAc;AAU7B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gCAAgC;QAC5C,UAAU,EAAE,sBAAsB;KACnC,CAAC;sCACS,IAAI;2CAAc;AAO7B;IALC,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE;QACtB,qDAAqD;QACrD,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,YAAY;KACxB,CAAC;;2CACiB;mBAtCR,QAAQ;IAHpB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,UAAU;KACtB,CAAC;GACW,QAAQ,CAuCpB"}

package/src/lib/mock-utils/entities/notes.js

@@ -5,10 +5,11 @@ const tslib_1 = require("tslib");
 const core_1 = require("@mikro-orm/core");
 const index_1 = require("./index");
 let Notes = class Notes {
-    constructor() {
-        this.createdAt = new Date();
-        this.updatedAt = new Date();
-    }
+    id;
+    text;
+    createdAt = new Date();
+    updatedAt = new Date();
+    createdBy;
 };
 exports.Notes = Notes;
 tslib_1.__decorate([

package/src/lib/mock-utils/entities/notes.js.map

@@ -1 +1 @@
-{"version":3,"file":"notes.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/notes.ts"],"names":[],"mappings":";;;;AAAA,0CAA0E;AAE1E,mCAAwC;AAKjC,IAAM,KAAK,GAAX,MAAM,KAAK;IAAX;QAoBL,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAU7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAM/B,CAAC;CAAA,CAAA;AApCY,sBAAK;AAKT;IAJN,IAAA,iBAAU,EAAC;QACV,IAAI,EAAE,MAAM;QACZ,UAAU,EAAE,mBAAmB;KAChC,CAAC;;iCACiB;AAMZ;IAJN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,KAAK;KAChB,CAAC;;mCACmB;AASrB;IAPC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;KAC7C,CAAC;sCACS,IAAI;wCAAc;AAU7B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gCAAgC;QAC5C,UAAU,EAAE,sBAAsB;KACnC,CAAC;sCACS,IAAI;wCAAc;AAKtB;IAHN,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE;QACtB,SAAS,EAAE,YAAY;KACxB,CAAC;;wCACwB;gBAnCf,KAAK;IAHjB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,OAAO;KACnB,CAAC;GACW,KAAK,CAoCjB"}
+{"version":3,"file":"notes.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/notes.ts"],"names":[],"mappings":";;;;AAAA,0CAA0E;AAE1E,mCAAwC;AAKjC,IAAM,KAAK,GAAX,MAAM,KAAK;IAKT,EAAE,CAAU;IAMZ,IAAI,CAAU;IASrB,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAU7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAKtB,SAAS,CAAU;CAC3B,CAAA;AApCY,sBAAK;AAKT;IAJN,IAAA,iBAAU,EAAC;QACV,IAAI,EAAE,MAAM;QACZ,UAAU,EAAE,mBAAmB;KAChC,CAAC;;iCACiB;AAMZ;IAJN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,KAAK;KAChB,CAAC;;mCACmB;AASrB;IAPC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;KAC7C,CAAC;sCACS,IAAI;wCAAc;AAU7B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gCAAgC;QAC5C,UAAU,EAAE,sBAAsB;KACnC,CAAC;sCACS,IAAI;wCAAc;AAKtB;IAHN,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE;QACtB,SAAS,EAAE,YAAY;KACxB,CAAC;;wCACwB;gBAnCf,KAAK;IAHjB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,OAAO;KACnB,CAAC;GACW,KAAK,CAoCjB"}

package/src/lib/mock-utils/entities/roles.js

@@ -5,11 +5,13 @@ const tslib_1 = require("tslib");
 const core_1 = require("@mikro-orm/core");
 const index_1 = require("./index");
 let Roles = class Roles {
-    constructor() {
-        this.createdAt = new Date();
-        this.updatedAt = new Date();
-        this.users = new core_1.Collection(this);
-    }
+    id;
+    name;
+    key;
+    isDefault;
+    createdAt = new Date();
+    updatedAt = new Date();
+    users = new core_1.Collection(this);
 };
 exports.Roles = Roles;
 tslib_1.__decorate([

package/src/lib/mock-utils/entities/roles.js.map

@@ -1 +1 @@
-{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/roles.ts"],"names":[],"mappings":";;;;AAAA,0CAMyB;AAEzB,mCAAwC;AAOjC,IAAM,KAAK,GAAX,MAAM,KAAK;IAAX;QAqCL,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAU7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAGtB,UAAK,GAAG,IAAI,iBAAU,CAAQ,IAAI,CAAC,CAAC;IAC7C,CAAC;CAAA,CAAA;AAnDY,sBAAK;AAIT;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;iCACiB;AAQZ;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,MAAM;KAChB,CAAC;;mCACmB;AAQd;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,IAAI;KACb,CAAC;;kCACkB;AAOb;IALN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;;wCACyB;AAU3B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;QAC5C,IAAI,EAAE,WAAW;KAClB,CAAC;sCACS,IAAI;wCAAc;AAU7B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gCAAgC;QAC5C,UAAU,EAAE,sBAAsB;KACnC,CAAC;sCACS,IAAI;wCAAc;AAGtB;IADN,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;;oCACH;gBAlDhC,KAAK;IAHjB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,OAAO;KACnB,CAAC;GACW,KAAK,CAmDjB"}
+{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/roles.ts"],"names":[],"mappings":";;;;AAAA,0CAMyB;AAEzB,mCAAwC;AAOjC,IAAM,KAAK,GAAX,MAAM,KAAK;IAIT,EAAE,CAAU;IAQZ,IAAI,CAAU;IAQd,GAAG,CAAU;IAOb,SAAS,CAAW;IAU3B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAU7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAGtB,KAAK,GAAG,IAAI,iBAAU,CAAQ,IAAI,CAAC,CAAC;CAC5C,CAAA;AAnDY,sBAAK;AAIT;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;iCACiB;AAQZ;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,MAAM;KAChB,CAAC;;mCACmB;AAQd;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,IAAI;KACb,CAAC;;kCACkB;AAOb;IALN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;;wCACyB;AAU3B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;QAC5C,IAAI,EAAE,WAAW;KAClB,CAAC;sCACS,IAAI;wCAAc;AAU7B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gCAAgC;QAC5C,UAAU,EAAE,sBAAsB;KACnC,CAAC;sCACS,IAAI;wCAAc;AAGtB;IADN,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;;oCACH;gBAlDhC,KAAK;IAHjB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,OAAO;KACnB,CAAC;GACW,KAAK,CAmDjB"}

package/src/lib/mock-utils/entities/user-groups.js

@@ -5,9 +5,9 @@ const tslib_1 = require("tslib");
 const core_1 = require("@mikro-orm/core");
 const index_1 = require("./index");
 let UserGroups = class UserGroups {
-    constructor() {
-        this.users = new core_1.Collection(this);
-    }
+    id;
+    label;
+    users = new core_1.Collection(this);
 };
 exports.UserGroups = UserGroups;
 tslib_1.__decorate([

package/src/lib/mock-utils/entities/user-groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-groups.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/user-groups.ts"],"names":[],"mappings":";;;;AAAA,0CAMyB;AAEzB,mCAAgC;AAKzB,IAAM,UAAU,GAAhB,MAAM,UAAU;IAAhB;QAeE,UAAK,GAAG,IAAI,iBAAU,CAAQ,IAAI,CAAC,CAAC;IAC7C,CAAC;CAAA,CAAA;AAhBY,gCAAU;AAId;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;sCACiB;AAQZ;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,SAAS;KACtB,CAAC;;yCACoB;AAGf;IADN,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;;yCACN;qBAfhC,UAAU;IAHtB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,aAAa;KACzB,CAAC;GACW,UAAU,CAgBtB"}
+{"version":3,"file":"user-groups.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/user-groups.ts"],"names":[],"mappings":";;;;AAAA,0CAMyB;AAEzB,mCAAgC;AAKzB,IAAM,UAAU,GAAhB,MAAM,UAAU;IAId,EAAE,CAAU;IAQZ,KAAK,CAAU;IAGf,KAAK,GAAG,IAAI,iBAAU,CAAQ,IAAI,CAAC,CAAC;CAC5C,CAAA;AAhBY,gCAAU;AAId;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;sCACiB;AAQZ;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,SAAS;KACtB,CAAC;;yCACoB;AAGf;IADN,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;;yCACN;qBAfhC,UAAU;IAHtB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,aAAa;KACzB,CAAC;GACW,UAAU,CAgBtB"}

package/src/lib/mock-utils/entities/users.js

@@ -8,14 +8,22 @@ class MyDateType extends core_1.Type {
 }
 exports.MyDateType = MyDateType;
 let Users = class Users {
-    constructor() {
-        this.testReal = [];
-        this.createdAt = new Date();
-        this.updatedAt = new Date();
-        this.roles = new core_1.Collection(this);
-        this.comments = new core_1.Collection(this);
-        this.notes = new core_1.Collection(this);
-    }
+    id;
+    login;
+    firstName;
+    testReal = [];
+    testArrayNull;
+    lastName;
+    isActive;
+    testDate;
+    createdAt = new Date();
+    updatedAt = new Date();
+    addresses;
+    manager;
+    roles = new core_1.Collection(this);
+    comments = new core_1.Collection(this);
+    notes = new core_1.Collection(this);
+    userGroup;
 };
 exports.Users = Users;
 tslib_1.__decorate([

package/src/lib/mock-utils/entities/users.js.map

@@ -1 +1 @@
-{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/users.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/users.ts"],"names":[],"mappings":"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"}

package/src/lib/mock-utils/index.js

@@ -14,7 +14,7 @@ const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
 const entities_1 = require("./entities");
 const factory_1 = require("../factory");
-const micro_orm_util_service_1 = require("../service/micro-orm-util.service");
+const service_1 = require("../service");
 tslib_1.__exportStar(require("./entities"), exports);
 tslib_1.__exportStar(require("./utils"), exports);
 const utils_1 = require("./utils");
@@ -23,10 +23,7 @@ exports.entities = [entities_1.Users, entities_1.UserGroups, entities_1.Roles, e
 function mockDbPgLiteTestModule(dbName = `test_db_${Date.now()}`) {
     const mikroORM = {
         provide: core_1.MikroORM,
-        useFactory: async () => {
-            const knexInst = await (0, utils_1.sharedConnect)();
-            return (0, utils_1.initMikroOrm)(knexInst, dbName);
-        },
+        useFactory: () => (0, utils_1.initMikroOrm)(dbName),
     };
     return {
         module: nestjs_1.MikroOrmModule,
@@ -54,7 +51,7 @@ function getModuleForPgLite(entity, dbName = `test_db_${Date.now()}`) {
             (0, factory_1.CurrentEntityManager)(),
             (0, factory_1.CurrentEntityMetadata)(),
             (0, factory_1.CurrentEntityRepository)(entity),
-            micro_orm_util_service_1.MicroOrmUtilService,
+            service_1.MicroOrmUtilService,
             {
                 provide: json_api_nestjs_1.JsonApiTransformerService,
                 useValue: {

package/src/lib/mock-utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/index.ts"],"names":[],"mappings":"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"}

package/src/lib/mock-utils/utils/init-db.d.ts

@@ -1,5 +1,3 @@
-import { Knex as TypeKnex } from '@mikro-orm/knex';
 import { MikroORM } from '@mikro-orm/core';
 import { PostgreSqlDriver } from '@mikro-orm/postgresql';
-export declare function sharedConnect(): Promise<TypeKnex>;
-export declare function initMikroOrm(knex: TypeKnex, testDbName: string): Promise<MikroORM<PostgreSqlDriver, import("@mikro-orm/knex").EntityManager<PostgreSqlDriver> & import("@mikro-orm/core").EntityManager<import("@mikro-orm/knex").IDatabaseDriver<import("@mikro-orm/knex").Connection>>>>;
+export declare function initMikroOrm(testDbName: string): Promise<MikroORM<PostgreSqlDriver, import("@mikro-orm/knex").EntityManager<PostgreSqlDriver> & import("@mikro-orm/core").EntityManager<import("@mikro-orm/knex").IDatabaseDriver<import("@mikro-orm/knex").Connection>>>>;

package/src/lib/mock-utils/utils/init-db.js

@@ -1,56 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sharedConnect = sharedConnect;
 exports.initMikroOrm = initMikroOrm;
 const core_1 = require("@mikro-orm/core");
-const postgresql_1 = require("@mikro-orm/postgresql");
 const sql_highlighter_1 = require("@mikro-orm/sql-highlighter");
-const knex_1 = require("knex");
-const ClientPgLite = require("knex-pglite");
 const entities_1 = require("../entities");
-let knexInst;
-async function sharedConnect() {
-    // @ts-ignore
-    // return globalThis.pgLite;
-    if (knexInst) {
-        return knexInst;
-    }
-    const pgLite = await Promise.all([
-        Promise.resolve().then(() => require('@electric-sql/pglite')),
-        Promise.resolve().then(() => require('@electric-sql/pglite/contrib/uuid_ossp')),
-    ]).then(([{ PGlite }, { uuid_ossp }]) => new PGlite({
-        extensions: { uuid_ossp },
-    }));
-    knexInst = (0, knex_1.default)({
-        // @ts-ignore
-        client: ClientPgLite,
-        dialect: 'postgres',
-        // @ts-ignore
-        connection: { pglite: pgLite },
+const pglite_1 = require("@electric-sql/pglite");
+// @ts-ignore
+const mikro_orm_pglite_1 = require("mikro-orm-pglite");
+// @ts-ignore
+const uuid_ossp_1 = require("@electric-sql/pglite/contrib/uuid_ossp");
+async function initMikroOrm(testDbName) {
+    const pgLite = new pglite_1.PGlite({
+        extensions: { uuid_ossp: uuid_ossp_1.uuid_ossp },
     });
-    return knexInst;
-}
-async function initMikroOrm(knex, testDbName) {
-    const result = await knex.raw(`select 1 from pg_database where datname = '${testDbName}'`);
-    if (result['rows'].length === 0) {
-        await knex.raw(`create database ??`, [testDbName]);
-    }
     const orm = await core_1.MikroORM.init({
         highlighter: new sql_highlighter_1.SqlHighlighter(),
-        driver: postgresql_1.PostgreSqlDriver,
+        driver: mikro_orm_pglite_1.PGliteDriver,
         dbName: testDbName,
-        driverOptions: knexInst,
+        driverOptions: {
+            connection: {
+                pglite: () => pgLite,
+            },
+        },
         entities: [entities_1.Users, entities_1.UserGroups, entities_1.Roles, entities_1.Comments, entities_1.Addresses, entities_1.Notes],
         allowGlobalContext: true,
         schema: 'public',
-        debug: process.env['DB_LOGGING'] !== '0' ? ['query', 'query-params'] : false,
+        debug: false
+        // process.env['DB_LOGGING'] !== '0' ? ['query', 'query-params'] : false,
     });
-    if (result['rows'].length === 0) {
-        const sql = await orm.getSchemaGenerator().getCreateSchemaSQL();
-        const statements = sql.split(';').filter((s) => s.trim().length > 0); // Разбиваем на отдельные команды
-        for (const statement of statements) {
-            await orm.em.execute(statement);
-        }
+    const sql = await orm.getSchemaGenerator().getCreateSchemaSQL();
+    const statements = sql.split(';').filter((s) => s.trim().length > 0); // Разбиваем на отдельные команды
+    for (const statement of statements) {
+        await orm.em.execute(statement);
     }
     return orm;
 }

package/src/lib/mock-utils/utils/init-db.js.map

@@ -1 +1 @@
-{"version":3,"file":"init-db.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/utils/init-db.ts"],"names":[],"mappings":";;AAmBA,sCA4BC;AAED,oCA+BC;AA/ED,0CAA2C;AAC3C,sDAAyD;AACzD,gEAA4D;AAE5D,+BAAwB;AACxB,4CAA4C;AAE5C,0CAOqB;AAErB,IAAI,QAAkB,CAAC;AAEhB,KAAK,UAAU,aAAa;IACjC,aAAa;IACb,4BAA4B;IAE5B,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;6CACxB,sBAAsB;6CAEtB,wCAAwC;KAChD,CAAC,CAAC,IAAI,CACL,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAC9B,IAAI,MAAM,CAAC;QACT,UAAU,EAAE,EAAE,SAAS,EAAE;KAC1B,CAAC,CACL,CAAC;IAEF,QAAQ,GAAG,IAAA,cAAI,EAAC;QACd,aAAa;QACb,MAAM,EAAE,YAAY;QACpB,OAAO,EAAE,UAAU;QACnB,aAAa;QACb,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;KAC/B,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,IAAc,EAAE,UAAkB;IACnE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAC3B,8CAA8C,UAAU,GAAG,CAC5D,CAAC;IAEF,IAAK,MAAM,CAAC,MAAM,CAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,eAAQ,CAAC,IAAI,CAAmB;QAChD,WAAW,EAAE,IAAI,gCAAc,EAAE;QACjC,MAAM,EAAE,6BAAgB;QACxB,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,QAAQ;QACvB,QAAQ,EAAE,CAAC,gBAAK,EAAE,qBAAU,EAAE,gBAAK,EAAE,mBAAQ,EAAE,oBAAS,EAAE,gBAAK,CAAC;QAChE,kBAAkB,EAAE,IAAI;QACxB,MAAM,EAAE,QAAQ;QAChB,KAAK,EACH,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK;KACxE,CAAC,CAAC;IAEH,IAAK,MAAM,CAAC,MAAM,CAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC,kBAAkB,EAAE,CAAC;QAChE,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iCAAiC;QAEvG,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"init-db.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/utils/init-db.ts"],"names":[],"mappings":";;AAmBA,oCA4BC;AA9CD,0CAA2C;AAE3C,gEAA4D;AAE5D,0CAOqB;AACrB,iDAA8C;AAC9C,aAAa;AACb,uDAAwE;AACxE,aAAa;AACb,sEAAmE;AAE5D,KAAK,UAAU,YAAY,CAAC,UAAkB;IACnD,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;QACxB,UAAU,EAAE,EAAE,SAAS,EAAT,qBAAS,EAAE;KAC1B,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,eAAQ,CAAC,IAAI,CAAmB;QAChD,WAAW,EAAE,IAAI,gCAAc,EAAE;QACjC,MAAM,EAAE,+BAAY;QACpB,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM;aACY;SACnC;QACD,QAAQ,EAAE,CAAC,gBAAK,EAAE,qBAAU,EAAE,gBAAK,EAAE,mBAAQ,EAAE,oBAAS,EAAE,gBAAK,CAAC;QAChE,kBAAkB,EAAE,IAAI;QACxB,MAAM,EAAE,QAAQ;QAChB,KAAK,EAAE,KAAK;QACV,yEAAyE;KAC5E,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAChE,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iCAAiC;IACvG,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/src/lib/mock-utils/utils/pull-data.js

@@ -42,7 +42,7 @@ async function pullUser() {
     user.firstName = faker_1.faker.person.firstName();
     user.lastName = faker_1.faker.person.lastName();
     user.isActive = faker_1.faker.datatype.boolean();
-    user.login = faker_1.faker.internet.userName({
+    user.login = faker_1.faker.internet.username({
         lastName: user.lastName,
         firstName: user.firstName,
     });

package/src/lib/orm-helper/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getArrayType = exports.getRelationProperty = exports.getPrimaryColumnType = exports.getPrimaryColumnName = exports.getPropsNullable = exports.getPropsType = exports.getProps = exports.getRelation = void 0;
+const common_1 = require("@nestjs/common");
 const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
 const constants_1 = require("../constants");
 const getRelation = (entityMetadata) => entityMetadata.relations.map((i) => i.name);
@@ -13,6 +14,7 @@ const getProps = (entityMetadata) => {
 };
 exports.getProps = getProps;
 const getPropsType = (entityMetadata, config = constants_1.DEFAULT_ARRAY_TYPE) => {
+    const logger = new common_1.Logger('JSON-API:MkroORM: init');
     const field = (0, exports.getProps)(entityMetadata);
     const result = {};
     for (const item of field) {
@@ -35,6 +37,10 @@ const getPropsType = (entityMetadata, config = constants_1.DEFAULT_ARRAY_TYPE) =
             case 'object':
                 typeProps = json_api_nestjs_1.TypeField.object;
                 break;
+            case 'any':
+                logger.warn(`The field "${item}" in entity ${entityMetadata.name} has runtime type "any". Should be use object type.`);
+                typeProps = json_api_nestjs_1.TypeField.object;
+                break;
             default:
                 typeProps = json_api_nestjs_1.TypeField.string;
         }

package/src/lib/orm-helper/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-helper/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-helper/index.ts"],"names":[],"mappings":"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"}

package/src/lib/orm-methods/get-all/get-all.d.ts

@@ -1,6 +1,6 @@
 import { Query } from '@klerick/json-api-nestjs';
 import { MicroOrmService } from '../../service';
-export declare function getAll<E extends object, IdKey extends string>(this: MicroOrmService<E, IdKey>, query: Query<E, IdKey>): Promise<{
+export declare function getAll<E extends object, IdKey extends string>(this: MicroOrmService<E, IdKey>, query: Query<E, IdKey>, additionalQueryParams?: Record<string, unknown>): Promise<{
     totalItems: number;
     items: E[];
 }>;

package/src/lib/orm-methods/get-all/get-all.js

@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAll = getAll;
 const core_1 = require("@mikro-orm/core");
 const get_query_for_count_1 = require("./get-query-for-count");
-async function getAll(query) {
+async function getAll(query, additionalQueryParams) {
     const { page } = query;
     const countSubQuery = get_query_for_count_1.getQueryForCount.call(this, ...[query]);
+    if (additionalQueryParams) {
+        countSubQuery.andWhere(additionalQueryParams);
+    }
     const skip = (page.number - 1) * page.size;
     await countSubQuery.applyFilters();
     const paginationQuery = countSubQuery

package/src/lib/orm-methods/get-all/get-all.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-all.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/get-all/get-all.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-all.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/get-all/get-all.ts"],"names":[],"mappings":"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"}

package/src/lib/orm-methods/get-one/get-one.d.ts

@@ -1,3 +1,3 @@
 import { QueryOne } from '@klerick/json-api-nestjs';
 import { MicroOrmService } from '../../service';
-export declare function getOne<E extends object, IdKey extends string>(this: MicroOrmService<E, IdKey>, id: number | string, query: QueryOne<E, IdKey>): Promise<E>;
+export declare function getOne<E extends object, IdKey extends string>(this: MicroOrmService<E, IdKey>, id: number | string, query: QueryOne<E, IdKey>, additionalQueryParams?: Record<string, unknown>): Promise<E>;

package/src/lib/orm-methods/get-one/get-one.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOne = getOne;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@mikro-orm/core");
-async function getOne(id, query) {
+async function getOne(id, query, additionalQueryParams) {
     const queryBuilder = this.microOrmUtilService.queryBuilder().where({
         [this.microOrmUtilService.currentPrimaryColumn]: id,
     });
     const resultQueryBuilder = this.microOrmUtilService.prePareQueryBuilder(queryBuilder, query);
+    if (additionalQueryParams) {
+        resultQueryBuilder.andWhere(additionalQueryParams);
+    }
     await resultQueryBuilder.applyFilters();
     const resultItem = await resultQueryBuilder.getSingleResult();
     if (!resultItem) {

package/src/lib/orm-methods/get-one/get-one.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-one.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/get-one/get-one.ts"],"names":[],"mappings":";;AAKA,wBA2BC;AAhCD,2CAAmD;AAEnD,0CAAuC;AAGhC,KAAK,UAAU,MAAM,CAE1B,EAAmB,EACnB,KAAyB;IAEzB,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;QACjE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,EAAE;KACpD,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CACrE,YAAY,EACZ,KAAY,CACb,CAAC;IAEF,MAAM,kBAAkB,CAAC,YAAY,EAAE,CAAC;IAExC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,CAAC;IAC9D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,KAAK,GAAuB;YAChC,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,aAAa,IAAI,CAAC,mBAAmB,CAAC,YAAY,cAAc,EAAE,kBAAkB;YAC7F,IAAI,EAAE,CAAC,QAAQ,CAAC;SACjB,CAAC;QACF,MAAM,IAAI,0BAAiB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,MAAM,EAAO,CAAC;AACxC,CAAC"}
+{"version":3,"file":"get-one.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/get-one/get-one.ts"],"names":[],"mappings":";;AAKA,wBAgCC;AArCD,2CAAmD;AAEnD,0CAAuC;AAGhC,KAAK,UAAU,MAAM,CAE1B,EAAmB,EACnB,KAAyB,EACzB,qBAA+C;IAE/C,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;QACjE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,EAAE;KACpD,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CACrE,YAAY,EACZ,KAAY,CACb,CAAC;IAEF,IAAI,qBAAqB,EAAE,CAAC;QAC1B,kBAAkB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,kBAAkB,CAAC,YAAY,EAAE,CAAC;IAExC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,CAAC;IAC9D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,KAAK,GAAuB;YAChC,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,aAAa,IAAI,CAAC,mBAAmB,CAAC,YAAY,cAAc,EAAE,kBAAkB;YAC7F,IAAI,EAAE,CAAC,QAAQ,CAAC;SACjB,CAAC;QACF,MAAM,IAAI,0BAAiB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,MAAM,EAAO,CAAC;AACxC,CAAC"}

package/src/lib/orm-methods/post-one/post-one.js.map

@@ -1 +1 @@
-{"version":3,"file":"post-one.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/post-one/post-one.ts"],"names":[],"mappings":";;AAGA,0BAkBC;AAlBM,KAAK,UAAU,OAAO,CAE3B,SAA6B;IAE7B,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;IAEpD,MAAM,QAAQ,GAAG,EAAE;QACjB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE;QACpE,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,gBAAgB,GAAG;QACvB,GAAG,UAAU;QACb,GAAG,QAAQ;KACZ,CAAC;IAEF,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAE1E,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AACvE,CAAC"}
+{"version":3,"file":"post-one.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/post-one/post-one.ts"],"names":[],"mappings":";;AAKA,0BAkBC;AAlBM,KAAK,UAAU,OAAO,CAE3B,SAA6B;IAE7B,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;IAEpD,MAAM,QAAQ,GAAG,EAAE;QACjB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE;QACpE,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,gBAAgB,GAAG;QACvB,GAAG,UAAU;QACb,GAAG,QAAQ;KACgB,CAAC;IAE9B,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAE1E,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AACvE,CAAC"}

package/src/lib/service/index.d.ts

@@ -1 +1,3 @@
 export * from './microorm-service';
+export * from './mikro-orm-format.error.service';
+export * from './micro-orm-util.service';

package/src/lib/service/index.js

@@ -2,4 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./microorm-service"), exports);
+tslib_1.__exportStar(require("./mikro-orm-format.error.service"), exports);
+tslib_1.__exportStar(require("./micro-orm-util.service"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,2EAAiD;AACjD,mEAAyC"}

package/src/lib/service/micro-orm-util.service.d.ts

@@ -1,5 +1,5 @@
-import { EntityClass, EntityKey, EntityProperty, type QBFilterQuery, QBQueryOrderMap, EntityData } from '@mikro-orm/core';
-import { Knex, SqlEntityManager, QueryBuilder } from '@mikro-orm/knex';
+import { EntityClass, EntityKey, EntityProperty, type QBFilterQuery, QBQueryOrderMap, EntityData, Collection } from '@mikro-orm/core';
+import { type Knex, SqlEntityManager, QueryBuilder } from '@mikro-orm/knex';
 import { Query, QueryOne, Relationships } from '@klerick/json-api-nestjs';
 import { RelationKeys } from '@klerick/json-api-nestjs-shared';
 export type InputValidateData = {
@@ -7,6 +7,9 @@ export type InputValidateData = {
     id: string;
 };
 export type ValidateReturn<T> = T extends unknown[] ? string[] : T extends null ? null : string;
+type RelationshipsResult<E extends object> = {
+    [K in RelationKeys<E>]: E[K] extends object ? E[K] extends Collection<E[K]> ? E[K] : E[K] | null : never;
+};
 export declare class MicroOrmUtilService<E extends object, IdKey extends string = 'id'> {
     readonly entityManager: SqlEntityManager;
     private entityRepository;
@@ -39,9 +42,10 @@ export declare class MicroOrmUtilService<E extends object, IdKey extends string
     private getSubQueryForRelation;
     private getInverseFieldForManyToMany;
     createEntity(params: EntityData<E>): E;
-    private asyncIterateFindRelationships;
+    asyncIterateFindRelationships(relationships: NonNullable<Relationships<E, IdKey>>): AsyncGenerator<RelationshipsResult<E>>;
     saveEntity(targetInstance: E, relationships?: Relationships<E, IdKey>): Promise<E>;
     validateRelationInputData<Rel extends RelationKeys<E, IdKey>, In extends InputValidateData | InputValidateData[]>(rel: Rel, inputData: In): Promise<ValidateReturn<In>>;
     validateRelationInputData<Rel extends RelationKeys<E, IdKey>, In extends InputValidateData | InputValidateData[]>(rel: Rel, inputData: In): Promise<ValidateReturn<In>>;
     validateRelationInputData<Rel extends RelationKeys<E, IdKey>, In extends null | InputValidateData | InputValidateData[]>(rel: Rel, inputData: In): Promise<ValidateReturn<In>>;
 }
+export {};

package/src/lib/service/micro-orm-util.service.js

@@ -30,10 +30,12 @@ const getErrorObject = (props, message) => ({
 });
 (0, common_1.Injectable)();
 class MicroOrmUtilService {
-    constructor() {
-        this._relationMap = new Map();
-        this._relationPropsMap = new Map();
-    }
+    entityManager;
+    entityRepository;
+    entity;
+    _relationsName;
+    _relationMap = new Map();
+    _relationPropsMap = new Map();
     get relationsName() {
         if (!this._relationsName) {
             this._relationsName = this.metadata.relations.map((r) => r.name);
@@ -199,7 +201,8 @@ class MicroOrmUtilService {
     }
     extractedResultOperand(operand) {
         if (operand === json_api_nestjs_shared_1.FilterOperand.like &&
-            this.entityManager.getDriver().constructor.name === 'PostgreSqlDriver') {
+            (this.entityManager.getDriver().constructor.name === 'PostgreSqlDriver' ||
+                this.entityManager.getDriver().constructor.name === 'PGliteDriver')) {
             return '$ilike';
         }
         return operand === 'regexp'
@@ -298,7 +301,8 @@ class MicroOrmUtilService {
         const resultInclude = new Set([
             ...[...(include || []), ...json_api_nestjs_shared_1.ObjectTyped.keys(relationFields)],
         ]);
-        for (const item of resultInclude) {
+        for (const itemFromloop of resultInclude) {
+            const item = itemFromloop;
             const relationProps = this.getRelation(item);
             const relationEntity = relationProps.entity();
             const relationAlias = this.getAliasForEntity(relationEntity);

package/src/lib/service/micro-orm-util.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"micro-orm-util.service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/micro-orm-util.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"micro-orm-util.service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/micro-orm-util.service.ts"],"names":[],"mappings":";;;;AAAA,2CAMwB;AACxB,0CAWyB;AACzB,0CAKyB;AACzB,8DAOkC;AAClC,4EAIyC;AACzC,+DAAiD;AACjD,4CAGsB;AAqBtB,SAAS,eAAe,CACtB,aAAuB,EACvB,KAAU;IAEV,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO;IAC1C,MAAM,KAAK,GAAuB;QAChC,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC;QAC/B,OAAO,EAAE,0BAA0B,KAAK,CAAC,QAAQ,EAAE,kBAAkB;QACrE,IAAI,EAAE,CAAC,KAAK,CAAC;KACd,CAAC;IAEF,MAAM,IAAI,4BAAmB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,iBAAiB,CACxB,cAAmB;IAEnB,OAAO,cAAc,YAAY,iBAAU,CAAC;AAC9C,CAAC;AAED,MAAM,cAAc,GAAG,CACrB,KAAa,EACb,OAAe,EACK,EAAE,CAAC,CAAC;IACxB,IAAI,EAAE,mBAAmB;IACzB,IAAI,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC;IAC/B,OAAO;CACR,CAAC,CAAC;AAEH,IAAA,mBAAU,GAAE,CAAC;AACb,MAAa,mBAAmB;IAKd,aAAa,CAAoB;IAEzC,gBAAgB,CAAuB;IACP,MAAM,CAAkB;IAExD,cAAc,CAAyB;IACvC,YAAY,GAAG,IAAI,GAAG,EAA0C,CAAC;IACjE,iBAAiB,GAAG,IAAI,GAAG,EAAyC,CAAC;IAC7E,IAAI,aAAa;QACf,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,MAAsB;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK;aAC/B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aACzC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE7C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,WAAW,CAAC,IAAyB;QACnC,IAAI,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAChE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,iBAAiB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YACzE,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,CAAC;IAC/C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC;IAC7C,CAAC;IAED,IAAI,YAAY;QACd,OAAO;YACL,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,qBAAG;SACjC,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAQ,MAAsB;QAC7C,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;IAClE,CAAC;IAOD,qBAAqB,CACnB,MAAgC,EAChC,OAAiB;QAEjB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,MAAiB,CAAC;YAC5B,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,MAAwB,CAAC;QACpC,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa;aACrC,WAAW,EAAE;aACb,GAAG,CAAC,MAAM,CAAC;aACX,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,aAAa;YAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;QAC9D,IAAI,aAAa,CAAC,IAAI,KAAK,oBAAa,CAAC,YAAY;YACnD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAEpD,OAAO,IAAI,CAAC,aAAa;aACtB,aAAa,CAAC,aAAa,CAAC,WAAW,CAAC;aACxC,aAAa,EAAE,CAAC;IACrB,CAAC;IAaD,YAAY,CACV,GAAG,GAIuB;QAE1B,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC;QAE1B,IAAI,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,KAAK,GAAG,MAAM,CAAC;gBACf,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;YAC1B,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAC1C,MAAM,EACN,KAAK,CACN,CAAC;IACJ,CAAC;IAED,4BAA4B,CAC1B,KAAsB;QAEtB,MAAM,MAAM,GAAuB,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC3D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QAChC,IAAI,CAAC,YAAY;YAAE,OAAO,MAAM,CAAC;QAEjC,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,oCAAW,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACpE,MAAM,QAAQ,GAAG,SAA2C,CAAC;YAE7D,IAAI,MAAM,KAAK,SAAS;gBAAE,SAAS;YACnC,MAAM,YAAY,GAAqB;gBACrC,CAAC,QAAQ,CAAC,EAAE,EAAE;aACf,CAAC;YACF,IAAI,kBAAgD,CAAC;YAErD,KAAK,MAAM,OAAO,IAAI,oCAAW,CAAC,OAAO,CAAC,MAAa,CAAC,EAAE,CAAC;gBACzD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,OAAkC,CAAC;gBAEjE,MAAM,KAAK,GACT,OAAO,KAAK,sCAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;gBAElE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC3C,MAAM,uBAAuB,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;oBACrE,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,uBAAuB,CAAC,GAAG,KAAK,CAAC;oBACnE,SAAS;gBACX,CAAC;gBAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBAC5C,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACtB,KAAK,oBAAa,CAAC,YAAY,CAAC;oBAChC,KAAK,oBAAa,CAAC,WAAW,CAAC,CAAC,CAAC;wBAC/B,IAAI,IAAI,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;4BAC7B,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC;gCAC1C,OAAO,KAAK,sCAAa,CAAC,EAAE,CAAC;4BAC/B,MAAM;wBACR,CAAC;wBAED,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAe,CAAC,EAAE,CAAC;4BACjD,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC;gCAC1C,OAAO,KAAK,sCAAa,CAAC,EAAE,CAAC;4BAC/B,MAAM;wBACR,CAAC;wBAED,MAAM,QAAQ,GACZ,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,iBAAiB,EAAE,CAAC;wBAC5D,MAAM,IAAI,GAAG,OAAO,KAAK,sCAAa,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC;wBACpE,MAAM,WAAW,GAAG,GAAG,IAAI,KAAK,QAAQ,GAAG,CAAC;wBAC5C,kBAAkB,GAAG,IAAA,UAAG,EAAC,WAAW,CAAC,CAAC;wBACtC,MAAM;oBACR,CAAC;oBACD;wBACE,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC;4BAC1C,OAAO,KAAK,sCAAa,CAAC,EAAE,CAAC;gBACnC,CAAC;YACH,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,qBAAqB,CACnB,KAAsB,EACtB,GAAW;QAEX,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAE/D,IAAI,CAAC,cAAc;YAAE,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,CAAC,GAAG,IAAK,cAAyB,CAAC;YAAE,OAAO,EAAE,CAAC;QAEpD,KAAK,MAAM,CAAC,GAAG,EAAE,mBAAmB,CAAC,IAAI,oCAAW,CAAC,OAAO,CAC1D,cAAc,CACf,EAAE,CAAC;YACF,IAAI,GAAG,KAAK,GAAG;gBAAE,SAAS;YAC1B,IAAI,CAAC,mBAAmB;gBAAE,SAAS;YAEnC,KAAK,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,oCAAW,CAAC,OAAO,CACpD,mBAAmB,CACpB,EAAE,CAAC;gBACF,IAAI,CAAC,WAAW;oBAAE,SAAS;gBAC3B,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE;oBACnE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG;wBACvB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;wBACjC,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAwB,CAAC,CAAC,EAAE,KAAK;qBAC/D,CAAC;oBACF,OAAO,IAAI,CAAC;gBACd,CAAC,EAAE,EAAmB,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,sBAAsB,CAAC,OAAsB;QACnD,IACE,OAAO,KAAK,sCAAa,CAAC,IAAI;YAC9B,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,IAAI,KAAK,kBAAkB;gBACrE,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,IAAI,KAAK,cAAc,CAAC,EACrE,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,OAAO,OAAO,KAAK,QAAQ;YACzB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,OAAO,KAAK,MAAM;gBACpB,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAE,CAAC,GAAG,GAAG,OAAO,CAAyB,CAAC;IAC/C,CAAC;IAED,8BAA8B,CAC5B,KAAsB;QAEtB,MAAM,MAAM,GAAuB,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,cAAc;YAAE,OAAO,MAAM,CAAC;QAEnC,KAAK,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,IAAI,oCAAW,CAAC,OAAO,CAC5D,cAAc,CACf,EAAE,CAAC;YACF,MAAM,SAAS,GAAG,aAA+C,CAAC;YAClE,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,CAAC,WAAW;gBAAE,SAAS;YAC3B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAE,SAAS;YACtD,MAAM,YAAY,GAAqB;gBACrC,CAAC,aAAa,CAAC,EAAE,EAAE;aACpB,CAAC;YACF,IAAI,kBAES,CAAC;YACd,KAAK,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,IAAI,oCAAW,CAAC,OAAO,CAC5D,WAAW,CACZ,EAAE,CAAC;gBACF,MAAM,UAAU,GAAG,kBAAoD,CAAC;gBACxE,IAAI,CAAC,MAAM;oBAAE,SAAS;gBACtB,KAAK,MAAM,OAAO,IAAI,oCAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBAClD,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,OAAkC,CAAC;oBAC5D,QAAQ,aAAa,CAAC,IAAI,EAAE,CAAC;wBAC3B,KAAK,oBAAa,CAAC,YAAY,CAAC;wBAChC,KAAK,oBAAa,CAAC,WAAW,CAAC;wBAC/B,KAAK,oBAAa,CAAC,WAAW;4BAC5B,CAAC;gCACC,IAAI,IAAI,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;oCAClC,YAAY,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,SAAS,CAAC,CAC3D,UAAU,CACX,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;oCAC9C,YAAY,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CACjC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CACrC,GAAG,KAAK,CAAC;gCACZ,CAAC;qCAAM,CAAC;oCACN,IAAI,CAAC,kBAAkB,EAAE,CAAC;wCACxB,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;oCAC9D,CAAC;oCACD,MAAM,UAAU,GACd,aAAa,CAAC,IAAI,KAAK,oBAAa,CAAC,YAAY;wCAC/C,CAAC,CAAC;4CACE,CAAC,IAAI,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC,EAAE;gDAC9C,CAAC,UAAU,CAAC,EAAE;oDACZ,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK;iDAC9C;6CACF;yCACF;wCACH,CAAC,CAAC;4CACE,CAAC,UAAU,CAAC,EAAE;gDACZ,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK;6CAC9C;yCACF,CAAC;oCACR,kBAAkB,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gCAC/C,CAAC;4BACH,CAAC;4BACD,MAAM;wBACR;4BACE,YAAY,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC;gCACjC,YAAY,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;4BAC5C,YAAY,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CACjC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CACrC,GAAG,KAAK,CAAC;oBACd,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,WAAW,GAAG,WAAW,kBAAkB,CAAC,iBAAiB,EAAE,GAAG,CAAC;gBACzE,MAAM,CAAC,IAAI,CAAC,IAAA,UAAG,EAAC,WAAW,CAAC,CAAC,CAAC;gBAC9B,kBAAkB,GAAG,SAAS,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAED,mBAAmB,CACjB,YAA6B,EAC7B,KAA2C;QAE3C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QAClC,MAAM,cAAc,GAAuB,EAAE,CAAC;QAE9C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,GAAG,MAAa,CAAC;YAC/C,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YACzC,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;oBAChD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;gBAC5C,CAAC;gBACD,YAAY,CAAC,MAAM,CAAC,MAA6B,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;YAC5B,GAAG,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,oCAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SAC7D,CAAC,CAAC;QAEH,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,MAAM,IAAI,GAAG,YAA8C,CAAC;YAC5D,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC7C,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,EAAoB,CAAC;YAChE,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;YAEpC,MAAM,SAAS,GAAkB,IAAI,CAAC,qBAAqB,CACzD,KAAwB,EACxB,IAAI,CACL,CAAC;YAEF,IAAI,UAAU,GAAa,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACjE,IAAI,IAAI,IAAI,cAAc,EAAE,CAAC;gBAC3B,MAAM,MAAM,GAAG,IAAI,GAAG,CAAS;oBAC7B,GAAG,cAAc,CAAC,IAAI,CAAC;oBACvB,IAAI,CAAC,iBAAiB,CAAC,IAAW,CAAC;iBACpC,CAAC,CAAC;gBAEH,UAAU,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;YAC3B,CAAC;YAED,YAAY,CAAC,iBAAiB,CAC5B,GAAG,SAAS,IAAI,IAAI,EAAE,EACtB,GAAG,aAAa,KAAK,IAAI,EAAE,EAC3B,SAAS,EACT,UAAU,CACX,CAAC;QACJ,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,iBAAiB,CAAC,GAA2B;QAC3C,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CACrC,GAAqC,CACtC,CAAC,MAAM,EAAoB,CAAC;QAC7B,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,cAAc,EAAE;aACzE,IAAI,CAAC;IACV,CAAC;IAEO,eAAe,CACrB,KAAsB,EACtB,UAAiC;QAEjC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IAEO,sBAAsB,CAAC,SAA8B;QAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAE7C,IAAI,cAAc,CAAC;QACnB,IAAI,UAA8B,CAAC;QACnC,IAAI,oBAAoB,GAAuB,IAAI,CAAC,oBAAoB,CAAC;QACzE,IAAI,QAAQ,CAAC,IAAI,KAAK,oBAAa,CAAC,YAAY,EAAE,CAAC;YACjD,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAI,SAAS,CAAC,CAAC;YAC1D,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;aAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,oBAAa,CAAC,WAAW,EAAE,CAAC;YACvD,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAS,CAAC,CAAC;YAClE,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,oBAAoB,GAAG,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAClD,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAS,CAAC,CAAC;YAClE,UAAU,GAAG,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACzD,IAAI,CAAC,oBAAoB;YACvB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAEpD,OAAO,IAAI,CAAC,aAAa;aACtB,kBAAkB,CAAC,cAAc,EAAE,cAAc,CAAC;aAClD,MAAM,CAAC,IAAA,UAAG,EAAC,GAAG,CAAC,CAAC;aAChB,IAAI,CAAC,cAAc,CAAC;aACpB,KAAK,CAAC;YACL,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,aAAa;iBAC7B,OAAO,EAAE;iBACT,GAAG,CAAC,GAAG,IAAI,CAAC,YAAY,IAAI,oBAAoB,EAAE,CAAC;SACvD,CAAC,CAAC;IACP,CAAC;IAEO,4BAA4B,CAAC,SAA8B;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAI,SAAS,CAAC,CAAC;QAEhE,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE3E,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CACpC,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,UAAU;YACf,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC;YACrC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,KAAK,QAAQ,CAAC,MAAM,EAAE,CACvE,CAAC;QAEF,IAAI,CAAC,KAAK;YACR,MAAM,IAAI,KAAK,CACb,uBAAuB,SAAS,iBAAiB,cAAc,EAAE,CAClE,CAAC;QAEJ,OAAO,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,QAAQ,CAAC;IAC5C,CAAC;IAED,YAAY,CAAC,MAAqB;QAChC,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE;YACpD,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,CAAC,6BAA6B,CAClC,aAAmD;QAEnD,KAAK,MAAM,OAAO,IAAI,oCAAW,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACzD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC;YAClC,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YAC3C,MAAM,QAAQ,GAAG,KAAuC,CAAC;YACzD,IAAI,QAAQ,KAAK,SAAS;gBAAE,SAAS;YAErC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAkB,EAAE,MAAM,CAAC,CAAC;YACrD,IAAI,IAAI,KAAK,SAAS;gBAAE,SAAS;YACjC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAA4B,CAAC;gBAClD,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACpC,IAAI,OAAO,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAA4B,CAAC;gBAChD,SAAS;YACX,CAAC;YAED,MAAM,SAAS,GAAG,OAAO;gBACvB,CAAC,CAAC;oBACE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;iBACnC;gBACH,CAAC,CAAC;oBACE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC;iBAChB,CAAC;YAEN,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACzD,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,EAAsB,CAAC;YAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACtE,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC;YAEnD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CACpC,cAAc,EACd,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CACvC;iBACE,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;iBACrB,KAAK,CAAC;gBACL,CAAC,WAAW,CAAC,EAAE,SAAS;aACzB,CAAC,CAAC;YACL,IAAI,MAAyD,CAAC;YAC9D,IAAI,KAAK,GAAoC,SAAS,CAAC;YACvD,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC;gBAEjD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;oBAC/D,MAAM,GAAG,GAAG,aAAa,QAAQ,CAAC,SAAS,eAAe,IAAI;yBAC3D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;yBAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;yBAC1D,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC;oBAC/B,KAAK,GAAG,IAAI,4BAAmB,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;gBAChE,CAAC;gBACD,MAAM,GAAG,SAAS,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAC;gBACvD,IAAI,CAAC,SAAS;oBACZ,KAAK,GAAG,IAAI,4BAAmB,CAAC;wBAC9B,cAAc,CACZ,KAAK,EACL,aAAa,QAAQ,CAAC,SAAS,cAAc,IAAI,CAAC,EAAE,kBAAkB,CACvE;qBACF,CAAC,CAAC;gBACL,MAAM,GAAG,SAAS,CAAC;YACrB,CAAC;YACD,IAAI,KAAK;gBAAE,MAAM,KAAK,CAAC;YACvB,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,EAA4B,CAAC;QACtD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CACd,cAAiB,EACjB,aAAuC;QAEvC,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,6BAA6B,CACzD,aAAa,CACd,EAAE,CAAC;gBACF,MAAM,SAAS,GAAG,oCAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAClD,IAAI,CAAC,SAAS;oBAAE,SAAS;gBACzB,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;gBAEpC,IAAI,iBAAiB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;oBACjD,cAAc,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC;oBACtC,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,IAAU,CAAC,CAAC;gBAC5C,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAEzD,OAAO,cAAc,CAAC;IACxB,CAAC;IAcD,KAAK,CAAC,yBAAyB,CAG7B,GAAQ,EAAE,SAAa;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEzC,IACE,CAAC,oBAAa,CAAC,WAAW,EAAE,oBAAa,CAAC,YAAY,CAAC,CAAC,QAAQ,CAC9D,QAAQ,CAAC,IAAI,CACd;YACD,CAAC,OAAO,EACR,CAAC;YACD,MAAM,KAAK,GAAuB;gBAChC,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,CAAC,MAAM,CAAC;gBACd,OAAO,EAAE,2BAA2B;aACrC,CAAC;YAEF,MAAM,IAAI,qCAA4B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,CAAC;QAED,IACE,CAAC,oBAAa,CAAC,UAAU,EAAE,oBAAa,CAAC,WAAW,CAAC,CAAC,QAAQ,CAC5D,QAAQ,CAAC,IAAI,CACd;YACD,OAAO,EACP,CAAC;YACD,MAAM,KAAK,GAAuB;gBAChC,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,CAAC,MAAM,CAAC;gBACd,OAAO,EAAE,4BAA4B;aACtC,CAAC;YAEF,MAAM,IAAI,qCAA4B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC;YACpB,OAAO,MAA4B,CAAC;QACtC,CAAC;QACD,IAAI,OAAO,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,MAAM,MAAM,GAAU,EAAE,CAAC;YACzB,OAAO,MAA4B,CAAC;QACtC,CAAC;QAED,MAAM,WAAW,GAAG,CAClB,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CACX,CAAC;QAEzB,MAAM,MAAM,GAAyB,EAAE,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,GAAU,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7D,MAAM,QAAQ,GAAG,IAAA,gCAAS,EACxB,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,SAAS,CAC/D,CAAC;QAEF,KAAK,MAAM,WAAW,IAAI,WAAW,EAAE,CAAC;YACtC,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAClC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBACzD,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,mBAAmB;oBACzB,IAAI,EAAE,IAAI;oBACV,OAAO,EAAE,6CAA6C,GAAG,CAAC,QAAQ,EAAE,cAAc,GAAG,CAAC,QAAQ,EAAE,QAAQ,QAAQ,oBAC9G,WAAW,CAAC,IACd,GAAG;iBACJ,CAAC,CAAC;YACL,CAAC;YACD,CAAC,EAAE,CAAC;QACN,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,IAAI,qCAA4B,CAAC,MAAM,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAqB,CAAC;aAC/D,KAAK,CAAC;YACL,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC7B,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClC;SACF,CAAC;aACD,SAAS,EAAE,CAAC;QAEf,IAAI,WAAW,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,EAAE,CAAC;YAC9C,OAAO,CACL,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAC9B,CAAC;QAC1B,CAAC;QAED,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC1E,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAA6B,CAAC,CAAC;QAElC,CAAC,GAAG,CAAC,CAAC;QACN,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACrE,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,mBAAmB;oBACzB,IAAI,EAAE,IAAI;oBACV,OAAO,EAAE,mBACP,IAAI,CAAC,EACP,kBAAkB,GAAG,CAAC,QAAQ,EAAE,GAAG;iBACpC,CAAC,CAAC;YACL,CAAC;YACD,CAAC,EAAE,CAAC;QACN,CAAC;QACD,MAAM,IAAI,0BAAiB,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;CACF;AAtrBD,kDAsrBC;AAjrBiB;IADf,IAAA,eAAM,EAAC,wCAA4B,CAAC;sCACL,uBAAgB;0DAAC;AAEzC;IADP,IAAA,eAAM,EAAC,qCAAyB,CAAC;sCACP,uBAAgB;6DAAI;AACP;IAAvC,IAAA,eAAM,EAAC,gCAAc,CAAC;;mDAAyC"}

package/src/lib/service/microorm-service.d.ts

@@ -1,12 +1,13 @@
-import { ResourceObject, ResourceObjectRelationships } from '@klerick/json-api-nestjs-shared';
+import { ResourceObject, ResourceObjectRelationships, RelationKeys } from '@klerick/json-api-nestjs-shared';
 import { JsonApiTransformerService, OrmService, PatchData, PatchRelationshipData, PostData, PostRelationshipData, Query, QueryOne } from '@klerick/json-api-nestjs';
 import { MicroOrmUtilService } from './micro-orm-util.service';
-import { RelationKeys } from '@klerick/json-api-nestjs-shared';
 export declare class MicroOrmService<E extends object, IdKey extends string = 'id'> implements OrmService<E, IdKey> {
     microOrmUtilService: MicroOrmUtilService<E, IdKey>;
     jsonApiTransformerService: JsonApiTransformerService<E, IdKey>;
     getAll(query: Query<E, IdKey>): Promise<ResourceObject<E, 'array', null, IdKey>>;
+    getAll(query: Query<E, IdKey>, transformData?: boolean, additionalQueryParams?: Record<string, unknown>): Promise<ResourceObject<E, 'array', null, IdKey>>;
     getOne(id: number | string, query: QueryOne<E, IdKey>): Promise<ResourceObject<E, 'object', null, IdKey>>;
+    getOne(id: number | string, query: QueryOne<E, IdKey>, transformData?: boolean, additionalQueryParams?: Record<string, unknown>): Promise<ResourceObject<E, 'object', null, IdKey> | E>;
     deleteOne(id: number | string): Promise<void>;
     postOne(inputData: PostData<E, IdKey>): Promise<ResourceObject<E, 'object', null, IdKey>>;
     patchOne(id: number | string, inputData: PatchData<E, IdKey>): Promise<ResourceObject<E, 'object', null, IdKey>>;
@@ -14,4 +15,7 @@ export declare class MicroOrmService<E extends object, IdKey extends string = 'i
     deleteRelationship<Rel extends RelationKeys<E, IdKey>>(id: number | string, rel: Rel, input: PostRelationshipData): Promise<void>;
     postRelationship<Rel extends RelationKeys<E, IdKey>>(id: number | string, rel: Rel, input: PostRelationshipData): Promise<ResourceObjectRelationships<E, IdKey, Rel>>;
     patchRelationship<Rel extends RelationKeys<E, IdKey>>(id: number | string, rel: Rel, input: PatchRelationshipData): Promise<ResourceObjectRelationships<E, IdKey, Rel>>;
+    loadRelations(relationships: PatchData<E, IdKey>['relationships'] | PostData<E, IdKey>['relationships']): Promise<{
+        [K in RelationKeys<E>]: E[K];
+    }>;
 }

package/src/lib/service/microorm-service.js

@@ -8,9 +8,14 @@ const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
 const orm_methods_1 = require("../orm-methods");
 const micro_orm_util_service_1 = require("./micro-orm-util.service");
 class MicroOrmService {
-    async getAll(query) {
+    microOrmUtilService;
+    jsonApiTransformerService;
+    async getAll(query, transformData = true, additionalQueryParams) {
         const { page } = query;
-        const { totalItems, items } = await orm_methods_1.getAll.call(this, query);
+        const { totalItems, items } = await orm_methods_1.getAll.call(this, query, additionalQueryParams);
+        if (!transformData) {
+            return { totalItems, items };
+        }
         const { data, included } = this.jsonApiTransformerService.transformData(items, query);
         const meta = {
             totalItems: totalItems,
@@ -23,8 +28,11 @@ class MicroOrmService {
             ...(included ? { included } : {}),
         };
     }
-    async getOne(id, query) {
-        const result = await orm_methods_1.getOne.call(this, id, query);
+    async getOne(id, query, transformData = true, additionalQueryParams) {
+        const result = await orm_methods_1.getOne.call(this, id, query, additionalQueryParams);
+        if (!transformData) {
+            return result;
+        }
         const { data, included } = this.jsonApiTransformerService.transformData(result, query);
         return {
             meta: {},
@@ -89,6 +97,17 @@ class MicroOrmService {
             data: this.jsonApiTransformerService.transformRel(result, rel),
         };
     }
+    async loadRelations(relationships) {
+        const result = {};
+        for await (const item of this.microOrmUtilService.asyncIterateFindRelationships(relationships)) {
+            const itemProps = json_api_nestjs_shared_1.ObjectTyped.entries(item).at(0);
+            if (!itemProps)
+                continue;
+            const [nameProps, data] = itemProps;
+            Reflect.set(result, nameProps, data);
+        }
+        return result;
+    }
 }
 exports.MicroOrmService = MicroOrmService;
 tslib_1.__decorate([

package/src/lib/service/microorm-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"microorm-service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/microorm-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"microorm-service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/microorm-service.ts"],"names":[],"mappings":"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"}

package/src/lib/service/mikro-orm-format.error.service.d.ts

@@ -0,0 +1,11 @@
+import { ErrorFormatService } from '@klerick/json-api-nestjs';
+import { HttpException } from '@nestjs/common';
+import { EntityManager } from '@mikro-orm/core';
+export declare class MikroOrmFormatErrorService extends ErrorFormatService {
+    em: EntityManager;
+    private mainConfig;
+    private errorMsg;
+    formatError(error: unknown): HttpException;
+    private formatValidationError;
+    private prepareDataBaseError;
+}

package/src/lib/service/mikro-orm-format.error.service.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MikroOrmFormatErrorService = void 0;
+const tslib_1 = require("tslib");
+const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
+const common_1 = require("@nestjs/common");
+const core_1 = require("@mikro-orm/core");
+const constants_1 = require("../constants");
+const duplicateItems = (errorText, options, detail) => {
+    errorText = 'Duplicate value';
+    if (detail) {
+        const matches = detail.match(/(?<=\().+?(?=\))/gm);
+        if (matches) {
+            errorText = `Duplicate value in the "${matches[0]}"`;
+        }
+    }
+    const error = {
+        code: 'invalid_arguments',
+        message: errorText,
+        path: ['data', 'attributes'],
+    };
+    return new common_1.ConflictException([error], options);
+};
+class MikroOrmFormatErrorService extends json_api_nestjs_1.ErrorFormatService {
+    em;
+    mainConfig;
+    errorMsg = 'Internal Server Error';
+    formatError(error) {
+        try {
+            if (error instanceof core_1.ValidationError) {
+                return this.formatValidationError(error);
+            }
+            if (error instanceof core_1.DriverException) {
+                return this.prepareDataBaseError(error);
+            }
+            return super.formatError(error);
+        }
+        catch (error) {
+            return super.formatError(error);
+        }
+    }
+    formatValidationError(error) {
+        const { message } = error;
+        const entity = error.getEntity();
+        const errorObject = {
+            code: 'invalid_arguments',
+            message: message.split('\n').at(0) || message,
+            path: [],
+        };
+        if (entity) {
+            errorObject['path'] = ['data', 'attributes'];
+        }
+        const descriptionOrOptions = this.mainConfig.options
+            .debug
+            ? { cause: error }
+            : {};
+        return new common_1.BadRequestException([errorObject], descriptionOrOptions);
+    }
+    prepareDataBaseError(error) {
+        const driverName = this.em
+            .getPlatform()
+            .getConfig()
+            .getDriver()
+            .constructor.name;
+        if (!(driverName.startsWith('Postgre') || driverName.startsWith('PGliteDriver'))) {
+            return super.formatError(error);
+        }
+        const { errorCode, errorMsg, detail, table } = {
+            errorCode: error.code,
+            errorMsg: error.message,
+            detail: Reflect.get(error, 'detail'),
+            table: Reflect.get(error, 'table'),
+        };
+        const descriptionOrOptions = this.mainConfig.options
+            .debug
+            ? { cause: error }
+            : {};
+        switch (error.constructor) {
+            case core_1.UniqueConstraintViolationException:
+                return duplicateItems(errorMsg, descriptionOrOptions, detail);
+            default:
+                return super.formatError(error);
+        }
+    }
+}
+exports.MikroOrmFormatErrorService = MikroOrmFormatErrorService;
+tslib_1.__decorate([
+    (0, common_1.Inject)(constants_1.CURRENT_ENTITY_MANAGER_TOKEN),
+    tslib_1.__metadata("design:type", core_1.EntityManager)
+], MikroOrmFormatErrorService.prototype, "em", void 0);
+tslib_1.__decorate([
+    (0, common_1.Inject)(json_api_nestjs_1.MODULE_OPTIONS_TOKEN),
+    tslib_1.__metadata("design:type", Object)
+], MikroOrmFormatErrorService.prototype, "mainConfig", void 0);
+//# sourceMappingURL=mikro-orm-format.error.service.js.map

package/src/lib/service/mikro-orm-format.error.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mikro-orm-format.error.service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/mikro-orm-format.error.service.ts"],"names":[],"mappings":"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"}