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

package/dist/base/controllers/relational.controller.d.ts

@@ -1,14 +1,16 @@
 import { ControllerClass } from '@loopback/core';
 import { SchemaObject } from '@loopback/rest';
 import { NullableType, TRelationType } from '../../common/types';
-import { Class } from '@loopback/service-proxy';
-import { TBaseTzEntity } from '../models';
-import { BaseController } from './common';
-export interface IRelationCrudControllerOptions {
+import { BaseEntity, TBaseTzEntity } from '../models';
+export interface IRelationCrudControllerOptions<S, T> {
     association: {
         entities: {
-            source: string;
-            target: string;
+            source: typeof BaseEntity & {
+                prototype: S;
+            };
+            target: typeof BaseEntity & {
+                prototype: T;
+            };
         };
         repositories?: {
             source: string;
@@ -34,10 +36,14 @@ export interface IRelationCrudControllerOptions {
 export declare const defineRelationViewController: <S extends TBaseTzEntity, // Source Entity Type
 T extends TBaseTzEntity, // Target Entity Type
 TE extends TBaseTzEntity = any>(opts: {
-    baseClass?: Class<BaseController>;
+    baseClass?: ControllerClass;
     entities: {
-        source: string;
-        target: string;
+        source: typeof BaseEntity & {
+            prototype: S;
+        };
+        target: typeof BaseEntity & {
+            prototype: T;
+        };
     };
     relation: {
         name: string;
@@ -48,7 +54,15 @@ TE extends TBaseTzEntity = any>(opts: {
     schema?: SchemaObject;
 }) => ControllerClass;
 export declare const defineAssociateController: <S extends TBaseTzEntity, T extends TBaseTzEntity, R extends TBaseTzEntity | NullableType>(opts: {
-    baseClass: ReturnType<typeof defineRelationViewController>;
+    baseClass: ControllerClass;
+    entities: {
+        source: typeof BaseEntity & {
+            prototype: S;
+        };
+        target: typeof BaseEntity & {
+            prototype: T;
+        };
+    };
     relation: {
         name: string;
         type: TRelationType;
@@ -57,4 +71,4 @@ export declare const defineAssociateController: <S extends TBaseTzEntity, T exte
     endPoint?: string;
     schema?: SchemaObject;
 }) => ControllerClass;
-export declare const defineRelationCrudController: <S extends TBaseTzEntity, T extends TBaseTzEntity, R extends TBaseTzEntity | NullableType>(controllerOptions: IRelationCrudControllerOptions) => ControllerClass;
+export declare const defineRelationCrudController: <S extends TBaseTzEntity, T extends TBaseTzEntity, R extends TBaseTzEntity | NullableType>(controllerOptions: IRelationCrudControllerOptions<S, T>) => ControllerClass;

package/dist/base/controllers/relational.controller.js

@@ -38,6 +38,11 @@ const defineRelationViewController = (opts) => {
     const { baseClass, entities, relation, defaultLimit = common_1.App.DEFAULT_QUERY_LIMIT, endPoint = '', schema, } = opts;
     const restPath = `/{id}/${endPoint ? endPoint : relation.name}`;
     const BaseClass = baseClass !== null && baseClass !== void 0 ? baseClass : common_2.BaseController;
+    const sourceIdPathParam = {
+        name: 'id',
+        in: 'path',
+        schema: (0, utilities_1.getIdSchema)(entities.source),
+    };
     class ViewController extends BaseClass {
         constructor(sourceRepository, targetRepository, getCurrentUser) {
             super({ scope: `ViewController.${relation.name}` });
@@ -197,7 +202,7 @@ const defineRelationViewController = (opts) => {
                 },
             },
         }),
-        __param(0, rest_1.param.path.number('id')),
+        __param(0, (0, rest_1.param)(sourceIdPathParam)),
         __param(1, rest_1.param.query.object('filter')),
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Object, Object]),
@@ -215,7 +220,7 @@ const defineRelationViewController = (opts) => {
                 },
             },
         }),
-        __param(0, rest_1.param.path.number('id')),
+        __param(0, (0, rest_1.param)(sourceIdPathParam)),
         __param(1, rest_1.param.query.object('where')),
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Object, Object]),
@@ -226,8 +231,18 @@ const defineRelationViewController = (opts) => {
 exports.defineRelationViewController = defineRelationViewController;
 // --------------------------------------------------------------------------------------------------------------
 const defineAssociateController = (opts) => {
-    const { baseClass, relation, defaultLimit = common_1.App.DEFAULT_QUERY_LIMIT, endPoint = '', schema, } = opts;
+    const { baseClass, entities, relation, defaultLimit = common_1.App.DEFAULT_QUERY_LIMIT, endPoint = '', schema, } = opts;
     const restPath = `/{id}/${endPoint ? endPoint : relation.name}`;
+    const sourceIdPathParam = {
+        name: 'id',
+        in: 'path',
+        schema: (0, utilities_1.getIdSchema)(entities.source),
+    };
+    const targetIdPathParam = {
+        name: 'id',
+        in: 'path',
+        schema: (0, utilities_1.getIdSchema)(entities.target),
+    };
     class AssociationController extends baseClass {
         constructor(sourceRepository, targetRepository, getCurrentUser) {
             super(sourceRepository, targetRepository, getCurrentUser);
@@ -275,10 +290,10 @@ const defineAssociateController = (opts) => {
                 },
             },
         }),
-        __param(0, rest_1.param.path.number('id')),
-        __param(1, rest_1.param.path.number('link_id')),
+        __param(0, (0, rest_1.param)(sourceIdPathParam)),
+        __param(1, (0, rest_1.param)(targetIdPathParam)),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Number, Number]),
+        __metadata("design:paramtypes", [Object, Object]),
         __metadata("design:returntype", Promise)
     ], AssociationController.prototype, "link", null);
     __decorate([
@@ -290,10 +305,10 @@ const defineAssociateController = (opts) => {
                 },
             },
         }),
