@minimaltech/node-infra 0.5.9-25 → 0.5.9-26

package/dist/base/models/base.model.js

@@ -120,10 +120,14 @@ class BaseSoftDeleteTzEntity extends BaseNumberSoftDeleteTzEntity {
 }
 exports.BaseSoftDeleteTzEntity = BaseSoftDeleteTzEntity;
 // ---------------------------------------------------------------------
-class BaseNumberDuplicatableTzEntity extends (0, mixins_1.DuplicatableMixin)(BaseNumberTzEntity) {
+class BaseNumberDuplicatableTzEntity extends (0, mixins_1.DuplicatableMixin)(BaseNumberTzEntity, {
+    idType: 'number',
+}) {
 }
 exports.BaseNumberDuplicatableTzEntity = BaseNumberDuplicatableTzEntity;
-class BaseStringDuplicatableTzEntity extends (0, mixins_1.DuplicatableMixin)(BaseNumberTzEntity) {
+class BaseStringDuplicatableTzEntity extends (0, mixins_1.DuplicatableMixin)(BaseNumberTzEntity, {
+    idType: 'string',
+}) {
 }
 exports.BaseStringDuplicatableTzEntity = BaseStringDuplicatableTzEntity;
 class BaseDuplicatableTzEntity extends BaseNumberDuplicatableTzEntity {

package/dist/components/authenticate/models/oauth2-client.model.d.ts

@@ -1,4 +1,4 @@
-import { BaseNumberTzEntity } from '../../../base';
+import { BaseNumberTzEntity } from '../../../base/models';
 import { NumberIdType } from '../../../common';
 export declare class OAuth2Client extends BaseNumberTzEntity {
     identifier: string;

package/dist/components/authenticate/models/oauth2-client.model.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2Client = void 0;
-const base_1 = require("../../../base");
+const models_1 = require("../../../base/models");
 const repository_1 = require("@loopback/repository");
-let OAuth2Client = class OAuth2Client extends base_1.BaseNumberTzEntity {
+let OAuth2Client = class OAuth2Client extends models_1.BaseNumberTzEntity {
     constructor(data) {
         super(data);
     }

package/dist/components/authenticate/models/oauth2-scope.model.d.ts

@@ -1,4 +1,4 @@
-import { BaseNumberTzEntity } from '../../../base';
+import { BaseNumberTzEntity } from '../../../base/models';
 export declare class OAuth2Scope extends BaseNumberTzEntity {
     identifier: string;
     name: string;

package/dist/components/authenticate/models/oauth2-scope.model.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2Scope = void 0;
-const base_1 = require("../../../base");
+const models_1 = require("../../../base/models");
 const repository_1 = require("@loopback/repository");
-let OAuth2Scope = class OAuth2Scope extends base_1.BaseNumberTzEntity {
+let OAuth2Scope = class OAuth2Scope extends models_1.BaseNumberTzEntity {
     constructor(data) {
         super(data);
     }

package/dist/components/authenticate/models/oauth2-token.model.d.ts

@@ -1,4 +1,4 @@
-import { BaseNumberTzEntity } from '../../../base';
+import { BaseNumberTzEntity } from '../../../base/models';
 import { AnyObject, IdType } from '../../../common';
 export declare class OAuth2Token extends BaseNumberTzEntity {
     token: string;

package/dist/components/authenticate/models/oauth2-token.model.js

@@ -10,11 +10,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2Token = void 0;
-const base_1 = require("../../../base");
+const models_1 = require("../../../base/models");
 const common_1 = require("../../../common");
 const repository_1 = require("@loopback/repository");
 const oauth2_client_model_1 = require("./oauth2-client.model");
-let OAuth2Token = class OAuth2Token extends base_1.BaseNumberTzEntity {
+let OAuth2Token = class OAuth2Token extends models_1.BaseNumberTzEntity {
     constructor(data) {
         super(data);
     }

package/dist/components/authorize/models/defs.js

@@ -10,13 +10,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineUserRole = exports.definePermissionMapping = exports.definePermission = exports.defineRole = exports.defineUser = void 0;
-const base_1 = require("../../../base");
+const models_1 = require("../../../base/models");
 const common_1 = require("../../../common");
 const mixins_1 = require("../../../mixins");
 const repository_1 = require("@loopback/repository");
 // -----------------------------------------------------------------------
 const defineUser = () => {
-    class User extends base_1.BaseNumberTzEntity {
+    class User extends models_1.BaseNumberTzEntity {
         constructor(data) {
             super(data);
         }
@@ -83,7 +83,7 @@ const defineUser = () => {
 exports.defineUser = defineUser;
 // -----------------------------------------------------------------------
 const defineRole = () => {
-    class Role extends base_1.BaseNumberTzEntity {
+    class Role extends models_1.BaseNumberTzEntity {
         constructor(data) {
             super(data);
         }
@@ -126,7 +126,7 @@ const defineRole = () => {
 exports.defineRole = defineRole;
 // -----------------------------------------------------------------------
 const definePermission = () => {
-    class Permission extends base_1.BaseNumberTzEntity {
+    class Permission extends models_1.BaseNumberTzEntity {
         constructor(data) {
             super(data);
         }
@@ -190,7 +190,7 @@ const definePermission = () => {
 exports.definePermission = definePermission;
 // -----------------------------------------------------------------------
 const definePermissionMapping = () => {
-    class PermissionMapping extends base_1.BaseNumberTzEntity {
+    class PermissionMapping extends models_1.BaseNumberTzEntity {
         constructor(data) {
             super(data);
         }
@@ -225,7 +225,7 @@ const definePermissionMapping = () => {
 exports.definePermissionMapping = definePermissionMapping;
 // -----------------------------------------------------------------------
 const defineUserRole = () => {
-    class UserRole extends (0, mixins_1.PrincipalMixin)(base_1.BaseNumberTzEntity, 'Role', 'number') {
+    class UserRole extends (0, mixins_1.PrincipalMixin)(models_1.BaseNumberTzEntity, 'Role', 'number') {
         constructor(data) {
             super(data);
         }

package/dist/components/migration/models/migration.model.d.ts

@@ -1,4 +1,4 @@
-import { BaseNumberTzEntity } from '../../../base';
+import { BaseNumberTzEntity } from '../../../base/models';
 export declare class Migration extends BaseNumberTzEntity {
     name: string;
     status: string;

package/dist/components/migration/models/migration.model.js

@@ -10,10 +10,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Migration = void 0;
-const base_1 = require("../../../base");
+const models_1 = require("../../../base/models");
 const common_1 = require("../../../common");
 const repository_1 = require("@loopback/repository");
-let Migration = class Migration extends base_1.BaseNumberTzEntity {
+let Migration = class Migration extends models_1.BaseNumberTzEntity {
     constructor(data) {
         super(data);
     }

package/dist/interceptors/content-range.interceptor.d.ts

@@ -1,4 +1,4 @@
-import { TBaseIdEntity } from '../base';
+import { TBaseIdEntity } from '../base/models';
 import { IController } from '../common';
 import { Interceptor, InvocationContext, InvocationResult, Provider, ValueOrPromise } from '@loopback/core';
 import { Response } from '@loopback/rest';

package/dist/mixins/duplicatable.mixin.d.ts

@@ -1,7 +1,9 @@
 import { BaseEntity } from '../base/models';
 import { IdType } from '../common';
 import { MixinTarget } from '@loopback/core';
-export declare const DuplicatableMixin: <E extends MixinTarget<BaseEntity>>(superClass: E) => {
+export declare const DuplicatableMixin: <E extends MixinTarget<BaseEntity>>(superClass: E, opts: {
+    idType: "string" | "number";
+}) => {
     new (...args: any[]): {
         sourceId?: IdType;
         getId: () => any;

package/dist/mixins/duplicatable.mixin.js

@@ -10,19 +10,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuplicatableMixin = void 0;
-const models_1 = require("../base/models");
-const model_utility_1 = require("../utilities/model.utility");
 const repository_1 = require("@loopback/repository");
-const DuplicatableMixin = (superClass) => {
-    const sourceIdType = (0, model_utility_1.getIdType)(models_1.BaseNumberIdEntity);
+const DuplicatableMixin = (superClass, opts) => {
+    // const sourceIdType = getIdType(BaseNumberIdEntity);
     let Mixed = class Mixed extends superClass {
     };
     __decorate([
         (0, repository_1.property)({
-            type: sourceIdType,
+            type: opts.idType,
             postgresql: {
                 columnName: 'source_id',
-                dataType: sourceIdType === 'number' ? 'integer' : 'text',
+                dataType: opts.idType === 'number' ? 'integer' : 'text',
             },
         }),
         __metadata("design:type", Object)

package/dist/mixins/user-audit.mixin.d.ts

@@ -1,4 +1,4 @@
-import { TBaseTzEntity } from '../base';
+import { TBaseTzEntity } from '../base/models';
 import { IdType } from '../common/types';
 import { MixinTarget } from '@loopback/core';
 import { Entity, EntityResolver } from '@loopback/repository';

package/dist/utilities/model.utility.d.ts

@@ -1,8 +1,8 @@
 import { SchemaObject } from '@loopback/rest';
-import { BaseEntity } from '../base/models/base.model';
+import { BaseEntity, BaseIdEntity } from '../base/models/base.model';
 export declare const getIdSchema: <E extends BaseEntity>(entity: typeof BaseEntity & {
     prototype: E;
 }) => SchemaObject;
-export declare const getIdType: <E extends BaseEntity>(entity: typeof BaseEntity & {
+export declare const getIdType: <E extends BaseEntity>(entity: typeof BaseIdEntity & {
     prototype: E;
 }) => "string" | "number";

package/dist/utilities/query.utility.d.ts

@@ -1,5 +1,5 @@
-import { BaseEntity } from '../base';
 import { AnyType, EntityClassType } from '../common';
+import { BaseEntity } from '../base/models';
 export declare const getTableDefinition: <T extends BaseEntity>(opts: {
     model: EntityClassType<T>;
     alias?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minimaltech/node-infra",
-  "version": "0.5.9-25",
+  "version": "0.5.9-26",
   "description": "Minimal Technology - NodeJS Infrastructure - Loopback 4 Framework",
   "keywords": [
     "web",