@alanszp/typeorm 4.0.5 → 6.0.0

package/dist/BaseEntityWithoutId.js

@@ -18,14 +18,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseEntityWithoutId = void 0;
 const class_validator_1 = require("class-validator");
 const typeorm_1 = require("typeorm");
-const ModelValidationError_1 = require("./ModelValidationError");
+const validations_1 = require("@alanszp/validations");
 class BaseEntityWithoutId extends typeorm_1.BaseEntity {
     // TODO: This model is shared between baseEntity and baseModel. Do a mixin.
     validate() {
         return __awaiter(this, void 0, void 0, function* () {
             const validationResult = yield (0, class_validator_1.validate)(this);
             if (validationResult.length > 0) {
-                return Promise.reject(new ModelValidationError_1.ModelValidationError(validationResult));
+                return Promise.reject(new validations_1.ModelValidationError(validationResult));
             }
             return Promise.resolve();
         });

package/dist/BaseEntityWithoutId.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseEntityWithoutId.js","sourceRoot":"","sources":["../src/BaseEntityWithoutId.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,qDAA2C;AAC3C,qCAIiB;AACjB,iEAA8D;AAE9D,MAAsB,mBAAoB,SAAQ,oBAAiB;IACjE,2EAA2E;IAG9D,QAAQ;;YACnB,MAAM,gBAAgB,GAAG,MAAM,IAAA,0BAAQ,EAAC,IAAI,CAAC,CAAC;YAE9C,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,2CAAoB,CAAC,gBAAgB,CAAC,CAAC,CAAC;aACnE;YACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;KAAA;IAIM,MAAM;QACX,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IACpC,CAAC;CACF;AAdC;IAFC,IAAA,sBAAY,GAAE;IACd,IAAA,sBAAY,GAAE;mDAQd;AAXH,kDAkBC"}
+{"version":3,"file":"BaseEntityWithoutId.js","sourceRoot":"","sources":["../src/BaseEntityWithoutId.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,qDAA2C;AAC3C,qCAIiB;AACjB,sDAA4D;AAE5D,MAAsB,mBAAoB,SAAQ,oBAAiB;IACjE,2EAA2E;IAG9D,QAAQ;;YACnB,MAAM,gBAAgB,GAAG,MAAM,IAAA,0BAAQ,EAAC,IAAI,CAAC,CAAC;YAE9C,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,kCAAoB,CAAC,gBAAgB,CAAC,CAAC,CAAC;aACnE;YACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;KAAA;IAIM,MAAM;QACX,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IACpC,CAAC;CACF;AAdC;IAFC,IAAA,sBAAY,GAAE;IACd,IAAA,sBAAY,GAAE;mDAQd;AAXH,kDAkBC"}

package/dist/index.d.ts

@@ -2,6 +2,3 @@ export * from "./TypeormLogger";
 export * from "./BaseEntity";
 export * from "./BaseEntityUuid";
 export * from "./BaseEntityWithoutId";
-export * from "./BaseModel";
-export * from "./ModelValidationError";
-export * from "./entityOrValidationError";

package/dist/index.js

@@ -14,7 +14,4 @@ __exportStar(require("./TypeormLogger"), exports);
 __exportStar(require("./BaseEntity"), exports);
 __exportStar(require("./BaseEntityUuid"), exports);
 __exportStar(require("./BaseEntityWithoutId"), exports);
-__exportStar(require("./BaseModel"), exports);
-__exportStar(require("./ModelValidationError"), exports);
-__exportStar(require("./entityOrValidationError"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAgC;AAChC,+CAA6B;AAC7B,mDAAiC;AACjC,wDAAsC;AACtC,8CAA4B;AAC5B,yDAAuC;AACvC,4DAA0C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAgC;AAChC,+CAA6B;AAC7B,mDAAiC;AACjC,wDAAsC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alanszp/typeorm",
-  "version": "4.0.5",
+  "version": "6.0.0",
   "description": "Alan's typeorm utils.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -19,7 +19,7 @@
     "yalc-publish": "yarn run yalc publish"
   },
   "devDependencies": {
-    "@alanszp/logger": "^4.0.5",
+    "@alanszp/logger": "^6.0.0",
     "@types/node": "^15.12.3",
     "class-validator": "^0.13.1",
     "ts-node": "^10.0.0",
@@ -33,7 +33,8 @@
     "typeorm": "^0.2.34"
   },
   "dependencies": {
-    "@alanszp/errors": "^4.0.5"
+    "@alanszp/errors": "^6.0.0",
+    "@alanszp/validations": "^6.0.0"
   },
-  "gitHead": "dd71920ed2c565d81bab8de3fafadbea0fff9ad9"
+  "gitHead": "75b34d763277366fdf93146cd1d20084ff469273"
 }

package/src/BaseEntityWithoutId.ts

@@ -4,7 +4,7 @@ import {
   BeforeInsert,
   BeforeUpdate,
 } from "typeorm";
-import { ModelValidationError } from "./ModelValidationError";
+import { ModelValidationError } from "@alanszp/validations";
 
 export abstract class BaseEntityWithoutId extends TypeOrmBaseEntity {
   // TODO: This model is shared between baseEntity and baseModel. Do a mixin.

package/src/index.ts

@@ -2,6 +2,3 @@ export * from "./TypeormLogger";
 export * from "./BaseEntity";
 export * from "./BaseEntityUuid";
 export * from "./BaseEntityWithoutId";
-export * from "./BaseModel";
-export * from "./ModelValidationError";
-export * from "./entityOrValidationError";

package/dist/BaseModel.d.ts

@@ -1,6 +0,0 @@
-/**
- * BaseModel represents a va
- */
-export declare abstract class BaseModel {
-    validate(): Promise<void>;
-}

package/dist/BaseModel.js

@@ -1,31 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseModel = void 0;
-const class_validator_1 = require("class-validator");
-const ModelValidationError_1 = require("./ModelValidationError");
-/**
- * BaseModel represents a va
- */
-class BaseModel {
-    // TODO: This model is shared between baseEntity and baseModel. Do a mixin.
-    validate() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const validationResult = yield (0, class_validator_1.validate)(this);
-            if (validationResult.length > 0) {
-                return Promise.reject(new ModelValidationError_1.ModelValidationError(validationResult));
-            }
-            return Promise.resolve();
-        });
-    }
-}
-exports.BaseModel = BaseModel;
-//# sourceMappingURL=BaseModel.js.map

package/dist/BaseModel.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../src/BaseModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA2C;AAC3C,iEAA8D;AAE9D;;GAEG;AACH,MAAsB,SAAS;IAC7B,2EAA2E;IAC9D,QAAQ;;YACnB,MAAM,gBAAgB,GAAG,MAAM,IAAA,0BAAQ,EAAC,IAAI,CAAC,CAAC;YAE9C,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,2CAAoB,CAAC,gBAAgB,CAAC,CAAC,CAAC;aACnE;YACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;KAAA;CACF;AAVD,8BAUC"}

package/dist/ModelValidationError.d.ts

@@ -1,16 +0,0 @@
-import { ValidationError } from "class-validator";
-import { BaseError, RenderableError, RenderableContext } from "@alanszp/errors";
-export interface ValidationObject {
-    property: string;
-    constraints: {
-        [type: string]: string;
-    };
-}
-export declare class ModelValidationError extends BaseError implements RenderableError {
-    errors: ValidationError[];
-    constructor(errors: ValidationError[]);
-    static from(objects: ValidationObject | ValidationObject[]): ModelValidationError;
-    renderMessage(): string;
-    code(): string;
-    context(): RenderableContext;
-}

package/dist/ModelValidationError.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelValidationError = void 0;
-const class_validator_1 = require("class-validator");
-const lodash_1 = require("lodash");
-const errors_1 = require("@alanszp/errors");
-class ModelValidationError extends errors_1.BaseError {
-    constructor(errors) {
-        super("Model Validation Error");
-        this.errors = errors;
-    }
-    static from(objects) {
-        const arrayObjects = (0, lodash_1.isArray)(objects) ? objects : [objects];
-        const validationErrors = arrayObjects.map((o) => {
-            const validationError = new class_validator_1.ValidationError();
-            validationError.property = o.property;
-            validationError.children = [];
-            validationError.constraints = o.constraints;
-            return validationError;
-        });
-        return new ModelValidationError(validationErrors);
-    }
-    renderMessage() {
-        return "Model validation error";
-    }
-    code() {
-        return "model_validation_error";
-    }
-    context() {
-        return {
-            errors: this.errors.map((e) => ({
-                property: e.property,
-                errors: e.constraints,
-                children: e.children,
-            })),
-        };
-    }
-}
-exports.ModelValidationError = ModelValidationError;
-//# sourceMappingURL=ModelValidationError.js.map

package/dist/ModelValidationError.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModelValidationError.js","sourceRoot":"","sources":["../src/ModelValidationError.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,mCAAiC;AACjC,4CAAgF;AAOhF,MAAa,oBAAqB,SAAQ,kBAAS;IAGjD,YAAY,MAAyB;QACnC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,IAAI,CAChB,OAA8C;QAE9C,MAAM,YAAY,GAAG,IAAA,gBAAO,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAE5D,MAAM,gBAAgB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9C,MAAM,eAAe,GAAG,IAAI,iCAAe,EAAE,CAAC;YAE9C,eAAe,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;YACtC,eAAe,CAAC,QAAQ,GAAG,EAAE,CAAC;YAC9B,eAAe,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC;YAE5C,OAAO,eAAe,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;IACpD,CAAC;IAEM,aAAa;QAClB,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAEM,IAAI;QACT,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAEM,OAAO;QACZ,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC9B,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,MAAM,EAAE,CAAC,CAAC,WAAW;gBACrB,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;CACF;AA3CD,oDA2CC"}

package/dist/entityOrValidationError.d.ts

@@ -1 +0,0 @@
-export declare function entityOrValidationError<T>(entity: T | undefined, property: string): T;

package/dist/entityOrValidationError.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.entityOrValidationError = void 0;
-const ModelValidationError_1 = require("./ModelValidationError");
-function entityOrValidationError(entity, property) {
-    if (!entity) {
-        throw ModelValidationError_1.ModelValidationError.from({
-            property,
-            constraints: {
-                mustBePresent: `${property} is not present`,
-            },
-        });
-    }
-    return entity;
-}
-exports.entityOrValidationError = entityOrValidationError;
-//# sourceMappingURL=entityOrValidationError.js.map

package/dist/entityOrValidationError.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"entityOrValidationError.js","sourceRoot":"","sources":["../src/entityOrValidationError.ts"],"names":[],"mappings":";;;AAAA,iEAA8D;AAE9D,SAAgB,uBAAuB,CACrC,MAAqB,EACrB,QAAgB;IAEhB,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,2CAAoB,CAAC,IAAI,CAAC;YAC9B,QAAQ;YACR,WAAW,EAAE;gBACX,aAAa,EAAE,GAAG,QAAQ,iBAAiB;aAC5C;SACF,CAAC,CAAC;KACJ;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,0DAaC"}