-        __param(0, rest_1.param.path.number('id')),
-        __param(1, rest_1.param.path.number('link_id')),
+        __param(0, (0, rest_1.param)(sourceIdPathParam)),
+        __param(1, (0, rest_1.param)(targetIdPathParam)),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Number, Number]),
+        __metadata("design:paramtypes", [Object, Object]),
         __metadata("design:returntype", Promise)
     ], AssociationController.prototype, "unlink", null);
     return AssociationController;
@@ -320,7 +335,10 @@ const defineRelationCrudController = (controllerOptions) => {
     const restPath = `{id}/${endPoint}`;
     const ViewController = (0, exports.defineRelationViewController)({
         baseClass: common_2.BaseController,
-        entities,
+        entities: {
+            source: entities.source,
+            target: entities.target,
+        },
         relation,
         defaultLimit,
         endPoint,
@@ -328,6 +346,7 @@ const defineRelationCrudController = (controllerOptions) => {
     });
     const AssociationController = (0, exports.defineAssociateController)({
         baseClass: ViewController,
+        entities,
         relation,
         defaultLimit,
         endPoint,
@@ -338,6 +357,11 @@ const defineRelationCrudController = (controllerOptions) => {
     if (!useControlTarget) {
         return ExtendsableClass;
     }
+    const sourceIdPathParam = {
+        name: 'id',
+        in: 'path',
+        schema: (0, utilities_1.getIdSchema)(entities.source),
+    };
     // -----------------------------------------------------------------------------------------------
     class Controller extends ExtendsableClass {
         constructor(sourceRepository, targetRepository, getCurrentUser) {
@@ -405,7 +429,7 @@ const defineRelationCrudController = (controllerOptions) => {
                 },
             },
         }),
-        __param(0, rest_1.param.path.number('id')),
+        __param(0, (0, rest_1.param)(sourceIdPathParam)),
         __param(1, (0, rest_1.requestBody)({
             required: true,
             content: {
@@ -413,7 +437,7 @@ const defineRelationCrudController = (controllerOptions) => {
             },
         })),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Number, Object]),
+        __metadata("design:paramtypes", [Object, Object]),
         __metadata("design:returntype", Promise)
     ], Controller.prototype, "create", null);
     __decorate([
@@ -425,7 +449,7 @@ const defineRelationCrudController = (controllerOptions) => {
                 },
             },
         }),
-        __param(0, rest_1.param.path.number('id')),
+        __param(0, (0, rest_1.param)(sourceIdPathParam)),
         __param(1, (0, rest_1.requestBody)({
             required: true,
             content: {
@@ -434,7 +458,7 @@ const defineRelationCrudController = (controllerOptions) => {
         })),
         __param(2, rest_1.param.query.object('where')),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Number, Object, Object]),
+        __metadata("design:paramtypes", [Object, Object, Object]),
         __metadata("design:returntype", Promise)
     ], Controller.prototype, "patch", null);
     __decorate([
@@ -446,14 +470,14 @@ const defineRelationCrudController = (controllerOptions) => {
                 },
             },
         }),
-        __param(0, rest_1.param.path.number('id')),
+        __param(0, (0, rest_1.param)(sourceIdPathParam)),
         __param(1, rest_1.param.query.object('where')),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Number, Object]),
+        __metadata("design:paramtypes", [Object, Object]),
         __metadata("design:returntype", Promise)
     ], Controller.prototype, "delete", null);
