@rsdk/db.typeorm 6.0.0-next.10 → 6.0.0-next.12

package/dist/typeorm.errors-transformer.d.ts

@@ -1,5 +1,6 @@
 import type { IErrorsTransformer, PipelineException } from '@rsdk/core';
+import { TypeORMError } from 'typeorm';
 export declare class TypeOrmErrorTransformer implements IErrorsTransformer {
     match(ex: unknown): boolean;
-    transform(ex: any): PipelineException;
+    transform(ex: TypeORMError): PipelineException;
 }

package/dist/typeorm.errors-transformer.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeOrmErrorTransformer = void 0;
 const core_1 = require("@rsdk/core");
+const lodash_1 = __importDefault(require("lodash"));
 const typeorm_1 = require("typeorm");
 class TypeOrmErrorTransformer {
     match(ex) {
@@ -10,15 +14,12 @@ class TypeOrmErrorTransformer {
     transform(ex) {
         if (ex instanceof typeorm_1.EntityNotFoundError) {
             return new core_1.NotFoundException(ex.message, {
-                cause: ex,
+                cause: lodash_1.default.omit(ex, 'entityClass'),
             });
         }
-        if (ex instanceof typeorm_1.TypeORMError) {
-            return new core_1.InternalException(ex.message, {
-                cause: ex,
-            });
-        }
-        throw new Error('unknown exception');
+        return new core_1.InternalException(ex.message, {
+            cause: lodash_1.default.omit(ex, 'entityClass'),
+        });
     }
 }
 exports.TypeOrmErrorTransformer = TypeOrmErrorTransformer;

package/dist/typeorm.errors-transformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeorm.errors-transformer.js","sourceRoot":"","sources":["../src/typeorm.errors-transformer.ts"],"names":[],"mappings":";;;AACA,qCAAkE;AAClE,qCAA4D;AAE5D,MAAa,uBAAuB;IAClC,KAAK,CAAC,EAAW;QACf,OAAO,EAAE,YAAY,sBAAY,CAAC;IACpC,CAAC;IAED,SAAS,CAAC,EAAO;QACf,IAAI,EAAE,YAAY,6BAAmB,EAAE,CAAC;YACtC,OAAO,IAAI,wBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE;gBACvC,KAAK,EAAE,EAAE;aACV,CAAC,CAAC;QACL,CAAC;QAED,IAAI,EAAE,YAAY,sBAAY,EAAE,CAAC;YAC/B,OAAO,IAAI,wBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE;gBACvC,KAAK,EAAE,EAAE;aACV,CAAC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;CACF;AApBD,0DAoBC"}
+{"version":3,"file":"typeorm.errors-transformer.js","sourceRoot":"","sources":["../src/typeorm.errors-transformer.ts"],"names":[],"mappings":";;;;;;AACA,qCAAkE;AAClE,oDAAuB;AACvB,qCAA4D;AAE5D,MAAa,uBAAuB;IAClC,KAAK,CAAC,EAAW;QACf,OAAO,EAAE,YAAY,sBAAY,CAAC;IACpC,CAAC;IAED,SAAS,CAAC,EAAgB;QACxB,IAAI,EAAE,YAAY,6BAAmB,EAAE,CAAC;YACtC,OAAO,IAAI,wBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE;gBACvC,KAAK,EAAE,gBAAC,CAAC,IAAI,CAAC,EAAE,EAAE,aAAa,CAAC;aACjC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,wBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE;YACvC,KAAK,EAAE,gBAAC,CAAC,IAAI,CAAC,EAAE,EAAE,aAAa,CAAC;SACjC,CAAC,CAAC;IACL,CAAC;CACF;AAhBD,0DAgBC"}

package/dist/typeorm.plugin.js

@@ -84,7 +84,7 @@ class TypeOrmPlugin {
         ];
     }
     errorTransformers() {
-        return [new typeorm_errors_transformer_1.TypeOrmErrorTransformer()];
+        return this.options.errorTransformers ?? [new typeorm_errors_transformer_1.TypeOrmErrorTransformer()];
     }
     getMigrationsOption() {
         return [node_path_1.default.resolve(process.cwd(), 'dist/typeorm/migrations/**.js')];

package/dist/typeorm.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;AAIjD,6CAAgD;AAOhD,qCAAsC;AACtC,2CAA8C;AAC9C,0DAA6B;AAG7B,sDAAgE;AAChE,wDAAqD;AACrD,iFAA4E;AAC5E,6HAAqH;AACrH,2CAIqB;AACrB,6EAAuE;AAGvE,MAAa,aAAa;IAMK;IALrB,MAAM,CAAU,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAErE;;OAEG;IACH,YAA6B,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;QACxD,yBAAW,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC;IACjC,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC9C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACpD,CAAC;QAED,OAAO;YACL,uBAAa,CAAC,YAAY,CAAC;gBACzB,OAAO,EAAE;oBACP;wBACE,MAAM,EAAE,uBAAa;wBACrB,SAAS,EAAE,CAAC,kCAAsB,EAAE,gCAAoB,CAAC;wBACzD,OAAO,EAAE,CAAC,gCAAoB,CAAC;qBAChC;iBACF;gBACD,MAAM,EAAE,CAAC,+BAAmB,EAAE,gCAAoB,EAAE,eAAQ,CAAC;gBAC7D,UAAU,EAAE,CACV,MAA2B,EAC3B,MAA4B,EAC5B,OAAe,EACO,EAAE,CAAC,CAAC;oBAC1B;;;;uBAIG;oBACH,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;oBACvB,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;oBAC1B,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI;wBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;qBACtB,CAAC;oBACF,MAAM;oBACN,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACjD,gBAAgB,EAAE,CAAC,IAAI,CAAC,QAAQ;oBAChC,UAAU,EAAE,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE;oBAC7C,aAAa,EAAE,MAAM,CAAC,iBAAiB;oBACvC,eAAe,EAAE,OAAO,GAAG,UAAU;oBACrC,KAAK,EAAE;wBACL,GAAG,EAAE,MAAM,CAAC,OAAO;wBACnB,GAAG,EAAE,MAAM,CAAC,OAAO;wBACnB,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;qBACpD;oBACD,UAAU;oBACV,mBAAmB,EAAE,oBAAoB;oBACzC,GAAI,IAAI,CAAC,OAAO,CAAC,cAAsB;iBACxC,CAAC;gBACF,iBAAiB,EAAE,CAAC,OAA2B,EAAE,EAAE;oBACjD,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,MAAM,IAAI,oCAAuB,EAAE,CAAC;oBACtC,CAAC;oBACD,OAAO,wFAAwC,CAAC,MAAM,CACpD,OAAO,CACR,CAAC,UAAU,EAAE,CAAC;gBACjB,CAAC;aACF,CAAC;YACF,iDAAsB;SACvB,CAAC;IACJ,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,IAAI,oDAAuB,EAAE,CAAC,CAAC;IACzC,CAAC;IAEO,mBAAmB;QACzB,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,+BAA+B,CAAC,CAAC,CAAC;IACxE,CAAC;;AApFH,sCAqFC"}
+{"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -1,8 +1,26 @@
 import type { TypeOrmModuleOptions } from '@nestjs/typeorm';
+import type { IErrorsTransformer } from '@rsdk/core';
 export interface TypeOrmPluginOptions {
+    /**
+     * Тип драйвера
+     */
     type: NonNullable<TypeOrmModuleOptions['type']>;
+    /**
+     * Сущности. Если массив сущностей не задан - будет
+     * использована опция autoLoadEntities.
+     */
     entities?: (string | any)[];
+    /**
+     * Дополнительные конфигурационные параметры
+     */
     overrideConfig?: Partial<Omit<TypeOrmModuleOptions, 'type'>>;
+    /**
+     * Трансформеры ошибок.
+     *
+     * NOTE: Если значение задаётся - трансформер по умолчанию
+     * не добавляется!
+     */
+    errorTransformers?: IErrorsTransformer[];
 }
 export declare enum IsolationLevel {
     READ_UNCOMMITTED = "READ UNCOMMITTED",

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAQA,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,uDAAqC,CAAA;IACrC,mDAAiC,CAAA;IACjC,qDAAmC,CAAA;IACnC,+CAA6B,CAAA;AAC/B,CAAC,EALW,cAAc,8BAAd,cAAc,QAKzB;AAEY,QAAA,eAAe,GAA8B;IACxD,cAAc,CAAC,gBAAgB;IAC/B,cAAc,CAAC,cAAc;IAC7B,cAAc,CAAC,eAAe;IAC9B,cAAc,CAAC,YAAY;CAC5B,CAAC;AAEW,QAAA,uBAAuB,GAAG,cAAc,CAAC,gBAAgB,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AA6BA,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,uDAAqC,CAAA;IACrC,mDAAiC,CAAA;IACjC,qDAAmC,CAAA;IACnC,+CAA6B,CAAA;AAC/B,CAAC,EALW,cAAc,8BAAd,cAAc,QAKzB;AAEY,QAAA,eAAe,GAA8B;IACxD,cAAc,CAAC,gBAAgB;IAC/B,cAAc,CAAC,cAAc;IAC7B,cAAc,CAAC,eAAe;IAC9B,cAAc,CAAC,YAAY;CAC5B,CAAC;AAEW,QAAA,uBAAuB,GAAG,cAAc,CAAC,gBAAgB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/db.typeorm",
-  "version": "6.0.0-next.10",
+  "version": "6.0.0-next.12",
   "description": "TypeOrm module for platform",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -24,9 +24,10 @@
     "@rsdk/db": "*",
     "@rsdk/logging": "*",
     "@rsdk/nest-tools": "*",
+    "lodash": "^4.17.21",
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.12"
   },
-  "gitHead": "26c1a04480e6209098be6636afbde7fd357da61a"
+  "gitHead": "5d940f876c6b8c86c80835e49f8d26b7384f5b53"
 }

package/src/typeorm.errors-transformer.ts

@@ -1,5 +1,6 @@
 import type { IErrorsTransformer, PipelineException } from '@rsdk/core';
 import { InternalException, NotFoundException } from '@rsdk/core';
+import _ from 'lodash';
 import { EntityNotFoundError, TypeORMError } from 'typeorm';
 
 export class TypeOrmErrorTransformer implements IErrorsTransformer {
@@ -7,19 +8,15 @@ export class TypeOrmErrorTransformer implements IErrorsTransformer {
     return ex instanceof TypeORMError;
   }
 
-  transform(ex: any): PipelineException {
+  transform(ex: TypeORMError): PipelineException {
     if (ex instanceof EntityNotFoundError) {
       return new NotFoundException(ex.message, {
-        cause: ex,
+        cause: _.omit(ex, 'entityClass'),
       });
     }
 
-    if (ex instanceof TypeORMError) {
-      return new InternalException(ex.message, {
-        cause: ex,
-      });
-    }
-
-    throw new Error('unknown exception');
+    return new InternalException(ex.message, {
+      cause: _.omit(ex, 'entityClass'),
+    });
   }
 }

package/src/typeorm.plugin.ts

@@ -105,7 +105,7 @@ export class TypeOrmPlugin implements PlatformAppPlugin {
   }
 
   errorTransformers(): IErrorsTransformer[] {
-    return [new TypeOrmErrorTransformer()];
+    return this.options.errorTransformers ?? [new TypeOrmErrorTransformer()];
   }
 
   private getMigrationsOption(): string[] {

package/src/types.ts

@@ -1,9 +1,30 @@
 import type { TypeOrmModuleOptions } from '@nestjs/typeorm';
+import type { IErrorsTransformer } from '@rsdk/core';
 
 export interface TypeOrmPluginOptions {
+  /**
+   * Тип драйвера
+   */
   type: NonNullable<TypeOrmModuleOptions['type']>;
+
+  /**
+   * Сущности. Если массив сущностей не задан - будет
+   * использована опция autoLoadEntities.
+   */
   entities?: (string | any)[];
+
+  /**
+   * Дополнительные конфигурационные параметры
+   */
   overrideConfig?: Partial<Omit<TypeOrmModuleOptions, 'type'>>;
+
+  /**
+   * Трансформеры ошибок.
+   *
+   * NOTE: Если значение задаётся - трансформер по умолчанию
+   * не добавляется!
+   */
+  errorTransformers?: IErrorsTransformer[];
 }
 
 export enum IsolationLevel {