@solidxai/core 0.1.12 → 0.1.13-beta.0

package/dist/services/crud-helper.service.d.ts

@@ -1,4 +1,4 @@
-import { SelectQueryBuilder, WhereExpressionBuilder } from "typeorm";
+import { EntityMetadata, SelectQueryBuilder, WhereExpressionBuilder } from "typeorm";
 import { BasicFilterDto } from "../dtos/basic-filters.dto";
 import { ActiveUserData } from "../interfaces/active-user-data.interface";
 export declare enum FilterCombinator {
@@ -9,9 +9,23 @@ export declare enum UserIdFields {
     CREATED_BY = "createdBy",
     UPDATED_BY = "updatedBy"
 }
+export interface ResolvedFieldPath {
+    relationSegments: string[];
+    leafProperty?: string;
+    leafIsRelation: boolean;
+}
 export declare class CrudHelperService {
     constructor();
     private readonly logger;
+    resolveFieldPathFromMetadata(rootMetadata: EntityMetadata, pathParts: string[], { allowRelationLeaf }?: {
+        allowRelationLeaf?: boolean;
+    }): ResolvedFieldPath;
+    resolveFieldPath(qb: SelectQueryBuilder<any>, pathParts: string[], { allowRelationLeaf, startAlias }?: {
+        allowRelationLeaf?: boolean;
+        startAlias?: string;
+    }): ResolvedFieldPath;
+    private findAliasMetadata;
+    private describeInvalidField;
     private orderOptions;
     applyFilters(qb: WhereExpressionBuilder, filters: any, alias: string, selectQb: SelectQueryBuilder<any>): void;
     private buildOperatorQuery;
@@ -42,6 +56,7 @@ export declare class CrudHelperService {
     countGroups(qb: SelectQueryBuilder<any>): Promise<number>;
     private buildJoinQueryForRelation;
     private wrapFieldWithAlias;
+    private resolveOwnColumn;
     isAggregateField(field: string): boolean;
     isAggregateFieldKey(key: string, aggregateAliases: Set<string>): boolean;
     getFieldFromQueryFieldKey(queryFieldKey: string, alias: string): string;

package/dist/services/crud-helper.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crud-helper.service.d.ts","sourceRoot":"","sources":["../../src/services/crud-helper.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"crud-helper.service.d.ts","sourceRoot":"","sources":["../../src/services/crud-helper.service.ts"],"names":[],"mappings":"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"}

package/dist/services/crud-helper.service.js

@@ -17,6 +17,8 @@ var UserIdFields;
     UserIdFields["CREATED_BY"] = "createdBy";
     UserIdFields["UPDATED_BY"] = "updatedBy";
 })(UserIdFields || (exports.UserIdFields = UserIdFields = {}));
