@steroidsjs/nest 4.2.1 → 4.4.0

package/usecases/base/SearchQuery.d.ts

@@ -1,4 +1,13 @@
 import { ICondition } from '../../infrastructure/helpers/typeORM/ConditionHelperTypeORM';
+/**
+ * Order keys can be:
+ * - a field name, for example `name`
+ * - a root alias field path, for example `model.name`
+ * - a relation field path, for example `author.name` or `author.profile.name`
+ * - an already resolved relation alias path, for example `model_author.name`
+ *
+ * Field path parts can already be wrapped in double quotes.
+ */
 export type ISearchQueryOrder = {
     [key: string]: 'asc' | 'desc';
 };
@@ -67,6 +76,8 @@ export default class SearchQuery<TModel> {
     orWhere(condition: ICondition): this;
     orFilterWhere(condition: ICondition): this;
     getWhere(): ICondition;
+    private resolveOrderByFieldPath;
+    private resolveOrderByFieldPaths;
     orderBy(value: string | ISearchQueryOrder, direction?: 'asc' | 'desc'): this;
     addOrderBy(value: string | ISearchQueryOrder, direction?: 'asc' | 'desc'): this;
     getOrderBy(): ISearchQueryOrder;

package/usecases/base/SearchQuery.js

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_ALIAS = void 0;
 const lodash_1 = require("lodash");
+const crypto_1 = require("crypto");
 const SchemaSelect_1 = require("../../infrastructure/decorators/schema/SchemaSelect");
 const BaseField_1 = require("../../infrastructure/decorators/fields/BaseField");
+const wrapInDoubleQuotes_1 = require("../utils/wrapInDoubleQuotes");
 exports.DEFAULT_ALIAS = 'model';
+const ALIAS_HASH_LENGTH = 16;
 class SearchQuery {
     constructor(config) {
         this._useShortAliases = config === null || config === void 0 ? void 0 : config.useShortAliases;
@@ -36,23 +39,12 @@ class SearchQuery {
         if (!isShort) {
             return relationsArray.join('_');
         }
-        else {
-            // first letter + the uppercase letters + relation index in path + relation length
-            // model.firstRelation.secondRelation -> m0_fr113_sr214
-            return relationsArray.map((relation, index) => {
-                // root alias shouldn't change
-                if (index === 0) {
-                    return relation;
-                }
-                return relation[0]
-                    + relation.split('')
-                        .filter(letter => /\w/.test(letter) && letter === letter.toUpperCase())
-                        .map(letter => letter.toLowerCase())
-                        .join('')
-                    + String(index)
-                    + relation.length;
-            }).join('_');
-        }
+        return relationsArray.length === 1
+            ? relationsArray[0]
+            : (0, crypto_1.createHash)('sha256')
+                .update(relationPath)
+                .digest('hex')
+                .slice(0, ALIAS_HASH_LENGTH);
     }
     select(value) {
         this._select = [].concat(value || []);
@@ -202,12 +194,37 @@ class SearchQuery {
     getWhere() {
         return this._condition;
     }
+    resolveOrderByFieldPath(fieldPath) {
+        const pathToField = fieldPath.split('.');
+        const field = pathToField.pop();
+        if (pathToField[0] && (0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(pathToField[0]) === (0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(this._alias)) {
+            pathToField.shift();
+        }
+        if (!pathToField.length) {
+            if (field.split('_')[0] === this._alias) {
+                return (0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(field);
+            }
+            return `${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(this._alias)}.${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(field)}`;
+        }
+        if (pathToField.length === 1 && pathToField[0].split('_')[0] === this._alias) {
+            return `${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(pathToField[0])}.${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(field)}`;
+        }
+        return `${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(this.getRelationAlias(pathToField.join('.')))}.${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(field)}`;
+    }
+    resolveOrderByFieldPaths(orderValue, direction) {
+        if (typeof orderValue === 'string') {
+            return {
+                [this.resolveOrderByFieldPath(orderValue)]: direction,
+            };
+        }
+        return Object.entries(orderValue).reduce((acc, [key, value]) => (Object.assign(Object.assign({}, acc), { [this.resolveOrderByFieldPath(key)]: value })), {});
+    }
     orderBy(value, direction = 'asc') {
-        this._orders = typeof value === 'string' ? { [value]: direction } : value;
+        this._orders = this.resolveOrderByFieldPaths(value, direction);
         return this;
     }
     addOrderBy(value, direction = 'asc') {
-        this._orders = Object.assign(Object.assign({}, this._orders), (typeof value === 'string' ? { [value]: direction } : value));
+        this._orders = Object.assign(Object.assign({}, this._orders), this.resolveOrderByFieldPaths(value, direction));
         return this;
     }
     getOrderBy() {

package/usecases/base/SearchQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchQuery.js","sourceRoot":"","sources":["../../../src/usecases/base/SearchQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SearchQuery.js","sourceRoot":"","sources":["../../../src/usecases/base/SearchQuery.ts"],"names":[],"mappings":"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"}

package/usecases/base/SearchQuery.test.d.ts

@@ -0,0 +1 @@
+export {};

package/usecases/base/SearchQuery.test.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const SearchQuery_1 = require("./SearchQuery");
+(0, globals_1.describe)('SearchQuery', () => {
+    let searchQuery;
+    (0, globals_1.beforeEach)(() => {
+        searchQuery = new SearchQuery_1.default();
+        searchQuery.alias('model');
+    });
+    (0, globals_1.describe)('orderBy', () => {
+        (0, globals_1.it)('should resolve field name', () => {
+            searchQuery.orderBy('name');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model"."name"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve root alias field path', () => {
+            searchQuery.orderBy('model.email');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model"."email"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve root alias relation field path', () => {
+            searchQuery.orderBy('model.relation.age');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model_relation"."age"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve relation alias field path', () => {
+            searchQuery.orderBy('model_relation.city');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model_relation"."city"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve nested root alias relation field path', () => {
+            searchQuery.orderBy('model.relation1.relation2.address');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model_relation1_relation2"."address"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve nested relation alias field path', () => {
+            searchQuery.orderBy('model_relation1_relation2.country');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model_relation1_relation2"."country"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve relation alias with nested relation field path', () => {
+            searchQuery.orderBy('model_relation1_relation2.relation3.field');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model_model_relation1_relation2_relation3"."field"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve quoted root alias field path', () => {
+            searchQuery.orderBy('"model"."createdTime"');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model"."createdTime"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve partially quoted root alias field path', () => {
+            searchQuery.orderBy('model."updatedTime"');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model"."updatedTime"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve quoted root alias with unquoted field path', () => {
+            searchQuery.orderBy('"model".deleteTime');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model"."deleteTime"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve root alias field', () => {
+            searchQuery.orderBy('model_name');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model_name"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should resolve relation alias field', () => {
+            searchQuery.orderBy('model_relation_name');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model_relation_name"': 'asc',
+            });
+        });
+        (0, globals_1.it)('should use provided direction for a string field path', () => {
+            searchQuery.orderBy('relation.age', 'desc');
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model_relation"."age"': 'desc',
+            });
+        });
+        (0, globals_1.it)('should resolve object field paths with their directions', () => {
+            searchQuery.orderBy({
+                name: 'asc',
+                'relation.age': 'desc',
+            });
+            (0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
+                '"model"."name"': 'asc',
+                '"model_relation"."age"': 'desc',
+            });
+        });
+    });
+});
+//# sourceMappingURL=SearchQuery.test.js.map

package/usecases/base/SearchQuery.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SearchQuery.test.js","sourceRoot":"","sources":["../../../src/usecases/base/SearchQuery.test.ts"],"names":[],"mappings":"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"}

package/usecases/exceptions/UserException.d.ts

@@ -1,3 +1,4 @@
+/** @deprecated */
 export declare class UserException {
     message: any;
     constructor(message: string);

package/usecases/exceptions/UserException.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserException = void 0;
+/** @deprecated */
 class UserException {
     constructor(message) {
         this.message = message;

package/usecases/exceptions/UserException.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserException.js","sourceRoot":"","sources":["../../../src/usecases/exceptions/UserException.ts"],"names":[],"mappings":";;;AAAA,MAAa,aAAa;IAGtB,YAAY,OAAe;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;CACJ;AAND,sCAMC"}
+{"version":3,"file":"UserException.js","sourceRoot":"","sources":["../../../src/usecases/exceptions/UserException.ts"],"names":[],"mappings":";;;AAAA,kBAAkB;AAClB,MAAa,aAAa;IAGtB,YAAY,OAAe;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;CACJ;AAND,sCAMC"}

package/usecases/helpers/DataMapper.js

@@ -54,25 +54,29 @@ class DataMapper {
             : [transformType];
         keys.forEach(name => {
             const options = (0, BaseField_1.getFieldOptions)(MetaClass, name);
+            const appType = (0, BaseField_1.getFieldAppType)(MetaClass, name);
             const sourceName = (options === null || options === void 0 ? void 0 : options.sourceFieldName) || name;
             if (!options && (0, BaseField_1.isMetaClass)(MetaClass)) {
                 return;
             }
             if ((0, lodash_1.has)(values, sourceName)) {
-                if ((options === null || options === void 0 ? void 0 : options.appType) === 'relation') {
-                    if (options.isArray && Array.isArray(values[sourceName])) {
-                        object[name] = values[sourceName]
+                const value = (options === null || options === void 0 ? void 0 : options.isArray) && values[sourceName] != null && !Array.isArray(values[sourceName])
+                    ? [values[sourceName]]
+                    : values[sourceName];
+                if (appType === 'relation') {
+                    if (options.isArray && Array.isArray(value)) {
+                        object[name] = value
                             .map(item => DataMapper.create(options.relationClass(), item, transformType));
                     }
-                    else if ((0, lodash_2.isObject)(values[sourceName])) {
-                        object[name] = DataMapper.create(options.relationClass(), values[sourceName], transformType);
+                    else if ((0, lodash_2.isObject)(value)) {
+                        object[name] = DataMapper.create(options.relationClass(), value, transformType);
                     }
                     else {
-                        object[name] = values[sourceName];
+                        object[name] = value;
                     }
                 }
                 else {
-                    object[name] = values[sourceName];
+                    object[name] = value;
                 }
             }
             for (let type of transformTypes) {
@@ -103,7 +107,8 @@ class DataMapper {
                 attributes: fieldNames.map(fieldName => {
                     const apiMeta = Reflect.getMetadata(constants_1.DECORATORS.API_MODEL_PROPERTIES, type.prototype, fieldName);
                     const options = (0, BaseField_1.getFieldOptions)(type, fieldName);
-                    const fieldData = Object.assign({ attribute: fieldName, type: options.appType || 'string', label: options.label || apiMeta.description, required: apiMeta.required }, (options.enum
+                    const appType = (0, BaseField_1.getFieldAppType)(type, fieldName);
+                    const fieldData = Object.assign({ attribute: fieldName, type: appType || 'string', label: options.label || apiMeta.description, required: apiMeta.required }, (options.enum
                         ? {
                             items: (Array.isArray(options.enum) ? options.enum[0] : options.enum).name
                         }

package/usecases/helpers/DataMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataMapper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataMapper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapper.ts"],"names":[],"mappings":"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"}

package/usecases/helpers/getMetaRelationsFromObject.d.ts

@@ -0,0 +1,2 @@
+import { IType } from '../interfaces/IType';
+export declare const getMetaRelationsFromObject: (obj: Record<string, any>, ModelClass: IType) => string[];

package/usecases/helpers/getMetaRelationsFromObject.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMetaRelationsFromObject = void 0;
+const BaseField_1 = require("../../infrastructure/decorators/fields/BaseField");
+const joinRelationPath = (parentPath, fieldName) => parentPath
+    ? `${parentPath}.${fieldName}`
+    : fieldName;
+const isRecursiveRelationValue = (value) => (typeof value === 'object'
+    && value !== null
+    && !Array.isArray(value));
+const getNestedRelationValues = (value) => {
+    if (Array.isArray(value)) {
+        return value.filter(isRecursiveRelationValue);
+    }
+    return isRecursiveRelationValue(value)
+        ? [value]
+        : [];
+};
+const getMetaRelationsFromObject = (obj, ModelClass) => {
+    const relationNames = new Set();
+    const collectRelationNames = (currentObject, RelationMetaClass, parentPath = '') => {
+        Object.entries(currentObject).forEach(([fieldName, value]) => {
+            const options = (0, BaseField_1.getFieldOptions)(RelationMetaClass, fieldName);
+            const appType = (0, BaseField_1.getFieldAppType)(RelationMetaClass, fieldName);
+            if (!options) {
+                return;
+            }
+            if (appType === 'relationId' && options.relationName) {
+                relationNames.add(joinRelationPath(parentPath, fieldName));
+                return;
+            }
+            if (appType !== 'relation') {
+                return;
+            }
+            const relationPath = joinRelationPath(parentPath, fieldName);
+            relationNames.add(relationPath);
+            if (!options.relationClass) {
+                return;
+            }
+            const NestedMetaClass = options.relationClass();
+            if (!(0, BaseField_1.isMetaClass)(NestedMetaClass)) {
+                return;
+            }
+            getNestedRelationValues(value).forEach(nestedValue => {
+                collectRelationNames(nestedValue, NestedMetaClass, relationPath);
+            });
+        });
+    };
+    collectRelationNames(obj, ModelClass);
+    return Array.from(relationNames);
+};
+exports.getMetaRelationsFromObject = getMetaRelationsFromObject;
+//# sourceMappingURL=getMetaRelationsFromObject.js.map

package/usecases/helpers/getMetaRelationsFromObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMetaRelationsFromObject.js","sourceRoot":"","sources":["../../../src/usecases/helpers/getMetaRelationsFromObject.ts"],"names":[],"mappings":";;;AAAA,gFAA+G;AAG/G,MAAM,gBAAgB,GAAG,CAAC,UAAkB,EAAE,SAAiB,EAAU,EAAE,CAAC,UAAU;IAClF,CAAC,CAAC,GAAG,UAAU,IAAI,SAAS,EAAE;IAC9B,CAAC,CAAC,SAAS,CAAC;AAEhB,MAAM,wBAAwB,GAAG,CAAC,KAAc,EAAgC,EAAE,CAAC,CAC/E,OAAO,KAAK,KAAK,QAAQ;OACtB,KAAK,KAAK,IAAI;OACd,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAC3B,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAAyB,EAAE;IACtE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACtB,OAAO,KAAK,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;KACjD;IAED,OAAO,wBAAwB,CAAC,KAAK,CAAC;QAClC,CAAC,CAAC,CAAC,KAAK,CAAC;QACT,CAAC,CAAC,EAAE,CAAC;AACb,CAAC,CAAC;AAEK,MAAM,0BAA0B,GAAG,CAAC,GAAwB,EAAE,UAAiB,EAAE,EAAE;IACtF,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAExC,MAAM,oBAAoB,GAAG,CACzB,aAAkC,EAClC,iBAAwB,EACxB,UAAU,GAAG,EAAE,EACjB,EAAE;QACA,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE;YACzD,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;YAC9D,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;YAE9D,IAAI,CAAC,OAAO,EAAE;gBACV,OAAO;aACV;YAED,IAAI,OAAO,KAAK,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE;gBAClD,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;gBAC3D,OAAO;aACV;YAED,IAAI,OAAO,KAAK,UAAU,EAAE;gBACxB,OAAO;aACV;YAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAC7D,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAEhC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;gBACxB,OAAO;aACV;YAED,MAAM,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;YAChD,IAAI,CAAC,IAAA,uBAAW,EAAC,eAAe,CAAC,EAAE;gBAC/B,OAAO;aACV;YAED,uBAAuB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBACjD,oBAAoB,CAAC,WAAW,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,oBAAoB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAEtC,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AACrC,CAAC,CAAC;AA9CW,QAAA,0BAA0B,8BA8CrC"}

package/usecases/helpers/getMetaRelationsFromObject.test.d.ts

@@ -0,0 +1 @@
+export {};