package/src/BaseModel.ts

@@ -1,17 +0,0 @@
-import { validate } from "class-validator";
-import { ModelValidationError } from "./ModelValidationError";
-
-/**
- * BaseModel represents a va
- */
-export abstract class BaseModel {
-  // TODO: This model is shared between baseEntity and baseModel. Do a mixin.
-  public async validate(): Promise<void> {
-    const validationResult = await validate(this);
-
-    if (validationResult.length > 0) {
-      return Promise.reject(new ModelValidationError(validationResult));
-    }
-    return Promise.resolve();
-  }
-}

package/src/ModelValidationError.ts

@@ -1,53 +0,0 @@
-import { ValidationError } from "class-validator";
-import { isArray } from "lodash";
-import { BaseError, RenderableError, RenderableContext } from "@alanszp/errors";
-
-export interface ValidationObject {
-  property: string;
-  constraints: { [type: string]: string };
-}
-
-export class ModelValidationError extends BaseError implements RenderableError {
-  public errors: ValidationError[];
-
-  constructor(errors: ValidationError[]) {
-    super("Model Validation Error");
-    this.errors = errors;
-  }
-
-  public static from(
-    objects: ValidationObject | ValidationObject[]
-  ): ModelValidationError {
-    const arrayObjects = isArray(objects) ? objects : [objects];
-
-    const validationErrors = arrayObjects.map((o) => {
-      const validationError = new ValidationError();
-
-      validationError.property = o.property;
-      validationError.children = [];
-      validationError.constraints = o.constraints;
-
-      return validationError;
-    });
-
-    return new ModelValidationError(validationErrors);
-  }
-
-  public renderMessage(): string {
-    return "Model validation error";
-  }
-
-  public code(): string {
-    return "model_validation_error";
-  }
-
-  public context(): RenderableContext {
-    return {
-      errors: this.errors.map((e) => ({
-        property: e.property,
-        errors: e.constraints,
-        children: e.children,
-      })),
-    };
-  }
-}

package/src/entityOrValidationError.ts

@@ -1,16 +0,0 @@
-import { ModelValidationError } from "./ModelValidationError";
-
-export function entityOrValidationError<T>(
-  entity: T | undefined,
-  property: string
-): T {
-  if (!entity) {
-    throw ModelValidationError.from({
-      property,
-      constraints: {
-        mustBePresent: `${property} is not present`,
-      },
-    });
-  }
-  return entity;
-}