+const SUPPORTED_FIELD_FUNCTIONS = ['COUNT', 'SUM', 'AVG', 'MIN', 'MAX'];
+const SUPPORTED_GRANULARITIES = ['day', 'week', 'month', 'year'];
 class CrudHelperService {
     constructor() {
         this.logger = new common_1.Logger(CrudHelperService.name);
@@ -61,6 +63,50 @@ class CrudHelperService {
             return matchingPermssions.length > 0;
         };
     }
+    resolveFieldPathFromMetadata(rootMetadata, pathParts, { allowRelationLeaf = false } = {}) {
+        if (!rootMetadata)
+            throw new common_1.BadRequestException(`Cannot resolve field '${this.describeInvalidField(pathParts?.join('.'))}'`);
+        if (!pathParts?.length || pathParts.some(part => !part)) {
+            throw new common_1.BadRequestException(`Invalid field path '${this.describeInvalidField(pathParts?.join('.'))}'`);
+        }
+        let metadata = rootMetadata;
+        const relationSegments = [];
+        for (let i = 0; i < pathParts.length; i++) {
+            const isLeaf = i === pathParts.length - 1;
+            const relation = metadata.findRelationWithPropertyPath(pathParts[i]);
+            const column = metadata.findColumnWithPropertyName(pathParts[i]);
+            if (!isLeaf) {
+                if (!relation) {
+                    throw new common_1.BadRequestException(`Invalid relation '${this.describeInvalidField(pathParts[i])}' in '${this.describeInvalidField(pathParts.join('.'))}'`);
+                }
+                relationSegments.push(relation.propertyName);
+                metadata = relation.inverseEntityMetadata;
+                continue;
+            }
+            if (allowRelationLeaf && relation) {
+                relationSegments.push(relation.propertyName);
+                return { relationSegments, leafIsRelation: true };
+            }
+            if (column) {
+                return { relationSegments, leafProperty: column.propertyName, leafIsRelation: false };
+            }
+            throw new common_1.BadRequestException(`Invalid field '${this.describeInvalidField(pathParts[i])}' in '${this.describeInvalidField(pathParts.join('.'))}'`);
+        }
+        throw new common_1.BadRequestException(`Invalid field path '${this.describeInvalidField(pathParts.join('.'))}'`);
+    }
+    resolveFieldPath(qb, pathParts, { allowRelationLeaf = false, startAlias } = {}) {
+        const aliasMetadata = startAlias ? this.findAliasMetadata(qb, startAlias) : undefined;
+        const rootMetadata = aliasMetadata ?? qb?.expressionMap?.mainAlias?.metadata;
+        return this.resolveFieldPathFromMetadata(rootMetadata, pathParts, { allowRelationLeaf });
+    }
+    findAliasMetadata(qb, alias) {
+        const found = qb?.expressionMap?.aliases?.find(a => a.name === alias);
+        return found?.hasMetadata ? found.metadata : undefined;
+    }
+    describeInvalidField(value) {
+        const text = String(value ?? '');
+        return text.length > 80 ? `${text.slice(0, 80)}...` : text;
+    }
     orderOptions(sort = []) {
         const orderOptions = {};
         sort.forEach((s) => {
@@ -106,26 +152,34 @@ class CrudHelperService {
                 const operatorOrField = Object.keys(normalizedPrimaryFilterObj)[0];
                 if (operatorOrField.startsWith('$')) {
                     const operator = operatorOrField;
+                    const { leafProperty } = this.resolveFieldPath(selectQb, [rawField], { startAlias: alias });
                     let columnExpression;
                     if (funcAlias) {
                         try {
-                            columnExpression = this.buildDateGranularityExpression(this.getDriver(selectQb), `${alias}.${rawField}`, funcAlias);
+                            columnExpression = this.buildDateGranularityExpression(this.getDriver(selectQb), `${alias}.${leafProperty}`, funcAlias);
                         }
-                        catch {
-                            throw new common_1.BadRequestException(`Unsupported field function '${funcAlias}'. Supported functions are: day, week, month, year.`);
+                        catch (error) {
+                            if (error instanceof common_1.BadRequestException)
+                                throw error;
+                            throw new common_1.BadRequestException(`Unsupported field function '${this.describeInvalidField(funcAlias)}'. Supported functions are: ${SUPPORTED_GRANULARITIES.join(', ')}.`);
                         }
                     }
-                    this.buildOperatorQuery(qb, alias, rawField, normalizedPrimaryFilterObj, operator, columnExpression);
+                    this.buildOperatorQuery(qb, alias, leafProperty, normalizedPrimaryFilterObj, operator, columnExpression);
                     return;
                 }
                 else {
                     if (funcAlias) {
                         throw new common_1.BadRequestException(`Function alias ':${funcAlias}' is not valid on relation field '${rawField}'. It can only be applied to scalar fields.`);
                     }
-                    const joinField = `${alias}.${rawField}`;
+                    const resolvedRelation = this.resolveFieldPath(selectQb, [rawField], { allowRelationLeaf: true, startAlias: alias });
+                    if (!resolvedRelation.leafIsRelation) {
+                        throw new common_1.BadRequestException(`'${this.describeInvalidField(rawField)}' is not a relation and cannot contain nested filters.`);
+                    }
+                    const relationName = resolvedRelation.relationSegments[resolvedRelation.relationSegments.length - 1];
+                    const joinField = `${alias}.${relationName}`;
                     if (!this.isRelationJoined(selectQb, joinField))
-                        selectQb.leftJoin(joinField, rawField);
-                    this.applyFilters(qb, primaryFilterObj, rawField, selectQb);
+                        selectQb.leftJoin(joinField, relationName);
+                    this.applyFilters(qb, primaryFilterObj, relationName, selectQb);
                 }
             });
         }
@@ -287,7 +341,7 @@ class CrudHelperService {
         }
         if (normalizedFields && normalizedFields.length) {
             qb.select(normalizedFields.map(field => {
-                return this.wrapFieldWithAlias(field, entityAlias);
+                return this.wrapFieldWithAlias(qb, field, entityAlias);
             }));
         }
         if (applySorting && normalizedSort && normalizedSort.length) {
@@ -309,7 +363,8 @@ class CrudHelperService {
                             qb.addSelect(orderColumn);
                     }
                     else {
-                        qb.addOrderBy(`${entityAlias}.${field}`, value);
+                        const { leafProperty } = this.resolveFieldPath(qb, [field]);
+                        qb.addOrderBy(`${entityAlias}.${leafProperty}`, value);
                     }
                 });
                 if (!hasExplicitIdSort) {
@@ -322,7 +377,7 @@ class CrudHelperService {
         }
         if (showSoftDeleted === 'exclusive') {
             qb.withDeleted();
-            qb.where(`${entityAlias}.deletedAt IS NOT NULL`);
+            qb.andWhere(`${entityAlias}.deletedAt IS NOT NULL`);
         }
         if (applyPagination) {
             if (limit)
@@ -359,13 +414,14 @@ class CrudHelperService {
         return existingJoin?.alias?.name;
     }
     ensureRelationPathJoined(qb, rootAlias, pathParts) {
+        const resolved = this.resolveFieldPath(qb, pathParts);
         const mainAlias = qb.expressionMap?.mainAlias?.name ||
             qb.expressionMap?.aliases?.find(a => a.metadata)?.name ||
             qb.expressionMap?.aliases?.[0]?.name;
         let parentAlias = mainAlias || rootAlias;
         let leafJoinCreated = false;
-        for (let i = 0; i < pathParts.length - 1; i++) {
-            const part = pathParts[i];
+        for (let i = 0; i < resolved.relationSegments.length; i++) {
+            const part = resolved.relationSegments[i];
             const joinProperty = `${parentAlias}.${part}`;
             const existingAlias = this.getExistingJoinAlias(qb, joinProperty);
             const joinAlias = existingAlias ?? this.sanitizeAlias(`${parentAlias}_${part}`);
@@ -378,12 +434,15 @@ class CrudHelperService {
             }
             parentAlias = joinAlias;
         }
-        return { alias: parentAlias, property: pathParts[pathParts.length - 1], created: leafJoinCreated };
+        return { alias: parentAlias, property: resolved.leafProperty, created: leafJoinCreated };
     }
     getDriver(qb) {
         return qb.connection.options.type;
     }
     buildDateGranularityExpression(driver, columnExpr, granularity) {
+        if (!SUPPORTED_GRANULARITIES.includes(granularity)) {
+            throw new common_1.BadRequestException(`Unsupported granularity '${this.describeInvalidField(granularity)}'. Supported granularities are: ${SUPPORTED_GRANULARITIES.join(', ')}.`);
+        }
         switch (driver) {
             case 'postgres':
             case 'cockroachdb':
@@ -494,7 +553,10 @@ class CrudHelperService {
             const orderOptions = this.orderOptions(normalizedSort);
             const orderOptionKeys = Object.keys(orderOptions);
             orderOptionKeys.forEach((key) => {
-                const resolvedKey = aliasMap[key] || key;
+                const resolvedKey = aliasMap[key];
+                if (!resolvedKey) {
+                    throw new common_1.BadRequestException(`Cannot sort by '${this.describeInvalidField(String(key))}' on a grouped query. Sort only by a groupBy or aggregate field.`);
+                }
                 const value = orderOptions[key];
                 qb.addOrderBy(`"${resolvedKey}"`, value);
             });
@@ -518,11 +580,15 @@ class CrudHelperService {
     }
     buildJoinQueryForRelation(qb, entityAlias, relation) {
         const relationParts = relation.split('.');
+        const { relationSegments, leafIsRelation } = this.resolveFieldPath(qb, relationParts, { allowRelationLeaf: true });
+        if (!leafIsRelation) {
+            throw new common_1.BadRequestException(`'${this.describeInvalidField(relation)}' is not a relation and cannot be populated.`);
+        }
         let parentAlias = entityAlias;
-        relationParts.forEach((part, i) => {
+        relationSegments.forEach((part, i) => {
             const joinProperty = `${parentAlias}.${part}`;
             if (!this.isRelationJoined(qb, joinProperty)) {
-                const joinAlias = relationParts.slice(0, i + 1).join('_');
+                const joinAlias = this.sanitizeAlias(relationSegments.slice(0, i + 1).join('_'));
                 qb.leftJoinAndSelect(joinProperty, joinAlias);
             }
             else {
@@ -532,13 +598,24 @@ class CrudHelperService {
         });
         return qb;
     }
-    wrapFieldWithAlias(field, entityAlias) {
-        if (!this.isAggregateField(field))
-            return `${entityAlias}.${field}`;
+    wrapFieldWithAlias(qb, field, entityAlias) {
+        if (!this.isAggregateField(field)) {
+            return `${entityAlias}.${this.resolveOwnColumn(qb, field, 'fields')}`;
+        }
         const fieldParts = field.split('(');
-        const aggregateFunction = fieldParts[0];
-        const fieldName = fieldParts[1].replace(')', '');
-        return `${aggregateFunction}(${entityAlias}.${fieldName})`;
+        const aggregateFunction = fieldParts[0].trim().toUpperCase();
+        if (!SUPPORTED_FIELD_FUNCTIONS.includes(aggregateFunction)) {
+            throw new common_1.BadRequestException(`Unsupported field function '${this.describeInvalidField(fieldParts[0])}'. Supported functions are: ${SUPPORTED_FIELD_FUNCTIONS.join(', ')}.`);
+        }
+        const fieldName = fieldParts[1].replace(')', '').trim();
+        return `${aggregateFunction}(${entityAlias}.${this.resolveOwnColumn(qb, fieldName, 'fields')})`;
+    }
+    resolveOwnColumn(qb, field, context) {
+        const resolved = this.resolveFieldPath(qb, field.split('.'));
+        if (resolved.relationSegments.length) {
+            throw new common_1.BadRequestException(`Related field '${this.describeInvalidField(field)}' is not supported in '${context}'. Use 'populate' to fetch related records.`);
+        }
+        return resolved.leafProperty;
     }
     isAggregateField(field) {
         return field.includes('(');