@chilibase/backend 0.5.0 → 0.6.0

package/lib/persistence/persistence.controller.js.map

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

package/lib/{services/x-lib.service.d.ts → persistence/persistence.service.d.ts}

@@ -1,28 +1,26 @@
 import { DataSource, EntityManager, SelectQueryBuilder } from "typeorm";
-import { XEntityMetadataService } from "./x-entity-metadata.service.js";
+import { EntityMetadataService } from "../entity-metadata/entity-metadata.service.js";
 import { Assoc, Entity } from "../common/EntityMetadata.js";
 import { FindParamRowsForAssoc } from "./FindParamRowsForAssoc.js";
 import { SaveRowParam } from "./SaveRowParam.js";
 import { RemoveRowParam } from "./RemoveRowParam.js";
-import { FindParamRows } from "./FindParamRows.js";
 import { PostLoginRequest, PostLoginResponse } from "../common/auth-api.js";
-import { XRowIdListToRemove } from "./XRowIdListToRemove.js";
+import { RowIdListToRemove } from "./RowIdListToRemove.js";
 import { LocalAuthService } from "../auth/local-auth.service.js";
 import { UnlockRowRequest } from "../common/lib-api.js";
-export declare class XLibService {
+export declare class PersistenceService {
     private readonly dataSource;
-    private readonly xEntityMetadataService;
+    private readonly entityMetadataService;
     private readonly localAuthService;
-    constructor(dataSource: DataSource, xEntityMetadataService: XEntityMetadataService, localAuthService: LocalAuthService);
+    constructor(dataSource: DataSource, entityMetadataService: EntityMetadataService, localAuthService: LocalAuthService);
     findRowsForAssoc(findParamRows: FindParamRowsForAssoc): Promise<any[]>;
-    findRows(findParamRows: FindParamRows): Promise<any[]>;
     saveRow(row: SaveRowParam): Promise<any>;
     saveRowInTransaction(manager: EntityManager, row: SaveRowParam, fileListToRemove?: Array<string>): Promise<any>;
     removeRow(row: RemoveRowParam): Promise<void>;
     removeRowInTransaction(manager: EntityManager, row: RemoveRowParam, fileListToRemove?: Array<string>): Promise<void>;
     removeRowsInTransaction(manager: EntityManager, xEntity: Entity, rowIdList: any[], fileListToRemove?: Array<string>, assocsToRemove?: string[]): Promise<void>;
     addAssocsOfEntity(selectQueryBuilder: SelectQueryBuilder<unknown>, xEntity: Entity, alias: string, assocsToRemove?: string[]): boolean;
-    addRowOfEntityToRemove(xEntity: Entity, row: any, rowIdListToRemove: XRowIdListToRemove, fileListToRemove?: Array<string>, assocsToRemove?: string[]): void;
+    addRowOfEntityToRemove(xEntity: Entity, row: any, rowIdListToRemove: RowIdListToRemove, fileListToRemove?: Array<string>, assocsToRemove?: string[]): void;
     filterForAssocToRemove(assoc: Assoc, assocsToRemove?: string[]): boolean;
     deleteRows(manager: EntityManager, entity: string, rowIdList: any[]): Promise<void>;
     removeFiles(fileListToRemove: Array<string>): void;

package/lib/{services/x-lib.service.js → persistence/persistence.service.js}

@@ -9,25 +9,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { Injectable } from '@nestjs/common';
 import { DataSource } from "typeorm";
-import { XEntityMetadataService } from "./x-entity-metadata.service.js";
+import { EntityMetadataService } from "../entity-metadata/entity-metadata.service.js";
 import { User } from "../modules/administration/user.entity.js";
-import { XUtils } from "./XUtils.js";
-import { XAuth, XEnvVar } from "./XEnvVars.js";
+import { Utils } from "../utils/Utils.js";
+import { Auth, EnvVar } from "../env-vars/EnvVars.js";
 import { join } from "path";
 import { unlinkSync } from "fs";
-import { XRowIdListToRemove } from "./XRowIdListToRemove.js";
-import { XParam } from "../modules/administration/x-param.entity.js";
+import { RowIdListToRemove } from "./RowIdListToRemove.js";
+import { Parameter } from "../modules/administration/parameter.entity.js";
 import { dateFromModel, dateFromUI, datetimeAsUI, intFromUI, numberFromModel } from "../common/UtilsConversions.js";
 import { LocalAuthService } from "../auth/local-auth.service.js";
-import { XAppError } from "./XAppError.js";
-import { xLocaleOption } from "./XLocale.js";
-let XLibService = class XLibService {
+import { AppError } from "../utils/AppError.js";
+import { localeOption } from "../locale/Locale.js";
+let PersistenceService = class PersistenceService {
     dataSource;
-    xEntityMetadataService;
+    entityMetadataService;
     localAuthService;
-    constructor(dataSource, xEntityMetadataService, localAuthService) {
+    constructor(dataSource, entityMetadataService, localAuthService) {
         this.dataSource = dataSource;
-        this.xEntityMetadataService = xEntityMetadataService;
+        this.entityMetadataService = entityMetadataService;
         this.localAuthService = localAuthService;
     }
     async findRowsForAssoc(findParamRows) {
@@ -45,19 +45,6 @@ let XLibService = class XLibService {
         const rows = await selectQueryBuilder.getMany();
         return rows;
     }
-    async findRows(findParamRows) {
-        const repository = this.dataSource.getRepository(findParamRows.entity);
-        const selectQueryBuilder = repository.createQueryBuilder("t0");
-        if (findParamRows.displayField && findParamRows.filter) {
-            selectQueryBuilder.where("t0." + findParamRows.displayField + " LIKE :filter", { filter: findParamRows.filter + "%" });
-        }
-        if (findParamRows.sortMeta) {
-            let orderByItems = {};
-            orderByItems["t0." + findParamRows.sortMeta.field] = (findParamRows.sortMeta.order === 1 ? "ASC" : "DESC");
-            selectQueryBuilder.orderBy(orderByItems);
-        }
-        return await selectQueryBuilder.getMany();
-    }
     async saveRow(row) {
         const fileListToRemove = new Array();
         const objectReloaded = await this.dataSource.transaction(manager => this.saveRowInTransaction(manager, row, fileListToRemove));
@@ -66,17 +53,17 @@ let XLibService = class XLibService {
     }
     async saveRowInTransaction(manager, row, fileListToRemove) {
         await this.unlockRowForSave(manager, row.entity, row.object);
-        const xEntity = this.xEntityMetadataService.getXEntity(row.entity);
+        const xEntity = this.entityMetadataService.getEntity(row.entity);
         if (row.object.__x_generatedRowId) {
             row.object[xEntity.idField] = undefined;
             delete row.object.__x_generatedRowId;
         }
-        let assocOneToManyList = this.xEntityMetadataService.getXAssocList(xEntity, ["one-to-many"]);
+        let assocOneToManyList = this.entityMetadataService.getAssocList(xEntity, ["one-to-many"]);
         const rowId = row.object[xEntity.idField];
         const insert = (rowId === undefined);
         assocOneToManyList = assocOneToManyList.filter(insert ? (assoc) => assoc.isCascadeInsert : (assoc) => assoc.isCascadeUpdate);
         for (const assoc of assocOneToManyList) {
-            const xChildEntity = this.xEntityMetadataService.getXEntity(assoc.entityName);
+            const xChildEntity = this.entityMetadataService.getEntity(assoc.entityName);
             const childRowList = row.object[assoc.name];
             if (childRowList === undefined) {
                 continue;
@@ -90,7 +77,7 @@ let XLibService = class XLibService {
         }
         if (!insert) {
             for (const assoc of assocOneToManyList) {
-                const xChildEntity = this.xEntityMetadataService.getXEntity(assoc.entityName);
+                const xChildEntity = this.entityMetadataService.getEntity(assoc.entityName);
                 const idList = [];
                 const childRowList = row.object[assoc.name];
                 if (childRowList === undefined) {
@@ -128,7 +115,7 @@ let XLibService = class XLibService {
         this.removeFiles(fileListToRemove);
     }
     async removeRowInTransaction(manager, row, fileListToRemove) {
-        const xEntity = this.xEntityMetadataService.getXEntity(row.entity);
+        const xEntity = this.entityMetadataService.getEntity(row.entity);
         return this.removeRowsInTransaction(manager, xEntity, [row.id], fileListToRemove, row.assocsToRemove);
     }
     async removeRowsInTransaction(manager, xEntity, rowIdList, fileListToRemove, assocsToRemove) {
@@ -138,7 +125,7 @@ let XLibService = class XLibService {
         if (this.addAssocsOfEntity(selectQueryBuilder, xEntity, alias, assocsToRemove)) {
             selectQueryBuilder.whereInIds(rowIdList);
             const rowList = await selectQueryBuilder.getMany();
-            const rowIdListToRemove = new XRowIdListToRemove();
+            const rowIdListToRemove = new RowIdListToRemove();
             for (const row of rowList) {
                 this.addRowOfEntityToRemove(xEntity, row, rowIdListToRemove, fileListToRemove, assocsToRemove);
             }
@@ -152,36 +139,36 @@ let XLibService = class XLibService {
     }
     addAssocsOfEntity(selectQueryBuilder, xEntity, alias, assocsToRemove) {
         let leftJoinAdded = false;
-        const assocList = this.xEntityMetadataService.getXAssocList(xEntity).filter((assoc) => this.filterForAssocToRemove(assoc, assocsToRemove));
+        const assocList = this.entityMetadataService.getAssocList(xEntity).filter((assoc) => this.filterForAssocToRemove(assoc, assocsToRemove));
         for (const [index, assoc] of assocList.entries()) {
             const aliasForAssoc = `${alias}_${index}`;
             selectQueryBuilder.leftJoinAndSelect(`${alias}.${assoc.name}`, aliasForAssoc);
             leftJoinAdded = true;
-            const xAssocEntity = this.xEntityMetadataService.getXEntity(assoc.entityName);
+            const xAssocEntity = this.entityMetadataService.getEntity(assoc.entityName);
             this.addAssocsOfEntity(selectQueryBuilder, xAssocEntity, aliasForAssoc, undefined);
         }
         return leftJoinAdded;
     }
     addRowOfEntityToRemove(xEntity, row, rowIdListToRemove, fileListToRemove, assocsToRemove) {
-        const assocToManyList = this.xEntityMetadataService.getXAssocList(xEntity, ["one-to-many", "many-to-many"]).filter((assoc) => this.filterForAssocToRemove(assoc, assocsToRemove));
+        const assocToManyList = this.entityMetadataService.getAssocList(xEntity, ["one-to-many", "many-to-many"]).filter((assoc) => this.filterForAssocToRemove(assoc, assocsToRemove));
         for (const assoc of assocToManyList) {
             const assocRowList = row[assoc.name];
             for (const assocRow of assocRowList) {
-                this.addRowOfEntityToRemove(this.xEntityMetadataService.getXEntity(assoc.entityName), assocRow, rowIdListToRemove, fileListToRemove, undefined);
+                this.addRowOfEntityToRemove(this.entityMetadataService.getEntity(assoc.entityName), assocRow, rowIdListToRemove, fileListToRemove, undefined);
             }
         }
         const rowId = row[xEntity.idField];
         rowIdListToRemove.addRowId(xEntity.name, rowId);
-        if (fileListToRemove !== undefined && xEntity.name === "XFile") {
+        if (fileListToRemove !== undefined && xEntity.name === "FileMeta") {
             if (row.pathName !== null) {
-                fileListToRemove.push(join(XUtils.getXFilesDir(), row.pathName));
+                fileListToRemove.push(join(Utils.getXFilesDir(), row.pathName));
             }
         }
-        const assocToOneList = this.xEntityMetadataService.getXAssocList(xEntity, ["one-to-one", "many-to-one"]).filter((assoc) => this.filterForAssocToRemove(assoc, assocsToRemove));
+        const assocToOneList = this.entityMetadataService.getAssocList(xEntity, ["one-to-one", "many-to-one"]).filter((assoc) => this.filterForAssocToRemove(assoc, assocsToRemove));
         for (const assoc of assocToOneList) {
             const assocRow = row[assoc.name];
             if (assocRow) {
-                this.addRowOfEntityToRemove(this.xEntityMetadataService.getXEntity(assoc.entityName), assocRow, rowIdListToRemove, fileListToRemove, undefined);
+                this.addRowOfEntityToRemove(this.entityMetadataService.getEntity(assoc.entityName), assocRow, rowIdListToRemove, fileListToRemove, undefined);
             }
         }
     }
@@ -205,7 +192,7 @@ let XLibService = class XLibService {
     async unlockRowForSave(manager, entity, object) {
         const lockDate = dateFromModel(object.lockDate ?? null);
         if (lockDate) {
-            const xEntity = this.xEntityMetadataService.getXEntity(entity);
+            const xEntity = this.entityMetadataService.getEntity(entity);
             const rowId = object[xEntity.idField];
             const rowFromDB = await this.findRowByIdForLocking(manager, entity, rowId);
             const lockDateFromDB = rowFromDB.lockDate;
@@ -216,11 +203,11 @@ let XLibService = class XLibService {
             else {
                 if (lockDateFromDB) {
                     const rowFromDBWithUser = await this.findRowByIdWithAssoc(manager, entity, rowId, "lockUser");
-                    throw new XAppError(xLocaleOption('pessimisticLockFailedLockPresent', { lockUser: rowFromDBWithUser.lockUser?.name, lockDate: datetimeAsUI(lockDateFromDB) }));
+                    throw new AppError(localeOption('pessimisticLockFailedLockPresent', { lockUser: rowFromDBWithUser.lockUser?.name, lockDate: datetimeAsUI(lockDateFromDB) }));
                 }
                 else {
                     const rowFromDBWithUser = await this.findRowByIdWithAssoc(manager, entity, rowId, "modifUser");
-                    throw new XAppError(xLocaleOption('pessimisticLockFailedLockFinished', { modifUser: rowFromDBWithUser.modifUser?.name, modifDate: datetimeAsUI(rowFromDBWithUser.modifDate) }));
+                    throw new AppError(localeOption('pessimisticLockFailedLockFinished', { modifUser: rowFromDBWithUser.modifUser?.name, modifDate: datetimeAsUI(rowFromDBWithUser.modifDate) }));
                 }
             }
         }
@@ -251,7 +238,7 @@ let XLibService = class XLibService {
     }
     async userSaveRow(row) {
         const repository = this.dataSource.getRepository(row.entity);
-        if (XUtils.getEnvVarValue(XEnvVar.X_AUTH) === XAuth.LOCAL) {
+        if (Utils.getEnvVarValue(EnvVar.X_AUTH) === Auth.LOCAL) {
             if (row.object.password && row.object.password !== '') {
                 row.object.password = await this.localAuthService.hashPassword(row.object.password);
             }
@@ -260,20 +247,20 @@ let XLibService = class XLibService {
     }
     async postLogin(reqUser, xPostLoginRequest) {
         let username;
-        if (XUtils.getEnvVarValue(XEnvVar.X_AUTH) === XAuth.OFF) {
+        if (Utils.getEnvVarValue(EnvVar.X_AUTH) === Auth.OFF) {
             username = xPostLoginRequest.username;
         }
-        else if (XUtils.getEnvVarValue(XEnvVar.X_AUTH) === XAuth.LOCAL) {
+        else if (Utils.getEnvVarValue(EnvVar.X_AUTH) === Auth.LOCAL) {
             username = reqUser.username;
         }
-        else if (XUtils.getEnvVarValue(XEnvVar.X_AUTH) === XAuth.AUTH0) {
+        else if (Utils.getEnvVarValue(EnvVar.X_AUTH) === Auth.AUTH0) {
             const emailKey = 'x-custom-claim-email';
             username = reqUser[emailKey];
             if (username === undefined) {
                 throw `Email of the current user was not found in access token. Email-key = ${emailKey}`;
             }
         }
-        else if (XUtils.getEnvVarValue(XEnvVar.X_AUTH) === XAuth.MS_ENTRA_ID) {
+        else if (Utils.getEnvVarValue(EnvVar.X_AUTH) === Auth.MS_ENTRA_ID) {
             username = reqUser.preferred_username;
         }
         const repository = this.dataSource.getRepository(User);
@@ -283,11 +270,11 @@ let XLibService = class XLibService {
         return { user: xUser !== null ? xUser : undefined };
     }
     async getSequenceValue(sequenceName) {
-        const rowList = await this.dataSource.query(`SELECT nextval('${XUtils.getSchema()}.${sequenceName}') AS value`);
+        const rowList = await this.dataSource.query(`SELECT nextval('${Utils.getSchema()}.${sequenceName}') AS value`);
         return numberFromModel(rowList[0].value);
     }
     async setSequenceValue(sequenceName, value) {
-        await this.dataSource.query(`SELECT setval('${XUtils.getSchema()}.${sequenceName}', ${value}, false)`);
+        await this.dataSource.query(`SELECT setval('${Utils.getSchema()}.${sequenceName}', ${value}, false)`);
     }
     async getParamValueAsInt(paramCode) {
         const paramValue = await this.getParamValue(paramCode);
@@ -306,21 +293,21 @@ let XLibService = class XLibService {
         return paramValueDate;
     }
     async getParamValue(paramCode) {
-        const repository = this.dataSource.getRepository(XParam);
-        const sqb = repository.createQueryBuilder("xParam");
-        sqb.where("xParam.code = :code", { code: paramCode });
-        const xParam = await sqb.getOne();
-        if (xParam === null) {
-            throw `XParam row for code = ${paramCode} not found.`;
+        const repository = this.dataSource.getRepository(Parameter);
+        const sqb = repository.createQueryBuilder("parameter");
+        sqb.where("parameter.code = :code", { code: paramCode });
+        const parameter = await sqb.getOne();
+        if (parameter === null) {
+            throw `Parameter row for code = ${paramCode} not found.`;
         }
-        return xParam.value;
+        return parameter.value;
     }
 };
-XLibService = __decorate([
+PersistenceService = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [DataSource,
-        XEntityMetadataService,
+        EntityMetadataService,
         LocalAuthService])
-], XLibService);
-export { XLibService };
-//# sourceMappingURL=x-lib.service.js.map
+], PersistenceService);
+export { PersistenceService };
+//# sourceMappingURL=persistence.service.js.map

package/lib/persistence/persistence.service.js.map

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

package/lib/persistence/query-data/MainQueryData.d.ts

@@ -0,0 +1,27 @@
+import { QueryData } from "./QueryData.js";
+import { EntityMetadataService } from "../../entity-metadata/entity-metadata.service.js";
+import { OrderByCondition, SelectQueryBuilder } from "typeorm";
+import { SubQueryData } from "./SubQueryData.js";
+import { DataTableFilterMeta, DataTableSortMeta } from "../../common/PrimeFilterSortMeta.js";
+import { CustomFilterItem, ExtendedDataTableFilterMeta, FullTextSearch } from "../../common/FindParam.js";
+import { Assoc } from "../../common/EntityMetadata.js";
+export declare class MainQueryData extends QueryData {
+    assocSubQueryDataMap: Map<string, SubQueryData>;
+    selectItems: string[];
+    fullTextSearch: FullTextSearch | undefined;
+    orderByItems: OrderByCondition;
+    constructor(entityMetadataService: EntityMetadataService, entity: string, rootAlias: string, filters: DataTableFilterMeta | undefined, fullTextSearch: FullTextSearch | undefined, customFilterItems: CustomFilterItem[] | undefined);
+    isMainQueryData(): boolean;
+    addFilters(filters: ExtendedDataTableFilterMeta | undefined): void;
+    processFullTextSearch(): void;
+    addCustomFilterItems(customFilterItems: CustomFilterItem[] | undefined): void;
+    addSelectItems(fields: string[] | undefined): void;
+    addOrderByItems(multiSortMeta: DataTableSortMeta[] | undefined): void;
+    private addCustomFilterItem;
+    replacePathFieldQueryData(sqlExpParam: string): [string, QueryData];
+    getDBFieldForPathField(pathField: string): string;
+    replacePathField(pathFieldOrPathFieldExp: string): string;
+    getQueryForPathField(pathField: string): [QueryData, string];
+    getSubQueryData(xAssocOneToMany: Assoc): SubQueryData;
+    createFtsWhereItem(mainQueryBuilderForExistsSubQueries: SelectQueryBuilder<unknown> | undefined): string | "";
+}

package/lib/{x-query-data/XMainQueryData.js → persistence/query-data/MainQueryData.js}

@@ -1,14 +1,14 @@
-import { XQueryData } from "./XQueryData.js";
-import { XSubQueryData } from "./XSubQueryData.js";
-import { UtilsCommon } from "../common/UtilsCommon.js";
-export class XMainQueryData extends XQueryData {
-    assocXSubQueryDataMap;
+import { QueryData } from "./QueryData.js";
+import { SubQueryData } from "./SubQueryData.js";
+import { UtilsCommon } from "../../common/UtilsCommon.js";
+export class MainQueryData extends QueryData {
+    assocSubQueryDataMap;
     selectItems;
     fullTextSearch;
     orderByItems;
-    constructor(xEntityMetadataService, entity, rootAlias, filters, fullTextSearch, customFilterItems) {
-        super(xEntityMetadataService, entity, rootAlias);
-        this.assocXSubQueryDataMap = new Map();
+    constructor(entityMetadataService, entity, rootAlias, filters, fullTextSearch, customFilterItems) {
+        super(entityMetadataService, entity, rootAlias);
+        this.assocSubQueryDataMap = new Map();
         this.selectItems = [];
         this.fullTextSearch = fullTextSearch;
         this.orderByItems = {};
@@ -27,8 +27,8 @@ export class XMainQueryData extends XQueryData {
                         this.addCustomFilterItems(filterValue.customFilterItems);
                     }
                     else {
-                        const [xQueryData, filterFieldNew] = this.getQueryForPathField(filterField);
-                        xQueryData.addFilterField(filterFieldNew, filterValue);
+                        const [queryData, filterFieldNew] = this.getQueryForPathField(filterField);
+                        queryData.addFilterField(filterFieldNew, filterValue);
                     }
                 }
             }
@@ -40,8 +40,8 @@ export class XMainQueryData extends XQueryData {
             if (fields) {
                 for (const field of fields) {
                     const [prefix, fieldOnly] = UtilsCommon.getPrefixAndField(field);
-                    const [xQueryData, filterFieldNew] = this.getQueryForPathField(fieldOnly);
-                    xQueryData.addFtsField(prefix, filterFieldNew);
+                    const [queryData, filterFieldNew] = this.getQueryForPathField(fieldOnly);
+                    queryData.addFtsField(prefix, filterFieldNew);
                 }
             }
         }
@@ -56,8 +56,8 @@ export class XMainQueryData extends XQueryData {
     addSelectItems(fields) {
         if (fields) {
             for (const field of fields) {
-                const [xQueryData, fieldNew] = this.getQueryForPathField(field);
-                const dbField = xQueryData.getFieldFromPathField(fieldNew);
+                const [queryData, fieldNew] = this.getQueryForPathField(field);
+                const dbField = queryData.getFieldFromPathField(fieldNew);
                 if (!dbField.endsWith('*FAKE*')) {
                     this.selectItems.push(dbField);
                 }
@@ -67,41 +67,41 @@ export class XMainQueryData extends XQueryData {
     addOrderByItems(multiSortMeta) {
         if (multiSortMeta) {
             for (const sortMeta of multiSortMeta) {
-                const [xQueryData, fieldNew] = this.getQueryForPathField(sortMeta.field);
-                const dbField = xQueryData.getFieldFromPathField(fieldNew);
+                const [queryData, fieldNew] = this.getQueryForPathField(sortMeta.field);
+                const dbField = queryData.getFieldFromPathField(fieldNew);
                 this.orderByItems[dbField] = (sortMeta.order === 1 ? "ASC" : "DESC");
             }
         }
     }
-    addCustomFilterItem(xCustomFilterItem) {
-        const [sqlExpWithAliases, xQueryData] = this.replacePathFieldQueryData(xCustomFilterItem.where);
-        xQueryData.addWhereItem(sqlExpWithAliases);
-        xQueryData.addParams(xCustomFilterItem.params);
+    addCustomFilterItem(customFilterItem) {
+        const [sqlExpWithAliases, queryData] = this.replacePathFieldQueryData(customFilterItem.where);
+        queryData.addWhereItem(sqlExpWithAliases);
+        queryData.addParams(customFilterItem.params);
     }
     replacePathFieldQueryData(sqlExpParam) {
         let sqlExp = sqlExpParam;
         let match;
-        let xQueryDataForItem = null;
+        let queryDataForItem = null;
         while ((match = UtilsCommon.findFirstMatch(/\[[a-zA-Z0-9_.]+\]/, sqlExp)) != null) {
             const filterField = match.substring(1, match.length - 1);
-            const [xQueryData, filterFieldNew] = this.getQueryForPathField(filterField);
-            if (xQueryDataForItem === null) {
-                xQueryDataForItem = xQueryData;
+            const [queryData, filterFieldNew] = this.getQueryForPathField(filterField);
+            if (queryDataForItem === null) {
+                queryDataForItem = queryData;
             }
-            else if (xQueryData !== xQueryDataForItem) {
+            else if (queryData !== queryDataForItem) {
                 throw `Custom filter (or custom filter item) "${sqlExpParam}" must use the same query for all fields (all fields must use the same OneToMany assoc or OneToMany assoc cannot be used). Please divide your custom filter into more custom filters in form of array [filter1, filter2, ...].`;
             }
-            const dbField = xQueryDataForItem.getFieldFromPathField(filterFieldNew);
+            const dbField = queryDataForItem.getFieldFromPathField(filterFieldNew);
             sqlExp = sqlExp.replaceAll(match, dbField);
         }
-        if (xQueryDataForItem === null) {
+        if (queryDataForItem === null) {
             throw `Custom filter (or custom filter item) "${sqlExpParam}" - no field was found. Example of custom filter: [fieldX] = :valueX`;
         }
-        return [sqlExp, xQueryDataForItem];
+        return [sqlExp, queryDataForItem];
     }
     getDBFieldForPathField(pathField) {
-        const [xQueryData, fieldNew] = this.getQueryForPathField(pathField);
-        return xQueryData.getFieldFromPathField(fieldNew);
+        const [queryData, fieldNew] = this.getQueryForPathField(pathField);
+        return queryData.getFieldFromPathField(fieldNew);
     }
     replacePathField(pathFieldOrPathFieldExp) {
         let sqlExp;
@@ -109,7 +109,7 @@ export class XMainQueryData extends XQueryData {
             sqlExp = this.getDBFieldForPathField(pathFieldOrPathFieldExp);
         }
         else {
-            const [sqlExpWithAliases, xQueryData] = this.replacePathFieldQueryData(pathFieldOrPathFieldExp);
+            const [sqlExpWithAliases, queryData] = this.replacePathFieldQueryData(pathFieldOrPathFieldExp);
             sqlExp = sqlExpWithAliases;
         }
         return sqlExp;
@@ -117,24 +117,24 @@ export class XMainQueryData extends XQueryData {
     getQueryForPathField(pathField) {
         const [field, restPath] = UtilsCommon.getFieldAndRestPath(pathField);
         if (restPath !== null) {
-            const xAssoc = this.xEntityMetadataService.getXAssoc(this.xEntity, field);
-            if (xAssoc.relationType === "one-to-many") {
-                const xSubQueryData = this.getXSubQueryData(xAssoc);
-                return [xSubQueryData, restPath];
+            const assoc = this.entityMetadataService.getAssoc(this.entity, field);
+            if (assoc.relationType === "one-to-many") {
+                const subQueryData = this.getSubQueryData(assoc);
+                return [subQueryData, restPath];
             }
         }
         return [this, pathField];
     }
-    getXSubQueryData(xAssocOneToMany) {
+    getSubQueryData(xAssocOneToMany) {
         const aliasAssocOneToMany = `${this.rootAlias}.${xAssocOneToMany.name}`;
-        let xSubQueryData = this.assocXSubQueryDataMap.get(aliasAssocOneToMany);
-        if (xSubQueryData === undefined) {
-            const aliasSubQuery = "ts" + (this.assocXSubQueryDataMap.size + 1).toString();
-            const assocToOneWhereItem = `${aliasSubQuery}.${xAssocOneToMany.inverseAssocName} = ${this.rootAlias}.${this.xEntity.idField}`;
-            xSubQueryData = new XSubQueryData(this.xEntityMetadataService, xAssocOneToMany.entityName, aliasSubQuery, assocToOneWhereItem);
-            this.assocXSubQueryDataMap.set(aliasAssocOneToMany, xSubQueryData);
+        let subQueryData = this.assocSubQueryDataMap.get(aliasAssocOneToMany);
+        if (subQueryData === undefined) {
+            const aliasSubQuery = "ts" + (this.assocSubQueryDataMap.size + 1).toString();
+            const assocToOneWhereItem = `${aliasSubQuery}.${xAssocOneToMany.inverseAssocName} = ${this.rootAlias}.${this.entity.idField}`;
+            subQueryData = new SubQueryData(this.entityMetadataService, xAssocOneToMany.entityName, aliasSubQuery, assocToOneWhereItem);
+            this.assocSubQueryDataMap.set(aliasAssocOneToMany, subQueryData);
         }
-        return xSubQueryData;
+        return subQueryData;
     }
     createFtsWhereItem(mainQueryBuilderForExistsSubQueries) {
         let ftsWhere = "";
@@ -149,7 +149,7 @@ export class XMainQueryData extends XQueryData {
                 else {
                     ftsValueList = ftsValueFromParam.split(' ').filter((value) => value !== '');
                 }
-                ftsSeparator = XQueryData.xFtsSeparator;
+                ftsSeparator = QueryData.ftsSeparator;
             }
             else {
                 ftsValueList = [ftsValueFromParam];
@@ -157,16 +157,16 @@ export class XMainQueryData extends XQueryData {
             }
             for (const ftsValue of ftsValueList) {
                 let ftsWhereForValue = this.createFtsWhereItemForQuery(ftsValue, ftsSeparator);
-                for (const [assocOneToMany, xSubQueryData] of this.assocXSubQueryDataMap.entries()) {
-                    ftsWhereForValue = XQueryData.whereItemOr(ftsWhereForValue, xSubQueryData.createFtsWhereItemForSubQuery(mainQueryBuilderForExistsSubQueries, ftsValue, ftsSeparator));
+                for (const [assocOneToMany, subQueryData] of this.assocSubQueryDataMap.entries()) {
+                    ftsWhereForValue = QueryData.whereItemOr(ftsWhereForValue, subQueryData.createFtsWhereItemForSubQuery(mainQueryBuilderForExistsSubQueries, ftsValue, ftsSeparator));
                 }
                 if (ftsWhereForValue !== "") {
                     ftsWhereForValue = `(${ftsWhereForValue})`;
                 }
-                ftsWhere = XQueryData.whereItemAnd(ftsWhere, ftsWhereForValue);
+                ftsWhere = QueryData.whereItemAnd(ftsWhere, ftsWhereForValue);
             }
         }
         return ftsWhere;
     }
 }
-//# sourceMappingURL=XMainQueryData.js.map
+//# sourceMappingURL=MainQueryData.js.map

package/lib/persistence/query-data/MainQueryData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MainQueryData.js","sourceRoot":"","sources":["../../../src/persistence/query-data/MainQueryData.ts"],"names":[],"mappings":"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"}

package/lib/{x-query-data/XQueryData.d.ts → persistence/query-data/QueryData.d.ts}

@@ -1,16 +1,16 @@
-import { DataTableFilterMetaData, DataTableOperatorFilterMetaData } from "../common/PrimeFilterSortMeta.js";
+import { DataTableFilterMetaData, DataTableOperatorFilterMetaData } from "../../common/PrimeFilterSortMeta.js";
 import { ObjectLiteral } from "typeorm";
-import { XEntityMetadataService } from "../services/x-entity-metadata.service.js";
-import { Entity } from "../common/EntityMetadata.js";
-export declare abstract class XQueryData {
-    xEntityMetadataService: XEntityMetadataService;
-    xEntity: Entity;
+import { EntityMetadataService } from "../../entity-metadata/entity-metadata.service.js";
+import { Entity } from "../../common/EntityMetadata.js";
+export declare abstract class QueryData {
+    entityMetadataService: EntityMetadataService;
+    entity: Entity;
     rootAlias: string;
     assocAliasMap: Map<string, string>;
     where: string;
     params: ObjectLiteral;
     ftsFieldList: string[];
-    protected constructor(xEntityMetadataService: XEntityMetadataService, entity: string, rootAlias: string);
+    protected constructor(entityMetadataService: EntityMetadataService, entity: string, rootAlias: string);
     abstract isMainQueryData(): boolean;
     isFilterValueNotNull(filterValue: DataTableFilterMetaData | DataTableOperatorFilterMetaData): boolean;
     isFilterItemNotNull(filterItem: DataTableFilterMetaData): boolean;
@@ -25,7 +25,7 @@ export declare abstract class XQueryData {
     addWhereItem(whereItem: string): void;
     addParams(params: {}): void;
     addFtsField(prefix: string | null, ftsField: string): void;
-    static xFtsSeparator: string;
+    static ftsSeparator: string;
     createFtsWhereItemForQuery(ftsValue: string, ftsSeparator: string): string | "";
     static whereItemAnd(whereItem1: string | "", whereItem2: string | ""): string | "";
     static whereItemOr(whereItem1: string | "", whereItem2: string | ""): string | "";