@chilibase/backend 0.5.0 → 0.6.0

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

@@ -1,19 +1,19 @@
-import { FilterMatchMode } from "../common/PrimeFilterSortMeta.js";
-import { XUtils } from "../services/XUtils.js";
-import { stringAsDB } from "../common/UtilsConversions.js";
-import { XEnvVar } from "../services/XEnvVars.js";
-import { ExtendedFilterMatchMode } from "../common/index.js";
-export class XQueryData {
-    xEntityMetadataService;
-    xEntity;
+import { FilterMatchMode } from "../../common/PrimeFilterSortMeta.js";
+import { Utils } from "../../utils/Utils.js";
+import { stringAsDB } from "../../common/UtilsConversions.js";
+import { EnvVar } from "../../env-vars/EnvVars.js";
+import { ExtendedFilterMatchMode } from "../../common/index.js";
+export class QueryData {
+    entityMetadataService;
+    entity;
     rootAlias;
     assocAliasMap;
     where;
     params;
     ftsFieldList;
-    constructor(xEntityMetadataService, entity, rootAlias) {
-        this.xEntityMetadataService = xEntityMetadataService;
-        this.xEntity = this.xEntityMetadataService.getXEntity(entity);
+    constructor(entityMetadataService, entity, rootAlias) {
+        this.entityMetadataService = entityMetadataService;
+        this.entity = this.entityMetadataService.getEntity(entity);
         this.rootAlias = rootAlias;
         this.assocAliasMap = new Map();
         this.where = "";
@@ -128,7 +128,7 @@ export class XQueryData {
                         const value2 = filterItem.value[1];
                         const whereItem1 = (value1 !== null ? this.createWhereItemBase(field, ">=", paramName + '_1', value1) : "");
                         const whereItem2 = (value2 !== null ? this.createWhereItemBase(field, "<=", paramName + '_2', value2) : "");
-                        whereItem = XQueryData.whereItemAnd(whereItem1, whereItem2);
+                        whereItem = QueryData.whereItemAnd(whereItem1, whereItem2);
                     }
                     else {
                         console.log(`FilterMatchMode "${filterItem.matchMode}": value is expected to be array of length = 2`);
@@ -152,8 +152,8 @@ export class XQueryData {
     createWhereItemBaseLike(field, not, paramName, paramValue) {
         const notOperator = not ? "NOT " : "";
         let whereItem;
-        if (XUtils.getEnvVarValueBoolean(XEnvVar.X_STRING_DB_SEARCH_AI_CI)) {
-            whereItem = `${XUtils.getSchema()}.unaccent(${field}) ${notOperator}ILIKE ${XUtils.getSchema()}.unaccent(:${paramName})`;
+        if (Utils.getEnvVarValueBoolean(EnvVar.X_STRING_DB_SEARCH_AI_CI)) {
+            whereItem = `${Utils.getSchema()}.unaccent(${field}) ${notOperator}ILIKE ${Utils.getSchema()}.unaccent(:${paramName})`;
             this.params[paramName] = paramValue;
         }
         else {
@@ -192,8 +192,8 @@ export class XQueryData {
         return aliasForAssoc;
     }
     addDBCastIfNeeded(dbField, field) {
-        const xField = this.xEntityMetadataService.getXFieldByPath(this.xEntity, field);
-        if (xField.type === "jsonb") {
+        const fieldMetadata = this.entityMetadataService.getFieldByPath(this.entity, field);
+        if (fieldMetadata.type === "jsonb") {
             dbField = `(${dbField})::VARCHAR`;
         }
         return dbField;
@@ -209,18 +209,18 @@ export class XQueryData {
     }
     addFtsField(prefix, ftsField) {
         const dbField = this.getFieldFromPathField(ftsField);
-        const xField = this.xEntityMetadataService.getXFieldByPath(this.xEntity, ftsField);
+        const fieldMetadata = this.entityMetadataService.getFieldByPath(this.entity, ftsField);
         let dbFieldWithCast;
-        if (xField.type === "boolean") {
+        if (fieldMetadata.type === "boolean") {
             dbFieldWithCast = `(${dbField})::INT::VARCHAR`;
         }
-        else if (xField.type === "decimal") {
+        else if (fieldMetadata.type === "decimal") {
             dbFieldWithCast = `replace((${dbField})::VARCHAR, '.', ',')`;
         }
-        else if (xField.type === "date") {
+        else if (fieldMetadata.type === "date") {
             dbFieldWithCast = `to_char(${dbField}, 'DD.MM.YYYY')`;
         }
-        else if (xField.type === "datetime") {
+        else if (fieldMetadata.type === "datetime") {
             dbFieldWithCast = `to_char(${dbField}, 'DD.MM.YYYY HH24:MI:SS')`;
         }
         else {
@@ -229,20 +229,20 @@ export class XQueryData {
         const dbPrefix = prefix ? `'${prefix}' || ` : ``;
         this.ftsFieldList.push(`coalesce(${dbPrefix}${dbFieldWithCast}, '')`);
     }
-    static xFtsSeparator = '|';
+    static ftsSeparator = '|';
     createFtsWhereItemForQuery(ftsValue, ftsSeparator) {
         let whereItem = "";
         if (this.ftsFieldList.length > 0) {
             const ftsValueDB = stringAsDB(`%${ftsValue}%`);
-            whereItem = `${XUtils.getSchema()}.unaccent('${ftsSeparator}' || ${this.ftsFieldList.join(` || '${ftsSeparator}' || `)} || '${ftsSeparator}') ILIKE ${XUtils.getSchema()}.unaccent(${ftsValueDB})`;
+            whereItem = `${Utils.getSchema()}.unaccent('${ftsSeparator}' || ${this.ftsFieldList.join(` || '${ftsSeparator}' || `)} || '${ftsSeparator}') ILIKE ${Utils.getSchema()}.unaccent(${ftsValueDB})`;
         }
         return whereItem;
     }
     static whereItemAnd(whereItem1, whereItem2) {
-        return XQueryData.whereItemAndOr("AND", whereItem1, whereItem2);
+        return QueryData.whereItemAndOr("AND", whereItem1, whereItem2);
     }
     static whereItemOr(whereItem1, whereItem2) {
-        return XQueryData.whereItemAndOr("OR", whereItem1, whereItem2);
+        return QueryData.whereItemAndOr("OR", whereItem1, whereItem2);
     }
     static whereItemAndOr(and_or, whereItem1, whereItem2) {
         let whereItem;
@@ -255,4 +255,4 @@ export class XQueryData {
         return whereItem;
     }
 }
-//# sourceMappingURL=XQueryData.js.map
+//# sourceMappingURL=QueryData.js.map

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

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

package/lib/{x-query-data/XSubQueryData.d.ts → persistence/query-data/SubQueryData.d.ts}

@@ -1,9 +1,9 @@
-import { XQueryData } from "./XQueryData.js";
+import { QueryData } from "./QueryData.js";
 import { SelectQueryBuilder } from "typeorm";
-import { XEntityMetadataService } from "../services/x-entity-metadata.service.js";
-export declare class XSubQueryData extends XQueryData {
+import { EntityMetadataService } from "../../entity-metadata/entity-metadata.service.js";
+export declare class SubQueryData extends QueryData {
     assocToOneWhereItem: string;
-    constructor(xEntityMetadataService: XEntityMetadataService, entity: string, rootAlias: string, assocToOneWhereItem: string);
+    constructor(entityMetadataService: EntityMetadataService, entity: string, rootAlias: string, assocToOneWhereItem: string);
     isMainQueryData(): boolean;
     createQueryBuilder(selectQueryBuilder: SelectQueryBuilder<unknown>, selection: string): SelectQueryBuilder<unknown>;
     createQueryBuilderForFts(selectQueryBuilder: SelectQueryBuilder<unknown>, selection: string, ftsValue: string, ftsSeparator: string): SelectQueryBuilder<unknown> | undefined;

package/lib/{x-query-data/XSubQueryData.js → persistence/query-data/SubQueryData.js}

@@ -1,8 +1,8 @@
-import { XQueryData } from "./XQueryData.js";
-export class XSubQueryData extends XQueryData {
+import { QueryData } from "./QueryData.js";
+export class SubQueryData extends QueryData {
     assocToOneWhereItem;
-    constructor(xEntityMetadataService, entity, rootAlias, assocToOneWhereItem) {
-        super(xEntityMetadataService, entity, rootAlias);
+    constructor(entityMetadataService, entity, rootAlias, assocToOneWhereItem) {
+        super(entityMetadataService, entity, rootAlias);
         this.assocToOneWhereItem = assocToOneWhereItem;
     }
     isMainQueryData() {
@@ -11,7 +11,7 @@ export class XSubQueryData extends XQueryData {
     createQueryBuilder(selectQueryBuilder, selection) {
         const selectSubQueryBuilder = selectQueryBuilder.subQuery();
         selectSubQueryBuilder.select(selection);
-        selectSubQueryBuilder.from(this.xEntity.name, this.rootAlias);
+        selectSubQueryBuilder.from(this.entity.name, this.rootAlias);
         for (const [field, alias] of this.assocAliasMap.entries()) {
             selectSubQueryBuilder.leftJoin(field, alias);
         }
@@ -26,7 +26,7 @@ export class XSubQueryData extends XQueryData {
         if (this.ftsFieldList.length > 0) {
             selectSubQueryBuilder = selectQueryBuilder.subQuery();
             selectSubQueryBuilder.select(selection);
-            selectSubQueryBuilder.from(this.xEntity.name, this.rootAlias);
+            selectSubQueryBuilder.from(this.entity.name, this.rootAlias);
             for (const [field, alias] of this.assocAliasMap.entries()) {
                 selectSubQueryBuilder.leftJoin(field, alias);
             }
@@ -49,4 +49,4 @@ export class XSubQueryData extends XQueryData {
         return where;
     }
 }
-//# sourceMappingURL=XSubQueryData.js.map
+//# sourceMappingURL=SubQueryData.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SubQueryData.js","sourceRoot":"","sources":["../../../src/persistence/query-data/SubQueryData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAIzC,MAAM,OAAO,YAAa,SAAQ,SAAS;IAEvC,mBAAmB,CAAS;IAU5B,YAAY,qBAA4C,EAAE,MAAc,EAAE,SAAiB,EAAE,mBAA2B;QACpH,KAAK,CAAC,qBAAqB,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAChD,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACnD,CAAC;IAED,eAAe;QACX,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,kBAAkB,CAAC,kBAA+C,EAAE,SAAiB;QACjF,MAAM,qBAAqB,GAAgC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;QACzF,qBAAqB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7D,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;YACxD,qBAAqB,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;QACD,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,EAAE,CAAC;YACpB,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,qBAAqB,CAAC;IACjC,CAAC;IAED,wBAAwB,CAAC,kBAA+C,EAAE,SAAiB,EAAE,QAAgB,EAAE,YAAoB;QAC/H,IAAI,qBAAqB,GAA4C,SAAS,CAAC;QAC/E,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,qBAAqB,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC;YACtD,qBAAqB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACxC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7D,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxD,qBAAqB,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACjD,CAAC;YACD,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAItD,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QAChG,CAAC;QACD,OAAO,qBAAqB,CAAC;IACjC,CAAC;IAED,6BAA6B,CAAC,mCAA4E,EAAE,QAAgB,EAAE,YAAoB;QAC9I,IAAI,KAAK,GAAgB,EAAE,CAAC;QAC5B,IAAI,mCAAmC,EAAE,CAAC;YAEtC,MAAM,qBAAqB,GAAgC,IAAI,CAAC,wBAAwB,CAAC,mCAAmC,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;YAC3J,IAAI,qBAAqB,EAAE,CAAC;gBACxB,KAAK,GAAG,WAAW,qBAAqB,CAAC,QAAQ,EAAE,GAAG,CAAC;YAC3D,CAAC;QACL,CAAC;aACI,CAAC;YACF,KAAK,GAAG,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}