@nest-omni/core 4.1.3-12 → 4.1.3-14

package/cache/dependencies/db.dependency.d.ts

@@ -1,5 +1,20 @@
 import { DataSource } from 'typeorm';
 import type { CacheDependency } from '../interfaces/cache-dependency.interface';
+/**
+ * Options for DbDependency
+ */
+export interface DbDependencyOptions {
+    /**
+     * Name for this dependency (used in cache key generation)
+     * Default: 'db'
+     */
+    name?: string;
+    /**
+     * Data source name to use for querying
+     * If not specified, uses the default data source
+     */
+    dataSourceName?: string;
+}
 /**
  * Database-based cache dependency
  *
@@ -33,23 +48,57 @@ import type { CacheDependency } from '../interfaces/cache-dependency.interface';
  *   ]
  * })
  * async getUserList(tenantId: string) { }
+ *
+ * // Use specific data source
+ * @Cacheable({
+ *   key: (id) => `product:${id}:details`,
+ *   dependencies: [
+ *     new DbDependency(
+ *       'SELECT updated_at FROM products WHERE id = ?',
+ *       (id) => [id],
+ *       { dataSourceName: 'readReplicas' }
+ *     )
+ *   ]
+ * })
+ * async getProductDetails(id: string) { }
+ *
+ * // With custom name and data source
+ * new DbDependency(
+ *   'SELECT COUNT(*) FROM events',
+ *   [],
+ *   { name: 'eventCount', dataSourceName: 'analytics' }
+ * )
  * ```
  */
 export declare class DbDependency implements CacheDependency {
     private readonly sql;
     private readonly paramsFactory?;
-    private readonly name?;
-    private static dataSource;
-    constructor(sql: string, paramsFactory?: (...args: any[]) => any[], name?: string);
+    private readonly options?;
+    private static fallbackDataSource;
+    private static defaultDataSourceName;
+    constructor(sql: string, paramsFactory?: (...args: any[]) => any[], options?: DbDependencyOptions);
     /**
-     * Set the TypeORM DataSource for database queries
-     * This should be called once during application initialization
+     * Set a fallback DataSource for database queries
+     * This is used when DataSourceUtil cannot provide a DataSource
+     * This method is deprecated - use DataSourceUtil.registerDataSource() instead
+     * @deprecated Use DataSourceUtil.registerDataSource() to register DataSources
      */
     static setDataSource(dataSource: DataSource): void;
     /**
-     * Get the current DataSource
+     * Set the default data source name for DbDependency
+     * @param name The data source name (default: 'default')
+     */
+    static setDefaultDataSourceName(name: string): void;
+    /**
+     * Get the current fallback DataSource
+     * @deprecated Use DataSourceUtil.getDataSource() instead
      */
     static getDataSource(): DataSource | null;
+    /**
+     * Get DataSource for executing queries
+     * Priority: 1. Specific dataSourceName from options, 2. Default from DataSourceUtil, 3. Fallback
+     */
+    private getDataSource;
     getKey(): string;
     getData(): Promise<any>;
     isChanged(oldData: any): Promise<boolean>;

package/cache/dependencies/db.dependency.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbDependency = void 0;
+const data_source_util_1 = require("../../transaction/data-source.util");
 /**
  * Database-based cache dependency
  *
@@ -43,44 +44,93 @@ exports.DbDependency = void 0;
  *   ]
  * })
  * async getUserList(tenantId: string) { }
+ *
+ * // Use specific data source
+ * @Cacheable({
+ *   key: (id) => `product:${id}:details`,
+ *   dependencies: [
+ *     new DbDependency(
+ *       'SELECT updated_at FROM products WHERE id = ?',
+ *       (id) => [id],
+ *       { dataSourceName: 'readReplicas' }
+ *     )
+ *   ]
+ * })
+ * async getProductDetails(id: string) { }
+ *
+ * // With custom name and data source
+ * new DbDependency(
+ *   'SELECT COUNT(*) FROM events',
+ *   [],
+ *   { name: 'eventCount', dataSourceName: 'analytics' }
+ * )
  * ```
  */
 class DbDependency {
-    constructor(sql, paramsFactory, name) {
+    constructor(sql, paramsFactory, options) {
         this.sql = sql;
         this.paramsFactory = paramsFactory;
-        this.name = name;
+        this.options = options;
         if (!sql || typeof sql !== 'string') {
             throw new Error('DbDependency requires a valid SQL query');
         }
     }
     /**
-     * Set the TypeORM DataSource for database queries
-     * This should be called once during application initialization
+     * Set a fallback DataSource for database queries
+     * This is used when DataSourceUtil cannot provide a DataSource
+     * This method is deprecated - use DataSourceUtil.registerDataSource() instead
+     * @deprecated Use DataSourceUtil.registerDataSource() to register DataSources
      */
     static setDataSource(dataSource) {
-        this.dataSource = dataSource;
+        this.fallbackDataSource = dataSource;
     }
     /**
-     * Get the current DataSource
+     * Set the default data source name for DbDependency
+     * @param name The data source name (default: 'default')
+     */
+    static setDefaultDataSourceName(name) {
+        this.defaultDataSourceName = name;
+    }
+    /**
+     * Get the current fallback DataSource
+     * @deprecated Use DataSourceUtil.getDataSource() instead
      */
     static getDataSource() {
-        return this.dataSource;
+        return this.fallbackDataSource;
+    }
+    /**
+     * Get DataSource for executing queries
+     * Priority: 1. Specific dataSourceName from options, 2. Default from DataSourceUtil, 3. Fallback
+     */
+    getDataSource() {
+        var _a;
+        // Try to get from DataSourceUtil first (supports dynamic data sources from transactions)
+        const dsName = ((_a = this.options) === null || _a === void 0 ? void 0 : _a.dataSourceName) || DbDependency.defaultDataSourceName;
+        const dataSource = data_source_util_1.DataSourceUtil.getDataSourceSafe(dsName);
+        if (dataSource) {
+            return dataSource;
+        }
+        // Fallback to static dataSource for backward compatibility
+        if (DbDependency.fallbackDataSource) {
+            return DbDependency.fallbackDataSource;
+        }
+        throw new Error(`DbDependency requires DataSource '${dsName}' to be registered. ` +
+            `Use DataSourceUtil.registerDataSource('${dsName}', dataSource) ` +
+            `or DbDependency.setDataSource(dataSource) for fallback.`);
     }
     getKey() {
+        var _a;
         const queryHash = this.hashCode(this.sql);
-        const name = this.name || 'db';
+        const name = ((_a = this.options) === null || _a === void 0 ? void 0 : _a.name) || 'db';
         return `db:${name}:${queryHash}`;
     }
     getData() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (!DbDependency.dataSource) {
-                throw new Error('DbDependency requires DataSource to be set. Call DbDependency.setDataSource(dataSource) during app initialization.');
-            }
             try {
+                const dataSource = this.getDataSource();
                 const params = ((_a = this.paramsFactory) === null || _a === void 0 ? void 0 : _a.call(this)) || [];
-                const result = yield DbDependency.dataSource.query(this.sql, params);
+                const result = yield dataSource.query(this.sql, params);
                 // Serialize result for comparison
                 return JSON.stringify(result);
             }
@@ -115,4 +165,5 @@ class DbDependency {
     }
 }
 exports.DbDependency = DbDependency;
-DbDependency.dataSource = null;
+DbDependency.fallbackDataSource = null;
+DbDependency.defaultDataSourceName = 'default';

package/common/boilerplate.polyfill.js

@@ -52,7 +52,7 @@ typeorm_1.SelectQueryBuilder.prototype.searchByString = function (q, columnNames
     }
     this.andWhere(new typeorm_1.Brackets((qb) => {
         for (const item of columnNames) {
-            qb.orWhere(`${item} ILIKE :q`);
+            qb.orWhere(`${item} LIKE :q`);
         }
     }));
     if (options === null || options === void 0 ? void 0 : options.formStart) {

package/file-upload/decorators/column.decorator.d.ts

@@ -0,0 +1,151 @@
+import 'reflect-metadata';
+/**
+ * CSV列名映射元数据键
+ */
+export declare const CSV_COLUMN_METADATA = "csv:column";
+/**
+ * Excel列名映射元数据键
+ */
+export declare const EXCEL_COLUMN_METADATA = "excel:column";
+/**
+ * 列标识类型
+ * 可以是列名（字符串）、列序号（数字）或Excel列名（A, B, C）
+ */
+export type ColumnIdentifier = string | number;
+/**
+ * CSV列装饰器
+ * 用于指定CSV文件中列与DTO属性的映射关系
+ * 支持列名、列序号（从0开始）或Excel列名（A, B, C）
+ *
+ * @example
+ * ```typescript
+ * export class UserImportDto {
+ *   @CSVColumn('姓名')  // 使用列名
+ *   @CSVColumn(0)       // 使用列序号（第一列）
+ *   @CSVColumn('A')     // 使用Excel列名
+ *   @IsString()
+ *   @Length(2, 50)
+ *   name: string;
+ *
+ *   @CSVColumn('年龄')  // 使用列名
+ *   @CSVColumn(1)       // 使用列序号（第二列）
+ *   @CSVColumn('B')     // 使用Excel列名
+ *   @IsNumber()
+ *   @Min(0)
+ *   @Max(150)
+ *   age: number;
+ * }
+ * ```
+ */
+export declare function CSVColumn(columnIdentifier: ColumnIdentifier): PropertyDecorator;
+/**
+ * Excel列装饰器
+ * 用于指定Excel文件中列与DTO属性的映射关系
+ * 支持列名、列序号（从0开始）或Excel列名（A, B, C）
+ *
+ * @example
+ * ```typescript
+ * export class ProductImportDto {
+ *   @ExcelColumn('产品名称')  // 使用列名
+ *   @ExcelColumn(0)           // 使用列序号（第一列）
+ *   @ExcelColumn('A')         // 使用Excel列名
+ *   @IsString()
+ *   @Length(2, 200)
+ *   name: string;
+ *
+ *   @ExcelColumn('价格')     // 使用列名
+ *   @ExcelColumn(1)           // 使用列序号（第二列）
+ *   @ExcelColumn('B')         // 使用Excel列名
+ *   @IsNumber()
+ *   @Min(0)
+ *   price: number;
+ * }
+ * ```
+ */
+export declare function ExcelColumn(columnIdentifier: ColumnIdentifier): PropertyDecorator;
+/**
+ * 获取CSV列映射信息
+ * 返回列标识到属性名的映射Map
+ *
+ * @param dtoClass DTO类
+ * @returns Map<列标识, 属性名>
+ */
+export declare function getCsvColumnMapping(dtoClass: any): Map<ColumnIdentifier, string>;
+/**
+ * 获取Excel列映射信息
+ * 返回列标识到属性名的映射Map
+ *
+ * @param dtoClass DTO类
+ * @returns Map<列标识, 属性名>
+ */
+export declare function getExcelColumnMapping(dtoClass: any): Map<ColumnIdentifier, string>;
+/**
+ * Excel列名转数字（A=0, B=1, ..., AA=26, AB=27）
+ */
+export declare function excelColumnToNumber(columnLetter: string): number;
+/**
+ * 处理行数据
+ * 将原始数据行转换为DTO实例，支持多语言错误信息
+ * 支持列名、列序号和Excel列名（A, B, C）
+ *
+ * @param rowData 原始行数据
+ * @param dtoClass DTO类
+ * @param columnMapping 列映射
+ * @param type 数据类型（csv/excel）
+ * @returns 转换结果
+ */
+export declare function processRowWithMapping<T>(rowData: any, dtoClass: new () => T, columnMapping: Map<ColumnIdentifier, string>, type: 'csv' | 'excel'): {
+    instance: T;
+    errors: ValidationError[];
+};
+/**
+ * 数字转Excel列名（0=A, 1=B, ..., 26=AA, 27=AB）
+ */
+export declare function numberToExcelColumn(num: number): string;
+/**
+ * 验证错误接口
+ */
+interface ValidationError {
+    property: string;
+    value: any;
+    constraints: {
+        [key: string]: {
+            message: string;
+            values?: any[];
+        };
+    };
+}
+/**
+ * 格式化验证错误为多语言
+ * 支持中英文错误信息
+ *
+ * @param errors class-validator错误数组
+ * @returns 格式化后的错误信息
+ */
+export declare function formatValidationErrors(errors: ValidationError[]): string[];
+/**
+ * 创建CSV数据导入结果
+ * @param data 成功导入的数据
+ * @param errors 错误信息
+ * @param totalRows 总行数
+ * @param headers 表头信息
+ * @returns 导入结果对象
+ */
+export declare function createImportResult<T>(data: T[], errors: {
+    row: number;
+    errors: string[];
+    data: any;
+}[], totalRows: number, headers?: string[]): {
+    success: boolean;
+    data: T[];
+    errors: {
+        row: number;
+        errors: string[];
+        data: any;
+    }[];
+    totalCount: number;
+    successCount: number;
+    errorCount: number;
+    headers?: string[];
+};
+export {};

package/file-upload/decorators/column.decorator.js

@@ -0,0 +1,273 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EXCEL_COLUMN_METADATA = exports.CSV_COLUMN_METADATA = void 0;
+exports.CSVColumn = CSVColumn;
+exports.ExcelColumn = ExcelColumn;
+exports.getCsvColumnMapping = getCsvColumnMapping;
+exports.getExcelColumnMapping = getExcelColumnMapping;
+exports.excelColumnToNumber = excelColumnToNumber;
+exports.processRowWithMapping = processRowWithMapping;
+exports.numberToExcelColumn = numberToExcelColumn;
+exports.formatValidationErrors = formatValidationErrors;
+exports.createImportResult = createImportResult;
+require("reflect-metadata");
+/**
+ * CSV列名映射元数据键
+ */
+exports.CSV_COLUMN_METADATA = 'csv:column';
+/**
+ * Excel列名映射元数据键
+ */
+exports.EXCEL_COLUMN_METADATA = 'excel:column';
+/**
+ * CSV列装饰器
+ * 用于指定CSV文件中列与DTO属性的映射关系
+ * 支持列名、列序号（从0开始）或Excel列名（A, B, C）
+ *
+ * @example
+ * ```typescript
+ * export class UserImportDto {
+ *   @CSVColumn('姓名')  // 使用列名
+ *   @CSVColumn(0)       // 使用列序号（第一列）
+ *   @CSVColumn('A')     // 使用Excel列名
+ *   @IsString()
+ *   @Length(2, 50)
+ *   name: string;
+ *
+ *   @CSVColumn('年龄')  // 使用列名
+ *   @CSVColumn(1)       // 使用列序号（第二列）
+ *   @CSVColumn('B')     // 使用Excel列名
+ *   @IsNumber()
+ *   @Min(0)
+ *   @Max(150)
+ *   age: number;
+ * }
+ * ```
+ */
+function CSVColumn(columnIdentifier) {
+    return (target, propertyKey) => {
+        // target 是类的原型，我们需要将元数据存储在构造函数上
+        const constructor = target.constructor;
+        const columns = Reflect.getMetadata(exports.CSV_COLUMN_METADATA, constructor) || {};
+        columns[propertyKey] = columnIdentifier;
+        Reflect.defineMetadata(exports.CSV_COLUMN_METADATA, columns, constructor);
+    };
+}
+/**
+ * Excel列装饰器
+ * 用于指定Excel文件中列与DTO属性的映射关系
+ * 支持列名、列序号（从0开始）或Excel列名（A, B, C）
+ *
+ * @example
+ * ```typescript
+ * export class ProductImportDto {
+ *   @ExcelColumn('产品名称')  // 使用列名
+ *   @ExcelColumn(0)           // 使用列序号（第一列）
+ *   @ExcelColumn('A')         // 使用Excel列名
+ *   @IsString()
+ *   @Length(2, 200)
+ *   name: string;
+ *
+ *   @ExcelColumn('价格')     // 使用列名
+ *   @ExcelColumn(1)           // 使用列序号（第二列）
+ *   @ExcelColumn('B')         // 使用Excel列名
+ *   @IsNumber()
+ *   @Min(0)
+ *   price: number;
+ * }
+ * ```
+ */
+function ExcelColumn(columnIdentifier) {
+    return (target, propertyKey) => {
+        // target 是类的原型，我们需要将元数据存储在构造函数上
+        const constructor = target.constructor;
+        const columns = Reflect.getMetadata(exports.EXCEL_COLUMN_METADATA, constructor) || {};
+        columns[propertyKey] = columnIdentifier;
+        Reflect.defineMetadata(exports.EXCEL_COLUMN_METADATA, columns, constructor);
+    };
+}
+/**
+ * 获取CSV列映射信息
+ * 返回列标识到属性名的映射Map
+ *
+ * @param dtoClass DTO类
+ * @returns Map<列标识, 属性名>
+ */
+function getCsvColumnMapping(dtoClass) {
+    const constructor = dtoClass;
+    const mapping = new Map();
+    if (!constructor) {
+        return mapping;
+    }
+    // 从构造函数获取列映射元数据
+    const columns = Reflect.getMetadata(exports.CSV_COLUMN_METADATA, constructor) || {};
+    for (const [propertyKey, columnIdentifier] of Object.entries(columns)) {
+        mapping.set(columnIdentifier, propertyKey);
+    }
+    return mapping;
+}
+/**
+ * 获取Excel列映射信息
+ * 返回列标识到属性名的映射Map
+ *
+ * @param dtoClass DTO类
+ * @returns Map<列标识, 属性名>
+ */
+function getExcelColumnMapping(dtoClass) {
+    const constructor = dtoClass;
+    const mapping = new Map();
+    if (!constructor) {
+        return mapping;
+    }
+    // 从构造函数获取列映射元数据
+    const columns = Reflect.getMetadata(exports.EXCEL_COLUMN_METADATA, constructor) || {};
+    for (const [propertyKey, columnIdentifier] of Object.entries(columns)) {
+        mapping.set(columnIdentifier, propertyKey);
+    }
+    return mapping;
+}
+/**
+ * Excel列名转数字（A=0, B=1, ..., AA=26, AB=27）
+ */
+function excelColumnToNumber(columnLetter) {
+    let result = 0;
+    for (let i = 0; i < columnLetter.length; i++) {
+        const char = columnLetter.toUpperCase().charCodeAt(i) - 64; // A=65, so A-64=1
+        result = result * 26 + char;
+    }
+    return result - 1; // 转换为0基索引
+}
+/**
+ * 处理行数据
+ * 将原始数据行转换为DTO实例，支持多语言错误信息
+ * 支持列名、列序号和Excel列名（A, B, C）
+ *
+ * @param rowData 原始行数据
+ * @param dtoClass DTO类
+ * @param columnMapping 列映射
+ * @param type 数据类型（csv/excel）
+ * @returns 转换结果
+ */
+function processRowWithMapping(rowData, dtoClass, columnMapping, type) {
+    const instance = new dtoClass();
+    const errors = [];
+    // 遍历所有映射的列
+    for (const [columnIdentifier, propertyKey] of columnMapping.entries()) {
+        let value;
+        if (typeof columnIdentifier === 'number') {
+            // 列序号（0基索引）
+            if (Array.isArray(rowData)) {
+                // 如果rowData是数组，直接使用索引
+                value = rowData[columnIdentifier];
+            }
+            else if (type === 'excel') {
+                // Excel数据：尝试将列序号转换为Excel列名
+                const columnLetter = numberToExcelColumn(columnIdentifier);
+                value = rowData[columnLetter];
+            }
+            else {
+                // CSV数据：如果无法通过索引获取，则跳过
+                value = undefined;
+            }
+        }
+        else if (typeof columnIdentifier === 'string') {
+            // 列名或Excel列名
+            // 优先通过列名获取值
+            if (rowData.hasOwnProperty(columnIdentifier)) {
+                value = rowData[columnIdentifier];
+            }
+            else if (type === 'excel' && /^[A-Za-z]+$/.test(columnIdentifier)) {
+                // 如果是Excel列名格式（如A, B, C），但数据中没有，尝试其他方式
+                value = undefined;
+            }
+            // 如果是数组且列标识是特殊的索引格式
+            else if (Array.isArray(rowData) && columnIdentifier.startsWith('__index_')) {
+                const index = parseInt(columnIdentifier.replace('__index_', ''), 10);
+                if (!isNaN(index) && index < rowData.length) {
+                    value = rowData[index];
+                }
+            }
+        }
+        // 设置值到实例
+        instance[propertyKey] = value;
+    }
+    return { instance, errors };
+}
+/**
+ * 数字转Excel列名（0=A, 1=B, ..., 26=AA, 27=AB）
+ */
+function numberToExcelColumn(num) {
+    let result = '';
+    let n = num + 1; // 转换为1基索引
+    while (n > 0) {
+        n--;
+        result = String.fromCharCode(65 + (n % 26)) + result;
+        n = Math.floor(n / 26);
+    }
+    return result;
+}
+/**
+ * 格式化验证错误为多语言
+ * 支持中英文错误信息
+ *
+ * @param errors class-validator错误数组
+ * @returns 格式化后的错误信息
+ */
+function formatValidationErrors(errors) {
+    return errors.map(error => {
+        var _a, _b, _c, _d, _e;
+        const constraint = Object.values(error.constraints)[0];
+        // 英文错误信息直接使用
+        if (/^[a-zA-Z\s]+$/.test(constraint.message)) {
+            return `${error.property}: ${constraint.message}`;
+        }
+        // 中文错误信息特殊处理
+        const chineseMessages = {
+            'isString': '必须是字符串',
+            'isNumber': '必须是数字',
+            'isBoolean': '必须是布尔值',
+            'isDate': '必须是日期格式',
+            'min': `不能小于 ${(_a = constraint.values) === null || _a === void 0 ? void 0 : _a[0]}`,
+            'max': `不能大于 ${(_b = constraint.values) === null || _b === void 0 ? void 0 : _b[0]}`,
+            'minLength': `长度不能少于 ${(_c = constraint.values) === null || _c === void 0 ? void 0 : _c[0]}`,
+            'maxLength': `长度不能超过 ${(_d = constraint.values) === null || _d === void 0 ? void 0 : _d[0]}`,
+            'isEmail': '邮箱格式不正确',
+            'isEnum': `必须是以下值之一: ${(_e = constraint.values) === null || _e === void 0 ? void 0 : _e.join(', ')}`,
+            'matches': '格式不正确',
+        };
+        const ruleName = constraint.message.split(' ')[0];
+        const chineseMessage = chineseMessages[ruleName];
+        if (chineseMessage) {
+            const args = constraint.values || [];
+            let message = chineseMessage;
+            args.forEach(arg => {
+                message = message.replace(/\$\{(\w+)\}/g, (_, key) => {
+                    const index = parseInt(key.replace(/[^\d]/g, '')) - 1;
+                    return args[index] !== undefined ? args[index] : `$${key}`;
+                });
+            });
+            return `${error.property}: ${message}`;
+        }
+        // 默认使用原错误信息
+        return `${error.property}: ${constraint.message}`;
+    });
+}
+/**
+ * 创建CSV数据导入结果
+ * @param data 成功导入的数据
+ * @param errors 错误信息
+ * @param totalRows 总行数
+ * @param headers 表头信息
+ * @returns 导入结果对象
+ */
+function createImportResult(data, errors, totalRows, headers) {
+    return {
+        success: errors.length === 0,
+        data,
+        errors,
+        totalCount: totalRows,
+        successCount: data.length,
+        errorCount: errors.length,
+        headers
+    };
+}