@klerick/json-api-nestjs-typeorm 0.1.0-beta.3 → 0.1.0-beta.5

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## 0.1.0-beta.5 (2025-12-26)
+
+### 🧱 Updated Dependencies
+
+- Updated json-api-nestjs to 10.0.0-beta.7
+
+## 0.1.0-beta.4 (2025-11-13)
+
+### 🚀 Features
+
+- **json-api-nestjs-typeorm:** add ACL rule support for query builders and enhance `getOne` and `getAll` methods with additional query params and transform toggles ([c322379](https://github.com/klerick/nestjs-json-api/commit/c322379))
+- **json-api-nestjs-typeorm:** fix after update nx ([8f778f0](https://github.com/klerick/nestjs-json-api/commit/8f778f0))
+- **json-api-nestjs-typeorm:** fix after update nx ([5c9bbdf](https://github.com/klerick/nestjs-json-api/commit/5c9bbdf))
+- **json-api-nestjs-typeorm:** refine type usage, update imports, and handle relation aliases consistently ([b3e9f31](https://github.com/klerick/nestjs-json-api/commit/b3e9f31))
+
+### 🩹 Fixes
+
+- **json-api-nestjs-typeorm:** update type assertions and replace deprecated faker methods ([1aa21f5](https://github.com/klerick/nestjs-json-api/commit/1aa21f5))
+
+### 🧱 Updated Dependencies
+
+- Updated json-api-nestjs-shared to 1.0.0-beta.4
+- Updated json-api-nestjs to 10.0.0-beta.6
+
+### ❤️ Thank You
+
+- Alex H
+
 ## 0.1.0-beta.3 (2025-05-23)
 
 ### 🚀 Features

package/README.md

@@ -1,3 +1,11 @@
+<p align='center'>
+  <a href="https://www.npmjs.com/package/@klerick/json-api-nestjs-typeorm" target="_blank"><img src="https://img.shields.io/npm/v/@klerick/json-api-nestjs-typeorm.svg" alt="NPM Version" /></a>
+  <a href="https://www.npmjs.com/package/@klerick/json-api-nestjs-typeorm" target="_blank"><img src="https://img.shields.io/npm/l/@klerick/json-api-nestjs-typeorm.svg" alt="Package License" /></a>
+  <a href="https://www.npmjs.com/package/@klerick/json-api-nestjs-typeorm" target="_blank"><img src="https://img.shields.io/npm/dm/@klerick/json-api-nestjs-typeorm.svg" alt="NPM Downloads" /></a>
+  <a href="http://commitizen.github.io/cz-cli/" target="_blank"><img src="https://img.shields.io/badge/commitizen-friendly-brightgreen.svg" alt="Commitizen friendly" /></a>
+  <img src="https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/klerick/02a4c98cf7008fea2af70dc2d50f4cb7/raw/json-api-nestjs-microorm.json" alt="Coverage Badge" />
+</p>
+
 # json-api-nestjs-typeorm
 
 TypeOrm adapter for **[json-api-nestjs](https://github.com/klerick/nestjs-json-api/tree/master/libs/json-api/json-api-nestjs)**

package/package.json

@@ -1,16 +1,6 @@
 {
   "name": "@klerick/json-api-nestjs-typeorm",
-  "version": "0.1.0-beta.3",
-  "dependencies": {
-    "@mikro-orm/core": "^6.4.0",
-    "@nestjs/common": "^11.1.0",
-    "@nestjs/typeorm": "^11.0.0",
-    "change-case-commonjs": "^5.4.4",
-    "reflect-metadata": "^0.1.12 || ^0.2.0",
-    "rxjs": "^7.1.0",
-    "tslib": ">2.3.0",
-    "typeorm": "^0.3.20"
-  },
+  "version": "0.1.0-beta.5",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
@@ -25,8 +15,10 @@
     "CRUD"
   ],
   "peerDependencies": {
-    "@klerick/json-api-nestjs": "^10.0.0-beta.4"
+    "@klerick/json-api-nestjs": "^10.0.0-beta.7",
+    "@nestjs/typeorm": "^11.0.0"
   },
+  "dependencies": {},
   "exports": {
     "./package.json": "./package.json",
     ".": {

package/src/lib/orm-helper/acl-rules-to-typeorm.d.ts

@@ -0,0 +1,36 @@
+import { Brackets } from 'typeorm';
+import { TypeormUtilsService } from '../service';
+/**
+ * Extract all relation field names from ACL rulesForQuery
+ * @param rules - ACL rules object
+ * @param typeormUtils - TypeORM utils service
+ * @returns Set of relation field names used in the rules
+ */
+export declare function extractRelationsFromRules<E extends object, IdKey extends string>(rules: Record<string, unknown>, typeormUtils: TypeormUtilsService<E, IdKey>): Set<string>;
+/**
+ * Converts ACL rulesForQuery (MikroORM-like format) to TypeORM QueryBuilder conditions
+ *
+ * @param rulesForQuery - MongoDB-like query object from ExtendAbility.getQueryObject()
+ * @param typeormUtils - TypeORM utils service for getting aliases and paths
+ * @param hasExistingWhere - Whether queryBuilder already has WHERE conditions
+ * @returns Callback function for queryBuilder.andWhere() or queryBuilder.where()
+ *
+ * @example
+ * // With existing WHERE
+ * const callback = applyAclRulesToQueryBuilder(
+ *   { authorId: 123, profile: { isPublic: true } },
+ *   typeormUtils,
+ *   true
+ * );
+ * queryBuilder.andWhere(callback);
+ *
+ * @example
+ * // Without existing WHERE
+ * const callback = applyAclRulesToQueryBuilder(
+ *   { authorId: 123 },
+ *   typeormUtils,
+ *   false
+ * );
+ * callback(queryBuilder);
+ */
+export declare function applyAclRulesToQueryBuilder<E extends object, IdKey extends string>(rulesForQuery: Record<string, unknown>, typeormUtils: TypeormUtilsService<E, IdKey>): Brackets;

package/src/lib/orm-helper/acl-rules-to-typeorm.js

@@ -0,0 +1,314 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractRelationsFromRules = extractRelationsFromRules;
+exports.applyAclRulesToQueryBuilder = applyAclRulesToQueryBuilder;
+const typeorm_1 = require("typeorm");
+const type_1 = require("../type");
+/**
+ * Maps ACL operators (with $) to TypeORM operators (without $)
+ */
+const ACL_TO_TYPEORM_OPERATOR = {
+    '$eq': 'eq',
+    '$ne': 'ne',
+    '$gt': 'gt',
+    '$gte': 'gte',
+    '$lt': 'lt',
+    '$lte': 'lte',
+    '$in': 'in',
+    '$nin': 'nin',
+    '$re': 'regexp',
+    '$contains': 'contains',
+};
+/**
+ * Extract all relation field names from ACL rulesForQuery
+ * @param rules - ACL rules object
+ * @param typeormUtils - TypeORM utils service
+ * @returns Set of relation field names used in the rules
+ */
+function extractRelationsFromRules(rules, typeormUtils) {
+    const relations = new Set();
+    const processObject = (obj) => {
+        for (const [key, value] of Object.entries(obj)) {
+            // Skip logical operators
+            if (key === '$or' || key === '$and' || key === '$not') {
+                if (Array.isArray(value)) {
+                    value.forEach((item) => {
+                        if (typeof item === 'object' && item !== null) {
+                            processObject(item);
+                        }
+                    });
+                }
+                else if (typeof value === 'object' && value !== null) {
+                    processObject(value);
+                }
+                continue;
+            }
+            // Check if this is a relation field
+            // @ts-ignore
+            const isRelation = typeormUtils.relationFields.includes(key);
+            if (isRelation) {
+                relations.add(key);
+            }
+        }
+    };
+    processObject(rules);
+    return relations;
+}
+/**
+ * Converts ACL rulesForQuery (MikroORM-like format) to TypeORM QueryBuilder conditions
+ *
+ * @param rulesForQuery - MongoDB-like query object from ExtendAbility.getQueryObject()
+ * @param typeormUtils - TypeORM utils service for getting aliases and paths
+ * @param hasExistingWhere - Whether queryBuilder already has WHERE conditions
+ * @returns Callback function for queryBuilder.andWhere() or queryBuilder.where()
+ *
+ * @example
+ * // With existing WHERE
+ * const callback = applyAclRulesToQueryBuilder(
+ *   { authorId: 123, profile: { isPublic: true } },
+ *   typeormUtils,
+ *   true
+ * );
+ * queryBuilder.andWhere(callback);
+ *
+ * @example
+ * // Without existing WHERE
+ * const callback = applyAclRulesToQueryBuilder(
+ *   { authorId: 123 },
+ *   typeormUtils,
+ *   false
+ * );
+ * callback(queryBuilder);
+ */
+function applyAclRulesToQueryBuilder(rulesForQuery, typeormUtils) {
+    let paramCounter = 0;
+    const getParamName = () => {
+        paramCounter++;
+        return `aclParam_${paramCounter}`;
+    };
+    /**
+     * Recursively process rules and apply to query builder
+     */
+    const processRules = (qb, rules, isFirstCondition = true) => {
+        for (const [key, value] of Object.entries(rules)) {
+            // Handle logical operators
+            if (key === '$and' && Array.isArray(value)) {
+                qb.andWhere(new typeorm_1.Brackets((subQb) => {
+                    for (const condition of value) {
+                        processRules(subQb, condition, false);
+                    }
+                }));
+                continue;
+            }
+            if (key === '$or' && Array.isArray(value)) {
+                // Build OR conditions as a single WHERE clause with manual parentheses
+                const orConditions = [];
+                const orParams = {};
+                value.forEach((condition) => {
+                    const cond = condition;
+                    Object.entries(cond).forEach(([field, val]) => {
+                        // Check if this is a relation field
+                        // @ts-ignore
+                        const isRelation = typeormUtils.relationFields.includes(field);
+                        if (isRelation && typeof val === 'object' && val !== null && !Array.isArray(val)) {
+                            // Handle relation fields: { user: { id: { $eq: 3 } } }
+                            const relationAlias = typeormUtils.getAliasForRelation(field);
+                            for (const [nestedKey, nestedValue] of Object.entries(val)) {
+                                const fieldPath = `${relationAlias}.${nestedKey}`;
+                                if (nestedValue === null || typeof nestedValue !== 'object' || Array.isArray(nestedValue)) {
+                                    const paramName = getParamName();
+                                    orConditions.push(`${fieldPath} = :${paramName}`);
+                                    orParams[paramName] = nestedValue;
+                                }
+                                else {
+                                    // Handle operators in nested field
+                                    const operators = nestedValue;
+                                    const [aclOperator, operatorValue] = Object.entries(operators)[0];
+                                    const typeormOperator = ACL_TO_TYPEORM_OPERATOR[aclOperator];
+                                    if (typeormOperator) {
+                                        const sqlTemplate = type_1.OperandsMapExpression[typeormOperator];
+                                        if (sqlTemplate) {
+                                            const paramName = getParamName();
+                                            const sqlExpression = sqlTemplate.replace(type_1.EXPRESSION, paramName);
+                                            orConditions.push(`${fieldPath} ${sqlExpression}`);
+                                            orParams[paramName] = operatorValue;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        else {
+                            // Handle entity fields
+                            const fieldPath = `${typeormUtils.currentAlias}.${field}`;
+                            if (val === null || typeof val !== 'object' || Array.isArray(val)) {
+                                const paramName = getParamName();
+                                orConditions.push(`${fieldPath} = :${paramName}`);
+                                orParams[paramName] = val;
+                            }
+                            else {
+                                // Handle operators
+                                const operators = val;
+                                const [aclOperator, operatorValue] = Object.entries(operators)[0];
+                                const typeormOperator = ACL_TO_TYPEORM_OPERATOR[aclOperator];
+                                if (typeormOperator) {
+                                    const sqlTemplate = type_1.OperandsMapExpression[typeormOperator];
+                                    if (sqlTemplate) {
+                                        const paramName = getParamName();
+                                        const sqlExpression = sqlTemplate.replace(type_1.EXPRESSION, paramName);
+                                        orConditions.push(`${fieldPath} ${sqlExpression}`);
+                                        orParams[paramName] = operatorValue;
+                                    }
+                                }
+                            }
+                        }
+                    });
+                });
+                if (orConditions.length > 0) {
+                    // Wrap in parentheses and join with OR
+                    const orClause = `(${orConditions.join(' OR ')})`;
+                    const whereMethod = isFirstCondition ? 'where' : 'andWhere';
+                    qb[whereMethod](orClause, orParams);
+                    isFirstCondition = false;
+                }
+                continue;
+            }
+            if (key === '$not') {
+                // Build NOT conditions - collect all conditions and wrap in NOT (...)
+                const notConditions = [];
+                const notParams = {};
+                const notRules = value;
+                for (const [notKey, notValue] of Object.entries(notRules)) {
+                    // Check if this is a relation field
+                    // @ts-ignore
+                    const isRelation = typeormUtils.relationFields.includes(notKey);
+                    if (isRelation && typeof notValue === 'object' && notValue !== null && !Array.isArray(notValue)) {
+                        // Handle relation fields
+                        const relationAlias = typeormUtils.getAliasForRelation(notKey);
+                        for (const [nestedKey, nestedValue] of Object.entries(notValue)) {
+                            const fieldPath = `${relationAlias}.${nestedKey}`;
+                            if (nestedValue === null || typeof nestedValue !== 'object' || Array.isArray(nestedValue)) {
+                                const paramName = getParamName();
+                                notConditions.push(`${fieldPath} = :${paramName}`);
+                                notParams[paramName] = nestedValue;
+                            }
+                            else {
+                                // Handle operators
+                                const operators = nestedValue;
+                                const [aclOperator, operatorValue] = Object.entries(operators)[0];
+                                const typeormOperator = ACL_TO_TYPEORM_OPERATOR[aclOperator];
+                                if (typeormOperator) {
+                                    const sqlTemplate = type_1.OperandsMapExpression[typeormOperator];
+                                    if (sqlTemplate) {
+                                        const paramName = getParamName();
+                                        const sqlExpression = sqlTemplate.replace(type_1.EXPRESSION, paramName);
+                                        notConditions.push(`${fieldPath} ${sqlExpression}`);
+                                        notParams[paramName] = operatorValue;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        // Handle entity fields
+                        const fieldPath = `${typeormUtils.currentAlias}.${notKey}`;
+                        if (notValue === null || typeof notValue !== 'object' || Array.isArray(notValue)) {
+                            const paramName = getParamName();
+                            notConditions.push(`${fieldPath} = :${paramName}`);
+                            notParams[paramName] = notValue;
+                        }
+                        else {
+                            // Handle operators
+                            const operators = notValue;
+                            const [aclOperator, operatorValue] = Object.entries(operators)[0];
+                            const typeormOperator = ACL_TO_TYPEORM_OPERATOR[aclOperator];
+                            if (typeormOperator) {
+                                const sqlTemplate = type_1.OperandsMapExpression[typeormOperator];
+                                if (sqlTemplate) {
+                                    const paramName = getParamName();
+                                    const sqlExpression = sqlTemplate.replace(type_1.EXPRESSION, paramName);
+                                    notConditions.push(`${fieldPath} ${sqlExpression}`);
+                                    notParams[paramName] = operatorValue;
+                                }
+                            }
+                        }
+                    }
+                }
+                if (notConditions.length > 0) {
+                    // Wrap in NOT (...)
+                    const notClause = `NOT (${notConditions.join(' AND ')})`;
+                    qb.andWhere(notClause, notParams);
+                }
+                continue;
+            }
+            // Check if this is a relation field
+            // @ts-ignore
+            const isRelation = typeormUtils.relationFields.includes(key);
+            if (isRelation && typeof value === 'object' && value !== null && !Array.isArray(value)) {
+                // Handle relation fields: { profile: { isPublic: true } }
+                const relationAlias = typeormUtils.getAliasForRelation(key);
+                for (const [nestedKey, nestedValue] of Object.entries(value)) {
+                    processFieldCondition(qb, `${relationAlias}.${nestedKey}`, nestedValue, isFirstCondition && Object.keys(rules).indexOf(key) === 0);
+                    isFirstCondition = false;
+                }
+            }
+            else {
+                // Handle entity fields: { authorId: 123, status: { $in: [...] } }
+                const fieldPath = `${typeormUtils.currentAlias}.${key}`;
+                processFieldCondition(qb, fieldPath, value, isFirstCondition);
+                isFirstCondition = false;
+            }
+        }
+    };
+    /**
+     * Process a single field condition (with or without operators)
+     */
+    const processFieldCondition = (qb, fieldPath, value, isFirst) => {
+        const whereMethod = isFirst ? 'where' : 'andWhere';
+        // Primitive value - direct equality
+        if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+            const paramName = getParamName();
+            qb[whereMethod](`${fieldPath} = :${paramName}`, { [paramName]: value });
+            return;
+        }
+        // Object with operators: { $in: [...], $gt: 10, etc. }
+        const operators = value;
+        for (const [aclOperator, operatorValue] of Object.entries(operators)) {
+            const paramName = getParamName();
+            // Convert ACL operator ($eq) to TypeORM operator (eq)
+            const typeormOperator = ACL_TO_TYPEORM_OPERATOR[aclOperator];
+            if (!typeormOperator) {
+                console.warn(`[ACL] Unknown operator "${aclOperator}" in rulesForQuery`);
+                continue;
+            }
+            // Get SQL expression template from OperandsMapExpression
+            const sqlTemplate = type_1.OperandsMapExpression[typeormOperator];
+            if (!sqlTemplate) {
+                console.warn(`[ACL] No SQL template for operator "${typeormOperator}"`);
+                continue;
+            }
+            // Replace EXPRESSION placeholder with paramName
+            const sqlExpression = sqlTemplate.replace(type_1.EXPRESSION, paramName);
+            // Apply condition to query builder
+            qb[whereMethod](`${fieldPath} ${sqlExpression}`, { [paramName]: operatorValue });
+        }
+    };
+    // Return callback function
+    // if (hasExistingWhere) {
+    //   // If there's existing WHERE, wrap in Brackets to isolate ACL conditions
+    //   return (qb: WhereExpressionBuilder) => {
+    //     qb.andWhere(
+    //
+    //     );
+    //   };
+    // } else {
+    //   // If no existing WHERE, process rules directly
+    //   return (qb: WhereExpressionBuilder) => {
+    //     processRules(qb, rulesForQuery, true);
+    //   };
+    // }
+    return new typeorm_1.Brackets((subQb) => {
+        // Inside Brackets, MUST use TRUE - first condition needs .where()
+        processRules(subQb, rulesForQuery, true);
+    });
+}
+//# sourceMappingURL=acl-rules-to-typeorm.js.map

package/src/lib/orm-helper/acl-rules-to-typeorm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acl-rules-to-typeorm.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/orm-helper/acl-rules-to-typeorm.ts"],"names":[],"mappings":"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"}

package/src/lib/orm-helper/index.d.ts

@@ -1,5 +1,6 @@
 import { EntityParam } from '@klerick/json-api-nestjs';
 import { Repository } from 'typeorm';
+export * from './acl-rules-to-typeorm';
 export declare const getRelation: <E extends object>(repository: Repository<E>) => EntityParam<E>["relations"];
 export declare const getProps: <E extends object>(repository: Repository<E>) => EntityParam<E>["props"];
 export declare const getPropsType: <E extends object>(repository: Repository<E>) => EntityParam<E>["propsType"];
@@ -8,3 +9,4 @@ export declare const getPrimaryColumnName: <E extends object>(repository: Reposi
 export declare const getPrimaryColumnType: <E extends object>(repository: Repository<E>) => EntityParam<E>["primaryColumnType"];
 export declare const getRelationProperty: <E extends object>(repository: Repository<E>) => EntityParam<E>["relationProperty"];
 export declare const getArrayType: <E extends object>(repository: Repository<E>) => EntityParam<E>["propsArrayType"];
+export { applyAclRulesToQueryBuilder, extractRelationsFromRules } from './acl-rules-to-typeorm';

package/src/lib/orm-helper/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getArrayType = exports.getRelationProperty = exports.getPrimaryColumnType = exports.getPrimaryColumnName = exports.getPropsNullable = exports.getPropsType = exports.getProps = exports.getRelation = void 0;
+exports.extractRelationsFromRules = exports.applyAclRulesToQueryBuilder = exports.getArrayType = exports.getRelationProperty = exports.getPrimaryColumnType = exports.getPrimaryColumnName = exports.getPropsNullable = exports.getPropsType = exports.getProps = exports.getRelation = void 0;
+const tslib_1 = require("tslib");
 const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
+tslib_1.__exportStar(require("./acl-rules-to-typeorm"), exports);
 const getRelation = (repository) => repository.metadata.relations.map((i) => {
     return i.propertyName;
 });
@@ -148,4 +150,7 @@ const getArrayType = (repository) => {
     }, {});
 };
 exports.getArrayType = getArrayType;
+var acl_rules_to_typeorm_1 = require("./acl-rules-to-typeorm");
+Object.defineProperty(exports, "applyAclRulesToQueryBuilder", { enumerable: true, get: function () { return acl_rules_to_typeorm_1.applyAclRulesToQueryBuilder; } });
+Object.defineProperty(exports, "extractRelationsFromRules", { enumerable: true, get: function () { return acl_rules_to_typeorm_1.extractRelationsFromRules; } });
 //# sourceMappingURL=index.js.map

package/src/lib/orm-helper/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/orm-helper/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/orm-helper/index.ts"],"names":[],"mappings":"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"}

package/src/lib/orm-methods/get-all/get-all.d.ts

@@ -1,4 +1,7 @@
 import { Query } from '@klerick/json-api-nestjs';
 import { ResourceObject } from '@klerick/json-api-nestjs-shared';
 import { TypeOrmService } from '../../service';
-export declare function getAll<E extends object, IdKey extends string = 'id'>(this: TypeOrmService<E, IdKey>, query: Query<E, IdKey>): Promise<ResourceObject<E, 'array', null, IdKey>>;
+export declare function getAll<E extends object, IdKey extends string = 'id'>(this: TypeOrmService<E, IdKey>, query: Query<E, IdKey>, transformData?: boolean, additionalQueryParams?: Record<string, unknown>): Promise<ResourceObject<E, 'array', null, IdKey> | {
+    totalItems: number;
+    items: E[];
+}>;

package/src/lib/orm-methods/get-all/get-all.js

@@ -4,14 +4,16 @@ exports.getAll = getAll;
 const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const constants_1 = require("../../constants");
+const orm_helper_1 = require("../../orm-helper");
 function getSortObject(params, relationName) {
     return Object.entries(params).reduce((acum, [props, sort]) => {
         acum[`${relationName}.${props}`] = `${sort}` === json_api_nestjs_1.ASC ? json_api_nestjs_1.ASC : json_api_nestjs_1.DESC;
         return acum;
     }, {});
 }
-async function getAll(query) {
+async function getAll(query, transformData, additionalQueryParams) {
     const { fields, include, sort, page } = query;
+    let hasExistingWhere = false;
     let defaultSortObject = {
         [`${this.typeormUtilsService.currentAlias}.${this.typeormUtilsService.currentPrimaryColumn.toString()}`]: json_api_nestjs_1.ASC,
     };
@@ -51,6 +53,7 @@ async function getAll(query) {
         .select(this.typeormUtilsService.getAliasPath(this.typeormUtilsService.currentPrimaryColumn), this.typeormUtilsService.currentPrimaryColumn.toString())
         .orderBy(defaultSortObject);
     for (const i in expressionArray) {
+        hasExistingWhere = true;
         const { params, alias, selectInclude, expression } = expressionArray[i];
         const expressionTempArray = [];
         if (alias) {
@@ -75,6 +78,21 @@ async function getAll(query) {
         const currentIncludeAlias = this.typeormUtilsService.getAliasForRelation(rel);
         queryBuilderForCount.leftJoin(this.typeormUtilsService.getAliasPath(rel), currentIncludeAlias);
     }
+    if (additionalQueryParams) {
+        const brackets = (0, orm_helper_1.applyAclRulesToQueryBuilder)(additionalQueryParams, this.typeormUtilsService);
+        for (const item of include || []) {
+            const currentIncludeAlias = this.typeormUtilsService.getAliasForRelation(item);
+            if (!currentIncludeAlias)
+                continue;
+            queryBuilderForCount.leftJoin(this.typeormUtilsService.getAliasPath(item), currentIncludeAlias);
+        }
+        if (hasExistingWhere) {
+            queryBuilderForCount.andWhere(brackets);
+        }
+        else {
+            queryBuilderForCount.where(brackets);
+        }
+    }
     const count = await queryBuilderForCount.getCount();
     const meta = {
         pageNumber: page.number,
@@ -82,10 +100,15 @@ async function getAll(query) {
         pageSize: page.size,
     };
     if (count === 0) {
-        return {
-            meta,
-            data: [],
-        };
+        return transformData
+            ? {
+                meta,
+                data: [],
+            }
+            : {
+                totalItems: 0,
+                items: [],
+            };
     }
     const aliasForIdResultPagination = this.typeormUtilsService.getAliasPath(this.typeormUtilsService.currentPrimaryColumn, constants_1.ALIAS_FOR_PAGINATION, '_');
     const resultIds = await this.repository
@@ -103,7 +126,7 @@ async function getAll(query) {
     }
     if (include) {
         for (const rel of include) {
-            includeRel.add(rel);
+            includeRel.add(`${rel}`);
         }
     }
     const fieldsCast = fields;
@@ -167,6 +190,12 @@ async function getAll(query) {
         resultQuery[selectFields.size > 0 ? 'leftJoin' : 'leftJoinAndSelect'](this.typeormUtilsService.getAliasPath(item), currentIncludeAlias);
     }
     const resultData = await resultQuery.getMany();
+    if (!transformData) {
+        return {
+            totalItems: count,
+            items: resultData,
+        };
+    }
     const { included, data } = this.transformDataService.transformData(resultData, query);
     return {
         meta: {

package/src/lib/orm-methods/get-all/get-all.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-all.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/orm-methods/get-all/get-all.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-all.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/orm-methods/get-all/get-all.ts"],"names":[],"mappings":"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"}

package/src/lib/orm-methods/get-one/get-one.d.ts

@@ -1,4 +1,4 @@
 import { QueryOne } from '@klerick/json-api-nestjs';
 import { ResourceObject } from '@klerick/json-api-nestjs-shared';
 import { TypeOrmService } from '../../service';
-export declare function getOne<E extends object, IdKey extends string>(this: TypeOrmService<E, IdKey>, id: number | string, query: QueryOne<E, IdKey>): Promise<ResourceObject<E, 'object', null, IdKey>>;
+export declare function getOne<E extends object, IdKey extends string>(this: TypeOrmService<E, IdKey>, id: number | string, query: QueryOne<E, IdKey>, transformData?: boolean, additionalQueryParams?: Record<string, unknown>): Promise<ResourceObject<E, 'object', null, IdKey> | E>;

package/src/lib/orm-methods/get-one/get-one.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOne = getOne;
 const common_1 = require("@nestjs/common");
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
-async function getOne(id, query) {
+const orm_helper_1 = require("../../orm-helper");
+async function getOne(id, query, transformData, additionalQueryParams) {
     const { include, fields } = query;
     const selectFields = new Set();
     const builder = this.repository.createQueryBuilder(this.typeormUtilsService.currentAlias);
@@ -24,7 +25,8 @@ async function getOne(id, query) {
         }
     }
     if (include) {
-        for (const rel of include) {
+        for (const relFromLoop of include) {
+            const rel = relFromLoop;
             const currentIncludeAlias = this.typeormUtilsService.getAliasForRelation(rel);
             builder[fields ? 'leftJoin' : 'leftJoinAndSelect'](this.typeormUtilsService.getAliasPath(rel), currentIncludeAlias);
             if (fields) {
@@ -36,11 +38,24 @@ async function getOne(id, query) {
         builder.select([...selectFields]);
     }
     const paramsId = 'paramsId';
-    const result = await builder
-        .where(`${this.typeormUtilsService.getAliasPath(this.typeormUtilsService.currentPrimaryColumn)} = :${paramsId}`, {
+    builder.where(`${this.typeormUtilsService.getAliasPath(this.typeormUtilsService.currentPrimaryColumn)} = :${paramsId}`, {
         [paramsId]: id,
-    })
-        .getOne();
+    });
+    if (additionalQueryParams) {
+        // Extract relations from ACL rules
+        const aclRelations = (0, orm_helper_1.extractRelationsFromRules)(additionalQueryParams, this.typeormUtilsService);
+        // Add JOINs for ACL relations that aren't already in the query
+        for (const rel of aclRelations) {
+            const relationAlias = this.typeormUtilsService.getAliasForRelation(rel);
+            // Check if this alias already exists in the query
+            const aliasExists = builder.expressionMap.aliases.some((alias) => alias.name === relationAlias);
+            if (!aliasExists) {
+                builder.leftJoin(this.typeormUtilsService.getAliasPath(rel), relationAlias);
+            }
+        }
+        builder.andWhere((0, orm_helper_1.applyAclRulesToQueryBuilder)(additionalQueryParams, this.typeormUtilsService));
+    }
+    const result = await builder.getOne();
     if (!result) {
         const error = {
             code: 'invalid_arguments',
@@ -49,6 +64,8 @@ async function getOne(id, query) {
         };
         throw new common_1.NotFoundException([error]);
     }
+    if (!transformData)
+        return result;
     const { included, data } = this.transformDataService.transformData(result, query);
     return {
         meta: {},

package/src/lib/orm-methods/get-one/get-one.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-one.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/orm-methods/get-one/get-one.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-one.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/orm-methods/get-one/get-one.ts"],"names":[],"mappings":"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"}

package/src/lib/service/type-orm.service.d.ts

@@ -1,4 +1,4 @@
-import { OrmService, PatchData, PatchRelationshipData, PostData, PostRelationshipData, Query, QueryOne, EntityControllerParam, JsonApiTransformerService } from '@klerick/json-api-nestjs';
+import { OrmService, PatchData, PatchRelationshipData, PostData, PostRelationshipData, Query, QueryOne, EntityControllerParam, JsonApiTransformerService, Relationships } from '@klerick/json-api-nestjs';
 import { ResourceObject, RelationKeys, ResourceObjectRelationships } from '@klerick/json-api-nestjs-shared';
 import { Repository } from 'typeorm';
 import { TypeormUtilsService } from './typeorm-utils.service';
@@ -9,12 +9,17 @@ export declare class TypeOrmService<E extends object, IdKey extends string = 'id
     config: EntityControllerParam<TypeOrmParam>;
     repository: Repository<E>;
     getAll(query: Query<E, IdKey>): Promise<ResourceObject<E, 'array', null, IdKey>>;
+    getAll(query: Query<E, IdKey>, transformData?: boolean, additionalQueryParams?: Record<string, unknown>): Promise<ResourceObject<E, 'array', null, IdKey>>;
     deleteOne(id: number | string): Promise<void>;
     deleteRelationship<Rel extends RelationKeys<E, IdKey>>(id: number | string, rel: Rel, input: PostRelationshipData): Promise<void>;
     getOne(id: number | string, query: QueryOne<E, IdKey>): Promise<ResourceObject<E, 'object', null, IdKey>>;
+    getOne(id: number | string, query: QueryOne<E, IdKey>, transformData?: boolean, additionalQueryParams?: Record<string, unknown>): Promise<ResourceObject<E, 'object', null, IdKey> | E>;
     getRelationship<Rel extends RelationKeys<E, IdKey>>(id: number | string, rel: Rel): Promise<ResourceObjectRelationships<E, IdKey, Rel>>;
     patchOne(id: number | string, inputData: PatchData<E, IdKey>): Promise<ResourceObject<E, 'object', null, IdKey>>;
     patchRelationship<Rel extends RelationKeys<E, IdKey>>(id: number | string, rel: Rel, input: PatchRelationshipData): Promise<ResourceObjectRelationships<E, IdKey, Rel>>;
     postOne(inputData: PostData<E, IdKey>): Promise<ResourceObject<E, 'object', null, IdKey>>;
     postRelationship<Rel extends RelationKeys<E, IdKey>>(id: number | string, rel: Rel, input: PostRelationshipData): Promise<ResourceObjectRelationships<E, IdKey, Rel>>;
+    loadRelations(relationships: NonNullable<Relationships<E, IdKey>>): Promise<{
+        [K in RelationKeys<E>]: E[K];
+    }>;
 }

package/src/lib/service/type-orm.service.js

@@ -4,6 +4,7 @@ exports.TypeOrmService = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
+const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const typeorm_1 = require("typeorm");
 const orm_methods_1 = require("../orm-methods");
 const typeorm_utils_service_1 = require("./typeorm-utils.service");
@@ -13,8 +14,8 @@ class TypeOrmService {
     transformDataService;
     config;
     repository;
-    getAll(query) {
-        return orm_methods_1.getAll.call(this, query);
+    async getAll(query, transformData = true, additionalQueryParams) {
+        return orm_methods_1.getAll.call(this, query, transformData, additionalQueryParams);
     }
     deleteOne(id) {
         return orm_methods_1.deleteOne.call(this, id);
@@ -22,8 +23,8 @@ class TypeOrmService {
     deleteRelationship(id, rel, input) {
         return orm_methods_1.deleteRelationship.call(this, id, rel, input);
     }
-    getOne(id, query) {
-        return orm_methods_1.getOne.call(this, id, query);
+    async getOne(id, query, transformData = true, additionalQueryParams) {
+        return orm_methods_1.getOne.call(this, id, query, transformData, additionalQueryParams);
     }
     getRelationship(id, rel) {
         return orm_methods_1.getRelationship.call(this, id, rel);
@@ -40,6 +41,17 @@ class TypeOrmService {
     postRelationship(id, rel, input) {
         return orm_methods_1.postRelationship.call(this, id, rel, input);
     }
+    async loadRelations(relationships) {
+        const result = {};
+        for await (const item of this.typeormUtilsService.asyncIterateFindRelationships(relationships)) {
+            const itemProps = json_api_nestjs_shared_1.ObjectTyped.entries(item).at(0);
+            if (!itemProps)
+                continue;
+            const [nameProps, data] = itemProps;
+            Reflect.set(result, nameProps, data);
+        }
+        return result;
+    }
 }
 exports.TypeOrmService = TypeOrmService;
 tslib_1.__decorate([

package/src/lib/service/type-orm.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-orm.service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/service/type-orm.service.ts"],"names":[],"mappings":";;;;AAAA,2CAAwC;AACxC,8DAWkC;AAOlC,qCAAqC;AAErC,gDAUwB;AAExB,mEAA8D;AAC9D,4CAAyD;AAGzD,MAAa,cAAc;IAIlB,mBAAmB,CAAiC;IAEpD,oBAAoB,CAAuC;IAE3D,MAAM,CAAuC;IACV,UAAU,CAAiB;IAErE,MAAM,CACJ,KAAsB;QAEtB,OAAO,oBAAM,CAAC,IAAI,CAIhB,IAAI,EAAE,KAAK,CAAC,CAAC;IACjB,CAAC;IAED,SAAS,CAAC,EAAmB;QAC3B,OAAO,uBAAS,CAAC,IAAI,CAInB,IAAI,EAAE,EAAE,CAAC,CAAC;IACd,CAAC;IAED,kBAAkB,CAChB,EAAmB,EACnB,GAAQ,EACR,KAA2B;QAE3B,OAAO,gCAAkB,CAAC,IAAI,CAI5B,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,CACJ,EAAmB,EACnB,KAAyB;QAEzB,OAAO,oBAAM,CAAC,IAAI,CAIhB,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,eAAe,CACb,EAAmB,EACnB,GAAQ;QAER,OAAO,6BAAe,CAAC,IAAI,CAIzB,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,QAAQ,CACN,EAAmB,EACnB,SAA8B;QAE9B,OAAO,sBAAQ,CAAC,IAAI,CAIlB,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,iBAAiB,CACf,EAAmB,EACnB,GAAQ,EACR,KAA4B;QAE5B,OAAO,+BAAiB,CAAC,IAAI,CAI3B,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,CACL,SAA6B;QAE7B,OAAO,qBAAO,CAAC,IAAI,CAIjB,IAAI,EAAE,SAAS,CAAC,CAAC;IACrB,CAAC;IAED,gBAAgB,CACd,EAAmB,EACnB,GAAQ,EACR,KAA2B;QAE3B,OAAO,8BAAgB,CAAC,IAAI,CAI1B,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;CACF;AA3GD,wCA2GC;AAvGQ;IADN,IAAA,eAAM,EAAC,2CAAmB,CAAC;sCACC,2CAAmB;2DAAW;AAEpD;IADN,IAAA,eAAM,EAAC,2CAAyB,CAAC;sCACJ,2CAAyB;4DAAW;AAE3D;IADN,IAAA,eAAM,EAAC,0CAAwB,CAAC;;8CACmB;AACV;IAAzC,IAAA,eAAM,EAAC,qCAAyB,CAAC;sCAAqB,oBAAU;kDAAI"}
+{"version":3,"file":"type-orm.service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/service/type-orm.service.ts"],"names":[],"mappings":";;;;AAAA,2CAAwC;AACxC,8DAYkC;AAClC,4EAKyC;AAEzC,qCAAqC;AAErC,gDAUwB;AAExB,mEAA8D;AAC9D,4CAAyD;AAGzD,MAAa,cAAc;IAIlB,mBAAmB,CAAiC;IAEpD,oBAAoB,CAAuC;IAE3D,MAAM,CAAuC;IACV,UAAU,CAAiB;IAUrE,KAAK,CAAC,MAAM,CACV,KAAsB,EACtB,aAAa,GAAG,IAAI,EACpB,qBAA+C;QAI/C,OAAO,oBAAM,CAAC,IAAI,CAIhB,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,qBAAqB,CAAC,CAAC;IACvD,CAAC;IAED,SAAS,CAAC,EAAmB;QAC3B,OAAO,uBAAS,CAAC,IAAI,CAInB,IAAI,EAAE,EAAE,CAAC,CAAC;IACd,CAAC;IAED,kBAAkB,CAChB,EAAmB,EACnB,GAAQ,EACR,KAA2B;QAE3B,OAAO,gCAAkB,CAAC,IAAI,CAI5B,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAYD,KAAK,CAAC,MAAM,CACV,EAAmB,EACnB,KAAyB,EACzB,aAAa,GAAG,IAAI,EACpB,qBAA+C;QAE/C,OAAO,oBAAM,CAAC,IAAI,CAIhB,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,qBAAqB,CAAC,CAAC;IAC3D,CAAC;IAED,eAAe,CACb,EAAmB,EACnB,GAAQ;QAER,OAAO,6BAAe,CAAC,IAAI,CAIzB,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,QAAQ,CACN,EAAmB,EACnB,SAA8B;QAE9B,OAAO,sBAAQ,CAAC,IAAI,CAIlB,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,iBAAiB,CACf,EAAmB,EACnB,GAAQ,EACR,KAA4B;QAE5B,OAAO,+BAAiB,CAAC,IAAI,CAI3B,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,CACL,SAA6B;QAE7B,OAAO,qBAAO,CAAC,IAAI,CAIjB,IAAI,EAAE,SAAS,CAAC,CAAC;IACrB,CAAC;IAED,gBAAgB,CACd,EAAmB,EACnB,GAAQ,EACR,KAA2B;QAE3B,OAAO,8BAAgB,CAAC,IAAI,CAI1B,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,aAAmD;QAInD,MAAM,MAAM,GAAG,EAAwC,CAAC;QAExD,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,mBAAmB,CAAC,6BAA6B,CAC7E,aAAoB,CACrB,EAAE,CAAC;YACF,MAAM,SAAS,GAAG,oCAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,CAAC,SAAS;gBAAE,SAAS;YACzB,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtJD,wCAsJC;AAlJQ;IADN,IAAA,eAAM,EAAC,2CAAmB,CAAC;sCACC,2CAAmB;2DAAW;AAEpD;IADN,IAAA,eAAM,EAAC,2CAAyB,CAAC;sCACJ,2CAAyB;4DAAW;AAE3D;IADN,IAAA,eAAM,EAAC,0CAAwB,CAAC;;8CACmB;AACV;IAAzC,IAAA,eAAM,EAAC,qCAAyB,CAAC;sCAAqB,oBAAU;kDAAI"}

package/src/lib/service/typeorm-utils.service.d.ts

@@ -2,7 +2,7 @@ import { Repository } from 'typeorm';
 import { RelationMetadata as TypeOrmRelationMetadata } from 'typeorm/metadata/RelationMetadata';
 import { RelationKeys } from '@klerick/json-api-nestjs-shared';
 import { PatchData, PostData, Query, UnionToTuple } from '@klerick/json-api-nestjs';
-type RelationAlias<E> = {
+export type RelationAlias<E> = {
     [K in UnionToTuple<RelationKeys<E>>[number] & PropertyKey]: string;
 };
 type RelationMetadata<E> = {

package/src/lib/service/typeorm-utils.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeorm-utils.service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/service/typeorm-utils.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typeorm-utils.service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/service/typeorm-utils.service.ts"],"names":[],"mappings":"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"}

package/src/lib/type.d.ts

@@ -17,6 +17,7 @@ export declare const OperandsMapExpression: {
     nin: string;
     some: string;
     ilike: string;
+    contains: string;
 };
 export declare const OperandMapExpressionForNull: {
     ne: string;

package/src/lib/type.js

@@ -16,6 +16,7 @@ exports.OperandsMapExpression = {
     [json_api_nestjs_shared_1.FilterOperand.nin]: `NOT IN (:...${exports.EXPRESSION})`,
     [json_api_nestjs_shared_1.FilterOperand.some]: `&& :${exports.EXPRESSION}`,
     ilike: `ILIKE :${exports.EXPRESSION}`,
+    contains: `@> :${exports.EXPRESSION}`, // PostgreSQL array contains operator
 };
 exports.OperandMapExpressionForNull = {
     [json_api_nestjs_shared_1.FilterOperand.ne]: 'IS NOT NULL',

package/src/lib/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/type.ts"],"names":[],"mappings":";;;AAAA,4EAAgE;AAWnD,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,qBAAqB,GAAG;IACnC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,MAAM,kBAAU,EAAE;IACtC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,OAAO,kBAAU,EAAE;IACvC,CAAC,sCAAa,CAAC,MAAM,CAAC,EAAE,OAAO,kBAAU,EAAE;IAC3C,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,MAAM,kBAAU,EAAE;IACtC,CAAC,sCAAa,CAAC,GAAG,CAAC,EAAE,OAAO,kBAAU,EAAE;IACxC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,WAAW,kBAAU,GAAG;IAC5C,CAAC,sCAAa,CAAC,IAAI,CAAC,EAAE,SAAS,kBAAU,EAAE;IAC3C,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,MAAM,kBAAU,EAAE;IACtC,CAAC,sCAAa,CAAC,GAAG,CAAC,EAAE,OAAO,kBAAU,EAAE;IACxC,CAAC,sCAAa,CAAC,GAAG,CAAC,EAAE,eAAe,kBAAU,GAAG;IACjD,CAAC,sCAAa,CAAC,IAAI,CAAC,EAAE,OAAO,kBAAU,EAAE;IACzC,KAAK,EAAE,UAAU,kBAAU,EAAE;CAC9B,CAAC;AAEW,QAAA,2BAA2B,GAAG;IACzC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,aAAa;IACjC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,SAAS;CAC9B,CAAC;AAEW,QAAA,oCAAoC,GAAG;IAClD,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,UAAU,kBAAU,EAAE;IAC1C,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,cAAc,kBAAU,EAAE;CAC/C,CAAC"}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../../../libs/json-api/json-api-nestjs-typeorm/src/lib/type.ts"],"names":[],"mappings":";;;AAAA,4EAAgE;AAWnD,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,qBAAqB,GAAG;IACnC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,MAAM,kBAAU,EAAE;IACtC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,OAAO,kBAAU,EAAE;IACvC,CAAC,sCAAa,CAAC,MAAM,CAAC,EAAE,OAAO,kBAAU,EAAE;IAC3C,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,MAAM,kBAAU,EAAE;IACtC,CAAC,sCAAa,CAAC,GAAG,CAAC,EAAE,OAAO,kBAAU,EAAE;IACxC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,WAAW,kBAAU,GAAG;IAC5C,CAAC,sCAAa,CAAC,IAAI,CAAC,EAAE,SAAS,kBAAU,EAAE;IAC3C,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,MAAM,kBAAU,EAAE;IACtC,CAAC,sCAAa,CAAC,GAAG,CAAC,EAAE,OAAO,kBAAU,EAAE;IACxC,CAAC,sCAAa,CAAC,GAAG,CAAC,EAAE,eAAe,kBAAU,GAAG;IACjD,CAAC,sCAAa,CAAC,IAAI,CAAC,EAAE,OAAO,kBAAU,EAAE;IACzC,KAAK,EAAE,UAAU,kBAAU,EAAE;IAC7B,QAAQ,EAAE,OAAO,kBAAU,EAAE,EAAE,qCAAqC;CACrE,CAAC;AAEW,QAAA,2BAA2B,GAAG;IACzC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,aAAa;IACjC,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,SAAS;CAC9B,CAAC;AAEW,QAAA,oCAAoC,GAAG;IAClD,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,UAAU,kBAAU,EAAE;IAC1C,CAAC,sCAAa,CAAC,EAAE,CAAC,EAAE,cAAc,kBAAU,EAAE;CAC/C,CAAC"}