-    (0, core_1.inject)(`repositories.${(_a = repositories === null || repositories === void 0 ? void 0 : repositories.source) !== null && _a !== void 0 ? _a : `${entities.source}Repository`}`)(Controller, undefined, 0);
-    (0, core_1.inject)(`repositories.${(_b = repositories === null || repositories === void 0 ? void 0 : repositories.target) !== null && _b !== void 0 ? _b : `${entities.target}Repository`}`)(Controller, undefined, 1);
+    (0, core_1.inject)(`repositories.${(_a = repositories === null || repositories === void 0 ? void 0 : repositories.source) !== null && _a !== void 0 ? _a : `${entities.source.name}Repository`}`)(Controller, undefined, 0);
+    (0, core_1.inject)(`repositories.${(_b = repositories === null || repositories === void 0 ? void 0 : repositories.target) !== null && _b !== void 0 ? _b : `${entities.target.name}Repository`}`)(Controller, undefined, 1);
     if (options.doInjectCurrentUser) {
         core_1.inject.getter(security_1.SecurityBindings.USER, { optional: true })(Controller, undefined, 2);
     }

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/base/repositories/tz-crud.repository.js

@@ -204,7 +204,7 @@ class TzCrudRepository extends base_repository_1.AbstractTzRepository {
         if (options === null || options === void 0 ? void 0 : options.newInstance) {
             entity.createdAt = new Date();
         }
-        if (!options.ignoreModified) {
+        if (!options.ignoreModified && 'modifiedAt' in entity) {
             entity.modifiedAt = new Date();
         }
         return entity;

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/tz.mixin.d.ts

@@ -6,6 +6,9 @@ export declare const TzMixin: <E extends MixinTarget<Entity>>(superClass: E, opt
         dataType: string;
     };
     modifiedAt: {
+        enable: false;
+    } | {
+        enable?: true;
         columnName: string;
         dataType: string;
     };

package/dist/mixins/tz.mixin.js

@@ -12,15 +12,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TzMixin = void 0;
 const repository_1 = require("@loopback/repository");
 const TzMixin = (superClass, opts) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    if (!(opts === null || opts === void 0 ? void 0 : opts.modifiedAt.enable)) {
+        class Mixed extends superClass {
+        }
+        __decorate([
+            (0, repository_1.property)({
+                type: 'date',
+                postgresql: {
+                    columnName: (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.createdAt) === null || _a === void 0 ? void 0 : _a.columnName) !== null && _b !== void 0 ? _b : 'created_at',
+                    dataType: (_d = (_c = opts === null || opts === void 0 ? void 0 : opts.createdAt) === null || _c === void 0 ? void 0 : _c.dataType) !== null && _d !== void 0 ? _d : 'TIMESTAMPTZ',
+                    default: 'NOW()',
+                    nullable: 'NO',
+                },
+            }),
+            __metadata("design:type", Date)
+        ], Mixed.prototype, "createdAt", void 0);
+        return Mixed;
+    }
     class Mixed extends superClass {
     }
     __decorate([
         (0, repository_1.property)({
             type: 'date',
             postgresql: {
-                columnName: (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.createdAt) === null || _a === void 0 ? void 0 : _a.columnName) !== null && _b !== void 0 ? _b : 'created_at',
-                dataType: (_d = (_c = opts === null || opts === void 0 ? void 0 : opts.createdAt) === null || _c === void 0 ? void 0 : _c.dataType) !== null && _d !== void 0 ? _d : 'TIMESTAMPTZ',
+                columnName: (_f = (_e = opts === null || opts === void 0 ? void 0 : opts.createdAt) === null || _e === void 0 ? void 0 : _e.columnName) !== null && _f !== void 0 ? _f : 'created_at',
+                dataType: (_h = (_g = opts === null || opts === void 0 ? void 0 : opts.createdAt) === null || _g === void 0 ? void 0 : _g.dataType) !== null && _h !== void 0 ? _h : 'TIMESTAMPTZ',
                 default: 'NOW()',
                 nullable: 'NO',
             },
@@ -31,8 +48,8 @@ const TzMixin = (superClass, opts) => {
         (0, repository_1.property)({
             type: 'date',
             postgresql: {
-                columnName: (_f = (_e = opts === null || opts === void 0 ? void 0 : opts.modifiedAt) === null || _e === void 0 ? void 0 : _e.columnName) !== null && _f !== void 0 ? _f : 'modified_at',
-                dataType: (_h = (_g = opts === null || opts === void 0 ? void 0 : opts.modifiedAt) === null || _g === void 0 ? void 0 : _g.dataType) !== null && _h !== void 0 ? _h : 'TIMESTAMPTZ',
+                columnName: (_k = (_j = opts === null || opts === void 0 ? void 0 : opts.modifiedAt) === null || _j === void 0 ? void 0 : _j.columnName) !== null && _k !== void 0 ? _k : 'modified_at',
+                dataType: (_m = (_l = opts === null || opts === void 0 ? void 0 : opts.modifiedAt) === null || _l === void 0 ? void 0 : _l.dataType) !== null && _m !== void 0 ? _m : 'TIMESTAMPTZ',
                 default: 'NOW()',
                 nullable: 'NO',
             },

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-27",
   "description": "Minimal Technology - NodeJS Infrastructure - Loopback 4 Framework",
   "keywords": [
     "web",