@nest-util/nest-crud 1.1.2 → 1.1.4

package/README.md

@@ -21,6 +21,61 @@ pnpm add @nest-util/nest-crud@^1.0.7 @nest-util/nest-auth@^1.1.0 typeorm@^1.1.0
 - Automatic Swagger documentation
 - TypeORM exception filter for duplicate key errors
 
+## Filtering and Sorting
+
+### Filtering
+
+Query format: `?filter[field_operator]=value` (requires Express `query parser` set to `extended`).
+
+```typescript
+app.getHttpAdapter().getInstance().set('query parser', 'extended');
+```
+
+Supported operators: `eq`, `ne`, `cont`, `notcont`, `starts`, `ends`, `gte`, `lte`, `gt`, `lt`, `in`, `nin`, `isnull`. Groups via `filter[and][0][field_eq]=...` and `filter[or][0][field_eq]=...`.
+
+Filterable fields must be whitelisted with `allowedFilters` in the service options.
+
+### Filtering by nested (related) fields
+
+Nested relation fields use dot notation. The relation must be listed in `include` (so the join exists) and the full path must be whitelisted in `allowedFilters`:
+
+```typescript
+super({
+  repository,
+  include: ['author', 'author.profile'],
+  allowedFilters: ['title', 'author.name', 'author.profile.bio'],
+});
+```
+
+```http
+GET /post?filter[author.name_cont]=John
+GET /post?filter[author.profile.bio_starts]=Software
+```
+
+Nested filter keys with dots resolve against the joined alias (`author.name` → `author.name`, `author.profile.bio` → `author_profile.bio`). A nested filter whose join prefix is missing from `include` is silently skipped.
+
+### Sorting
+
+```http
+GET /post?orderBy=title&orderDirection=ASC
+```
+
+Sort fields are whitelisted with `allowedSortFields`. Nested sorting works the same way:
+
+```typescript
+super({
+  repository,
+  include: ['author'],
+  allowedSortFields: ['id', 'title', 'author.name'],
+});
+```
+
+```http
+GET /post?orderBy=author.name&orderDirection=DESC
+```
+
+Nested sort paths also require their join prefix to be in `include`. Cursor pagination keeps its fixed `id` ordering.
+
 ## Building
 
 Run `nx build nest-crud` to build the library.

package/dist/lib/helpers/filter.helper.d.ts

@@ -1,3 +1,14 @@
 import { ObjectLiteral, SelectQueryBuilder } from 'typeorm';
-export declare function applyFilters<Entity extends ObjectLiteral>(qb: SelectQueryBuilder<Entity>, filters: Record<string, unknown> | undefined, allowedFilters: readonly (keyof Entity)[]): void;
+/**
+ * Resolves a filter/sort field to a query-builder target.
+ *
+ * - Plain fields resolve against the root alias: `name` -> `e.name`.
+ * - Nested fields (dot notation) resolve against a joined alias whose path
+ *   prefix must be present in `include`: `author.name` -> `author.name`,
+ *   `userRoles.role.name` -> `userRoles_role.name`.
+ * - Returns `null` when the field is unsafe or the join prefix is not
+ *   configured, so callers can skip the condition entirely.
+ */
+export declare function resolveQueryTarget(field: string, include?: readonly string[], rootAlias?: string): string | null;
+export declare function applyFilters<Entity extends ObjectLiteral>(qb: SelectQueryBuilder<Entity>, filters: Record<string, unknown> | undefined, allowedFilters: readonly (keyof Entity)[], include?: readonly string[]): void;
 //# sourceMappingURL=filter.helper.d.ts.map

