@chilibase/backend 0.6.1 → 0.7.0

package/lib/common/ExportImportParam.d.ts

@@ -1,5 +1,6 @@
-import { DataTableSortMeta } from "./PrimeFilterSortMeta.js";
-import { CustomFilterItem, ExtendedDataTableFilterMeta, FullTextSearch } from "./FindParam.js";
+import type { DataTableSortMeta } from "./PrimeFilterSortMeta.js";
+import type { CustomFilterItem, ExtendedDataTableFilterMeta, FullTextSearch } from "./FindParam.js";
+import type { TextFormat } from "./types.js";
 export declare enum ExportType {
     Excel = "excel",
     Csv = "csv",
@@ -8,7 +9,6 @@ export declare enum ExportType {
 export interface ExportExcelParam {
     queryParam: LazyDataTableQueryParam;
     excelCsvParam: ExcelCsvParam;
-    widths: string[];
 }
 export interface ExportCsvParam {
     queryParam: LazyDataTableQueryParam;
@@ -27,14 +27,20 @@ export interface LazyDataTableQueryParam {
     fields: string[];
 }
 export interface ExcelCsvParam {
-    headers?: string[];
-    toManyAssocExport: MultilineExportType;
-    multilineTextExport: MultilineExportType;
+    columns: ExportColumnParam[];
+    createHeaders: boolean;
+    toManyAssocExportType: ToManyAssocExportType;
     fieldsToDuplicateValues?: string[];
 }
-export declare enum MultilineExportType {
+export interface ExportColumnParam {
+    header?: string;
+    width?: string;
+    textFormat?: TextFormat;
+}
+export declare enum ToManyAssocExportType {
     Singleline = "singleline",
     Multiline = "multiline",
+    Multirow = "multirow",
     Off = "off"
 }
 export interface CsvParam {

package/lib/common/ExportImportParam.js

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

package/lib/common/ExportImportParam.js.map

@@ -1 +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"}
+{"version":3,"file":"ExportImportParam.js","sourceRoot":"","sources":["../../src/common/ExportImportParam.ts"],"names":[],"mappings":"AAQA,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IAClB,6BAAe,CAAA;IACf,yBAAW,CAAA;IACX,2BAAa,CAAA;AACjB,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAyCD,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAC7B,kDAAyB,CAAA;IACzB,gDAAuB,CAAA;IACvB,8CAAqB,CAAA;IACrB,oCAAW,CAAA;AACf,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC;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

@@ -1,5 +1,5 @@
-import { DataTableFilterMetaData, DataTableOperatorFilterMetaData, DataTableSortMeta } from "./PrimeFilterSortMeta.js";
-import { Params } from "./UtilsCommon.js";
+import type { DataTableFilterMetaData, DataTableOperatorFilterMetaData, DataTableSortMeta } from "./PrimeFilterSortMeta.js";
+import type { Params } from "./UtilsCommon.js";
 export declare enum ResultType {
     OnlyRowCount = 0,
     OnlyPagedRows = 1,

package/lib/common/UtilsCommon.d.ts

@@ -1,6 +1,6 @@
-import { Entity, Field } from "./EntityMetadata.js";
-import { CustomFilter, CustomFilterItem } from "./FindParam.js";
-import { DataTableSortMeta } from "./PrimeFilterSortMeta.js";
+import type { Entity, Field } from "./EntityMetadata.js";
+import type { CustomFilter, CustomFilterItem } from "./FindParam.js";
+import type { DataTableSortMeta } from "./PrimeFilterSortMeta.js";
 export interface Params {
     [key: string]: any;
 }

package/lib/common/UtilsConversions.d.ts

@@ -1,5 +1,5 @@
-import { Field } from "./EntityMetadata.js";
-import { IPostgresInterval } from "postgres-interval";
+import type { Field } from "./EntityMetadata.js";
+import type { IPostgresInterval } from "postgres-interval";
 export declare function stringFromUI(stringValue: string): string | null;
 export declare function stringAsUI(value: string | null): string;
 export declare function stringAsDB(value: string | null): string;

package/lib/common/UtilsMetadataCommon.d.ts

@@ -1,4 +1,4 @@
-import { Assoc, Entity, EntityMap, Field, RelationType } from "./EntityMetadata.js";
+import type { Assoc, Entity, EntityMap, Field, RelationType } from "./EntityMetadata.js";
 export declare class UtilsMetadataCommon {
     private static entityMap;
     static getEntityMap(): EntityMap | undefined;

package/lib/common/auth-api.d.ts

@@ -1,4 +1,4 @@
-import { User } from "../modules/administration/user.entity.js";
+import type { User } from "../modules/administration/user.entity.js";
 export interface LocalAuthLoginRequest {
     username: string;
     password: string;

package/lib/common/index.d.ts

@@ -14,7 +14,7 @@ export type { Params as XParams } from "./UtilsCommon.js";
 export type { DateScale as XDateScale, AsUIType as XAsUIType } from "./UtilsConversions.js";
 export type { ResultType as XResultType, CustomFilterItem as XCustomFilterItem, CustomFilter as XCustomFilter, ExtendedFilterMatchMode as XFilterMatchMode, ExtendedDataTableFilterMetaData as XDataTableFilterMetaData, ExtendedDataTableFilterMeta as XDataTableFilterMeta, FullTextSearch as XFullTextSearch, AggregateFunction as XAggregateFunction, SimpleAggregateItem as XSimpleAggregateItem, FindParam as XFindParam, LazyAutoCompleteSuggestionsRequest as XLazyAutoCompleteSuggestionsRequest } from "./FindParam.js";
 export type { AggregateValues as XAggregateValues, FindResult as XFindResult } from "./FindResult.js";
-export type { ExportType as XExportType, ExportExcelParam as XExportExcelParam, ExportCsvParam as XExportCsvParam, ExportJsonParam as XExportJsonParam, LazyDataTableQueryParam as XLazyDataTableQueryParam, ExcelCsvParam as XExcelCsvParam, MultilineExportType as XMultilineExportType, CsvParam as XCsvParam, CsvSeparator as XCsvSeparator, CsvDecimalFormat as XCsvDecimalFormat, CsvEncoding as XCsvEncoding, ImportType as XImportType, ImportParam as XImportParam, ImportResponse as XImportResponse } from "./ExportImportParam.js";
+export type { ExportType as XExportType, ExportExcelParam as XExportExcelParam, ExportCsvParam as XExportCsvParam, ExportJsonParam as XExportJsonParam, LazyDataTableQueryParam as XLazyDataTableQueryParam, ExcelCsvParam as XExcelCsvParam, CsvParam as XCsvParam, CsvSeparator as XCsvSeparator, CsvDecimalFormat as XCsvDecimalFormat, CsvEncoding as XCsvEncoding, ImportType as XImportType, ImportParam as XImportParam, ImportResponse as XImportResponse } from "./ExportImportParam.js";
 export type { GetSequenceValueRequest as XGetSequenceValueRequest, GetSequenceValueResponse as XGetSequenceValueResponse, FindRowByIdRequest as XFindRowByIdRequest, FindRowByIdResponse as XFindRowByIdResponse, UnlockRowRequest as XUnlockRowRequest, RunDocTemplateRequest as XtRunDocTemplateRequest, FileJsonField as XFileJsonField } from "./lib-api.js";
 export type { LocalAuthLoginRequest as XLocalAuthLoginRequest, LocalAuthLoginResponse as XLocalAuthLoginResponse, PostLoginRequest as XPostLoginRequest, PostLoginResponse as XPostLoginResponse } from "./auth-api.js";
 export type { EntityRow as XObject } from "./types.js";

package/lib/common/lib-api.d.ts

@@ -1,4 +1,4 @@
-import { User } from "../modules/administration/user.entity.js";
+import type { User } from "../modules/administration/user.entity.js";
 export interface GetSequenceValueRequest {
     name: string;
 }

package/lib/common/types.d.ts

@@ -1,5 +1,6 @@
-import { BrowseMeta } from "../modules/administration/index.js";
+import type { BrowseMeta } from "../modules/administration/index.js";
 export type EntityRow = Record<string, any>;
 export interface BrowseMetaMap {
     [name: string]: BrowseMeta;
 }
+export type TextFormat = "multiline" | "html" | undefined;

package/lib/entity-metadata/NumberWidth.d.ts

@@ -0,0 +1,3 @@
+import "reflect-metadata";
+export declare function NumberWidth(width: number): PropertyDecorator;
+export declare function getNumberWidth(target: Function, propertyName: string): number | undefined;

package/lib/entity-metadata/NumberWidth.js

@@ -0,0 +1,12 @@
+import "reflect-metadata";
+const NUMBER_WIDTH = Symbol("chilibase:numberWidth");
+export function NumberWidth(width) {
+    return (target, propertyKey) => {
+        Reflect.defineMetadata(NUMBER_WIDTH, width, target, propertyKey);
+    };
+}
+export function getNumberWidth(target, propertyName) {
+    const width = Reflect.getMetadata(NUMBER_WIDTH, target.prototype, propertyName);
+    return typeof width === "number" ? width : undefined;
+}
+//# sourceMappingURL=NumberWidth.js.map

package/lib/entity-metadata/NumberWidth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NumberWidth.js","sourceRoot":"","sources":["../../src/entity-metadata/NumberWidth.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,MAAM,YAAY,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAMrD,MAAM,UAAU,WAAW,CAAC,KAAa;IACrC,OAAO,CAAC,MAAc,EAAE,WAA4B,EAAE,EAAE;QACpD,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACrE,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAgB,EAAE,YAAoB;IACjE,MAAM,KAAK,GAAY,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACzF,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACzD,CAAC"}

package/lib/entity-metadata/entity-metadata.service.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import { Injectable } from '@nestjs/common';
 import { DataSource } from "typeorm";
 import { UtilsMetadataCommon } from "../common/UtilsMetadataCommon.js";
+import { getNumberWidth } from "./NumberWidth.js";
 let EntityMetadataService = class EntityMetadataService {
     dataSource;
     constructor(dataSource) {
@@ -32,7 +33,8 @@ let EntityMetadataService = class EntityMetadataService {
     }
     getEntityForEntityMetadata(entityMetadata) {
         const fieldMap = {};
-        let columnMetadataList = entityMetadata.columns.filter((columnMetadata) => columnMetadata.relationMetadata?.relationType === undefined);
+        let columnMetadataList = entityMetadata.columns.filter((columnMetadata) => columnMetadata.relationMetadata === undefined
+            || columnMetadata.relationMetadata.propertyName !== columnMetadata.propertyName);
         for (const columnMetadata of columnMetadataList) {
             const fieldName = columnMetadata.propertyName;
             let type = "unknown";
@@ -62,7 +64,9 @@ let EntityMetadataService = class EntityMetadataService {
             if (isNaN(length)) {
                 length = undefined;
             }
-            let width = columnMetadata.width;
+            let width = typeof columnMetadata.target === "function"
+                ? getNumberWidth(columnMetadata.target, fieldName)
+                : undefined;
             if (type === "number" && width === undefined) {
                 width = 11;
             }

package/lib/entity-metadata/entity-metadata.service.js.map

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

package/lib/entity-metadata/index.d.ts

@@ -1 +1,2 @@
 export * from "./entity-metadata.service.js";
+export { NumberWidth } from "./NumberWidth.js";

package/lib/entity-metadata/index.js

@@ -1,2 +1,3 @@
 export * from "./entity-metadata.service.js";
+export { NumberWidth } from "./NumberWidth.js";
 //# sourceMappingURL=index.js.map

package/lib/entity-metadata/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/entity-metadata/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/entity-metadata/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC"}

package/lib/export/export-csv.service.d.ts

@@ -1,5 +1,5 @@
 import { Response } from "express";
-import { CsvEncoding, CsvParam, ExportCsvParam, MultilineExportType } from "../common/ExportImportParam.js";
+import { CsvEncoding, CsvParam, ExportCsvParam, ToManyAssocExportType } from "../common/ExportImportParam.js";
 import { ExportColumn, ExportService } from "./export.service.js";
 import { SelectQueryBuilder } from "typeorm";
 export declare class CsvWriter {
@@ -15,7 +15,7 @@ export declare class CsvWriter {
 }
 export declare class ExportCsvService extends ExportService {
     export(csvParam: CsvParam, columns: ExportColumn[], entity: string | undefined, rows: any[], res: Response): void;
-    exportBase(csvParam: CsvParam, columns: ExportColumn[], createHeaders: boolean, multilineExportType: MultilineExportType, fieldsToDuplicateValues: string[] | undefined, entity: string | undefined, rows: any[], res: Response): void;
+    exportBase(csvParam: CsvParam, columns: ExportColumn[], createHeaders: boolean, toManyAssocExportType: ToManyAssocExportType, fieldsToDuplicateValues: string[] | undefined, entity: string | undefined, rows: any[], res: Response): void;
     exportUsingList(exportCsvParam: ExportCsvParam, columns: ExportColumn[], selectQueryBuilder: SelectQueryBuilder<unknown>, res: Response): Promise<void>;
     exportUsingStream(exportCsvParam: ExportCsvParam, columns: ExportColumn[], selectQueryBuilder: SelectQueryBuilder<unknown>, res: Response): Promise<void>;
     startExport(csvParam: CsvParam, columns: ExportColumn[], createHeaders: boolean, res: Response): CsvWriter;

package/lib/export/export-csv.service.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 var ExportCsvService_1;
 import { HttpStatus, Injectable } from "@nestjs/common";
-import { CsvDecimalFormat, CsvEncoding, MultilineExportType } from "../common/ExportImportParam.js";
+import { CsvDecimalFormat, CsvEncoding, ToManyAssocExportType } from "../common/ExportImportParam.js";
 import { UtilsCommon } from "../common/UtilsCommon.js";
 import { dateFormat, datetimeFormat, numberFromModel } from "../common/UtilsConversions.js";
 import * as iconv from "iconv-lite";
@@ -90,28 +90,28 @@ export class CsvWriter {
 }
 let ExportCsvService = ExportCsvService_1 = class ExportCsvService extends ExportService {
     export(csvParam, columns, entity, rows, res) {
-        this.exportBase(csvParam, columns, true, MultilineExportType.Multiline, undefined, entity, rows, res);
+        this.exportBase(csvParam, columns, true, ToManyAssocExportType.Multiline, undefined, entity, rows, res);
     }
-    exportBase(csvParam, columns, createHeaders, multilineExportType, fieldsToDuplicateValues, entity, rows, res) {
+    exportBase(csvParam, columns, createHeaders, toManyAssocExportType, fieldsToDuplicateValues, entity, rows, res) {
         const csvWriter = this.startExport(csvParam, columns, createHeaders, res);
         const entityMetadata = entity ? UtilsMetadataCommon.getEntity(entity) : undefined;
         for (const row of rows) {
-            this.exportRowToCsv(columns, multilineExportType, fieldsToDuplicateValues, entityMetadata, row, csvWriter);
+            this.exportRowToCsv(columns, toManyAssocExportType, fieldsToDuplicateValues, entityMetadata, row, csvWriter);
         }
         csvWriter.end();
     }
     async exportUsingList(exportCsvParam, columns, selectQueryBuilder, res) {
         const rowList = await selectQueryBuilder.getMany();
         const excelCsvParam = exportCsvParam.excelCsvParam;
-        this.exportBase(exportCsvParam.csvParam, columns, excelCsvParam.headers !== undefined, excelCsvParam.toManyAssocExport, excelCsvParam.fieldsToDuplicateValues, exportCsvParam.queryParam.entity, rowList, res);
+        this.exportBase(exportCsvParam.csvParam, columns, excelCsvParam.createHeaders, excelCsvParam.toManyAssocExportType, excelCsvParam.fieldsToDuplicateValues, exportCsvParam.queryParam.entity, rowList, res);
     }
     async exportUsingStream(exportCsvParam, columns, selectQueryBuilder, res) {
-        const csvWriter = this.startExport(exportCsvParam.csvParam, columns, exportCsvParam.excelCsvParam.headers !== undefined, res);
+        const csvWriter = this.startExport(exportCsvParam.csvParam, columns, exportCsvParam.excelCsvParam.createHeaders, res);
         const readStream = await selectQueryBuilder.stream();
         const entityMetadata = UtilsMetadataCommon.getEntity(exportCsvParam.queryParam.entity);
         readStream.on('data', data => {
             const entityObj = this.transformToEntity(data, selectQueryBuilder);
-            this.exportRowToCsv(columns, exportCsvParam.excelCsvParam.toManyAssocExport, exportCsvParam.excelCsvParam.fieldsToDuplicateValues, entityMetadata, entityObj, csvWriter);
+            this.exportRowToCsv(columns, exportCsvParam.excelCsvParam.toManyAssocExportType, exportCsvParam.excelCsvParam.fieldsToDuplicateValues, entityMetadata, entityObj, csvWriter);
         });
         readStream.on('end', () => {
             csvWriter.end();
@@ -141,8 +141,8 @@ let ExportCsvService = ExportCsvService_1 = class ExportCsvService extends Expor
         }
         return headerCharset;
     }
-    exportRowToCsv(columns, multilineExportType, fieldsToDuplicateValues, entityMetadata, row, csvWriter) {
-        const resultRowList = this.exportRow(columns, multilineExportType, fieldsToDuplicateValues, entityMetadata, row);
+    exportRowToCsv(columns, toManyAssocExportType, fieldsToDuplicateValues, entityMetadata, row, csvWriter) {
+        const resultRowList = this.exportRow(columns, toManyAssocExportType, fieldsToDuplicateValues, entityMetadata, row);
         for (const resultRow of resultRowList) {
             csvWriter.writeRow(...resultRow);
         }

package/lib/export/export-csv.service.js.map

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

package/lib/export/export-excel.service.d.ts

@@ -1,12 +1,23 @@
 import { StreamableFile } from "@nestjs/common";
 import { ExportColumn, ExportService } from "./export.service.js";
-import { MultilineExportType } from "../common/ExportImportParam.js";
+import { ToManyAssocExportType } from "../common/ExportImportParam.js";
 import ExcelJS from "exceljs";
+interface RichTextRun {
+    text: string;
+    font?: Partial<ExcelJS.Font>;
+}
 export declare class ExportExcelService extends ExportService {
     export(worksheetName: string, columns: ExportColumn[], entity: string | undefined, rows: any[]): Promise<StreamableFile>;
-    exportBase(worksheetName: string, columns: ExportColumn[], createHeaders: boolean, multilineExportType: MultilineExportType, fieldsToDuplicateValues: string[] | undefined, entity: string | undefined, rows: any[]): Promise<StreamableFile>;
+    exportBase(worksheetName: string, columns: ExportColumn[], createHeaders: boolean, formatRow: (row: any, excelRow: ExcelJS.Row) => void | undefined, toManyAssocExportType: ToManyAssocExportType, fieldsToDuplicateValues: string[] | undefined, entity: string | undefined, rows: any[]): Promise<StreamableFile>;
     createWorksheet(workbook: ExcelJS.Workbook, worksheetName: string, createFrozenRow?: boolean): ExcelJS.Worksheet;
     highlightHeaderRow(worksheet: ExcelJS.Worksheet): void;
     createStreamableFile(workbook: ExcelJS.Workbook): Promise<StreamableFile>;
     private computeWidth;
+    static MDW: number;
+    static REM_TO_PX: number;
+    cssWidthToPixels(cssWidth: string): number;
+    pixelsToExcelWidth(pixels: number): number;
+    cssWidthToExcelWidth(cssWidth: string): number;
+    htmlToRichText(html: string): RichTextRun[];
 }
+export {};

package/lib/export/export-excel.service.js

@@ -4,27 +4,61 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var ExportExcelService_1;
 import { Injectable, StreamableFile } from "@nestjs/common";
 import { ExportService } from "./export.service.js";
 import { Readable } from "stream";
-import { MultilineExportType } from "../common/ExportImportParam.js";
+import { ToManyAssocExportType } from "../common/ExportImportParam.js";
 import { UtilsMetadataCommon } from "../common/UtilsMetadataCommon.js";
 import ExcelJS from "exceljs";
+import * as cheerio from "cheerio";
 let ExportExcelService = class ExportExcelService extends ExportService {
+    static { ExportExcelService_1 = this; }
     export(worksheetName, columns, entity, rows) {
-        return this.exportBase(worksheetName, columns, true, MultilineExportType.Singleline, undefined, entity, rows);
+        return this.exportBase(worksheetName, columns, true, undefined, ToManyAssocExportType.Multiline, undefined, entity, rows);
     }
-    exportBase(worksheetName, columns, createHeaders, multilineExportType, fieldsToDuplicateValues, entity, rows) {
+    exportBase(worksheetName, columns, createHeaders, formatRow, toManyAssocExportType, fieldsToDuplicateValues, entity, rows) {
+        const entityMetadata = entity ? UtilsMetadataCommon.getEntity(entity) : undefined;
+        if (entityMetadata && toManyAssocExportType === ToManyAssocExportType.Multiline) {
+            for (const column of columns) {
+                if (!column.textFormat
+                    && typeof column.field === 'string'
+                    && UtilsMetadataCommon.getFieldByPathBase(entityMetadata, column.field)
+                    && UtilsMetadataCommon.hasPathToManyAssoc(entityMetadata, column.field)) {
+                    column.textFormat = "multiline";
+                }
+            }
+        }
         const workbook = new ExcelJS.Workbook();
         const worksheet = this.createWorksheet(workbook, worksheetName, createHeaders);
         if (createHeaders) {
             worksheet.columns = columns.map((value) => { return { header: value.header, width: value.width ?? this.computeWidth(value.header) }; });
         }
-        const entityMetadata = entity ? UtilsMetadataCommon.getEntity(entity) : undefined;
         for (const row of rows) {
-            const resultRowList = this.exportRow(columns, multilineExportType, fieldsToDuplicateValues, entityMetadata, row);
+            const resultRowList = this.exportRow(columns, toManyAssocExportType, fieldsToDuplicateValues, entityMetadata, row);
             for (const resultRow of resultRowList) {
-                worksheet.addRow(resultRow);
+                const excelRow = worksheet.addRow(resultRow);
+                for (const [columnIndex, column] of columns.entries()) {
+                    const excelColumnIndex = columnIndex + 1;
+                    if (column.textFormat === "html") {
+                        const cell = excelRow.getCell(excelColumnIndex);
+                        if (cell.value !== null) {
+                            cell.value = { richText: this.htmlToRichText(cell.value.toString()) };
+                            cell.alignment = {
+                                wrapText: true
+                            };
+                        }
+                    }
+                    else if (column.textFormat === "multiline") {
+                        const cell = excelRow.getCell(excelColumnIndex);
+                        cell.alignment = {
+                            wrapText: true
+                        };
+                    }
+                }
+                if (formatRow) {
+                    formatRow(row, excelRow);
+                }
             }
         }
         if (createHeaders) {
@@ -60,8 +94,56 @@ let ExportExcelService = class ExportExcelService extends ExportService {
         }
         return width;
     }
+    static MDW = 7;
+    static REM_TO_PX = 14;
+    cssWidthToPixels(cssWidth) {
+        const trimmed = cssWidth.trim();
+        if (trimmed.endsWith('rem')) {
+            const rem = parseFloat(trimmed);
+            return rem * ExportExcelService_1.REM_TO_PX;
+        }
+        if (trimmed.endsWith('px')) {
+            return parseFloat(trimmed);
+        }
+        console.log(`warning - unsupported CSS unit in width: "${cssWidth}"`);
+        return parseFloat(trimmed);
+    }
+    pixelsToExcelWidth(pixels) {
+        const width = (pixels - 5) / ExportExcelService_1.MDW;
+        return Math.max(0, Math.round(width * 100) / 100);
+    }
+    cssWidthToExcelWidth(cssWidth) {
+        return this.pixelsToExcelWidth(this.cssWidthToPixels(cssWidth));
+    }
+    htmlToRichText(html) {
+        const $ = cheerio.load(html);
+        const runs = [];
+        $('body').children().each((i, el) => {
+            if (i > 0)
+                runs.push({ text: '\n' });
+            const walk = (node, font = {}) => {
+                $(node).contents().each((_, child) => {
+                    if (child.type === 'text') {
+                        const text = $(child).text();
+                        if (text)
+                            runs.push({ text, font: Object.keys(font).length ? font : undefined });
+                    }
+                    else if (child.type === 'tag') {
+                        const newFont = { ...font };
+                        if (child.tagName === 'strong' || child.tagName === 'b')
+                            newFont.bold = true;
+                        if (child.tagName === 'em' || child.tagName === 'i')
+                            newFont.italic = true;
+                        walk(child, newFont);
+                    }
+                });
+            };
+            walk(el);
+        });
+        return runs;
+    }
 };
-ExportExcelService = __decorate([
+ExportExcelService = ExportExcelService_1 = __decorate([
     Injectable()
 ], ExportExcelService);
 export { ExportExcelService };

package/lib/export/export-excel.service.js.map

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

package/lib/export/export.service.d.ts

@@ -1,14 +1,16 @@
-import { MultilineExportType } from "../common/ExportImportParam.js";
 import { Entity } from "../common/EntityMetadata.js";
 import { SelectQueryBuilder } from "typeorm";
+import { TextFormat } from "../common/types.js";
+import { ToManyAssocExportType } from "../common/ExportImportParam.js";
 export type FieldType = "string" | "decimal" | "date" | "datetime" | "interval" | "boolean";
 export interface ExportColumn {
     header: string;
     field: string | ((row: any) => any);
     type?: FieldType;
+    textFormat?: TextFormat;
     width?: number;
 }
 export declare abstract class ExportService {
-    exportRow(columns: ExportColumn[], multilineExportType: MultilineExportType, fieldsToDuplicateValues: string[] | undefined, entityMetadata: Entity | undefined, row: any): Array<Array<any>>;
+    exportRow(columns: ExportColumn[], toManyAssocExportType: ToManyAssocExportType, fieldsToDuplicateValues: string[] | undefined, entityMetadata: Entity | undefined, row: any): Array<Array<any>>;
     protected transformToEntity(data: any, selectQueryBuilder: SelectQueryBuilder<unknown>): any;
 }

package/lib/export/export.service.js

@@ -1,10 +1,10 @@
-import { MultilineExportType } from "../common/ExportImportParam.js";
 import { UtilsMetadataCommon } from "../common/UtilsMetadataCommon.js";
 import { UtilsCommon } from "../common/UtilsCommon.js";
 import { AsUIType, convertValueBase } from "../common/UtilsConversions.js";
 import { RawSqlResultsToEntityTransformer } from "typeorm/query-builder/transformer/RawSqlResultsToEntityTransformer.js";
+import { ToManyAssocExportType } from "../common/ExportImportParam.js";
 export class ExportService {
-    exportRow(columns, multilineExportType, fieldsToDuplicateValues, entityMetadata, row) {
+    exportRow(columns, toManyAssocExportType, fieldsToDuplicateValues, entityMetadata, row) {
         const columnList = new Array(columns.length);
         let maxColumnLength = 1;
         for (const [columnIndex, exportColumn] of columns.entries()) {
@@ -30,14 +30,15 @@ export class ExportService {
             let columnValuesProcessed = false;
             if (Array.isArray(value)) {
                 columnValues = value;
-                if (multilineExportType === MultilineExportType.Singleline) {
+                if (toManyAssocExportType === ToManyAssocExportType.Singleline || toManyAssocExportType === ToManyAssocExportType.Multiline) {
                     if (fieldType) {
                         columnValues = columnValues.map((value) => convertValueBase(fieldType, scale, value, true, AsUIType.Text));
                     }
                     else {
                         columnValues = columnValues.map((value) => (value !== null && value !== undefined) ? value.toString() : "");
                     }
-                    columnValues = [columnValues.join(", ")];
+                    const separator = toManyAssocExportType === ToManyAssocExportType.Singleline ? ", " : "\n";
+                    columnValues = [columnValues.join(separator)];
                     columnValuesProcessed = true;
                 }
             }
@@ -82,7 +83,7 @@ export class ExportService {
         return resultRowList;
     }
     transformToEntity(data, selectQueryBuilder) {
-        const transformer = new RawSqlResultsToEntityTransformer(selectQueryBuilder.expressionMap, selectQueryBuilder.connection.driver, [], [], undefined);
+        const transformer = new RawSqlResultsToEntityTransformer(selectQueryBuilder.expressionMap, selectQueryBuilder.connection.driver, []);
         const entityList = transformer.transform([data], selectQueryBuilder.expressionMap.mainAlias);
         return entityList[0];
     }

package/lib/export/export.service.js.map

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

package/lib/locale/index.d.ts

@@ -1,2 +1,3 @@
-export { LocaleOptions, localeOption } from "./Locale.js";
+export type { LocaleOptions } from "./Locale.js";
+export { localeOption } from "./Locale.js";
 export { localeEn } from "./x-en.js";

package/lib/locale/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/locale/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAC,MAAM,aAAa,CAAC;AACxD,OAAO,EAAC,QAAQ,EAAC,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/locale/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,QAAQ,EAAC,MAAM,WAAW,CAAC"}