@steroidsjs/nest 1.1.3 → 1.1.4

package/infrastructure/decorators/fields/BaseField.d.ts

@@ -1,7 +1,8 @@
 import { ColumnType } from 'typeorm/driver/types/ColumnTypes';
-export declare const MODEL_META_KEY = "meta";
-export declare const MODEL_FIELD_DECORATOR_NAME = "meta_field_decorator_name";
-export declare const MODEL_FIELD_NAMES_KEY = "meta_field_names";
+import { IAllFieldOptions } from './index';
+export declare const STEROIDS_META_FIELD = "steroids_meta_field";
+export declare const STEROIDS_META_FIELD_DECORATOR = "steroids_meta_field_decorator";
+export declare const STEROIDS_META_KEYS = "steroids_meta_keys";
 export declare type AppColumnType = 'boolean' | 'createTime' | 'date' | 'dateTime' | 'decimal' | 'email' | 'enum' | 'file' | 'html' | 'integer' | 'password' | 'phone' | 'primaryKey' | 'relation' | 'string' | 'text' | 'time' | 'updateTime' | string;
 export declare type JsType = 'boolean' | 'string' | 'number' | string;
 export interface IBaseFieldOptions {
@@ -26,4 +27,6 @@ export interface IInternalFieldOptions {
     decoratorName?: string;
     isArray?: boolean;
 }
-export declare function BaseField(options: IBaseFieldOptions, internalOptions: IInternalFieldOptions): <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
+export declare const getFieldOptions: (targetClass: any, fieldName: string) => IAllFieldOptions;
+export declare const getFieldDecorator: (targetClass: any, fieldName: string) => (...args: any) => PropertyDecorator;
+export declare function BaseField(options?: IBaseFieldOptions, internalOptions?: IInternalFieldOptions): <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;

package/infrastructure/decorators/fields/BaseField.js

@@ -1,20 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseField = exports.MODEL_FIELD_NAMES_KEY = exports.MODEL_FIELD_DECORATOR_NAME = exports.MODEL_META_KEY = void 0;
+exports.BaseField = exports.getFieldDecorator = exports.getFieldOptions = exports.STEROIDS_META_KEYS = exports.STEROIDS_META_FIELD_DECORATOR = exports.STEROIDS_META_FIELD = void 0;
 const common_1 = require("@nestjs/common");
 const swagger_1 = require("@nestjs/swagger");
 const class_validator_1 = require("class-validator");
-exports.MODEL_META_KEY = 'meta';
-exports.MODEL_FIELD_DECORATOR_NAME = 'meta_field_decorator_name';
-exports.MODEL_FIELD_NAMES_KEY = 'meta_field_names';
+exports.STEROIDS_META_FIELD = 'steroids_meta_field';
+exports.STEROIDS_META_FIELD_DECORATOR = 'steroids_meta_field_decorator';
+exports.STEROIDS_META_KEYS = 'steroids_meta_keys';
+const getFieldOptions = (targetClass, fieldName) => {
+    return targetClass && Reflect.getMetadata(exports.STEROIDS_META_FIELD, targetClass.prototype, fieldName);
+};
+exports.getFieldOptions = getFieldOptions;
+const getFieldDecorator = (targetClass, fieldName) => {
+    const decoratorName = Reflect.getMetadata(exports.STEROIDS_META_FIELD_DECORATOR, targetClass.prototype, fieldName);
+    const decorator = require('./index')[decoratorName];
+    if (!decorator) {
+        throw new Error(`Not found Field decorator ${decoratorName}, property: ${fieldName}`);
+    }
+    return decorator;
+};
+exports.getFieldDecorator = getFieldDecorator;
 const ColumnMetaDecorator = (options, internalOptions) => (object, propertyName) => {
-    Reflect.defineMetadata(exports.MODEL_META_KEY, options, object, propertyName);
-    Reflect.defineMetadata(exports.MODEL_FIELD_DECORATOR_NAME, internalOptions.decoratorName, object, propertyName);
-    const fieldNames = Reflect.getMetadata(exports.MODEL_FIELD_NAMES_KEY, object) || [];
+    Reflect.defineMetadata(exports.STEROIDS_META_FIELD, options, object, propertyName);
+    Reflect.defineMetadata(exports.STEROIDS_META_FIELD_DECORATOR, internalOptions.decoratorName, object, propertyName);
+    const fieldNames = Reflect.getMetadata(exports.STEROIDS_META_KEYS, object) || [];
     fieldNames.push(propertyName);
-    Reflect.defineMetadata(exports.MODEL_FIELD_NAMES_KEY, fieldNames, object);
+    Reflect.defineMetadata(exports.STEROIDS_META_KEYS, fieldNames, object);
 };
-function BaseField(options = null, internalOptions) {
+function BaseField(options = null, internalOptions = {}) {
     return (0, common_1.applyDecorators)(...[
         ColumnMetaDecorator(Object.assign(Object.assign({ label: null, hint: null, items: null }, options), { isArray: internalOptions.isArray || null, appType: internalOptions.appType || null }), internalOptions),
         (0, swagger_1.ApiProperty)({

package/infrastructure/decorators/fields/BaseField.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/BaseField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,6CAA4C;AAE5C,qDAA2C;AAE9B,QAAA,cAAc,GAAG,MAAM,CAAC;AACxB,QAAA,0BAA0B,GAAG,2BAA2B,CAAC;AACzD,QAAA,qBAAqB,GAAG,kBAAkB,CAAC;AA+BxD,MAAM,mBAAmB,GAAG,CAAC,OAA0B,EAAE,eAAsC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;IACzH,OAAO,CAAC,cAAc,CAAC,sBAAc,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACtE,OAAO,CAAC,cAAc,CAAC,kCAA0B,EAAE,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAGxG,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,6BAAqB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IAC5E,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9B,OAAO,CAAC,cAAc,CAAC,6BAAqB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF,SAAgB,SAAS,CAAC,UAA6B,IAAI,EAAE,eAAsC;IAC/F,OAAO,IAAA,wBAAe,EAClB,GAAG;QACC,mBAAmB,+BACf,KAAK,EAAE,IAAI,EACX,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,IAAI,IACR,OAAO,KACV,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,IAAI,EACxC,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,IAAI,KACzC,eAAe,CAAC;QACnB,IAAA,qBAAW,EAAC;YACR,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,WAAW,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS;YACvC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;YACrC,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,KAAK;YACpC,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC;QACF,OAAO,CAAC,QAAQ,IAAI,IAAA,4BAAU,GAAE;KACnC,CAAC,MAAM,CAAC,OAAO,CAAC,CACpB,CAAC;AACN,CAAC;AArBD,8BAqBC"}
+{"version":3,"file":"BaseField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/BaseField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,6CAA4C;AAE5C,qDAA2C;AAG9B,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAC5C,QAAA,6BAA6B,GAAG,+BAA+B,CAAC;AAChE,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AA+BhD,MAAM,eAAe,GAAG,CAAC,WAAW,EAAE,SAAiB,EAAoB,EAAE;IAChF,OAAO,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,2BAAmB,EAAE,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACrG,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B;AAEK,MAAM,iBAAiB,GAAG,CAAC,WAAW,EAAE,SAAiB,EAAuC,EAAE;IACrG,MAAM,aAAa,GAAW,OAAO,CAAC,WAAW,CAAC,qCAA6B,EAAE,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACnH,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC;IACpD,IAAI,CAAC,SAAS,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,aAAa,eAAe,SAAS,EAAE,CAAC,CAAC;KACzF;IAED,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AARW,QAAA,iBAAiB,qBAQ5B;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAA0B,EAAE,eAAsC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;IACzH,OAAO,CAAC,cAAc,CAAC,2BAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAC3E,OAAO,CAAC,cAAc,CAAC,qCAA6B,EAAE,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAG3G,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,0BAAkB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IACzE,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9B,OAAO,CAAC,cAAc,CAAC,0BAAkB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;AACnE,CAAC,CAAC;AAEF,SAAgB,SAAS,CAAC,UAA6B,IAAI,EAAE,kBAAyC,EAAE;IACpG,OAAO,IAAA,wBAAe,EAClB,GAAG;QACC,mBAAmB,+BACf,KAAK,EAAE,IAAI,EACX,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,IAAI,IACR,OAAO,KACV,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,IAAI,EACxC,OAAO,EAAE,eAAe,CAAC,OAAO,IAAI,IAAI,KACzC,eAAe,CAAC;QACnB,IAAA,qBAAW,EAAC;YACR,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,WAAW,EAAE,OAAO,CAAC,KAAK,IAAI,SAAS;YACvC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;YACrC,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,KAAK;YACpC,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC;QACF,OAAO,CAAC,QAAQ,IAAI,IAAA,4BAAU,GAAE;KACnC,CAAC,MAAM,CAAC,OAAO,CAAC,CACpB,CAAC;AACN,CAAC;AArBD,8BAqBC"}

package/infrastructure/decorators/fields/ExtendField.d.ts

@@ -1,5 +1,5 @@
 import { IBaseFieldOptions } from './BaseField';
 export interface IExtendFieldOptions extends IBaseFieldOptions {
-    propertyName?: string;
+    sourceFieldName?: string;
 }
-export declare function ExtendField(modelClass: any, options?: IExtendFieldOptions): (object: any, propertyName: any) => void;
+export declare function ExtendField(modelClass: any, options?: string | IExtendFieldOptions): (object: any, propertyName: any) => void;

package/infrastructure/decorators/fields/ExtendField.js

@@ -5,27 +5,28 @@ const BaseField_1 = require("./BaseField");
 const DataMapperHelper_1 = require("../../../usecases/helpers/DataMapperHelper");
 function ExtendField(modelClass, options = {}) {
     return (object, propertyName) => {
-        if (options.propertyName) {
-            propertyName = options.propertyName;
+        if (typeof options === 'string') {
+            options = { sourceFieldName: options };
         }
         let modelFieldName;
-        const modelFieldNames = DataMapperHelper_1.DataMapperHelper.getKeys(modelClass);
-        for (let suffix of ['', 'Id', 'Ids']) {
-            const nameWithoutSuffix = propertyName.replace(new RegExp(suffix + '$', 'g'), '');
-            if (modelFieldNames.includes(nameWithoutSuffix)) {
-                modelFieldName = nameWithoutSuffix;
-                break;
+        if (options.sourceFieldName) {
+            modelFieldName = options.sourceFieldName;
+        }
+        else {
+            const modelFieldNames = DataMapperHelper_1.DataMapperHelper.getKeys(modelClass);
+            for (let suffix of ['', 'Id', 'Ids']) {
+                const nameWithoutSuffix = propertyName.replace(new RegExp(suffix + '$', 'g'), '');
+                if (modelFieldNames.includes(nameWithoutSuffix)) {
+                    modelFieldName = nameWithoutSuffix;
+                    break;
+                }
             }
         }
         if (!modelFieldName) {
             throw new Error('Not found field "' + propertyName + '" in model "' + modelClass.name + '"');
         }
-        const extendOptions = Reflect.getMetadata(BaseField_1.MODEL_META_KEY, modelClass.prototype, modelFieldName);
-        const decoratorName = Reflect.getMetadata(BaseField_1.MODEL_FIELD_DECORATOR_NAME, modelClass.prototype, modelFieldName);
-        const decorator = require('./index')[decoratorName];
-        if (!decorator) {
-            throw new Error(`Not found Field decorator ${decoratorName}, property: ${propertyName}`);
-        }
+        const extendOptions = (0, BaseField_1.getFieldOptions)(modelClass, modelFieldName);
+        const decorator = (0, BaseField_1.getFieldDecorator)(modelClass, modelFieldName);
         decorator(Object.assign(Object.assign({}, extendOptions), options))(object, propertyName);
     };
 }

package/infrastructure/decorators/fields/ExtendField.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExtendField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/ExtendField.ts"],"names":[],"mappings":";;;AAAA,2CAA0F;AAC1F,iFAA4E;AAM5E,SAAgB,WAAW,CAAC,UAAU,EAAE,UAA+B,EAAE;IACrE,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;QAC5B,IAAI,OAAO,CAAC,YAAY,EAAE;YACtB,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;SACvC;QAGD,IAAI,cAAc,CAAC;QACnB,MAAM,eAAe,GAAG,mCAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAG7D,KAAK,IAAI,MAAM,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE;YAClC,MAAM,iBAAiB,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAClF,IAAI,eAAe,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;gBAC7C,cAAc,GAAG,iBAAiB,CAAC;gBACnC,MAAM;aACT;SACJ;QAED,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,YAAY,GAAG,cAAc,GAAG,UAAU,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;SAChG;QAED,MAAM,aAAa,GAAsB,OAAO,CAAC,WAAW,CAAC,0BAAc,EAAE,UAAU,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACnH,MAAM,aAAa,GAAW,OAAO,CAAC,WAAW,CAAC,sCAA0B,EAAE,UAAU,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QAEpH,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,aAAa,eAAe,YAAY,EAAE,CAAC,CAAC;SAC5F;QAED,SAAS,iCACF,aAAa,GACb,OAAO,EACZ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC7B,CAAC,CAAC;AACN,CAAC;AApCD,kCAoCC"}
+{"version":3,"file":"ExtendField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/ExtendField.ts"],"names":[],"mappings":";;;AAAA,2CAAkF;AAClF,iFAA4E;AAM5E,SAAgB,WAAW,CAAC,UAAU,EAAE,UAAwC,EAAE;IAC9E,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;QAC5B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,OAAO,GAAG,EAAC,eAAe,EAAE,OAAO,EAAC,CAAC;SACxC;QAGD,IAAI,cAAc,CAAC;QACnB,IAAI,OAAO,CAAC,eAAe,EAAE;YACzB,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;SAC5C;aAAM;YACH,MAAM,eAAe,GAAG,mCAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC7D,KAAK,IAAI,MAAM,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE;gBAClC,MAAM,iBAAiB,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;gBAClF,IAAI,eAAe,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;oBAC7C,cAAc,GAAG,iBAAiB,CAAC;oBACnC,MAAM;iBACT;aACJ;SACJ;QACD,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,YAAY,GAAG,cAAc,GAAG,UAAU,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;SAChG;QAGD,MAAM,aAAa,GAAG,IAAA,2BAAe,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAClE,MAAM,SAAS,GAAG,IAAA,6BAAiB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAChE,SAAS,iCAAK,aAAa,GAAK,OAAO,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACpE,CAAC,CAAC;AACN,CAAC;AA7BD,kCA6BC"}

package/infrastructure/decorators/schema/ExtractRelationId.d.ts

@@ -0,0 +1,2 @@
+export declare const SCHEMA_META_EXTRACT_RELATION_ID = "meta_extract_relation_id";
+export declare function ExtractRelationId(): any;

package/infrastructure/decorators/schema/ExtractRelationId.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExtractRelationId = exports.SCHEMA_META_EXTRACT_RELATION_ID = void 0;
+const common_1 = require("@nestjs/common");
+exports.SCHEMA_META_EXTRACT_RELATION_ID = 'meta_extract_relation_id';
+const getExtractRelationId = (target, key) => Reflect.getMetadata(exports.SCHEMA_META_EXTRACT_RELATION_ID, target, key);
+function ExtractRelationId() {
+    return (0, common_1.applyDecorators)((0, common_1.SetMetadata)(exports.SCHEMA_META_EXTRACT_RELATION_ID, true));
+}
+exports.ExtractRelationId = ExtractRelationId;
+//# sourceMappingURL=ExtractRelationId.js.map

package/infrastructure/decorators/schema/ExtractRelationId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExtractRelationId.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/schema/ExtractRelationId.ts"],"names":[],"mappings":";;;AAAA,2CAA4D;AAE/C,QAAA,+BAA+B,GAAG,0BAA0B,CAAC;AAE1E,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,uCAA+B,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AAEhH,SAAgB,iBAAiB;IAC7B,OAAO,IAAA,wBAAe,EAClB,IAAA,oBAAW,EAAC,uCAA+B,EAAE,IAAI,CAAC,CACrD,CAAC;AACN,CAAC;AAJD,8CAIC"}

package/infrastructure/decorators/schema/SchemaSelect.d.ts

@@ -0,0 +1,7 @@
+export declare const STEROIDS_META_SCHEMA_SELECT = "steroids_meta_schema_select";
+export interface ISchemaOptions {
+    select?: string[];
+    excludeSelect?: string[];
+}
+export declare const getSchemaSelectOptions: (schemaClass: any) => any;
+export declare function SchemaSelect(options?: ISchemaOptions): (target: any) => void;

package/infrastructure/decorators/schema/SchemaSelect.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaSelect = exports.getSchemaSelectOptions = exports.STEROIDS_META_SCHEMA_SELECT = void 0;
+exports.STEROIDS_META_SCHEMA_SELECT = 'steroids_meta_schema_select';
+const getSchemaSelectOptions = (schemaClass) => schemaClass && Reflect.getMetadata(exports.STEROIDS_META_SCHEMA_SELECT, schemaClass);
+exports.getSchemaSelectOptions = getSchemaSelectOptions;
+function SchemaSelect(options = {}) {
+    return (target) => {
+        Reflect.defineMetadata(exports.STEROIDS_META_SCHEMA_SELECT, options, target);
+    };
+}
+exports.SchemaSelect = SchemaSelect;
+//# sourceMappingURL=SchemaSelect.js.map

package/infrastructure/decorators/schema/SchemaSelect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SchemaSelect.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/schema/SchemaSelect.ts"],"names":[],"mappings":";;;AAAa,QAAA,2BAA2B,GAAG,6BAA6B,CAAC;AAOlE,MAAM,sBAAsB,GAAG,CAClC,WAAW,EACb,EAAE,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,mCAA2B,EAAE,WAAW,CAAC,CAAC;AAFrE,QAAA,sBAAsB,0BAE+C;AAElF,SAAgB,YAAY,CAAC,UAA0B,EAAE;IACrD,OAAO,CAAC,MAAM,EAAE,EAAE;QACd,OAAO,CAAC,cAAc,CAAC,mCAA2B,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACzE,CAAC,CAAC;AACN,CAAC;AAJD,oCAIC"}

package/infrastructure/repositories/CrudRepository.d.ts

@@ -3,8 +3,8 @@ import { ICrudRepository } from '../../usecases/interfaces/ICrudRepository';
 import { SearchInputDto } from '../../usecases/dtos/SearchInputDto';
 import { SearchResultDto } from '../../usecases/dtos/SearchResultDto';
 import SearchQuery from '../../usecases/base/SearchQuery';
-import { ICondition } from '../helpers/ConditionHelper';
 import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
+import { ICondition } from '../../usecases/helpers/ConditionHelper';
 export declare class CrudRepository<TModel> implements ICrudRepository<TModel> {
     primaryKey: string;
     dbRepository: Repository<any>;

package/infrastructure/repositories/CrudRepository.js

@@ -28,9 +28,11 @@ class CrudRepository {
         return rows.map(row => this.entityToModel(row));
     }
     createQueryBuilder(conditionOrQuery) {
-        const searchQuery = !(conditionOrQuery instanceof SearchQuery_1.default)
-            ? new SearchQuery_1.default({ condition: conditionOrQuery })
-            : conditionOrQuery;
+        let searchQuery = conditionOrQuery;
+        if (!(conditionOrQuery instanceof SearchQuery_1.default)) {
+            searchQuery = new SearchQuery_1.default();
+            searchQuery.condition = conditionOrQuery;
+        }
         const dbQuery = this.dbRepository.createQueryBuilder();
         SearchQuery_1.default.prepare(this.dbRepository, dbQuery, searchQuery);
         return dbQuery;

package/infrastructure/repositories/CrudRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"CrudRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/CrudRepository.ts"],"names":[],"mappings":";;;AACA,sEAAiE;AAIjE,iEAA0D;AAC1D,8EAAyE;AAOzE,MAAa,cAAc;IAA3B;QAIW,eAAU,GAAW,IAAI,CAAC;IA4HrC,CAAC;IA9GU,IAAI,CAAC,YAA6B,EAAE,UAAe;QACtD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,WAAwB;QACtD,MAAM,MAAM,GAAG,MAAM,2BAAY,CAAC,MAAM,CACpC,IAAI,CAAC,YAAY,EACjB,GAAG,EACH,WAAW,EACX,IAAI,CACP,CAAC;QACF,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC;IAClB,CAAC;IAMD,KAAK,CAAC,OAAO,CAAC,gBAA0C;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAE1D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IAMD,KAAK,CAAC,QAAQ,CAAC,gBAA0C;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAE1D,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IACpD,CAAC;IAOS,kBAAkB,CAAC,gBAA0C;QACnE,MAAM,WAAW,GAAG,CAAC,CAAC,gBAAgB,YAAY,qBAAW,CAAC;YAC1D,CAAC,CAAC,IAAI,qBAAW,CAAC,EAAC,SAAS,EAAE,gBAAgB,EAAC,CAAC;YAChD,CAAC,CAAC,gBAAgB,CAAC;QAEvB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC;QACvD,qBAAW,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAE7D,OAAO,OAAO,CAAC;IACnB,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,KAAa;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/E,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAa;QAClC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,EAAE,CAAC,CAAC;SACnD;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,iCAAK,SAAS,GAAK,KAAK,EAAE,CAAC,CAAC;QAC/F,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IAOS,aAAa,CAAC,KAAK;QACzB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAOS,aAAa,CAAC,GAAQ;QAC5B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,gDAAgD,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAC7F;QACD,OAAO,mCAAgB,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;CACJ;AAhID,wCAgIC"}
+{"version":3,"file":"CrudRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/CrudRepository.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/nest",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "scripts": {
     "build": "tsc && copyfiles ./{package.json,LICENSE,README.md} dist/"
   },