@chilibase/backend 0.1.2 → 0.2.0

package/README.md

@@ -1,9 +1,5 @@
-Backend part of the opensource fullstack framework chilibase.<br/>
-Based on nestjs, typeorm, postgres DB.<br/>
-<br/>
-Source code:<br/>
-https://github.com/chilibase/chilibase<br/>
-<br/>
-Example of use:<br/>
-https://github.com/chilibase/car-demo<br/>
+Backend part of the opensource fullstack framework chilibase.  
+Based on nestjs, typeorm, postgres DB.  
 
+Source code and documentation:  
+https://github.com/chilibase/chilibase  

package/lib/auth/local-auth.service.d.ts

@@ -1,14 +1,14 @@
 import { DataSource } from "typeorm";
-import { XUser } from "../administration/x-user.entity.js";
+import { User } from "../modules/administration/user.entity.js";
 import { JwtService } from '@nestjs/jwt';
-import { XLocalAuthLoginResponse } from "../serverApi/x-auth-api.js";
+import { LocalAuthLoginResponse } from "../common/auth-api.js";
 export declare class LocalAuthService {
     private readonly dataSource;
     private jwtService;
     constructor(dataSource: DataSource, jwtService: JwtService);
-    validateUser(username: string, password: string): Promise<XUser | null>;
-    createJwtToken(user: XUser): Promise<XLocalAuthLoginResponse>;
-    changePassword(user: XUser, request: {
+    validateUser(username: string, password: string): Promise<User | null>;
+    createJwtToken(user: User): Promise<LocalAuthLoginResponse>;
+    changePassword(user: User, request: {
         passwordCurrent: string;
         passwordNew: string;
     }): Promise<void>;

package/lib/auth/local-auth.service.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { Injectable } from '@nestjs/common';
 import { DataSource } from "typeorm";
-import { XUser } from "../administration/x-user.entity.js";
+import { User } from "../modules/administration/user.entity.js";
 import { JwtService } from '@nestjs/jwt';
 import * as bcrypt from "bcrypt";
 let LocalAuthService = class LocalAuthService {
@@ -20,7 +20,7 @@ let LocalAuthService = class LocalAuthService {
         this.jwtService = jwtService;
     }
     async validateUser(username, password) {
-        const repository = this.dataSource.getRepository(XUser);
+        const repository = this.dataSource.getRepository(User);
         const selectQueryBuilder = repository.createQueryBuilder("xUser");
         selectQueryBuilder.where("xUser.username = :username", { username: username });
         const xUser = await selectQueryBuilder.getOne();
@@ -35,7 +35,7 @@ let LocalAuthService = class LocalAuthService {
         return { accessToken: this.jwtService.sign(payload) };
     }
     async changePassword(user, request) {
-        const repository = this.dataSource.getRepository(XUser);
+        const repository = this.dataSource.getRepository(User);
         const selectQueryBuilder = repository.createQueryBuilder("xUser");
         selectQueryBuilder.where("xUser.username = :username", { username: user.username });
         const xUser = await selectQueryBuilder.getOneOrFail();

package/lib/auth/local-auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-auth.service.js","sourceRoot":"","sources":["../../src/auth/local-auth.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAqB,MAAM,SAAS,CAAC;AACvD,OAAO,EAAC,KAAK,EAAC,MAAM,oCAAoC,CAAC;AACzD,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAEvC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAG1B,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAGJ;IACT;IAFZ,YACqB,UAAsB,EAC/B,UAAsB;QADb,eAAU,GAAV,UAAU,CAAY;QAC/B,eAAU,GAAV,UAAU,CAAY;IAC/B,CAAC;IAEJ,KAAK,CAAC,YAAY,CAAC,QAAgB,EAAE,QAAgB;QAEjD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,kBAAkB,GAA8B,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC7F,kBAAkB,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC,CAAC,CAAC;QAC7E,MAAM,KAAK,GAAiB,MAAM,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC9D,IAAI,KAAK,IAAI,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,OAAO,KAAK,CAAC,QAAQ,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAW;QAC5B,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QAC1D,OAAO,EAAC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAW,EAAE,OAAwD;QACtF,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,kBAAkB,GAA8B,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC7F,kBAAkB,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAC,CAAC,CAAC;QAClF,MAAM,KAAK,GAAU,MAAM,kBAAkB,CAAC,YAAY,EAAE,CAAC;QAE7D,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxE,MAAM,2BAA2B,CAAC;QACtC,CAAC;QAED,KAAK,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9D,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAuB,EAAE,UAAyB;QACrE,IAAI,KAAK,GAAY,KAAK,CAAC;QAC3B,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;YAGzB,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,QAAgB;QAEzB,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA;AArDY,gBAAgB;IAD5B,UAAU,EAAE;qCAIwB,UAAU;QACnB,UAAU;GAJzB,gBAAgB,CAqD5B"}
+{"version":3,"file":"local-auth.service.js","sourceRoot":"","sources":["../../src/auth/local-auth.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAqB,MAAM,SAAS,CAAC;AACvD,OAAO,EAAC,IAAI,EAAC,MAAM,0CAA0C,CAAC;AAC9D,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAEvC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAG1B,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAGJ;IACT;IAFZ,YACqB,UAAsB,EAC/B,UAAsB;QADb,eAAU,GAAV,UAAU,CAAY;QAC/B,eAAU,GAAV,UAAU,CAAY;IAC/B,CAAC;IAEJ,KAAK,CAAC,YAAY,CAAC,QAAgB,EAAE,QAAgB;QAEjD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,kBAAkB,GAA6B,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC5F,kBAAkB,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAC,CAAC,CAAC;QAC7E,MAAM,KAAK,GAAgB,MAAM,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC7D,IAAI,KAAK,IAAI,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,OAAO,KAAK,CAAC,QAAQ,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAU;QAC3B,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QAC1D,OAAO,EAAC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAU,EAAE,OAAwD;QACrF,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,kBAAkB,GAA6B,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC5F,kBAAkB,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAC,CAAC,CAAC;QAClF,MAAM,KAAK,GAAS,MAAM,kBAAkB,CAAC,YAAY,EAAE,CAAC;QAE5D,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxE,MAAM,2BAA2B,CAAC;QACtC,CAAC;QAED,KAAK,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9D,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAuB,EAAE,UAAyB;QACrE,IAAI,KAAK,GAAY,KAAK,CAAC;QAC3B,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;YAGzB,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,QAAgB;QAEzB,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA;AArDY,gBAAgB;IAD5B,UAAU,EAAE;qCAIwB,UAAU;QACnB,UAAU;GAJzB,gBAAgB,CAqD5B"}

package/lib/common/EntityMetadata.d.ts

@@ -0,0 +1,35 @@
+export interface EntityMap {
+    [name: string]: Entity;
+}
+export interface Entity {
+    name: string;
+    idField: string;
+    fieldMap: FieldMap;
+    assocMap: AssocMap;
+}
+export interface FieldMap {
+    [name: string]: Field;
+}
+export interface AssocMap {
+    [name: string]: Assoc;
+}
+export interface Field {
+    name: string;
+    type: string;
+    isNullable: boolean;
+    length?: number;
+    precision?: number;
+    scale?: number;
+    width?: number;
+}
+export type RelationType = "one-to-one" | "one-to-many" | "many-to-one" | "many-to-many";
+export interface Assoc {
+    relationType: RelationType;
+    name: string;
+    entityName: string;
+    inverseAssocName?: string;
+    isCascadeInsert: boolean;
+    isCascadeUpdate: boolean;
+    isCascadeRemove: boolean;
+    isNullable: boolean;
+}

package/lib/common/EntityMetadata.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EntityMetadata.js.map

package/lib/common/EntityMetadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityMetadata.js","sourceRoot":"","sources":["../../src/common/EntityMetadata.ts"],"names":[],"mappings":""}

package/lib/{serverApi → common}/ExportImportParam.d.ts

@@ -1,5 +1,5 @@
 import { DataTableSortMeta } from "./PrimeFilterSortMeta.js";
-import { XCustomFilterItem, XDataTableFilterMeta, XFullTextSearch } from "./FindParam.js";
+import { CustomFilterItem, ExtendedDataTableFilterMeta, FullTextSearch } from "./FindParam.js";
 export declare enum ExportType {
     Excel = "excel",
     Csv = "csv",
@@ -19,20 +19,20 @@ export interface ExportJsonParam {
     queryParam: LazyDataTableQueryParam;
 }
 export interface LazyDataTableQueryParam {
-    filters: XDataTableFilterMeta;
-    fullTextSearch?: XFullTextSearch;
-    customFilterItems?: XCustomFilterItem[];
+    filters: ExtendedDataTableFilterMeta;
+    fullTextSearch?: FullTextSearch;
+    customFilterItems?: CustomFilterItem[];
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields: string[];
 }
 export interface ExcelCsvParam {
     headers?: string[];
-    toManyAssocExport: XMultilineExportType;
-    multilineTextExport: XMultilineExportType;
+    toManyAssocExport: MultilineExportType;
+    multilineTextExport: MultilineExportType;
     fieldsToDuplicateValues?: string[];
 }
-export declare enum XMultilineExportType {
+export declare enum MultilineExportType {
     Singleline = "singleline",
     Multiline = "multiline",
     Off = "off"

package/lib/{serverApi → common}/ExportImportParam.js

@@ -4,12 +4,12 @@ export var ExportType;
     ExportType["Csv"] = "csv";
     ExportType["Json"] = "json";
 })(ExportType || (ExportType = {}));
-export var XMultilineExportType;
-(function (XMultilineExportType) {
-    XMultilineExportType["Singleline"] = "singleline";
-    XMultilineExportType["Multiline"] = "multiline";
-    XMultilineExportType["Off"] = "off";
-})(XMultilineExportType || (XMultilineExportType = {}));
+export var MultilineExportType;
+(function (MultilineExportType) {
+    MultilineExportType["Singleline"] = "singleline";
+    MultilineExportType["Multiline"] = "multiline";
+    MultilineExportType["Off"] = "off";
+})(MultilineExportType || (MultilineExportType = {}));
 export var CsvSeparator;
 (function (CsvSeparator) {
     CsvSeparator["Semicolon"] = ";";

package/lib/common/ExportImportParam.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExportImportParam.js","sourceRoot":"","sources":["../../src/common/ExportImportParam.ts"],"names":[],"mappings":"AAOA,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IAClB,6BAAe,CAAA;IACf,yBAAW,CAAA;IACX,2BAAa,CAAA;AACjB,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAoCD,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC3B,gDAAyB,CAAA;IACzB,8CAAuB,CAAA;IACvB,kCAAW,CAAA;AACf,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B;AAWD,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,+BAAe,CAAA;IACf,2BAAW,CAAA;AACf,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB;AAGD,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,uCAAmB,CAAA;IACnB,qCAAiB,CAAA;AACrB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAKD,MAAM,CAAN,IAAY,WAGX;AAHD,WAAY,WAAW;IACnB,6BAAc,CAAA;IACd,kCAAmB,CAAA;AACvB,CAAC,EAHW,WAAW,KAAX,WAAW,QAGtB;AAID,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,yBAAW,CAAA;IACX,2BAAa,CAAA;AACjB,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB"}

package/lib/common/FindParam.d.ts

@@ -0,0 +1,61 @@
+import { DataTableFilterMetaData, DataTableOperatorFilterMetaData, DataTableSortMeta } from "./PrimeFilterSortMeta.js";
+import { Params } from "./UtilsCommon.js";
+export declare enum ResultType {
+    OnlyRowCount = 0,
+    OnlyPagedRows = 1,
+    RowCountAndPagedRows = 2,
+    AllRows = 3
+}
+export interface CustomFilterItem {
+    where: string;
+    params: Params;
+}
+export type CustomFilter = CustomFilterItem | CustomFilterItem[];
+export declare enum ExtendedFilterMatchMode {
+    IS_NOT_NULL = "isNotNull",
+    IS_NULL = "isNull",
+    AUTO_COMPLETE = "xAutoComplete",
+    FILTER_ELEMENT = "xFilterElement"
+}
+export interface ExtendedDataTableFilterMetaData extends DataTableFilterMetaData {
+    customFilterItems?: CustomFilterItem[];
+}
+export interface ExtendedDataTableFilterMeta {
+    [key: string]: ExtendedDataTableFilterMetaData | DataTableOperatorFilterMetaData;
+}
+export interface FullTextSearch {
+    fields?: string[];
+    value: string;
+    splitValue: boolean;
+    matchMode: 'startsWith' | 'contains' | 'endsWith' | 'equals';
+}
+export declare enum AggregateFunction {
+    Min = "MIN",
+    Max = "MAX",
+    Sum = "SUM",
+    Avg = "AVG"
+}
+export interface SimpleAggregateItem {
+    field: string;
+    aggregateFunction: AggregateFunction;
+}
+export interface FindParam {
+    resultType: ResultType;
+    first?: number;
+    rows?: number;
+    filters?: ExtendedDataTableFilterMeta;
+    fullTextSearch?: FullTextSearch;
+    customFilterItems?: CustomFilterItem[];
+    multiSortMeta?: DataTableSortMeta[];
+    entity: string;
+    fields?: string[];
+    aggregateItems?: SimpleAggregateItem[];
+}
+export interface LazyAutoCompleteSuggestionsRequest {
+    maxRows: number;
+    fullTextSearch?: FullTextSearch;
+    entity: string;
+    filterItems?: CustomFilterItem[];
+    multiSortMeta?: DataTableSortMeta[];
+    fields?: string[];
+}

package/lib/common/FindParam.js

@@ -0,0 +1,22 @@
+export var ResultType;
+(function (ResultType) {
+    ResultType[ResultType["OnlyRowCount"] = 0] = "OnlyRowCount";
+    ResultType[ResultType["OnlyPagedRows"] = 1] = "OnlyPagedRows";
+    ResultType[ResultType["RowCountAndPagedRows"] = 2] = "RowCountAndPagedRows";
+    ResultType[ResultType["AllRows"] = 3] = "AllRows";
+})(ResultType || (ResultType = {}));
+export var ExtendedFilterMatchMode;
+(function (ExtendedFilterMatchMode) {
+    ExtendedFilterMatchMode["IS_NOT_NULL"] = "isNotNull";
+    ExtendedFilterMatchMode["IS_NULL"] = "isNull";
+    ExtendedFilterMatchMode["AUTO_COMPLETE"] = "xAutoComplete";
+    ExtendedFilterMatchMode["FILTER_ELEMENT"] = "xFilterElement";
+})(ExtendedFilterMatchMode || (ExtendedFilterMatchMode = {}));
+export var AggregateFunction;
+(function (AggregateFunction) {
+    AggregateFunction["Min"] = "MIN";
+    AggregateFunction["Max"] = "MAX";
+    AggregateFunction["Sum"] = "SUM";
+    AggregateFunction["Avg"] = "AVG";
+})(AggregateFunction || (AggregateFunction = {}));
+//# sourceMappingURL=FindParam.js.map

package/lib/common/FindParam.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FindParam.js","sourceRoot":"","sources":["../../src/common/FindParam.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,UAKX;AALD,WAAY,UAAU;IAClB,2DAAY,CAAA;IACZ,6DAAa,CAAA;IACb,2EAAoB,CAAA;IACpB,iDAAO,CAAA;AACX,CAAC,EALW,UAAU,KAAV,UAAU,QAKrB;AAYD,MAAM,CAAN,IAAY,uBAKX;AALD,WAAY,uBAAuB;IAC/B,oDAAyB,CAAA;IACzB,6CAAkB,CAAA;IAClB,0DAA+B,CAAA;IAC/B,4DAAiC,CAAA;AACrC,CAAC,EALW,uBAAuB,KAAvB,uBAAuB,QAKlC;AAuBD,MAAM,CAAN,IAAY,iBAKX;AALD,WAAY,iBAAiB;IACzB,gCAAW,CAAA;IACX,gCAAW,CAAA;IACX,gCAAW,CAAA;IACX,gCAAW,CAAA;AACf,CAAC,EALW,iBAAiB,KAAjB,iBAAiB,QAK5B"}

package/lib/{serverApi → common}/FindResult.d.ts

@@ -1,8 +1,8 @@
-export interface XAggregateValues {
+export interface AggregateValues {
     [key: string]: any;
 }
 export interface FindResult {
     rowList?: any[];
     totalRecords?: number;
-    aggregateValues?: XAggregateValues;
+    aggregateValues?: AggregateValues;
 }

package/lib/{serverApi → common}/FindResult.js.map

@@ -1 +1 @@
-{"version":3,"file":"FindResult.js","sourceRoot":"","sources":["../../src/serverApi/FindResult.ts"],"names":[],"mappings":""}
+{"version":3,"file":"FindResult.js","sourceRoot":"","sources":["../../src/common/FindResult.ts"],"names":[],"mappings":""}

package/lib/common/PrimeFilterSortMeta.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PrimeFilterSortMeta.js","sourceRoot":"","sources":["../../src/common/PrimeFilterSortMeta.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,eAkBX;AAlBD,WAAY,eAAe;IACvB,6CAA0B,CAAA;IAC1B,wCAAqB,CAAA;IACrB,+CAA4B,CAAA;IAC5B,yCAAsB,CAAA;IACtB,oCAAiB,CAAA;IACjB,2CAAwB,CAAA;IACxB,4BAAS,CAAA;IACT,mCAAgB,CAAA;IAChB,gDAA6B,CAAA;IAC7B,sCAAmB,CAAA;IACnB,mDAAgC,CAAA;IAChC,sCAAmB,CAAA;IACnB,qCAAkB,CAAA;IAClB,4CAAyB,CAAA;IACzB,6CAA0B,CAAA;IAC1B,2CAAwB,CAAA;IACxB,oCAAiB,CAAA;AACrB,CAAC,EAlBW,eAAe,KAAf,eAAe,QAkB1B;AAED,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,6BAAW,CAAA;IACX,2BAAS,CAAA;AACb,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACjB,0CAAS,CAAA;IACT,iDAAY,CAAA;IACZ,uCAAO,CAAA;AACX,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB"}

package/lib/{serverApi/XUtilsCommon.d.ts → common/UtilsCommon.d.ts}

@@ -1,10 +1,10 @@
-import { XEntity, XField } from "./XEntityMetadata.js";
-import { XCustomFilter, XCustomFilterItem } from "./FindParam.js";
+import { Entity, Field } from "./EntityMetadata.js";
+import { CustomFilter, CustomFilterItem } from "./FindParam.js";
 import { DataTableSortMeta } from "./PrimeFilterSortMeta.js";
-export interface XParams {
+export interface Params {
     [key: string]: any;
 }
-export declare class XUtilsCommon {
+export declare class UtilsCommon {
     static newLine: string;
     static getValueByPath(object: any, path: string): any;
     static getValueOrValueListByPath(object: any, path: string): any | any[];
@@ -15,20 +15,22 @@ export declare class XUtilsCommon {
     static getPathToAssocAndField(path: string): [string | null, string];
     static isSingleField(path: string): boolean;
     static getPrefixAndField(path: string): [string | null, string];
-    static createDisplayValue(object: any, xEntity: XEntity | undefined, fields: string[]): string;
-    static createDisplayValueForField(object: any, xEntity: XEntity | undefined, field: string): string;
-    static displayValueAsUI(prefix: string | null, value: any, xField: XField | undefined): string;
+    static createDisplayValue(object: any, xEntity: Entity | undefined, fields: string[]): string;
+    static createDisplayValueForField(object: any, xEntity: Entity | undefined, field: string): string;
+    static displayValueAsUI(prefix: string | null, value: any, xField: Field | undefined): string;
     static objectAsJSON(value: any): string;
     static arrayCreateMap<ID, T>(array: T[], idField: string): Map<ID, T>;
     static arrayMoveElement(array: any[], position: number, offset: number): void;
     static arraySort(array: any[], fieldOrValueFunction: string | ((item: any) => any)): any[];
     static arrayIncludes<T>(array: T[], item: T, idField: string): boolean;
     static arrayIntersect<T>(array1: T[], array2: T[], idField: string): T[];
-    static createCustomFilter(filter: string | undefined | null): XCustomFilterItem | undefined;
-    static createCustomFilterItems(customFilter: XCustomFilter | undefined): XCustomFilterItem[] | undefined;
+    static numberArraySymmetricDiff(idListA: number[], idListB: number[]): number[];
+    static numberArrayUnion(idListA: number[], idListB: number[]): number[];
+    static createCustomFilter(filter: string | undefined | null): CustomFilterItem | undefined;
+    static createCustomFilterItems(customFilter: CustomFilter | undefined): CustomFilterItem[] | undefined;
     static createMultiSortMeta(sortField: string | DataTableSortMeta[] | undefined): DataTableSortMeta[] | undefined;
-    static filterAnd(...filters: (XCustomFilter | undefined)[]): XCustomFilterItem[] | undefined;
-    static filterIdIn(idField: string, idList: number[]): XCustomFilter;
+    static filterAnd(...filters: (CustomFilter | undefined)[]): CustomFilterItem[] | undefined;
+    static filterIdIn(idField: string, idList: number[]): CustomFilter;
     static createPathFieldExp(pathFieldOrPathFieldExp: string): string;
     static isPathField(pathFieldOrPathFieldExp: string): boolean;
     static getDayName(date: Date | null | undefined): string | undefined;

package/lib/{serverApi/XUtilsCommon.js → common/UtilsCommon.js}

@@ -1,16 +1,16 @@
-import { XUtilsMetadataCommon } from "./XUtilsMetadataCommon.js";
-import { AsUIType, convertValue, dateAsYYYY_MM_DD, dateFormat, datetimeFormat } from "./XUtilsConversions.js";
-export class XUtilsCommon {
+import { UtilsMetadataCommon } from "./UtilsMetadataCommon.js";
+import { AsUIType, convertValue, dateAsYYYY_MM_DD, dateFormat, datetimeFormat } from "./UtilsConversions.js";
+export class UtilsCommon {
     static newLine = '\n';
     static getValueByPath(object, path) {
-        const [field, restPath] = XUtilsCommon.getFieldAndRestPath(path);
+        const [field, restPath] = UtilsCommon.getFieldAndRestPath(path);
         if (restPath === null) {
             return object[field];
         }
         else {
             const assocObject = object[field];
             if (assocObject !== null && assocObject !== undefined) {
-                return XUtilsCommon.getValueByPath(assocObject, restPath);
+                return UtilsCommon.getValueByPath(assocObject, restPath);
             }
             else {
                 return null;
@@ -18,7 +18,7 @@ export class XUtilsCommon {
         }
     }
     static getValueOrValueListByPath(object, path) {
-        const [field, restPath] = XUtilsCommon.getFieldAndRestPath(path);
+        const [field, restPath] = UtilsCommon.getFieldAndRestPath(path);
         if (restPath === null) {
             return object[field];
         }
@@ -28,7 +28,7 @@ export class XUtilsCommon {
                 const resultValueList = [];
                 for (const assocObjectItem of assocObject) {
                     if (assocObjectItem !== null && assocObjectItem !== undefined) {
-                        const itemValue = XUtilsCommon.getValueOrValueListByPath(assocObjectItem, restPath);
+                        const itemValue = UtilsCommon.getValueOrValueListByPath(assocObjectItem, restPath);
                         if (Array.isArray(itemValue)) {
                             resultValueList.push(...itemValue);
                         }
@@ -44,7 +44,7 @@ export class XUtilsCommon {
             }
             else {
                 if (assocObject !== null && assocObject !== undefined) {
-                    return XUtilsCommon.getValueOrValueListByPath(assocObject, restPath);
+                    return UtilsCommon.getValueOrValueListByPath(assocObject, restPath);
                 }
                 else {
                     return null;
@@ -53,11 +53,11 @@ export class XUtilsCommon {
         }
     }
     static setValueByPath(object, path, value) {
-        const [pathToAssoc, field] = XUtilsCommon.getPathToAssocAndField(path);
+        const [pathToAssoc, field] = UtilsCommon.getPathToAssocAndField(path);
         if (pathToAssoc !== null) {
-            const assocObject = XUtilsCommon.getValueByPath(object, pathToAssoc);
+            const assocObject = UtilsCommon.getValueByPath(object, pathToAssoc);
             if (assocObject === null || assocObject === undefined || typeof assocObject !== 'object') {
-                console.log(`XUtilsCommon.setValueByPath: could not set value ${value} into object property ${path}. Assoc object not found (found value: ${assocObject}). Main object:`);
+                console.log(`UtilsCommon.setValueByPath: could not set value ${value} into object property ${path}. Assoc object not found (found value: ${assocObject}). Main object:`);
                 console.log(object);
                 throw `setValueByPath: could not set value ${value} into object property ${path}. Assoc object not found. The main object can be seen in log.`;
             }
@@ -114,7 +114,7 @@ export class XUtilsCommon {
     static createDisplayValue(object, xEntity, fields) {
         let displayValue = "";
         for (const field of fields) {
-            const valueStr = XUtilsCommon.createDisplayValueForField(object, xEntity, field);
+            const valueStr = UtilsCommon.createDisplayValueForField(object, xEntity, field);
             if (valueStr !== "") {
                 if (displayValue !== "") {
                     displayValue += " ";
@@ -125,17 +125,17 @@ export class XUtilsCommon {
         return displayValue;
     }
     static createDisplayValueForField(object, xEntity, field) {
-        const [prefix, fieldOnly] = XUtilsCommon.getPrefixAndField(field);
+        const [prefix, fieldOnly] = UtilsCommon.getPrefixAndField(field);
         let xField = undefined;
         if (xEntity) {
-            xField = XUtilsMetadataCommon.getXFieldByPath(xEntity, fieldOnly);
+            xField = UtilsMetadataCommon.getFieldByPath(xEntity, fieldOnly);
         }
         let displayValue;
-        const valueOrValueList = XUtilsCommon.getValueOrValueListByPath(object, fieldOnly);
+        const valueOrValueList = UtilsCommon.getValueOrValueListByPath(object, fieldOnly);
         if (Array.isArray(valueOrValueList)) {
             displayValue = "";
             for (const value of valueOrValueList) {
-                const valueAsUI = XUtilsCommon.displayValueAsUI(prefix, value, xField);
+                const valueAsUI = UtilsCommon.displayValueAsUI(prefix, value, xField);
                 if (valueAsUI !== "") {
                     if (displayValue !== "") {
                         displayValue += " ";
@@ -145,7 +145,7 @@ export class XUtilsCommon {
             }
         }
         else {
-            displayValue = XUtilsCommon.displayValueAsUI(prefix, valueOrValueList, xField);
+            displayValue = UtilsCommon.displayValueAsUI(prefix, valueOrValueList, xField);
         }
         return displayValue;
     }
@@ -237,6 +237,25 @@ export class XUtilsCommon {
         }
         return array1.filter((item) => item && array2IdSet.has(item[idField]));
     }
+    static numberArraySymmetricDiff(idListA, idListB) {
+        const setA = new Set(idListA);
+        const setB = new Set(idListB);
+        const result = [];
+        for (const id of setA) {
+            if (!setB.has(id)) {
+                result.push(id);
+            }
+        }
+        for (const id of setB) {
+            if (!setA.has(id)) {
+                result.push(id);
+            }
+        }
+        return result;
+    }
+    static numberArrayUnion(idListA, idListB) {
+        return Array.from(new Set([...idListA, ...idListB]));
+    }
     static createCustomFilter(filter) {
         let customFilterItem = undefined;
         if (filter) {
@@ -281,7 +300,7 @@ export class XUtilsCommon {
         if (filters.length > 0) {
             customFilterItemsResult = [];
             for (const filter of filters) {
-                const customFilterItems = XUtilsCommon.createCustomFilterItems(filter);
+                const customFilterItems = UtilsCommon.createCustomFilterItems(filter);
                 if (customFilterItems) {
                     customFilterItemsResult.push(...customFilterItems);
                 }
@@ -293,7 +312,7 @@ export class XUtilsCommon {
         return { where: `[${idField}] IN (:...idList)`, params: { "idList": idList.length > 0 ? idList : [0] } };
     }
     static createPathFieldExp(pathFieldOrPathFieldExp) {
-        if (XUtilsCommon.isPathField(pathFieldOrPathFieldExp)) {
+        if (UtilsCommon.isPathField(pathFieldOrPathFieldExp)) {
             pathFieldOrPathFieldExp = `[${pathFieldOrPathFieldExp}]`;
         }
         return pathFieldOrPathFieldExp;
@@ -327,12 +346,12 @@ export class XUtilsCommon {
             result = true;
         }
         else if (date1 !== null && date2 !== null) {
-            result = (XUtilsCommon.dateCompare(date1, date2) === 0);
+            result = (UtilsCommon.dateCompare(date1, date2) === 0);
         }
         return result;
     }
     static dateIntersect(date1From, date1To, date2From, date2To) {
-        return XUtilsCommon.dateCompare(date1From, date2To) <= 0 && XUtilsCommon.dateCompare(date2From, date1To) <= 0;
+        return UtilsCommon.dateCompare(date1From, date2To) <= 0 && UtilsCommon.dateCompare(date2From, date1To) <= 0;
     }
     static dateCompare(date1, date2) {
         const dateOnly1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
@@ -392,7 +411,7 @@ export class XUtilsCommon {
         return new Date(dateAsYYYY_MM_DD(new Date()));
     }
     static currentMonth() {
-        return XUtilsCommon.dateAsMonth(XUtilsCommon.today());
+        return UtilsCommon.dateAsMonth(UtilsCommon.today());
     }
     static dateAsMonth(date) {
         let month = null;
@@ -406,4 +425,4 @@ export class XUtilsCommon {
         return /^[-+]?\d+$/.test(stringValue);
     }
 }
-//# sourceMappingURL=XUtilsCommon.js.map
+//# sourceMappingURL=UtilsCommon.js.map

package/lib/common/UtilsCommon.js.map

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

package/lib/{serverApi/XUtilsConversions.d.ts → common/UtilsConversions.d.ts}

@@ -1,4 +1,4 @@
-import { XField } from "./XEntityMetadata.js";
+import { Field } from "./EntityMetadata.js";
 import { IPostgresInterval } from "postgres-interval";
 export declare function stringFromUI(stringValue: string): string | null;
 export declare function stringAsUI(value: string | null): string;
@@ -7,22 +7,22 @@ export declare function intFromUI(stringValue: string): number | null | undefine
 export declare function numberAsUI(value: number | null, fractionDigits?: number): string;
 export declare function numberFromModel(value: any): number | null;
 export declare function numberFromString(valueString: string): number | null;
-export declare enum XDateScale {
+export declare enum DateScale {
     Date = 1,
     Month = 2,
     Year = 3
 }
 export declare function dateFromModel(value: any): Date | null;
-export declare function dateFromUI(valueString: string, dateScale?: XDateScale): Date | null | undefined;
-export declare function dateAsUI(value: Date | null, dateScale?: XDateScale): string;
+export declare function dateFromUI(valueString: string, dateScale?: DateScale): Date | null | undefined;
+export declare function dateAsUI(value: Date | null, dateScale?: DateScale): string;
 export declare function dateAsYYYY_MM_DD(date: Date): string;
 export declare function dateAsDB(date: Date | null): string;
 export declare function dateFormat(date: Date, format: string): string;
 export declare function datetimeAsUI(value: Date | null): string;
 export declare function datetimeFormat(date: Date, format: string): string;
 export declare function timeFromModel(value: any): Date | null;
-export declare function dateFormatUI(dateScale?: XDateScale): string;
-export declare function dateFormatCalendar(dateScale?: XDateScale): string;
+export declare function dateFormatUI(dateScale?: DateScale): string;
+export declare function dateFormatCalendar(dateScale?: DateScale): string;
 export declare function datetimeFormatUI(): string;
 export declare function intervalFromUI(valueString: string): IPostgresInterval | null | undefined;
 export declare function intervalAsUI(valueInterval: IPostgresInterval | null): string;
@@ -33,5 +33,5 @@ export declare enum AsUIType {
     Excel = 3
 }
 export declare function convertObject(entity: string, object: any, fromModel: boolean, asUI: AsUIType | undefined): void;
-export declare function convertValue(xField: XField, value: any, fromModel: boolean, asUI: AsUIType | undefined): any;
+export declare function convertValue(xField: Field, value: any, fromModel: boolean, asUI: AsUIType | undefined): any;
 export declare function convertValueBase(fieldType: string, scale: number | undefined, value: any, fromModel: boolean, asUI: AsUIType | undefined): any;