midway-fatcms 0.0.6 → 0.0.8

package/dist/libs/crud-sharding/ShardingTableCreator.js

@@ -15,8 +15,8 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
  * });
  */
 class ShardingTableCreator {
-    constructor(crudPro, config) {
-        this.crudPro = crudPro;
+    constructor(crudProFactory, config) {
+        this.crudProFactory = crudProFactory;
         this.config = config;
         this.validateIdentifier(this.config.baseTable, 'baseTable');
     }
@@ -46,28 +46,50 @@ class ShardingTableCreator {
         // 校验分表名格式，防止 SQL 注入
         this.validateIdentifier(tableName, 'tableName');
         const { copyIndexes = false } = options;
-        try {
-            // 1. 获取基表元信息
-            const tableMeta = await this.getBaseTableMeta(baseCfg);
-            if (!tableMeta || !tableMeta.columnDetails || tableMeta.columnDetails.length === 0) {
-                throw new Error(`[ShardingTableCreator] 无法获取基表 ${this.config.baseTable} 的结构信息`);
-            }
-            // 2. 生成建表 SQL
-            const createSql = this.generateCreateTableSql(tableName, tableMeta.columnDetails, baseCfg.sqlDbType, options);
-            // 3. 执行建表
-            await this.executeCreateSql(baseCfg, createSql);
-            // 4. 可选：复制索引
-            if (copyIndexes) {
+        // 0. 先检查表是否已存在
+        const tableExists = await this.checkTableExists(tableName, baseCfg);
+        if (tableExists) {
+            // 表已存在，跳过创建和索引复制
+            return { success: true, tableName, createSql: '' };
+        }
+        // 1. 获取基表元信息
+        const tableMeta = await this.getBaseTableMeta(baseCfg);
+        if (!tableMeta || !tableMeta.columnDetails || tableMeta.columnDetails.length === 0) {
+            throw new Error(`[ShardingTableCreator] 无法获取基表 ${this.config.baseTable} 的结构信息`);
+        }
+        // 2. 生成建表 SQL
+        const createSql = this.generateCreateTableSql(tableName, tableMeta.columnDetails, baseCfg.sqlDbType, options);
+        // 3. 执行建表
+        await this.executeCreateSql(baseCfg, createSql);
+        // 4. 可选：复制索引（只在新建表时执行）
+        if (copyIndexes) {
+            try {
                 await this.copyIndexes(tableName, baseCfg);
             }
-            return { success: true, tableName, createSql };
+            catch (e) {
+                console.error("copyIndexes", e);
+            }
+        }
+        return { success: true, tableName, createSql };
+    }
+    /**
+     * 检查表是否已存在
+     * 复用 CrudPro.getAllTableInfos 接口，使用缓存提升性能
+     * DDL 操作本身具有幂等性（CREATE TABLE IF NOT EXISTS），缓存短暂延迟可接受
+     */
+    async checkTableExists(tableName, baseCfg) {
+        try {
+            const { tables } = await this.crudProFactory().getAllTableInfos({
+                sqlDatabase: baseCfg.sqlDatabase,
+                sqlDbType: baseCfg.sqlDbType,
+            }, { skipCache: false } // 使用缓存，避免每次建表都直查数据库
+            );
+            return tables.some(t => t.name === tableName);
         }
         catch (error) {
-            return {
-                success: false,
-                tableName,
-                error: error instanceof Error ? error : new Error(String(error)),
-            };
+            console.warn('[ShardingTableCreator] 检查表存在性失败:', error);
+            // 检查失败时，假设表不存在，继续尝试创建
+            return false;
         }
     }
     /**
@@ -107,20 +129,19 @@ class ShardingTableCreator {
      */
     async loadMySQLColumns(baseCfg) {
         const sql = `
-      SELECT 
-        COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_KEY, 
+      SELECT
+        COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_KEY,
         COLUMN_DEFAULT, COLUMN_COMMENT, EXTRA
       FROM information_schema.COLUMNS
       WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '${this.config.baseTable}'
       ORDER BY ORDINAL_POSITION
     `.trim();
-        const result = await this.crudPro.executeSQL({
+        const rows = await this.crudProFactory().executeSQL({
             isNativeSQL: true,
             sqlDatabase: baseCfg.sqlDatabase,
             sqlDbType: baseCfg.sqlDbType,
             executeSql: sql,
-        });
-        const rows = (result === null || result === void 0 ? void 0 : result.rows) || [];
+        }) || [];
         return rows.map((row) => {
             var _a;
             return ({
@@ -150,13 +171,12 @@ class ShardingTableCreator {
       WHERE table_schema = '${schema}' AND table_name = '${this.config.baseTable}'
       ORDER BY ordinal_position
     `.trim();
-        const result = await this.crudPro.executeSQL({
+        const rows = await this.crudProFactory().executeSQL({
             isNativeSQL: true,
             sqlDatabase: baseCfg.sqlDatabase,
             sqlDbType: baseCfg.sqlDbType,
             executeSql: sql,
-        });
-        const rows = (result === null || result === void 0 ? void 0 : result.rows) || [];
+        }) || [];
         // 获取主键列
         const pkColumns = await this.getPostgreSQLPrimaryKeys(baseCfg, schema);
         return rows.map((row) => {
@@ -186,13 +206,13 @@ class ShardingTableCreator {
         AND c.relname = '${this.config.baseTable}'
         AND i.indisprimary
     `.trim();
-        const result = await this.crudPro.executeSQL({
+        const result = await this.crudProFactory().executeSQL({
             isNativeSQL: true,
             sqlDatabase: baseCfg.sqlDatabase,
             sqlDbType: baseCfg.sqlDbType,
             executeSql: sql,
-        });
-        return ((result === null || result === void 0 ? void 0 : result.rows) || []).map((row) => row.attname);
+        }) || [];
+        return result.map((row) => row.attname);
     }
     /**
      * 加载 SQL Server 表列信息
@@ -212,13 +232,12 @@ class ShardingTableCreator {
       WHERE c.object_id = OBJECT_ID('${this.config.baseTable}')
       ORDER BY c.column_id
     `.trim();
-        const result = await this.crudPro.executeSQL({
+        const rows = await this.crudProFactory().executeSQL({
             isNativeSQL: true,
             sqlDatabase: baseCfg.sqlDatabase,
             sqlDbType: baseCfg.sqlDbType,
             executeSql: sql,
-        });
-        const rows = (result === null || result === void 0 ? void 0 : result.rows) || [];
+        }) || [];
         // 获取主键列
         const pkColumns = await this.getSQLServerPrimaryKeys(baseCfg);
         return rows.map((row) => {
@@ -248,13 +267,13 @@ class ShardingTableCreator {
       WHERE i.object_id = OBJECT_ID('${this.config.baseTable}')
         AND i.is_primary_key = 1
     `.trim();
-        const result = await this.crudPro.executeSQL({
+        const result = await this.crudProFactory().executeSQL({
             isNativeSQL: true,
             sqlDatabase: baseCfg.sqlDatabase,
             sqlDbType: baseCfg.sqlDbType,
             executeSql: sql,
-        });
-        return ((result === null || result === void 0 ? void 0 : result.rows) || []).map((row) => row.name);
+        }) || [];
+        return result.map((row) => row.name);
     }
     /**
      * 生成建表 SQL
@@ -560,14 +579,44 @@ class ShardingTableCreator {
     /**
      * 执行建表 SQL
      */
-    async executeCreateSql(baseCfg, createSql) {
+    async executeCreateSql(baseCfg, createSql, options = {}) {
         const sqlCfgModel = {
             isNativeSQL: true,
             sqlDatabase: baseCfg.sqlDatabase,
             sqlDbType: baseCfg.sqlDbType,
             executeSql: createSql,
         };
-        await this.crudPro.executeSQL(sqlCfgModel);
+        try {
+            await this.crudProFactory().executeSQL(sqlCfgModel);
+        }
+        catch (error) {
+            // 静默处理 DDL "已存在"类错误（表已存在、索引已存在等）
+            if (options.silentDuplicate && this.isDuplicateError(error)) {
+                return;
+            }
+            throw error;
+        }
+    }
+    /**
+     * 判断是否为"已存在"类错误（表已存在、索引已存在等）
+     */
+    isDuplicateError(error) {
+        if (!error)
+            return false;
+        const code = error.code || error.errno;
+        const message = error.message || '';
+        // MySQL: ER_TABLE_EXISTS_ERROR (1050), ER_DUP_KEYNAME (1061)
+        // PostgreSQL: 42P07 (duplicate_table), 42P06 (duplicate_schema)
+        // SQL Server: 错误消息包含 "already exists"
+        return code === 'ER_TABLE_EXISTS_ERROR' ||
+            code === 'ER_DUP_KEYNAME' ||
+            code === 1050 ||
+            code === 1061 ||
+            code === '42P07' ||
+            code === '42P06' ||
+            message.includes('already exists') ||
+            message.includes('Duplicate') ||
+            message.includes('Table') && message.includes('already exists');
     }
     /**
      * 复制索引（可选功能）
@@ -576,23 +625,111 @@ class ShardingTableCreator {
      * 注意：主键索引已在建表时创建，此处只复制普通索引。
      */
     async copyIndexes(tableName, baseCfg) {
-        try {
-            const indexDefs = await this.getIndexDefinitions(baseCfg);
-            for (const indexDef of indexDefs) {
-                // 跳过主键索引（已创建）
-                if (indexDef.isPrimary || !indexDef.createSql)
-                    continue;
-                // 替换表名（支持不同数据库的标识符语法）
+        const indexDefs = await this.getIndexDefinitions(baseCfg);
+        // 过滤掉主键索引和空定义
+        const validIndexDefs = indexDefs.filter(def => !def.isPrimary && def.createSql);
+        if (validIndexDefs.length === 0) {
+            return;
+        }
+        // 一次性获取目标表已存在的所有索引名
+        const existingIndexNames = await this.getExistingIndexNames(tableName, baseCfg);
+        // 用于去重的 Set，防止同一请求中重复创建同名索引
+        const createdIndexNames = new Set();
+        for (const indexDef of validIndexDefs) {
+            try {
+                // 替换表名
                 const indexSql = this.replaceTableNameInIndexSql(indexDef.createSql, tableName, baseCfg.sqlDbType);
-                // 重命名索引以避免冲突
+                // 重命名索引
                 const renamedSql = this.renameIndex(indexSql, tableName, baseCfg.sqlDbType);
-                await this.executeCreateSql(baseCfg, renamedSql);
+                // 提取新索引名
+                const newIndexName = this.extractIndexName(renamedSql, baseCfg.sqlDbType);
+                // 如果索引已存在（数据库中或本次请求已创建），跳过创建
+                if (existingIndexNames.has(newIndexName) || createdIndexNames.has(newIndexName)) {
+                    continue;
+                }
+                console.info('[ShardingTableCreator] 准备创建索引 =>' + newIndexName + "  ===> renamedSql" + renamedSql);
+                // 使用 silentDuplicate 静默处理"索引已存在"错误
+                await this.executeCreateSql(baseCfg, renamedSql, { silentDuplicate: true });
+                // 创建成功后添加到已创建列表，防止重复创建
+                createdIndexNames.add(newIndexName);
+            }
+            catch (error) {
+                // 非预期错误，记录日志
+                console.warn('[ShardingTableCreator] 创建索引失败:', (error === null || error === void 0 ? void 0 : error.message) || error);
+            }
+        }
+    }
+    /**
+     * 获取目标表已存在的所有索引名
+     */
+    async getExistingIndexNames(tableName, baseCfg) {
+        const indexNames = new Set();
+        try {
+            if (baseCfg.sqlDbType === keys_1.SqlDbType.mysql) {
+                const sql = `
+          SELECT INDEX_NAME
+          FROM information_schema.STATISTICS
+          WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '${tableName}'
+        `;
+                const result = await this.crudProFactory().executeSQL({
+                    isNativeSQL: true,
+                    sqlDatabase: baseCfg.sqlDatabase,
+                    sqlDbType: baseCfg.sqlDbType,
+                    executeSql: sql,
+                });
+                result.forEach(row => indexNames.add(row.INDEX_NAME));
+            }
+            else if (baseCfg.sqlDbType === keys_1.SqlDbType.postgres) {
+                const sql = `
+          SELECT indexname
+          FROM pg_indexes
+          WHERE schemaname = 'public' AND tablename = '${tableName}'
+        `;
+                const result = await this.crudProFactory().executeSQL({
+                    isNativeSQL: true,
+                    sqlDatabase: baseCfg.sqlDatabase,
+                    sqlDbType: baseCfg.sqlDbType,
+                    executeSql: sql,
+                });
+                result.forEach(row => indexNames.add(row.indexname));
+            }
+            else if (baseCfg.sqlDbType === keys_1.SqlDbType.sqlserver) {
+                const sql = `
+          SELECT name
+          FROM sys.indexes
+          WHERE object_id = OBJECT_ID('${tableName}')
+        `;
+                const result = await this.crudProFactory().executeSQL({
+                    isNativeSQL: true,
+                    sqlDatabase: baseCfg.sqlDatabase,
+                    sqlDbType: baseCfg.sqlDbType,
+                    executeSql: sql,
+                });
+                result.forEach(row => indexNames.add(row.name));
             }
         }
         catch (error) {
-            console.warn('[ShardingTableCreator] 复制索引失败:', error);
-            // 索引复制失败不影响主流程
+            console.warn('[ShardingTableCreator] 获取已存在索引列表失败:', error);
         }
+        return indexNames;
+    }
+    /**
+     * 从 CREATE INDEX 语句中提取索引名
+     */
+    extractIndexName(indexSql, sqlDbType) {
+        if (sqlDbType === keys_1.SqlDbType.mysql) {
+            const match = indexSql.match(/INDEX `([^`]+)`/i);
+            return match ? match[1] : '';
+        }
+        else if (sqlDbType === keys_1.SqlDbType.postgres) {
+            const match = indexSql.match(/INDEX "([^"]+)"/i);
+            return match ? match[1] : '';
+        }
+        else if (sqlDbType === keys_1.SqlDbType.sqlserver) {
+            const match = indexSql.match(/INDEX \[([^\]]+)\]/i);
+            return match ? match[1] : '';
+        }
+        return '';
     }
     /**
      * 在索引 SQL 中替换表名
@@ -654,13 +791,12 @@ class ShardingTableCreator {
         AND TABLE_NAME = '${this.config.baseTable}'
       ORDER BY INDEX_NAME, SEQ_IN_INDEX
     `;
-        const result = await this.crudPro.executeSQL({
+        const rows = await this.crudProFactory().executeSQL({
             isNativeSQL: true,
             sqlDatabase: baseCfg.sqlDatabase,
             sqlDbType: baseCfg.sqlDbType,
             executeSql: sql,
-        });
-        const rows = (result === null || result === void 0 ? void 0 : result.rows) || [];
+        }) || [];
         // 按索引名分组
         const indexMap = new Map();
         for (const row of rows) {
@@ -708,13 +844,12 @@ class ShardingTableCreator {
       WHERE n.nspname = '${schema}'
         AND t.relname = '${this.config.baseTable}'
     `;
-        const result = await this.crudPro.executeSQL({
+        const rows = await this.crudProFactory().executeSQL({
             isNativeSQL: true,
             sqlDatabase: baseCfg.sqlDatabase,
             sqlDbType: baseCfg.sqlDbType,
             executeSql: sql,
-        });
-        const rows = (result === null || result === void 0 ? void 0 : result.rows) || [];
+        }) || [];
         return rows.map((row) => ({
             isPrimary: row.is_primary,
             createSql: row.index_def,
@@ -742,13 +877,12 @@ class ShardingTableCreator {
       WHERE i.object_id = OBJECT_ID('${this.config.baseTable}')
         AND i.name IS NOT NULL
     `;
-        const result = await this.crudPro.executeSQL({
+        const rows = await this.crudProFactory().executeSQL({
             isNativeSQL: true,
             sqlDatabase: baseCfg.sqlDatabase,
             sqlDbType: baseCfg.sqlDbType,
             executeSql: sql,
-        });
-        const rows = (result === null || result === void 0 ? void 0 : result.rows) || [];
+        }) || [];
         return rows.map((row) => {
             const isPrimary = row.is_primary;
             const isUnique = row.is_unique;

package/dist/libs/crud-sharding/ShardingUtils.d.ts

@@ -36,3 +36,51 @@ export declare function getCurrentSuffix(shardingType: ShardingType | undefined)
  * @returns 是否为当前表
  */
 export declare function isCurrentTable(tableName: string, baseTable: string, shardingType: ShardingType | undefined): boolean;
+/**
+ * 日期字符串的粒度类型
+ */
+export declare type DateStringGranularity = 'year' | 'month' | 'day' | 'datetime' | null;
+/**
+ * 判断日期字符串的粒度
+ *
+ * 根据字符串格式推断精度：
+ * - 4位纯年：'2024' → 'year'
+ * - 7位年-月：'2024-01' → 'month'
+ * - 10位年-月-日：'2024-01-15' → 'day'
+ * - 带时分秒：'2024-01-15 10:30:00' → 'datetime'（精度已足够，不需要转换）
+ *
+ * @param value 待判断的值
+ * @returns 粒度类型，非日期字符串返回 null
+ */
+export declare function detectDateStringGranularity(value: string): DateStringGranularity;
+/**
+ * 判断值是否为时间操作符表达式（ICompareCondition / ILogicalCondition）
+ *
+ * 排除 Date 对象后，typeof === 'object' 且非 null 即为操作符表达式。
+ * 判断优先级：`value instanceof Date` → 先于 `typeof === 'object'` 判断。
+ *
+ * @param value 待判断的值
+ * @returns 是否为操作符表达式
+ */
+export declare function isOperatorExpression(value: unknown): boolean;
+/**
+ * 将日期字符串按粒度转换为 $gte/$lte 范围表达式
+ *
+ * 仅对 year/month/day 粒度的字符串进行转换，
+ * datetime 粒度和非日期字符串不转换返回 null。
+ * 闰年2月自动处理（28/29天）。
+ *
+ * @param value 日期字符串
+ * @returns 范围表达式对象，不需要转换时返回 null
+ *
+ * @example
+ * expandDateToRange('2024')
+ * // → { $gte: '2024-01-01 00:00:00', $lte: '2024-12-31 23:59:59' }
+ *
+ * expandDateToRange('2024-01')
+ * // → { $gte: '2024-01-01 00:00:00', $lte: '2024-01-31 23:59:59' }
+ *
+ * expandDateToRange('2024-01-15')
+ * // → { $gte: '2024-01-15 00:00:00', $lte: '2024-01-15 23:59:59' }
+ */
+export declare function expandDateToRange(value: string): Record<string, string> | null;

package/dist/libs/crud-sharding/ShardingUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCurrentTable = exports.getCurrentSuffix = exports.getTimeSuffix = exports.shardingTypeToGranularity = void 0;
+exports.expandDateToRange = exports.isOperatorExpression = exports.detectDateStringGranularity = exports.isCurrentTable = exports.getCurrentSuffix = exports.getTimeSuffix = exports.shardingTypeToGranularity = void 0;
 const ShardingConfig_1 = require("./ShardingConfig");
 /**
  * 将 ShardingType 转换为时间粒度
@@ -75,3 +75,124 @@ function isCurrentTable(tableName, baseTable, shardingType) {
     return tableName === expectedTableName;
 }
 exports.isCurrentTable = isCurrentTable;
+/**
+ * 判断日期字符串的粒度
+ *
+ * 根据字符串格式推断精度：
+ * - 4位纯年：'2024' → 'year'
+ * - 7位年-月：'2024-01' → 'month'
+ * - 10位年-月-日：'2024-01-15' → 'day'
+ * - 带时分秒：'2024-01-15 10:30:00' → 'datetime'（精度已足够，不需要转换）
+ *
+ * @param value 待判断的值
+ * @returns 粒度类型，非日期字符串返回 null
+ */
+function detectDateStringGranularity(value) {
+    const trimmed = value.trim();
+    // 4位纯年：'2024'
+    if (/^\d{4}$/.test(trimmed)) {
+        return 'year';
+    }
+    // 7位年-月：'2024-01'
+    if (/^\d{4}-\d{2}$/.test(trimmed)) {
+        return 'month';
+    }
+    // 10位年-月-日：'2024-01-15'
+    if (/^\d{4}-\d{2}-\d{2}$/.test(trimmed)) {
+        return 'day';
+    }
+    // 带时分秒的完整时间字符串（精度已足够，不需要转换）
+    if (/^\d{4}-\d{2}-\d{2}[T ]\d{1,2}/.test(trimmed)) {
+        return 'datetime';
+    }
+    return null;
+}
+exports.detectDateStringGranularity = detectDateStringGranularity;
+/**
+ * 判断值是否为时间操作符表达式（ICompareCondition / ILogicalCondition）
+ *
+ * 排除 Date 对象后，typeof === 'object' 且非 null 即为操作符表达式。
+ * 判断优先级：`value instanceof Date` → 先于 `typeof === 'object'` 判断。
+ *
+ * @param value 待判断的值
+ * @returns 是否为操作符表达式
+ */
+function isOperatorExpression(value) {
+    // Date 对象是精确值，不是操作符
+    if (value instanceof Date) {
+        return false;
+    }
+    // 非-null 对象视为操作符表达式（如 { $gte: ... }, { $or: ... }）
+    return typeof value === 'object' && value !== null && Object.keys(value).length > 0;
+}
+exports.isOperatorExpression = isOperatorExpression;
+/**
+ * 获取指定年月的最后一天日期
+ *
+ * @param year 年份
+ * @param month 月份（1-12）
+ * @returns 最后一天的日号（28/29/30/31）
+ */
+function getLastDayOfMonth(year, month) {
+    // new Date(year, month, 0) 返回上个月最后一天
+    return new Date(year, month, 0).getDate();
+}
+/**
+ * 将日期字符串按粒度转换为 $gte/$lte 范围表达式
+ *
+ * 仅对 year/month/day 粒度的字符串进行转换，
+ * datetime 粒度和非日期字符串不转换返回 null。
+ * 闰年2月自动处理（28/29天）。
+ *
+ * @param value 日期字符串
+ * @returns 范围表达式对象，不需要转换时返回 null
+ *
+ * @example
+ * expandDateToRange('2024')
+ * // → { $gte: '2024-01-01 00:00:00', $lte: '2024-12-31 23:59:59' }
+ *
+ * expandDateToRange('2024-01')
+ * // → { $gte: '2024-01-01 00:00:00', $lte: '2024-01-31 23:59:59' }
+ *
+ * expandDateToRange('2024-01-15')
+ * // → { $gte: '2024-01-15 00:00:00', $lte: '2024-01-15 23:59:59' }
+ */
+function expandDateToRange(value) {
+    const granularity = detectDateStringGranularity(value);
+    if (!granularity || granularity === 'datetime') {
+        return null;
+    }
+    const trimmed = value.trim();
+    switch (granularity) {
+        case 'year': {
+            // '2024' → 2024-01-01 ~ 2024-12-31
+            const year = parseInt(trimmed, 10);
+            return {
+                $gte: `${year}-01-01 00:00:00`,
+                $lte: `${year}-12-31 23:59:59`,
+            };
+        }
+        case 'month': {
+            // '2024-01' → 2024-01-01 ~ 2024-01-31
+            const [yearStr, monthStr] = trimmed.split('-');
+            const year = parseInt(yearStr, 10);
+            const month = parseInt(monthStr, 10);
+            const lastDay = getLastDayOfMonth(year, month);
+            const monthPadded = monthStr.padStart(2, '0');
+            return {
+                $gte: `${year}-${monthPadded}-01 00:00:00`,
+                $lte: `${year}-${monthPadded}-${String(lastDay).padStart(2, '0')} 23:59:59`,
+            };
+        }
+        case 'day': {
+            // '2024-01-15' → 2024-01-15 00:00:00 ~ 2024-01-15 23:59:59
+            return {
+                $gte: `${trimmed} 00:00:00`,
+                $lte: `${trimmed} 23:59:59`,
+            };
+        }
+        default:
+            return null;
+    }
+}
+exports.expandDateToRange = expandDateToRange;