package/dist/lib/helpers/filter.helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.helper.d.ts","sourceRoot":"","sources":["../../../src/lib/helpers/filter.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAsL5D,wBAAgB,YAAY,CAAC,MAAM,SAAS,aAAa,EACvD,EAAE,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC5C,cAAc,EAAE,SAAS,CAAC,MAAM,MAAM,CAAC,EAAE,GACxC,IAAI,CAoBN"}
+{"version":3,"file":"filter.helper.d.ts","sourceRoot":"","sources":["../../../src/lib/helpers/filter.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AA+C5D;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,SAAS,MAAM,EAAO,EAC/B,SAAS,SAAM,GACd,MAAM,GAAG,IAAI,CAWf;AA6ID,wBAAgB,YAAY,CAAC,MAAM,SAAS,aAAa,EACvD,EAAE,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC5C,cAAc,EAAE,SAAS,CAAC,MAAM,MAAM,CAAC,EAAE,EACzC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAC1B,IAAI,CAqBN"}

package/dist/lib/helpers/filter.helper.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveQueryTarget = resolveQueryTarget;
 exports.applyFilters = applyFilters;
-const SAFE_FIELD_PATTERN = /^[A-Za-z][A-Za-z0-9_]*$/;
+const SAFE_FIELD_PATTERN = /^[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)*$/;
 const toArrayValue = (value) => {
     if (Array.isArray(value)) {
         return value;
@@ -36,41 +37,63 @@ const parseFilterKey = (rawKey) => {
     const operator = rawKey.slice(separatorIndex + 1).toLowerCase();
     return { field, operator };
 };
-const buildCondition = (field, operator, value, paramIndex) => {
+/**
+ * Resolves a filter/sort field to a query-builder target.
+ *
+ * - Plain fields resolve against the root alias: `name` -> `e.name`.
+ * - Nested fields (dot notation) resolve against a joined alias whose path
+ *   prefix must be present in `include`: `author.name` -> `author.name`,
+ *   `userRoles.role.name` -> `userRoles_role.name`.
+ * - Returns `null` when the field is unsafe or the join prefix is not
+ *   configured, so callers can skip the condition entirely.
+ */
+function resolveQueryTarget(field, include = [], rootAlias = 'e') {
+    if (!SAFE_FIELD_PATTERN.test(field))
+        return null;
+    const parts = field.split('.');
+    if (parts.length === 1)
+        return `${rootAlias}.${field}`;
+    const joinPath = parts.slice(0, -1).join('.');
+    if (!include.includes(joinPath))
+        return null;
+    const alias = joinPath.replace(/\./g, '_');
+    return `${alias}.${parts[parts.length - 1]}`;
+}
+const buildCondition = (target, operator, value, paramIndex) => {
     const paramKey = `filter_${paramIndex.current++}`;
     switch (operator) {
         case 'eq':
-            return { sql: `e.${field} = :${paramKey}`, params: { [paramKey]: value } };
+            return { sql: `${target} = :${paramKey}`, params: { [paramKey]: value } };
         case 'ne':
-            return { sql: `e.${field} != :${paramKey}`, params: { [paramKey]: value } };
+            return { sql: `${target} != :${paramKey}`, params: { [paramKey]: value } };
         case 'cont':
             return {
-                sql: `e.${field} ILIKE :${paramKey}`,
+                sql: `${target} ILIKE :${paramKey}`,
                 params: { [paramKey]: `%${value}%` },
             };
         case 'notcont':
             return {
-                sql: `e.${field} NOT ILIKE :${paramKey}`,
+                sql: `${target} NOT ILIKE :${paramKey}`,
                 params: { [paramKey]: `%${value}%` },
             };
         case 'starts':
             return {
-                sql: `e.${field} ILIKE :${paramKey}`,
+                sql: `${target} ILIKE :${paramKey}`,
                 params: { [paramKey]: `${value}%` },
             };
         case 'ends':
             return {
-                sql: `e.${field} ILIKE :${paramKey}`,
+                sql: `${target} ILIKE :${paramKey}`,
                 params: { [paramKey]: `%${value}` },
             };
         case 'gte':
-            return { sql: `e.${field} >= :${paramKey}`, params: { [paramKey]: value } };
+            return { sql: `${target} >= :${paramKey}`, params: { [paramKey]: value } };
         case 'lte':
-            return { sql: `e.${field} <= :${paramKey}`, params: { [paramKey]: value } };
+            return { sql: `${target} <= :${paramKey}`, params: { [paramKey]: value } };
         case 'gt':
-            return { sql: `e.${field} > :${paramKey}`, params: { [paramKey]: value } };
+            return { sql: `${target} > :${paramKey}`, params: { [paramKey]: value } };
         case 'lt':
-            return { sql: `e.${field} < :${paramKey}`, params: { [paramKey]: value } };
+            return { sql: `${target} < :${paramKey}`, params: { [paramKey]: value } };
         case 'in':
         case 'nin': {
             const values = toArrayValue(value);
@@ -78,8 +101,8 @@ const buildCondition = (field, operator, value, paramIndex) => {
                 return null;
             return {
                 sql: operator === 'in'
-                    ? `e.${field} IN (:...${paramKey})`
-                    : `e.${field} NOT IN (:...${paramKey})`,
+                    ? `${target} IN (:...${paramKey})`
+                    : `${target} NOT IN (:...${paramKey})`,
                 params: { [paramKey]: values },
             };
         }
@@ -87,13 +110,13 @@ const buildCondition = (field, operator, value, paramIndex) => {
             const isNull = toBooleanValue(value);
             if (isNull === null)
                 return null;
-            return { sql: isNull ? `e.${field} IS NULL` : `e.${field} IS NOT NULL` };
+            return { sql: isNull ? `${target} IS NULL` : `${target} IS NOT NULL` };
         }
         default:
             return null;
     }
 };
-const buildExpression = (node, combinator, allowedFilters, paramIndex, params) => {
+const buildExpression = (node, combinator, allowedFilters, include, paramIndex, params) => {
     if (!node || typeof node !== 'object')
         return null;
     const conditions = [];
@@ -105,7 +128,7 @@ const buildExpression = (node, combinator, allowedFilters, paramIndex, params) =
             const nestedCombinator = rawKey;
             const nestedNodes = Array.isArray(value) ? value : [value];
             const nestedExpressions = nestedNodes
-                .map((nestedNode) => buildExpression(nestedNode, 'and', allowedFilters, paramIndex, params))
+                .map((nestedNode) => buildExpression(nestedNode, 'and', allowedFilters, include, paramIndex, params))
                 .filter((sql) => Boolean(sql));
             if (nestedExpressions.length > 0) {
                 conditions.push(`(${nestedExpressions.join(` ${nestedCombinator.toUpperCase()} `)})`);
@@ -116,11 +139,12 @@ const buildExpression = (node, combinator, allowedFilters, paramIndex, params) =
         if (!parsed)
             continue;
         const { field, operator } = parsed;
-        if (!SAFE_FIELD_PATTERN.test(field))
-            continue;
         if (!allowedFilters.includes(field))
             continue;
-        const condition = buildCondition(field, operator, value, paramIndex);
+        const target = resolveQueryTarget(field, include);
+        if (!target)
+            continue;
+        const condition = buildCondition(target, operator, value, paramIndex);
         if (!condition)
             continue;
         if (condition.params)
@@ -133,11 +157,11 @@ const buildExpression = (node, combinator, allowedFilters, paramIndex, params) =
         return conditions[0];
     return `(${conditions.join(` ${combinator.toUpperCase()} `)})`;
 };
-function applyFilters(qb, filters, allowedFilters) {
+function applyFilters(qb, filters, allowedFilters, include) {
     if (!filters)
         return;
     const params = {};
-    const expression = buildExpression(filters, 'and', allowedFilters.map(String), { current: 0 }, params);
+    const expression = buildExpression(filters, 'and', allowedFilters.map(String), include ?? [], { current: 0 }, params);
     if (!expression)
         return;
     if (Object.keys(params).length > 0) {

package/dist/lib/interfaces/find-mine.interface.d.ts

@@ -28,5 +28,12 @@ export interface FindMineConfig<TEntity extends ObjectLiteral> {
      * Takes precedence alongside ownershipBypassPermissions.
      */
     ownershipBypass?: (user: OwnershipUser) => boolean;
+    /**
+     * Permission string that grants full access and bypasses ownership checks,
+     * mirroring `rbac.superAdminPermission` from @nest-util/nest-auth. When the
+     * user's resolved permissions (direct or via roles) include this string,
+     * ownership checks are skipped. Example: 'admin.access'.
+     */
+    superAdminPermission?: string;
 }
 //# sourceMappingURL=find-mine.interface.d.ts.map

package/dist/lib/interfaces/find-mine.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-mine.interface.d.ts","sourceRoot":"","sources":["../../../src/lib/interfaces/find-mine.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE5D;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc,CAAC,OAAO,SAAS,aAAa;IAC3D,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC;IAEnF;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,0BAA0B,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAE/C;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;CACpD"}
+{"version":3,"file":"find-mine.interface.d.ts","sourceRoot":"","sources":["../../../src/lib/interfaces/find-mine.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE5D;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc,CAAC,OAAO,SAAS,aAAa;IAC3D,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC;IAEnF;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,0BAA0B,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAE/C;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;IAEnD;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B"}

package/dist/lib/services/nest-crud.service.d.ts

@@ -10,8 +10,8 @@ import { CrudHooks, TransactionConfig } from '../interfaces/hooks.interface';
 import { FindMineConfig, OwnershipUser } from '../interfaces/find-mine.interface';
 export interface CrudServiceOptions<Entity extends ObjectLiteral, ResponseDto> extends FindMineConfig<Entity> {
     repository: Repository<Entity>;
-    allowedFilters?: readonly (keyof Entity)[];
-    allowedSortFields?: readonly (keyof Entity)[];
+    allowedFilters?: readonly (keyof Entity | (string & {}))[];
+    allowedSortFields?: readonly (keyof Entity | (string & {}))[];
     include?: readonly string[];
     relations?: {
         property: keyof Entity;
@@ -28,8 +28,8 @@ export interface CrudServiceOptions<Entity extends ObjectLiteral, ResponseDto> e
 }
 export declare class NestCrudService<Entity extends ObjectLiteral, CreateDto = Partial<Entity>, UpdateDto = Partial<Entity>, ResponseDto = Entity> implements CrudInterface<CreateDto, UpdateDto, ResponseDto> {
     protected readonly repo: Repository<Entity>;
-    protected readonly allowedFilters: readonly (keyof Entity)[];
-    protected readonly allowedSortFields: readonly (keyof Entity)[];
+    protected readonly allowedFilters: readonly (keyof Entity | (string & {}))[];
+    protected readonly allowedSortFields: readonly (keyof Entity | (string & {}))[];
     protected readonly include: readonly string[];
     protected readonly relations: {
         property: keyof Entity;
@@ -48,13 +48,16 @@ export declare class NestCrudService<Entity extends ObjectLiteral, CreateDto = P
     protected readonly enforceOwnership: boolean;
     protected readonly ownershipBypassPermissions: readonly string[];
     protected readonly ownershipBypass?: (user: OwnershipUser) => boolean;
+    protected readonly superAdminPermission?: string;
     constructor(options: CrudServiceOptions<Entity, ResponseDto>);
     private resolveRelations;
     private executeInTransaction;
     private executeHook;
     private buildRelationsObject;
     private applyIncludeJoins;
+    private applyOrderBy;
     private isOwnershipConfigured;
+    private resolveUserPermissions;
     private canBypassOwnership;
     private enforceOwnershipFor;
     private applyOwnershipCondition;

package/dist/lib/services/nest-crud.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nest-crud.service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/nest-crud.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0E,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC9G,OAAO,EAAe,aAAa,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAkB,SAAS,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAQlF,MAAM,WAAW,kBAAkB,CAAC,MAAM,SAAS,aAAa,EAAE,WAAW,CAC3E,SAAQ,cAAc,CAAC,MAAM,CAAC;IAC9B,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/B,cAAc,CAAC,EAAE,SAAS,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC;IAC3C,iBAAiB,CAAC,EAAE,SAAS,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC;IAC9C,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE;QACV,QAAQ,EAAE,MAAM,MAAM,CAAC;QACvB,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;QAChC,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,EAAE,CAAC;IACJ,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,WAAW,GAAG,WAAW,EAAE,CAAC;IAC3E,cAAc,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,cAAc,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,iBAAiB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAC5C,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,KAAK,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC;AAED,qBACa,eAAe,CAC1B,MAAM,SAAS,aAAa,EAC5B,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,EAC3B,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,EAC3B,WAAW,GAAG,MAAM,CACpB,YAAW,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC;IAE3D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC;IAC7D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC;IAChE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE;QAC5B,QAAQ,EAAE,MAAM,MAAM,CAAC;QACvB,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;QAChC,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,EAAE,CAAC;IACJ,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CACjC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,KACtB,WAAW,GAAG,WAAW,EAAE,CAAC;IACjC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,QAAQ,CAAC,iBAAiB,EAAE,SAAS,YAAY,EAAE,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,MAAM,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC;IACrG,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,SAAS,MAAM,EAAE,CAAC;IACjE,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;gBAE1D,OAAO,EAAE,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC;YAqB9C,gBAAgB;YA+BhB,oBAAoB;YAoBpB,WAAW;IAezB,OAAO,CAAC,oBAAoB;IAoB5B,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,uBAAuB;YAWjB,eAAe;IAqBvB,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS;;;;;;;;;;;IA8BxC,QAAQ,CACZ,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,KAAK,EAAE,aAAa,GAAG,SAAS,GAC/B,OAAO,CAAC;QAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAoC7C,iBAAiB,CACrB,KAAK,EAAE,mBAAmB,GAAG,SAAS,GACrC,OAAO,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAgEzC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,aAAa;IA+BxC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,aAAa;IAuD/C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,aAAa;IAgC3D,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,aAAa;IAyBvC,aAAa,CAAC,KAAK,EAAE;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB;;;;;;;;;CA4CF"}
+{"version":3,"file":"nest-crud.service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/nest-crud.service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/nest-crud.service.js

@@ -27,6 +27,7 @@ let NestCrudService = class NestCrudService {
         this.enforceOwnership = options.enforceOwnership ?? false;
         this.ownershipBypassPermissions = options.ownershipBypassPermissions ?? [];
         this.ownershipBypass = options.ownershipBypass;
+        this.superAdminPermission = options.superAdminPermission;
     }
     async resolveRelations(payload) {
         if (!this.relations.length)
@@ -95,35 +96,80 @@ let NestCrudService = class NestCrudService {
         }
         return result;
     }
-    applyIncludeJoins(qb) {
+    applyIncludeJoins(qb, withSelect = true) {
         if (this.include.length === 0)
             return;
+        const join = withSelect
+            ? (path, alias) => qb.leftJoinAndSelect(path, alias)
+            : (path, alias) => qb.leftJoin(path, alias);
         this.include.forEach((relation) => {
             const parts = relation.split('.');
             if (parts.length === 1) {
-                qb.leftJoinAndSelect(`e.${parts[0]}`, parts[0]);
+                join(`e.${parts[0]}`, parts[0]);
             }
             else {
                 const parentAlias = parts.slice(0, -1).join('_');
                 const field = parts[parts.length - 1];
                 const alias = parts.join('_');
-                qb.leftJoinAndSelect(`${parentAlias}.${field}`, alias);
+                join(`${parentAlias}.${field}`, alias);
             }
         });
     }
+    applyOrderBy(qb, orderBy, orderDirection) {
+        if (!orderBy)
+            return;
+        const target = (0, filter_helper_1.resolveQueryTarget)(orderBy, this.include.map(String), 'e');
+        if (!target)
+            return;
+        if (this.allowedSortFields.length === 0 ||
+            this.allowedSortFields.includes(orderBy)) {
+            qb.orderBy(target, orderDirection);
+        }
+    }
     isOwnershipConfigured() {
         return Boolean(this.userOwnershipField || this.findMineQuery);
     }
+    resolveUserPermissions(user) {
+        const out = new Set();
+        const add = (value) => {
+            if (Array.isArray(value)) {
+                value
+                    .filter((item) => typeof item === 'string')
+                    .forEach((permission) => out.add(permission));
+            }
+        };
+        add(user.permissions);
+        for (const rolesKey of ['userRoles', 'roles']) {
+            const rows = user[rolesKey];
+            if (!Array.isArray(rows))
+                continue;
+            for (const row of rows) {
+                if (!row || typeof row !== 'object')
+                    continue;
+                const roleLike = row;
+                add(roleLike.permissions);
+                const nested = roleLike.role;
+                if (nested && typeof nested === 'object') {
+                    add(nested.permissions);
+                }
+            }
+        }
+        return [...out];
+    }
     canBypassOwnership(user) {
         if (!user)
             return false;
+        if (this.superAdminPermission) {
+            const resolved = this.resolveUserPermissions(user);
+            if (resolved.includes(this.superAdminPermission)) {
+                return true;
+            }
+        }
         if (this.ownershipBypass && this.ownershipBypass(user)) {
             return true;
         }
         if (this.ownershipBypassPermissions.length > 0) {
-            const userPermissions = Array.isArray(user.permissions)
-                ? user.permissions
-                : [];
+            const userPermissions = this.resolveUserPermissions(user);
             return this.ownershipBypassPermissions.some((permission) => userPermissions.includes(permission));
         }
         return false;
@@ -156,15 +202,9 @@ let NestCrudService = class NestCrudService {
     async findAll(query) {
         const qb = this.repo.createQueryBuilder('e');
         this.applyIncludeJoins(qb);
-        (0, filter_helper_1.applyFilters)(qb, query.filter, this.allowedFilters);
+        (0, filter_helper_1.applyFilters)(qb, query.filter, this.allowedFilters, this.include);
         const paginationMeta = (0, pagination_helper_1.applyPagination)(qb, query);
-        if (query.orderBy) {
-            const orderDirection = query.orderDirection === 'ASC' ? 'ASC' : 'DESC';
-            if (this.allowedSortFields.length === 0 ||
-                this.allowedSortFields.includes(query.orderBy)) {
-                qb.orderBy(`e.${query.orderBy}`, orderDirection);
-            }
-        }
+        this.applyOrderBy(qb, query.orderBy, query.orderDirection === 'ASC' ? 'ASC' : 'DESC');
         const [entities, total] = await qb.getManyAndCount();
         const data = this.toResponseDto
             ? this.toResponseDto(entities)
@@ -180,15 +220,9 @@ let NestCrudService = class NestCrudService {
         const qb = this.repo.createQueryBuilder('e');
         this.applyOwnershipCondition(qb, userId);
         this.applyIncludeJoins(qb);
-        (0, filter_helper_1.applyFilters)(qb, query.filter, this.allowedFilters);
+        (0, filter_helper_1.applyFilters)(qb, query.filter, this.allowedFilters, this.include);
         const paginationMeta = (0, pagination_helper_1.applyPagination)(qb, query);
-        if (query.orderBy) {
-            const orderDirection = query.orderDirection === 'ASC' ? 'ASC' : 'DESC';
-            if (this.allowedSortFields.length === 0 ||
-                this.allowedSortFields.includes(query.orderBy)) {
-                qb.orderBy(`e.${query.orderBy}`, orderDirection);
-            }
-        }
+        this.applyOrderBy(qb, query.orderBy, query.orderDirection === 'ASC' ? 'ASC' : 'DESC');
         const [entities, total] = await qb.getManyAndCount();
         const data = this.toResponseDto
             ? this.toResponseDto(entities)
@@ -205,7 +239,7 @@ let NestCrudService = class NestCrudService {
         // Join relations
         this.applyIncludeJoins(qb);
         // Apply filters
-        (0, filter_helper_1.applyFilters)(qb, query.filter, this.allowedFilters);
+        (0, filter_helper_1.applyFilters)(qb, query.filter, this.allowedFilters, this.include);
         // Apply cursor filter
         if (query.cursor) {
             const decoded = (0, cursor_pagination_helper_1.decodeCursor)(query.cursor, strategy);
@@ -225,15 +259,8 @@ let NestCrudService = class NestCrudService {
         if (query.includeTotal) {
             // Build a clean count query (reuse same filters but no cursor/order/take)
             const countQb = this.repo.createQueryBuilder('e');
-            if (this.include.length > 0) {
-                this.include.forEach((relation) => {
-                    const parts = relation.split('.');
-                    if (parts.length === 1) {
-                        countQb.leftJoin(`e.${parts[0]}`, parts[0]);
-                    }
-                });
-            }
-            (0, filter_helper_1.applyFilters)(countQb, query.filter, this.allowedFilters);
+            this.applyIncludeJoins(countQb, false);
+            (0, filter_helper_1.applyFilters)(countQb, query.filter, this.allowedFilters, this.include);
             total = await countQb.getCount();
         }
         const response = this.toResponseDto

package/dist/lib/testing/crud-service.test-suites.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crud-service.test-suites.d.ts","sourceRoot":"","sources":["../../../src/lib/testing/crud-service.test-suites.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtE,wBAAgB,gBAAgB,CAC9B,OAAO,SAAS,aAAa,EAC7B,UAAU,EACV,UAAU,EACV,YAAY,EACZ,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,eAAe,CA6VxF"}
+{"version":3,"file":"crud-service.test-suites.d.ts","sourceRoot":"","sources":["../../../src/lib/testing/crud-service.test-suites.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtE,wBAAgB,gBAAgB,CAC9B,OAAO,SAAS,aAAa,EAC7B,UAAU,EACV,UAAU,EACV,YAAY,EACZ,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,eAAe,CA6axF"}

package/dist/lib/testing/crud-service.test-suites.js

@@ -59,6 +59,44 @@ function crudServiceTests(config) {
             });
             expect(lastQb.andWhere).toHaveBeenCalled();
         });
+        it('should apply nested filters via joined aliases', async () => {
+            const nestedFilters = (config.allowedFilters ?? []).filter((field) => String(field).includes('.'));
+            if (nestedFilters.length === 0)
+                return;
+            lastQb = (0, mock_repository_1.createMockQb)();
+            lastQb.getManyAndCount.mockResolvedValue([[], 0]);
+            repository.createQueryBuilder.mockReturnValue(lastQb);
+            const nestedField = String(nestedFilters[0]);
+            await service.findAll({
+                page: 1,
+                limit: 10,
+                filter: { [`${nestedField}_cont`]: 'test' },
+            });
+            const [sql] = lastQb.andWhere.mock.calls[0];
+            const parts = nestedField.split('.');
+            const alias = parts.slice(0, -1).join('_');
+            const column = parts[parts.length - 1];
+            expect(sql).toContain(`${alias}.${column} ILIKE`);
+        });
+        it('should sort by nested fields via joined aliases', async () => {
+            const nestedSorts = (config.allowedSortFields ?? []).filter((field) => String(field).includes('.'));
+            if (nestedSorts.length === 0)
+                return;
+            lastQb = (0, mock_repository_1.createMockQb)();
+            lastQb.getManyAndCount.mockResolvedValue([[], 0]);
+            repository.createQueryBuilder.mockReturnValue(lastQb);
+            const nestedField = String(nestedSorts[0]);
+            await service.findAll({
+                page: 1,
+                limit: 10,
+                orderBy: nestedField,
+                orderDirection: 'ASC',
+            });
+            const parts = nestedField.split('.');
+            const alias = parts.slice(0, -1).join('_');
+            const column = parts[parts.length - 1];
+            expect(lastQb.orderBy).toHaveBeenCalledWith(`${alias}.${column}`, 'ASC');
+        });
         it('should join include relations via leftJoinAndSelect', async () => {
             if (!config.include || config.include.length === 0)
                 return;
@@ -246,6 +284,26 @@ function crudServiceTests(config) {
             });
             expect(result.meta).toHaveProperty('total');
         });
+        it('should join nested relations on the count query when includeTotal is true', async () => {
+            const nestedIncludes = (config.include ?? []).filter((relation) => relation.includes('.'));
+            if (nestedIncludes.length === 0)
+                return;
+            lastQb = (0, mock_repository_1.createMockQb)();
+            lastQb.getMany.mockResolvedValue([]);
+            repository.createQueryBuilder.mockReturnValue(lastQb);
+            const countQb = (0, mock_repository_1.createMockQb)();
+            countQb.getCount.mockResolvedValue(0);
+            repository.createQueryBuilder.mockReturnValueOnce(lastQb);
+            repository.createQueryBuilder.mockReturnValueOnce(countQb);
+            await service.findAllWithCursor({ limit: 10, includeTotal: true });
+            for (const relation of nestedIncludes) {
+                const parts = relation.split('.');
+                const parentAlias = parts.slice(0, -1).join('_');
+                const field = parts[parts.length - 1];
+                const alias = parts.join('_');
+                expect(countQb.leftJoin).toHaveBeenCalledWith(`${parentAlias}.${field}`, alias);
+            }
+        });
     });
     describe('findAuditLogs', () => {
         it('should query audit logs with pagination', async () => {

package/dist/lib/testing/testing.interface.d.ts

@@ -8,8 +8,8 @@ export interface CrudTestConfig<TEntity extends ObjectLiteral, TCreateDto, TUpda
     createDto?: Type<TCreateDto>;
     updateDto?: Type<TUpdateDto>;
     responseDto?: Type<TResponseDto>;
-    allowedFilters?: readonly (keyof TEntity)[];
-    allowedSortFields?: readonly (keyof TEntity)[];
+    allowedFilters?: readonly (keyof TEntity | (string & {}))[];
+    allowedSortFields?: readonly (keyof TEntity | (string & {}))[];
     include?: readonly string[];
     userOwnershipField?: keyof TEntity;
     findMineQuery?: (qb: any, userId: string | number) => void;

package/dist/lib/testing/testing.interface.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-util/nest-crud",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",