baja-lite 1.0.1 → 1.0.3

package/es/sql.js

@@ -18,6 +18,7 @@ import { emptyString } from './string';
 import pino from 'pino';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn';
 import { add } from './math';
+import mustache from 'mustache';
 // #region 常量
 const _daoDBName = Symbol('dbName');
 const _tableName = Symbol('tableName');
@@ -30,7 +31,7 @@ const _deleteState = Symbol('deleteState');
 const _transformer = Symbol('transformer');
 const _index = Symbol('index');
 const _def = Symbol('def');
-const _sqlCache = Symbol('sqlCache');
+const _sqlCache = Symbol('sqlMap');
 const _dao = Symbol('dao');
 const _primaryDB = Symbol('primaryDB');
 const _dbType = Symbol('dbType');
@@ -61,21 +62,21 @@ export var DBType;
     DBType[DBType["Redis"] = 4] = "Redis";
     DBType[DBType["RedisLock"] = 5] = "RedisLock";
 })(DBType || (DBType = {}));
-export var SqlSyncMode;
-(function (SqlSyncMode) {
+export var SyncMode;
+(function (SyncMode) {
     /** 同步执行 */
-    SqlSyncMode[SqlSyncMode["Sync"] = 0] = "Sync";
+    SyncMode[SyncMode["Sync"] = 0] = "Sync";
     /** 异步执行 */
-    SqlSyncMode[SqlSyncMode["Async"] = 1] = "Async";
-})(SqlSyncMode || (SqlSyncMode = {}));
-export var SqlInsertMode;
-(function (SqlInsertMode) {
+    SyncMode[SyncMode["Async"] = 1] = "Async";
+})(SyncMode || (SyncMode = {}));
+export var InsertMode;
+(function (InsertMode) {
     /**
     # 默认使用
     ** 支持单个、批量,语法 `INSERT INTO XX VALUES (第一条数据), (第二条数据);`
     ** 批量执行有性能优势，但无法利用数据库的sql预编译功能
     */
-    SqlInsertMode[SqlInsertMode["Insert"] = 0] = "Insert";
+    InsertMode[InsertMode["Insert"] = 0] = "Insert";
     /**
     # 利用临时表
     ## 执行步骤
@@ -87,16 +88,16 @@ export var SqlInsertMode;
     1. 适用于：主键不会冲突、非自增
     2. 临时表的结构复制正式表
      */
-    SqlInsertMode[SqlInsertMode["InsertWithTempTable"] = 1] = "InsertWithTempTable";
-    SqlInsertMode[SqlInsertMode["InsertIfNotExists"] = 2] = "InsertIfNotExists";
+    InsertMode[InsertMode["InsertWithTempTable"] = 1] = "InsertWithTempTable";
+    InsertMode[InsertMode["InsertIfNotExists"] = 2] = "InsertIfNotExists";
     /**
     # 插入或者更新
     1. 判断依据是主键
      */
-    SqlInsertMode[SqlInsertMode["Replace"] = 3] = "Replace";
-})(SqlInsertMode || (SqlInsertMode = {}));
-export var SqlDelMode;
-(function (SqlDelMode) {
+    InsertMode[InsertMode["Replace"] = 3] = "Replace";
+})(InsertMode || (InsertMode = {}));
+export var DeleteMode;
+(function (DeleteMode) {
     /**
      ##常规删除 默认
      ### 例一
@@ -104,16 +105,16 @@ export var SqlDelMode;
      ### 例二
      `DELETE FROM WHERE (id = 1 AND idx = 11) OR (id = 2 AND idx = 22)`
     */
-    SqlDelMode[SqlDelMode["Common"] = 0] = "Common";
+    DeleteMode[DeleteMode["Common"] = 0] = "Common";
     /*
     ## 借助临时表
     ### 注意：必须保证where的字段都相同，否则会漏删数据
     DELETE FROM 正式表 INNER JOIN 临时表 WHERE 字段1 = 字段1 AND 字段2 = 字段2
      */
-    SqlDelMode[SqlDelMode["TempTable"] = 1] = "TempTable";
-})(SqlDelMode || (SqlDelMode = {}));
-export var SqlSelectMode;
-(function (SqlSelectMode) {
+    DeleteMode[DeleteMode["TempTable"] = 1] = "TempTable";
+})(DeleteMode || (DeleteMode = {}));
+export var SelectMode;
+(function (SelectMode) {
     /**
      ##常规 默认
      ### 例一
@@ -121,46 +122,70 @@ export var SqlSelectMode;
      ### 例二
      `SELECT * FROM WHERE (id = 1 AND idx = 11) OR (id = 2 AND idx = 22)`
     */
-    SqlSelectMode[SqlSelectMode["Common"] = 0] = "Common";
+    SelectMode[SelectMode["Common"] = 0] = "Common";
     /*
     ## 借助临时表
     ### 注意：必须保证where的字段都相同，否则会漏删数据
     SELECT * FROM 正式表 INNER JOIN 临时表 WHERE 字段1 = 字段1 AND 字段2 = 字段2
      */
-    SqlSelectMode[SqlSelectMode["TempTable"] = 1] = "TempTable";
-})(SqlSelectMode || (SqlSelectMode = {}));
-export var SqlTemplateMode;
-(function (SqlTemplateMode) {
-    /** 确定返回一个，如果不是一个，将报错，返回类型是T */
-    SqlTemplateMode[SqlTemplateMode["AssertOne"] = 0] = "AssertOne";
-    /** 可能返回一个，返回类型是T|null */
-    SqlTemplateMode[SqlTemplateMode["NotSureOne"] = 1] = "NotSureOne";
-    /** 返回多个 */
-    SqlTemplateMode[SqlTemplateMode["Many"] = 2] = "Many";
+    SelectMode[SelectMode["TempTable"] = 1] = "TempTable";
+})(SelectMode || (SelectMode = {}));
+export var TemplateResult;
+(function (TemplateResult) {
+    /** 确定返回一条记录，如果不是一个，将报错，返回类型是T */
+    TemplateResult[TemplateResult["AssertOne"] = 0] = "AssertOne";
+    /** 可能返回一条记录，返回类型是T|null */
+    TemplateResult[TemplateResult["NotSureOne"] = 1] = "NotSureOne";
+    /** 返回多条记录 */
+    TemplateResult[TemplateResult["Many"] = 2] = "Many";
     /** 仅查询记录数量 */
-    SqlTemplateMode[SqlTemplateMode["Count"] = 3] = "Count";
-})(SqlTemplateMode || (SqlTemplateMode = {}));
-export var SqlQueryMode;
-(function (SqlQueryMode) {
-    SqlQueryMode[SqlQueryMode["One_Row_One_Column_Assert"] = 0] = "One_Row_One_Column_Assert";
-    SqlQueryMode[SqlQueryMode["One_Row_One_Column_NotSure"] = 1] = "One_Row_One_Column_NotSure";
-    SqlQueryMode[SqlQueryMode["One_Row_Many_Column_Assert"] = 2] = "One_Row_Many_Column_Assert";
-    SqlQueryMode[SqlQueryMode["One_Row_Many_Column_NotSure"] = 3] = "One_Row_Many_Column_NotSure";
-    SqlQueryMode[SqlQueryMode["Many_Row_One_Column"] = 4] = "Many_Row_One_Column";
-    SqlQueryMode[SqlQueryMode["Many_Row_Many_Column"] = 5] = "Many_Row_Many_Column";
-})(SqlQueryMode || (SqlQueryMode = {}));
+    TemplateResult[TemplateResult["Count"] = 3] = "Count";
+})(TemplateResult || (TemplateResult = {}));
+export var SelectResult;
+(function (SelectResult) {
+    SelectResult[SelectResult["One_Row_One_Column_Assert"] = 0] = "One_Row_One_Column_Assert";
+    SelectResult[SelectResult["One_Row_One_Column_NotSure"] = 1] = "One_Row_One_Column_NotSure";
+    SelectResult[SelectResult["One_Row_Many_Column_Assert"] = 2] = "One_Row_Many_Column_Assert";
+    SelectResult[SelectResult["One_Row_Many_Column_NotSure"] = 3] = "One_Row_Many_Column_NotSure";
+    SelectResult[SelectResult["Many_Row_One_Column"] = 4] = "Many_Row_One_Column";
+    SelectResult[SelectResult["Many_Row_Many_Column"] = 5] = "Many_Row_Many_Column";
+})(SelectResult || (SelectResult = {}));
 export var SqlType;
 (function (SqlType) {
-    SqlType[SqlType["bigint"] = 0] = "bigint";
-    SqlType[SqlType["char"] = 1] = "char";
-    SqlType[SqlType["decimal"] = 2] = "decimal";
+    SqlType[SqlType["tinyint"] = 0] = "tinyint";
+    SqlType[SqlType["smallint"] = 1] = "smallint";
+    SqlType[SqlType["mediumint"] = 2] = "mediumint";
     SqlType[SqlType["int"] = 3] = "int";
-    SqlType[SqlType["longtext"] = 4] = "longtext";
-    SqlType[SqlType["mediumtext"] = 5] = "mediumtext";
-    SqlType[SqlType["smallint"] = 6] = "smallint";
-    SqlType[SqlType["text"] = 7] = "text";
-    SqlType[SqlType["tinyint"] = 8] = "tinyint";
-    SqlType[SqlType["varchar"] = 9] = "varchar";
+    SqlType[SqlType["bigint"] = 4] = "bigint";
+    SqlType[SqlType["float"] = 5] = "float";
+    SqlType[SqlType["double"] = 6] = "double";
+    SqlType[SqlType["decimal"] = 7] = "decimal";
+    SqlType[SqlType["date"] = 8] = "date";
+    SqlType[SqlType["time"] = 9] = "time";
+    SqlType[SqlType["year"] = 10] = "year";
+    SqlType[SqlType["datetime"] = 11] = "datetime";
+    SqlType[SqlType["timestamp"] = 12] = "timestamp";
+    SqlType[SqlType["char"] = 13] = "char";
+    SqlType[SqlType["varchar"] = 14] = "varchar";
+    SqlType[SqlType["tinyblob"] = 15] = "tinyblob";
+    SqlType[SqlType["tinytext"] = 16] = "tinytext";
+    SqlType[SqlType["blob"] = 17] = "blob";
+    SqlType[SqlType["text"] = 18] = "text";
+    SqlType[SqlType["mediumblob"] = 19] = "mediumblob";
+    SqlType[SqlType["mediumtext"] = 20] = "mediumtext";
+    SqlType[SqlType["longblob"] = 21] = "longblob";
+    SqlType[SqlType["longtext"] = 22] = "longtext";
+    SqlType[SqlType["set"] = 23] = "set";
+    SqlType[SqlType["enum"] = 24] = "enum";
+    SqlType[SqlType["json"] = 25] = "json";
+    SqlType[SqlType["geometry"] = 26] = "geometry";
+    SqlType[SqlType["point"] = 27] = "point";
+    SqlType[SqlType["linestring"] = 28] = "linestring";
+    SqlType[SqlType["polygon"] = 29] = "polygon";
+    SqlType[SqlType["multipoint"] = 30] = "multipoint";
+    SqlType[SqlType["multilinestring"] = 31] = "multilinestring";
+    SqlType[SqlType["multipolygon"] = 32] = "multipolygon";
+    SqlType[SqlType["geometrycollection"] = 33] = "geometrycollection";
 })(SqlType || (SqlType = {}));
 export const SqliteMemory = ':memory:';
 const _defOption = {
@@ -181,7 +206,7 @@ class MysqlConnection {
             return { affectedRows: 0, insertId: 0n };
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return { affectedRows: 0, insertId: 0n };
         }
@@ -189,7 +214,7 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const [_result] = await this[_daoConnection].execute(sql, params);
                 const result = _result;
@@ -204,7 +229,7 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -214,7 +239,7 @@ class MysqlConnection {
             return null;
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return null;
         }
@@ -222,7 +247,7 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const [result] = await this[_daoConnection].query(sql, params);
                 if (result && result[0]) {
@@ -240,7 +265,7 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -250,7 +275,7 @@ class MysqlConnection {
             return null;
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return null;
         }
@@ -258,7 +283,7 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const [result] = await this[_daoConnection].query(sql, params);
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
@@ -274,7 +299,7 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -284,7 +309,7 @@ class MysqlConnection {
             return [];
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return [];
         }
@@ -292,7 +317,7 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const [result] = await this[_daoConnection].query(sql, params);
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
@@ -308,7 +333,7 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -318,7 +343,7 @@ class MysqlConnection {
             return [];
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return [];
         }
@@ -326,7 +351,7 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const [result] = await this[_daoConnection].query(sql, params);
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
@@ -340,12 +365,12 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
     realse(sync) {
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             try {
                 this[_daoConnection]?.release();
             }
@@ -361,28 +386,33 @@ class Mysql {
         this[_daoDB] = pool;
     }
     createConnection(sync) {
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.error('MYSQL not suppouted sync mode');
             return null;
         }
         ;
-        return new Promise(async (resolve) => {
-            const connection = await this[_daoDB].getConnection();
-            logger.debug('create new!');
-            resolve(new MysqlConnection(connection));
+        return new Promise(async (resolve, reject) => {
+            try {
+                const connection = await this[_daoDB].getConnection();
+                logger.debug('create new!');
+                resolve(new MysqlConnection(connection));
+            }
+            catch (error) {
+                reject(error);
+            }
         });
     }
     transaction(sync, fn, conn) {
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('MYSQL not suppouted sync mode');
             return null;
         }
         ;
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             let needCommit = false;
             let newConn = false;
             if (!conn) {
-                conn = await this.createConnection(SqlSyncMode.Async) ?? undefined;
+                conn = await this.createConnection(SyncMode.Async) ?? undefined;
                 newConn = true;
             }
             if (conn?.[_inTransaction] !== true) {
@@ -408,7 +438,7 @@ class Mysql {
                 logger.debug('rollback end!');
                 conn[_inTransaction] = false;
                 logger.error(error);
-                throw error;
+                reject(error);
             }
             finally {
                 try {
@@ -427,7 +457,7 @@ class Mysql {
         });
     }
     close(sync) {
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             this[_daoDB]?.destroy();
         }
         ;
@@ -451,7 +481,7 @@ class SqliteConnection {
                 return { affectedRows: 0, insertId: 0n };
             }
             ;
-            if (sync === SqlSyncMode.Async) {
+            if (sync === SyncMode.Async) {
                 logger.warn(`SQLITE not suppoted async mode`);
                 return { affectedRows: 0, insertId: 0n };
             }
@@ -482,7 +512,7 @@ class SqliteConnection {
                 return null;
             }
             ;
-            if (sync === SqlSyncMode.Async) {
+            if (sync === SyncMode.Async) {
                 logger.warn(`SQLITE not suppoted async mode`);
                 return null;
             }
@@ -508,7 +538,7 @@ class SqliteConnection {
                 return null;
             }
             ;
-            if (sync === SqlSyncMode.Async) {
+            if (sync === SyncMode.Async) {
                 return null;
             }
             ;
@@ -533,7 +563,7 @@ class SqliteConnection {
                 return [];
             }
             ;
-            if (sync === SqlSyncMode.Async) {
+            if (sync === SyncMode.Async) {
                 logger.warn(`SQLITE not suppoted async mode`);
                 return [];
             }
@@ -559,7 +589,7 @@ class SqliteConnection {
                 return [];
             }
             ;
-            if (sync === SqlSyncMode.Async) {
+            if (sync === SyncMode.Async) {
                 logger.warn(`SQLITE not suppoted async mode`);
                 return [];
             }
@@ -598,7 +628,7 @@ class Sqlite {
         `);
     }
     createConnection(sync) {
-        if (sync === SqlSyncMode.Async) {
+        if (sync === SyncMode.Async) {
             logger.error(`SQLITE not suppoted async mode`);
             return null;
         }
@@ -606,13 +636,13 @@ class Sqlite {
         return new SqliteConnection(this[_daoDB]);
     }
     transaction(sync, fn, conn) {
-        if (sync === SqlSyncMode.Async) {
+        if (sync === SyncMode.Async) {
             logger.warn(`SQLITE not suppoted async mode`);
             return null;
         }
         ;
         if (!conn) {
-            conn = this.createConnection(SqlSyncMode.Sync) ?? undefined;
+            conn = this.createConnection(SyncMode.Sync) ?? undefined;
         }
         if (conn[_inTransaction] !== true) {
             return this[_daoDB].transaction(() => {
@@ -628,13 +658,13 @@ class Sqlite {
         }
     }
     close(sync) {
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             this[_daoDB].close();
         }
         ;
     }
     backup(sync, name) {
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             this[_daoDB].backup(name);
         }
         ;
@@ -656,7 +686,7 @@ class SqliteRemoteConnection {
             return { affectedRows: 0, insertId: 0n };
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return { affectedRows: 0, insertId: 0n };
         }
@@ -664,7 +694,7 @@ class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const { affectedRows, insertId } = await this[_daoConnection].execute(this[_sqliteRemoteName], sql, params);
                 resolve({ affectedRows, insertId: insertId ? BigInt(insertId) : 0n });
@@ -675,7 +705,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -685,7 +715,7 @@ class SqliteRemoteConnection {
             return null;
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return null;
         }
@@ -693,7 +723,7 @@ class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const r = await this[_daoConnection].pluck(this[_sqliteRemoteName], sql, params);
                 resolve(r);
@@ -704,7 +734,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -714,7 +744,7 @@ class SqliteRemoteConnection {
             return null;
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return null;
         }
@@ -722,7 +752,7 @@ class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const r = await this[_daoConnection].get(this[_sqliteRemoteName], sql, params);
                 resolve(r);
@@ -733,7 +763,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -743,7 +773,7 @@ class SqliteRemoteConnection {
             return [];
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return [];
         }
@@ -751,7 +781,7 @@ class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const r = await this[_daoConnection].raw(this[_sqliteRemoteName], sql, params);
                 resolve(r);
@@ -762,7 +792,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -772,7 +802,7 @@ class SqliteRemoteConnection {
             return [];
         }
         ;
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.warn('SqliteRemote not suppouted sync mode');
             return [];
         }
@@ -780,7 +810,7 @@ class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             logger.trace(Sqlstring.format(sql, params));
         }
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             try {
                 const r = await this[_daoConnection].query(this[_sqliteRemoteName], sql, params);
                 resolve(r);
@@ -791,7 +821,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -805,7 +835,7 @@ class SqliteRemote {
         this[_sqliteRemoteName] = name;
     }
     createConnection(sync) {
-        if (sync === SqlSyncMode.Sync) {
+        if (sync === SyncMode.Sync) {
             logger.error('SQLITEREMOTE not suppouted sync mode');
             return null;
         }
@@ -819,7 +849,7 @@ class SqliteRemote {
         return null;
     }
     close(sync) {
-        if (sync === SqlSyncMode.Async) {
+        if (sync === SyncMode.Async) {
             return new Promise(async () => {
                 await this[_daoConnection].close();
             });
@@ -827,7 +857,7 @@ class SqliteRemote {
         ;
     }
     backup(sync, name) {
-        if (sync === SqlSyncMode.Async) {
+        if (sync === SyncMode.Async) {
             return new Promise(async () => {
                 await this[_daoConnection].backup(this[_sqliteRemoteName], name);
             });
@@ -835,7 +865,7 @@ class SqliteRemote {
         ;
     }
     remove(sync) {
-        if (sync === SqlSyncMode.Async) {
+        if (sync === SyncMode.Async) {
             return new Promise(async () => {
                 await this[_daoConnection].remove();
             });
@@ -843,7 +873,7 @@ class SqliteRemote {
         ;
     }
     restore(sync, name) {
-        if (sync === SqlSyncMode.Async) {
+        if (sync === SyncMode.Async) {
             return new Promise(async () => {
                 await this[_daoConnection].restore(this[_sqliteRemoteName], name);
             });
@@ -851,34 +881,301 @@ class SqliteRemote {
         ;
     }
 }
+class Build {
+    /**
+     *
+     * @param count 是否是count查询
+     * @param isSum  是否是sum查询
+     * @param param
+     */
+    constructor(isCount, isSum, param = {}) {
+        this.brage = { haveOrderBy: false, haveLimit: false };
+        this.isCount = isCount;
+        this.isSum = isSum;
+        Object.assign(this, param);
+    }
+    /**
+     *
+     * 当分页时将函数内包含的内容替换为COUNT(1)
+     * @returns
+     * @memberof Build
+     */
+    pageTag() {
+        return (text, render) => {
+            if (this.isCount === true) {
+                return Build.page;
+            }
+            else if (this.isSum !== true) {
+                return render(text);
+            }
+        };
+    }
+    /**
+   *
+   * 汇总查询专用
+   * @returns
+   * @memberof Build
+   */
+    sumTag() {
+        return (text, render) => {
+            if (this.isSum !== true) {
+                return '';
+            }
+            else {
+                return render(text);
+            }
+        };
+    }
+    /**
+     *
+     * 当分页时、汇总时忽略函数内包含的内容
+     * @returns
+     * @memberof Build
+     */
+    pageIgnoreTag() {
+        return (text, render) => {
+            if (this.isCount === true || this.isSum === true) {
+                return '';
+            }
+            else {
+                return render(text);
+            }
+        };
+    }
+    /**
+     *
+     * 将查询条件包起来，如果条件内容不为空，则自动添加WHERE,同时将第一个条件的and、or替换为空
+     * 例如:
+     * {{#whereTag}}
+     * and name = 1
+     * and page = 2
+     * {{/whereTag}}
+     * 输出
+     * where name = 1 and page = 2
+     * @returns
+     * @memberof Build
+     */
+    where() {
+        return (text, render) => {
+            let data = render(text);
+            data = data.trim();
+            if (data) {
+                data = data.replace(/and|or/i, '');
+                return ` WHERE ${data} `;
+            }
+            else {
+                return '';
+            }
+        };
+    }
+    /**
+     * 删除第一个and、or
+     * 删除最后一个,
+     * 删除最后一个;
+     * @memberof Build
+     */
+    trim() {
+        return (text, render) => {
+            let data = render(text);
+            data = data.trim();
+            if (data) {
+                data = data.replace(/(^and\s)|(^or\s)|(,$)|(;$)/i, '');
+                return data;
+            }
+            else {
+                return '';
+            }
+        };
+    }
+    /**
+     * 分页时将排序部分代码用此函数包起来，可以自动拼接order by
+     * 查询条数时，自动忽略此部分
+     * etc
+     * {{#orderTag}} name desc, age asc {{/orderTag}}
+     * ===
+     * ORDER BY name desc, age asc
+     * @returns
+     * @memberof Build
+     */
+    orderTag() {
+        return (text, render) => {
+            if (this.isCount === true || this.isSum === true) {
+                return '';
+            }
+            else {
+                this.brage.haveOrderBy = true;
+                const orderBy = new Array();
+                const renderOrder = render(text);
+                if (/\S/.test(renderOrder)) {
+                    orderBy.push(renderOrder);
+                }
+                return orderBy.length > 0 ? ` ORDER BY ${orderBy.join(',')} ` : '';
+            }
+        };
+    }
+    limitTag() {
+        return (text, render) => {
+            if (this.isCount === true || this.isSum === true) {
+                return '';
+            }
+            else {
+                this.brage.haveOrderBy = true;
+                const orderBy = new Array();
+                const renderOrder = render(text);
+                if (/\S/.test(renderOrder)) {
+                    orderBy.push(renderOrder);
+                }
+                return orderBy.length > 0 ? ` ORDER BY ${orderBy.join(',')} ` : '';
+            }
+        };
+    }
+    /**
+     *
+     * 分页时将分组部分代码用此函数包起来，可以自动拼接GROUP BY
+     * 当分页时、汇总时，自动忽略此部分
+     * etc
+     * {{#groupTag}} name, age {{/groupTag}}
+     * ===
+     * group by name.age
+     * @returns
+     * @memberof Build
+     */
+    groupTag() {
+        return (text, render) => {
+            if (this.isCount === true || this.isSum === true) {
+                return '';
+            }
+            else {
+                const groupBy = render(text) || '';
+                return /\S/.test(groupBy) ? ` GROUP BY ${groupBy} ` : '';
+            }
+        };
+    }
+    /**
+     *
+     * beetween and
+     * etc.
+     * {{#between}} AND t.createtime | ({{createtime}}) {{/between}}
+     * createtime: 1,2
+     * ===
+     * AND t.createtime BETWEEN 1 AND 2
+     * @returns
+     * @memberof Build
+     */
+    between() {
+        return (text, render) => {
+            const result = render(text);
+            if (/\(([\w\W]+)\)/.exec(result)) {
+                return render(text).replace(/\(([\w\W]+)\)/, (a, b) => {
+                    if (a && b) {
+                        const xx = b.split(',');
+                        return `'${xx[0]}' AND '${xx[1]}'`;
+                    }
+                    else {
+                        return '';
+                    }
+                }).replace(/\|/, ' BETWEEN ');
+            }
+            else {
+                return '';
+            }
+        };
+    }
+    /**
+     *
+     * 距离计算,单位米
+     * etc
+     * {{#distanceTag}} (t.longitude, t.latitude), ({{longitude}}, {{latitude}}) {{/distanceTag}}
+     * ===
+     * ROUND(ST_DISTANCE(POINT(longitude1, latitude1), POINT({{longitude}}, {{latitude}}))*111195, 2)
+     * 可根据需求自行将数据转换为千米，例如
+     * {{#distanceTag}} (t.longitude, t.latitude), ({{longitude}}, {{latitude}}) {{/distanceTag}} / 1000
+     * @returns
+     * @memberof Build
+     */
+    distanceTag() {
+        return (text, render) => {
+            const result = render(text);
+            if (/\(([^()]+)\)/.exec(result)) {
+                let index = 0;
+                return render(text).replace(/\(([^()]+)\)/g, (a, b) => {
+                    if (a && b) {
+                        const xx = b.split(',');
+                        if (index === 0) {
+                            index++;
+                            return ` ROUND(ST_DISTANCE(POINT(${xx[0]}, ${xx[1]}) `;
+                        }
+                        else {
+                            return ` POINT(${xx[0]}, ${xx[1]}))*111195, 2)`;
+                        }
+                    }
+                    else {
+                        return '';
+                    }
+                });
+            }
+            else {
+                return '';
+            }
+        };
+    }
+}
+Build.page = 'COUNT(1) zccw1986 ';
 class SqlCache {
     constructor() {
-        this.cache = {};
+        this.sqlMap = {};
+        this.sqlFNMap = {};
     }
     async init(options) {
+        if (options.sqlMap) {
+            this.sqlMap = options.sqlMap;
+        }
         if (options.sqlDir) {
             const sqlFis = globalThis[_fs].readdirSync(options.sqlDir);
             for (const modeName of sqlFis) {
-                const name = globalThis[_path].basename(modeName, globalThis[_path].extname(modeName));
-                const obj = await import(globalThis[_path].join(options.sqlDir, modeName));
-                for (const [key, fn] of Object.entries(obj)) {
-                    this.cache[`${name}.${String(key)}`] = fn;
+                const extname = globalThis[_path].extname(modeName);
+                const name = globalThis[_path].basename(modeName, extname);
+                const file = globalThis[_path].join(options.sqlDir, modeName);
+                if (extname === 'mu') {
+                    const parser = new MUParser(name, globalThis[_fs].readFileSync(file, { encoding: 'utf-8' }).toString());
+                    let source = parser.next();
+                    while (source != null) {
+                        this.sqlMap[source[0]] = source[1];
+                        logger.debug(`sql: ${source[0]} found!`);
+                        source = parser.next();
+                    }
+                }
+                else if (extname === '.js') {
+                    const obj = (await import(globalThis[_path].join(options.sqlDir, modeName))).default;
+                    for (const [key, fn] of Object.entries(obj)) {
+                        this.sqlMap[`${name}.${String(key)}`] = fn;
+                    }
                 }
             }
         }
-        else if (options.sqlCache) {
-            this.cache = options.sqlCache;
+        if (options.sqlFNMap) {
+            this.sqlFNMap = options.sqlFNMap;
+        }
+        if (options.sqlFNDir) {
+            const sqlFis = globalThis[_fs].readdirSync(options.sqlDir);
+            for (const modeName of sqlFis) {
+                const extname = globalThis[_path].extname(modeName);
+                const name = globalThis[_path].basename(modeName, extname);
+                const file = globalThis[_path].join(options.sqlDir, modeName);
+                if (extname === 'mu') {
+                    this.sqlFNMap[name] = globalThis[_fs].readFileSync(file, { encoding: 'utf-8' }).toString();
+                }
+            }
         }
     }
-    load(sqlid, params, context, isPage) {
-        const sqlSource = this.cache[sqlid];
+    load(sqlid, options) {
+        const sqlSource = this.sqlMap[sqlid];
         Throw.if(!sqlSource, `指定的语句${sqlid}不存在!`);
-        if (typeof sqlSource === 'string') {
-            return sqlSource;
-        }
-        else {
-            return sqlSource(params, context, isPage);
-        }
+        const _sql = typeof sqlSource === 'function' ? sqlSource(options) : sqlSource;
+        const buildParam = new Build(options.isCount === true, options.isSum === true, options);
+        const sql = mustache.render(_sql, buildParam, this.sqlFNMap);
+        logger.debug(sqlid, sql);
+        return sql;
     }
 }
 // #endregion
@@ -905,17 +1202,17 @@ function P(skipConn = false) {
             const startTime = +new Date();
             // option
             const option = args[0] = Object.assign({}, globalThis[_GlobalSqlOption], this[_SqlOption], args[0]);
-            option.sync ?? (option.sync = SqlSyncMode.Async);
+            option.sync ?? (option.sync = SyncMode.Async);
             const dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
             option.dao = globalThis[_dao][this[_dbType]][dbName];
             Throw.if(!option.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
             option.tableName = option?.tableName ?? this[_tableName];
             const tableES = Sqlstring.escapeId(option.tableName);
             if (this[_dbType] === DBType.Sqlite) {
-                Throw.if(option.sync === SqlSyncMode.Async, 'sqlite can not Async!');
+                Throw.if(option.sync === SyncMode.Async, 'sqlite can not Async!');
                 // 连接共享
                 if (skipConn === false && !option.conn) {
-                    option.conn = option.dao.createConnection(SqlSyncMode.Sync);
+                    option.conn = option.dao.createConnection(SyncMode.Sync);
                 }
                 else {
                     needRealseConn = false;
@@ -923,20 +1220,20 @@ function P(skipConn = false) {
                 if (skipConn === false) {
                     const lastVersion = this[_sqlite_version] ?? '0.0.1';
                     // 检查表
-                    const tableCheckResult = option.conn.pluck(SqlSyncMode.Sync, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
+                    const tableCheckResult = option.conn.pluck(SyncMode.Sync, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
                     if (tableCheckResult) {
                         // 旧版本
-                        const tableVersion = option.conn.pluck(SqlSyncMode.Sync, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
+                        const tableVersion = option.conn.pluck(SyncMode.Sync, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
                         if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
                             // 更新版本
-                            const columns = iterare(option.conn.query(SqlSyncMode.Sync, `PRAGMA table_info(${tableES})`))
+                            const columns = iterare(option.conn.query(SyncMode.Sync, `PRAGMA table_info(${tableES})`))
                                 .filter(c => this[_fields].hasOwnProperty(c.name))
                                 .map(c => Sqlstring.escapeId(c.name))
                                 .join(',');
                             const rtable = Sqlstring.escapeId(`${option.tableName}_${tableVersion.replace(/\./, '_')}`);
-                            option.conn.execute(SqlSyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
-                            option.conn.execute(SqlSyncMode.Sync, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
-                            option.conn.execute(SqlSyncMode.Sync, `
+                            option.conn.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
+                            option.conn.execute(SyncMode.Sync, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
+                            option.conn.execute(SyncMode.Sync, `
                                 CREATE TABLE IF NOT EXISTS ${tableES}(
                                     ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]).join(',')}
                                     ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.esName).join(',')})` : ''}
@@ -944,22 +1241,22 @@ function P(skipConn = false) {
                             `);
                             if (this[_index] && this[_index].length) {
                                 for (const index of this[_index]) {
-                                    option.conn.execute(SqlSyncMode.Sync, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${index}");`);
+                                    option.conn.execute(SyncMode.Sync, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${index}");`);
                                 }
                             }
-                            option.conn.execute(SqlSyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
-                            option.conn.execute(SqlSyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
-                            option.conn.execute(SqlSyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
+                            option.conn.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                            option.conn.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                            option.conn.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
                             // 更新完毕，保存版本号
-                            option.conn.execute(SqlSyncMode.Sync, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option.tableName, lastVersion]);
+                            option.conn.execute(SyncMode.Sync, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option.tableName, lastVersion]);
                         }
                         else if (!tableVersion) { // 不需要升级情况：没有旧的版本号
-                            option.conn.execute(SqlSyncMode.Sync, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
+                            option.conn.execute(SyncMode.Sync, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
                         }
                     }
                     else { // 表不存在
                         // 创建表
-                        option.conn.execute(SqlSyncMode.Sync, `
+                        option.conn.execute(SyncMode.Sync, `
                             CREATE TABLE IF NOT EXISTS ${tableES} (
                                 ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]).join(',')}
                                 ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.esName).join(',')})` : ''}
@@ -968,10 +1265,10 @@ function P(skipConn = false) {
                         `);
                         if (this[_index] && this[_index].length) {
                             for (const index of this[_index]) {
-                                option.conn.execute(SqlSyncMode.Sync, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${index}");`);
+                                option.conn.execute(SyncMode.Sync, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${index}");`);
                             }
                         }
-                        option.conn.execute(SqlSyncMode.Sync, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
+                        option.conn.execute(SyncMode.Sync, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
                     }
                 }
                 try {
@@ -990,7 +1287,7 @@ function P(skipConn = false) {
                 finally {
                     if (needRealseConn && option && option.conn) {
                         try {
-                            option.conn.realse(SqlSyncMode.Sync);
+                            option.conn.realse(SyncMode.Sync);
                         }
                         catch (error) {
                         }
@@ -998,11 +1295,11 @@ function P(skipConn = false) {
                 }
             }
             else if (this[_dbType] === DBType.SqliteRemote) {
-                Throw.if(option.sync === SqlSyncMode.Sync, 'SqliteRemote remote can not sync!');
-                return new Promise(async (resolve) => {
+                Throw.if(option.sync === SyncMode.Sync, 'SqliteRemote remote can not sync!');
+                return new Promise(async (resolve, reject) => {
                     // 连接共享
                     if (skipConn === false && !option.conn) {
-                        (option).conn = await option.dao.createConnection(SqlSyncMode.Async);
+                        (option).conn = await option.dao.createConnection(SyncMode.Async);
                     }
                     else {
                         needRealseConn = false;
@@ -1010,20 +1307,20 @@ function P(skipConn = false) {
                     if (skipConn === false) {
                         const lastVersion = this[_sqlite_version] ?? '0.0.1';
                         // 检查表
-                        const tableCheckResult = await option.conn.pluck(SqlSyncMode.Async, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
+                        const tableCheckResult = await option.conn.pluck(SyncMode.Async, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
                         if (tableCheckResult) {
                             // 旧版本
-                            const tableVersion = await option.conn.pluck(SqlSyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
+                            const tableVersion = await option.conn.pluck(SyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
                             if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
                                 // 更新版本
-                                const columns = iterare(await option.conn.query(SqlSyncMode.Async, `PRAGMA table_info(${tableES})`))
+                                const columns = iterare(await option.conn.query(SyncMode.Async, `PRAGMA table_info(${tableES})`))
                                     .filter(c => this[_fields].hasOwnProperty(c.name))
                                     .map(c => Sqlstring.escapeId(c.name))
                                     .join(',');
                                 const rtable = `${option.tableName}_${tableVersion.replace(/\./, '_')}`;
-                                await option.conn.execute(SqlSyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
-                                await option.conn.execute(SqlSyncMode.Async, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
-                                await option.conn.execute(SqlSyncMode.Async, `
+                                await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
+                                await option.conn.execute(SyncMode.Async, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
+                                await option.conn.execute(SyncMode.Async, `
                                 CREATE TABLE IF NOT EXISTS ${tableES}(
                                     ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]).join(',')}
                                     ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.esName).join(',')})` : ''}
@@ -1031,22 +1328,22 @@ function P(skipConn = false) {
                             `);
                                 if (this[_index] && this[_index].length) {
                                     for (const index of this[_index]) {
-                                        await option.conn.execute(SqlSyncMode.Async, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${index}");`);
+                                        await option.conn.execute(SyncMode.Async, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${index}");`);
                                     }
                                 }
-                                await option.conn.execute(SqlSyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
-                                await option.conn.execute(SqlSyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
-                                await option.conn.execute(SqlSyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
+                                await option.conn.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                                await option.conn.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                                await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
                                 // 更新完毕，保存版本号
-                                await option.conn.execute(SqlSyncMode.Async, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option.tableName, lastVersion]);
+                                await option.conn.execute(SyncMode.Async, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option.tableName, lastVersion]);
                             }
                             else if (!tableVersion) { // 不需要升级情况：没有旧的版本号
-                                await option.conn.execute(SqlSyncMode.Async, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
+                                await option.conn.execute(SyncMode.Async, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
                             }
                         }
                         else { // 表不存在
                             // 创建表
-                            await option.conn.execute(SqlSyncMode.Async, `
+                            await option.conn.execute(SyncMode.Async, `
                             CREATE TABLE IF NOT EXISTS ${tableES}(
                                 ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]).join(',')}
                                 ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.esName).join(',')})` : ''}
@@ -1054,10 +1351,10 @@ function P(skipConn = false) {
                         `);
                             if (this[_index] && this[_index].length) {
                                 for (const index of this[_index]) {
-                                    await option.conn.execute(SqlSyncMode.Async, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${Sqlstring.escapeId(option.tableName)} ("${index}");`);
+                                    await option.conn.execute(SyncMode.Async, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${Sqlstring.escapeId(option.tableName)} ("${index}");`);
                                 }
                             }
-                            await option.conn.execute(SqlSyncMode.Async, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
+                            await option.conn.execute(SyncMode.Async, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
                         }
                     }
                     try {
@@ -1067,12 +1364,12 @@ function P(skipConn = false) {
                     }
                     catch (error) {
                         console.error(`service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
-                        throw error;
+                        reject(error);
                     }
                     finally {
                         if (needRealseConn && option && option.conn) {
                             try {
-                                option.conn.realse(SqlSyncMode.Sync);
+                                option.conn.realse(SyncMode.Sync);
                             }
                             catch (error) {
                             }
@@ -1081,11 +1378,11 @@ function P(skipConn = false) {
                 });
             }
             else if (this[_dbType] === DBType.Mysql) {
-                return new Promise(async (resolve) => {
+                return new Promise(async (resolve, reject) => {
                     try {
                         // 连接共享
                         if (skipConn === false && !option.conn) {
-                            (option).conn = await option.dao.createConnection(SqlSyncMode.Async);
+                            (option).conn = await option.dao.createConnection(SyncMode.Async);
                         }
                         else {
                             needRealseConn = false;
@@ -1096,12 +1393,12 @@ function P(skipConn = false) {
                     }
                     catch (error) {
                         console.error(`service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
-                        throw error;
+                        reject(error);
                     }
                     finally {
                         if (needRealseConn && option && option.conn) {
                             try {
-                                option.conn.realse(SqlSyncMode.Sync);
+                                option.conn.realse(SyncMode.Sync);
                             }
                             catch (error) {
                             }
@@ -1150,19 +1447,19 @@ export const Field = (config) => {
         field.esName = Sqlstring.escapeId(propertyName);
         const hasDef = field.hasOwnProperty('def') === true;
         switch (field.type) {
-            case SqlType.bigint: {
-                field[DBType.Mysql] = `${field.esName} bigint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+            case SqlType.tinyint: {
+                field[DBType.Mysql] = `${field.esName} tinyint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
                 break;
             }
-            case SqlType.char: {
-                field[DBType.Mysql] = `${field.esName} char(${config.length1 ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+            case SqlType.smallint: {
+                field[DBType.Mysql] = `${field.esName} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
                 break;
             }
-            case SqlType.decimal: {
-                field[DBType.Mysql] = `${field.esName} decimal(${config.length1 ?? 1}, ${config.length2 ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} real`;
+            case SqlType.mediumint: {
+                field[DBType.Mysql] = `${field.esName} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
                 break;
             }
             case SqlType.int: {
@@ -1170,6 +1467,26 @@ export const Field = (config) => {
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
                 break;
             }
+            case SqlType.bigint: {
+                field[DBType.Mysql] = `${field.esName} bigint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
+                break;
+            }
+            case SqlType.float: {
+                field[DBType.Mysql] = `${field.esName} float(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} real`;
+                break;
+            }
+            case SqlType.double: {
+                field[DBType.Mysql] = `${field.esName} double(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} real`;
+                break;
+            }
+            case SqlType.decimal: {
+                field[DBType.Mysql] = `${field.esName} decimal(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} real`;
+                break;
+            }
             case SqlType.longtext: {
                 field[DBType.Mysql] = `${field.esName} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
@@ -1180,8 +1497,58 @@ export const Field = (config) => {
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
                 break;
             }
-            case SqlType.smallint: {
-                field[DBType.Mysql] = `${field.esName} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''}`;
+            case SqlType.text: {
+                field[DBType.Mysql] = `${field.esName} text ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.date: {
+                field[DBType.Mysql] = `${field.esName} date ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.time: {
+                field[DBType.Mysql] = `${field.esName} time ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.year: {
+                field[DBType.Mysql] = `${field.esName} year ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.datetime: {
+                field[DBType.Mysql] = `${field.esName} datetime ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.timestamp: {
+                field[DBType.Mysql] = `${field.esName} timestamp ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
+                break;
+            }
+            case SqlType.char: {
+                field[DBType.Mysql] = `${field.esName} char(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.varchar: {
+                field[DBType.Mysql] = `${field.esName} varchar(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.tinyblob: {
+                field[DBType.Mysql] = `${field.esName} tinyblob ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.tinytext: {
+                field[DBType.Mysql] = `${field.esName} tinytext ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.blob: {
+                field[DBType.Mysql] = `${field.esName} binary ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
                 break;
             }
@@ -1190,13 +1557,78 @@ export const Field = (config) => {
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
                 break;
             }
-            case SqlType.tinyint: {
-                field[DBType.Mysql] = `${field.esName} tinyint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''}`;
+            case SqlType.mediumblob: {
+                field[DBType.Mysql] = `${field.esName} mediumblob ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
                 break;
             }
-            case SqlType.varchar: {
-                field[DBType.Mysql] = `${field.esName} varchar(${config.length1 ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+            case SqlType.mediumtext: {
+                field[DBType.Mysql] = `${field.esName} mediumtext ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.longblob: {
+                field[DBType.Mysql] = `${field.esName} longblob ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.longtext: {
+                field[DBType.Mysql] = `${field.esName} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.set: {
+                field[DBType.Mysql] = `${field.esName} set ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.enum: {
+                field[DBType.Mysql] = `${field.esName} enum ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.json: {
+                field[DBType.Mysql] = `${field.esName} json ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.geometry: {
+                field[DBType.Mysql] = `${field.esName} geometry ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.point: {
+                field[DBType.Mysql] = `${field.esName} point ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.linestring: {
+                field[DBType.Mysql] = `${field.esName} linestring ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.polygon: {
+                field[DBType.Mysql] = `${field.esName} polygon ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.multipoint: {
+                field[DBType.Mysql] = `${field.esName} multipoint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.multilinestring: {
+                field[DBType.Mysql] = `${field.esName} multilinestring ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.multipolygon: {
+                field[DBType.Mysql] = `${field.esName} multipolygon ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                break;
+            }
+            case SqlType.geometrycollection: {
+                field[DBType.Mysql] = `${field.esName} geometrycollection ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
                 break;
             }
@@ -1352,7 +1784,7 @@ export class SqlService {
         const sqls = [];
         const tableName = Sqlstring.escapeId(option.tableName);
         switch (option?.mode) {
-            case SqlInsertMode.InsertIfNotExists: {
+            case InsertMode.InsertIfNotExists: {
                 const conditions = option.existConditionOtherThanIds || this[_ids];
                 Throw.if(!conditions, 'not found where condition for insertIfNotExists!');
                 Throw.if(conditions.length === 0, 'insertIfNotExists must have not null where!');
@@ -1391,7 +1823,7 @@ export class SqlService {
                         ${selects};`;
                 sqls.push({ sql, params });
             }
-            case SqlInsertMode.Replace: {
+            case InsertMode.Replace: {
                 const finalColumns = new Set();
                 const params = datas
                     .map(data => this[_transformer](data, { ...option, finalColumns, def: true }))
@@ -1419,7 +1851,7 @@ export class SqlService {
                 `;
                 sqls.push({ sql, params });
             }
-            case SqlInsertMode.Insert: {
+            case InsertMode.Insert: {
                 const finalColumns = new Set();
                 const params = datas
                     .map(data => this[_transformer](data, { ...option, finalColumns, def: true }))
@@ -1447,7 +1879,7 @@ export class SqlService {
                 `;
                 sqls.push({ sql, params });
             }
-            case SqlInsertMode.InsertWithTempTable: {
+            case InsertMode.InsertWithTempTable: {
                 const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
                 const tableTempESC = Sqlstring.escapeId(tableTemp);
                 sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
@@ -1490,16 +1922,16 @@ export class SqlService {
         return sqls;
     }
     insert(option) {
-        option.mode ?? (option.mode = SqlInsertMode.Insert);
+        option.mode ?? (option.mode = InsertMode.Insert);
         const isArray = option.data instanceof Array;
         const datas = option.data instanceof Array ? option.data : [option.data];
-        if (option.sync === SqlSyncMode.Sync) {
+        if (option.sync === SyncMode.Sync) {
             const fn = () => {
                 const result = excuteSplit(ExcuteSplitMode.SyncTrust, datas, _data => {
                     const sqls = this._insert(_data, option);
                     let result = 0n;
                     for (const { sql, params } of sqls) {
-                        const dd = option.conn.execute(SqlSyncMode.Sync, sql, params);
+                        const dd = option.conn.execute(SyncMode.Sync, sql, params);
                         if (dd.insertId) {
                             result += dd.insertId;
                         }
@@ -1515,17 +1947,17 @@ export class SqlService {
                 return fn();
             }
             else {
-                return option?.dao?.transaction(SqlSyncMode.Sync, fn, option?.conn);
+                return option?.dao?.transaction(SyncMode.Sync, fn, option?.conn);
             }
         }
         else if (isArray) {
             const fn = async () => {
-                return await option?.dao?.transaction(SqlSyncMode.Async, async () => {
+                return await option?.dao?.transaction(SyncMode.Async, async () => {
                     const result = await excuteSplit(ExcuteSplitMode.AsyncTrust, datas, async (_data) => {
                         const sqls = this._insert(_data, option);
                         let result = 0n;
                         for (const { sql, params } of sqls) {
-                            const dd = await option?.conn.execute(SqlSyncMode.Async, sql, params);
+                            const dd = await option?.conn.execute(SyncMode.Async, sql, params);
                             if (dd.insertId) {
                                 result += dd.insertId;
                             }
@@ -1540,7 +1972,7 @@ export class SqlService {
                     resolve((await fn()));
                 }
                 else {
-                    await option?.dao?.transaction(SqlSyncMode.Async, async () => resolve((await fn())), option?.conn);
+                    await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
                 }
             });
         }
@@ -1550,7 +1982,7 @@ export class SqlService {
                     const sqls = this._insert(_data, option);
                     let result = 0n;
                     for (const { sql, params } of sqls) {
-                        const dd = await option.conn.execute(SqlSyncMode.Async, sql, params);
+                        const dd = await option.conn.execute(SyncMode.Async, sql, params);
                         if (dd.insertId) {
                             result += dd.insertId;
                         }
@@ -1564,7 +1996,7 @@ export class SqlService {
                     resolve((await fn()));
                 }
                 else {
-                    await option?.dao?.transaction(SqlSyncMode.Async, async () => resolve((await fn())), option?.conn);
+                    await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
                 }
             });
         }
@@ -1605,13 +2037,13 @@ export class SqlService {
     update(option) {
         Throw.if(!this[_ids] || this[_ids].length === 0, 'not found id');
         const datas = option.data instanceof Array ? option.data : [option.data];
-        if (option.sync === SqlSyncMode.Sync) {
+        if (option.sync === SyncMode.Sync) {
             const fn = () => {
                 const result = excuteSplit(ExcuteSplitMode.SyncTrust, datas, _data => {
                     const sqls = this._update(_data, option);
                     let result = 0;
                     for (const { sql, params } of sqls) {
-                        const dd = option.conn.execute(SqlSyncMode.Sync, sql, params);
+                        const dd = option.conn.execute(SyncMode.Sync, sql, params);
                         if (dd.affectedRows) {
                             result += dd.affectedRows;
                         }
@@ -1624,7 +2056,7 @@ export class SqlService {
                 return fn();
             }
             else {
-                return option?.dao?.transaction(SqlSyncMode.Sync, fn, option?.conn);
+                return option?.dao?.transaction(SyncMode.Sync, fn, option?.conn);
             }
         }
         else {
@@ -1633,7 +2065,7 @@ export class SqlService {
                     const sqls = this._update(_data, option);
                     let result = 0;
                     for (const { sql, params } of sqls) {
-                        const dd = await option.conn.execute(SqlSyncMode.Async, sql, params);
+                        const dd = await option.conn.execute(SyncMode.Async, sql, params);
                         if (dd.affectedRows) {
                             result += dd.affectedRows;
                         }
@@ -1647,7 +2079,7 @@ export class SqlService {
                     resolve((await fn()));
                 }
                 else {
-                    await option?.dao?.transaction(SqlSyncMode.Async, async () => resolve((await fn())), option?.conn);
+                    await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
                 }
             });
         }
@@ -1658,7 +2090,7 @@ export class SqlService {
         Throw.if(!option.id && !option.where, 'not found id or where!');
         Throw.if(!!option.id && !!this[_ids] && this[_ids].length > 1, 'muit id must set where!');
         Throw.if(!!option.id && !!option.where, 'id and where only one can set!');
-        option.mode ?? (option.mode = SqlDelMode.Common);
+        option.mode ?? (option.mode = DeleteMode.Common);
         const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
         const tableTempESC = Sqlstring.escapeId(tableTemp);
         const tableNameESC = Sqlstring.escapeId(option?.tableName);
@@ -1669,7 +2101,7 @@ export class SqlService {
         }
         const wheres = option.where instanceof Array ? option.where : [option.where];
         const sqls = [];
-        if (option.mode === SqlDelMode.Common) {
+        if (option.mode === DeleteMode.Common) {
             const params = new Array();
             const whereSql = iterare(wheres).map(where => {
                 return `(
@@ -1726,11 +2158,11 @@ export class SqlService {
             }
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
         }
-        if (option.sync === SqlSyncMode.Sync) {
+        if (option.sync === SyncMode.Sync) {
             const fn = () => {
                 let result = 0;
                 for (const { sql, params } of sqls) {
-                    const dd = option.conn.execute(SqlSyncMode.Sync, sql, params);
+                    const dd = option.conn.execute(SyncMode.Sync, sql, params);
                     result += dd.affectedRows;
                 }
                 return result;
@@ -1739,14 +2171,14 @@ export class SqlService {
                 return fn();
             }
             else {
-                return option?.dao?.transaction(SqlSyncMode.Sync, fn, option?.conn);
+                return option?.dao?.transaction(SyncMode.Sync, fn, option?.conn);
             }
         }
         else {
             const fn = async () => {
                 let result = 0;
                 for (const { sql, params } of sqls) {
-                    const dd = await option.conn.execute(SqlSyncMode.Async, sql, params);
+                    const dd = await option.conn.execute(SyncMode.Async, sql, params);
                     result += dd.affectedRows;
                 }
                 return result;
@@ -1756,25 +2188,25 @@ export class SqlService {
                     resolve((await fn()));
                 }
                 else {
-                    await option?.dao?.transaction(SqlSyncMode.Async, async () => resolve((await fn())), option?.conn);
+                    await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
                 }
             });
         }
     }
-    _select(resultMode, result, error) {
-        switch (resultMode) {
-            case SqlTemplateMode.AssertOne: {
+    _template(templateResult, result, error) {
+        switch (templateResult) {
+            case TemplateResult.AssertOne: {
                 Throw.if(!result || result.length !== 1, error);
                 return result[0];
             }
-            case SqlTemplateMode.NotSureOne: {
+            case TemplateResult.NotSureOne: {
                 Throw.if(!result, error);
                 return result[0] ?? null;
             }
-            case SqlTemplateMode.Many: {
+            case TemplateResult.Many: {
                 return result;
             }
-            case SqlTemplateMode.Count: {
+            case TemplateResult.Count: {
                 return result[0].ct;
             }
         }
@@ -1785,8 +2217,8 @@ export class SqlService {
         Throw.if(!option.id && !option.where, 'not found id or where!');
         Throw.if(!!option.id && !!this[_ids] && this[_ids].length > 1, 'muit id must set where!');
         Throw.if(!!option.id && !!option.where, 'id and where only one can set!');
-        option.mode ?? (option.mode = SqlSelectMode.Common);
-        option.resultMode ?? (option.resultMode = SqlTemplateMode.AssertOne);
+        option.mode ?? (option.mode = SelectMode.Common);
+        option.templateResult ?? (option.templateResult = TemplateResult.AssertOne);
         option.error ?? (option.error = 'error data!');
         const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
         const tableTempESC = Sqlstring.escapeId(tableTemp);
@@ -1796,11 +2228,11 @@ export class SqlService {
             const ids = option.id instanceof Array ? option.id : [option.id];
             option.where = ids.map(i => ({ [idName]: i }));
         }
-        const columns = option.resultMode === SqlTemplateMode.Count ? 'COUNT(1) ct' : iterare((option.columns ?? this[_columns])).map((K) => `a.${this[_fields][K]?.esName}`).join(',');
+        const columns = option.templateResult === TemplateResult.Count ? 'COUNT(1) ct' : iterare((option.columns ?? this[_columns])).map((K) => `a.${this[_fields][K]?.esName}`).join(',');
         const wheres = option.where instanceof Array ? option.where : [option.where];
         const sqls = [];
         let resultIndex = -1;
-        if (option.mode === SqlSelectMode.Common) {
+        if (option.mode === SelectMode.Common) {
             const params = new Array();
             const whereSql = iterare(wheres).map(where => {
                 return `SELECT ${columns} FROM ${tableNameESC} a WHERE
@@ -1821,79 +2253,79 @@ export class SqlService {
             sqls.push({ sql: `SELECT ${columns} FROM ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.esName} = b.${this[_fields][K]?.esName}`).join(' AND ')};` });
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
         }
-        if (option.sync === SqlSyncMode.Sync) {
+        if (option.sync === SyncMode.Sync) {
             let result;
             for (let i = 0; i < sqls.length; i++) {
                 if (i === resultIndex) {
-                    result = option.conn.query(SqlSyncMode.Sync, sqls[i]?.sql, sqls[i]?.params);
+                    result = option.conn.query(SyncMode.Sync, sqls[i]?.sql, sqls[i]?.params);
                 }
                 else {
-                    option.conn.execute(SqlSyncMode.Sync, sqls[i]?.sql, sqls[i]?.params);
+                    option.conn.execute(SyncMode.Sync, sqls[i]?.sql, sqls[i]?.params);
                 }
             }
-            return this._select(option.resultMode, result, option.error);
+            return this._template(option.templateResult, result, option.error);
         }
         else {
             return new Promise(async (resolve) => {
                 let result;
                 for (let i = 0; i < sqls.length; i++) {
                     if (i === resultIndex) {
-                        result = await option.conn.query(SqlSyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
+                        result = await option.conn.query(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
                     }
                     else {
-                        await option.conn.execute(SqlSyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
+                        await option.conn.execute(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
                     }
                 }
-                resolve(this._select(option.resultMode, result, option.error));
+                resolve(this._template(option.templateResult, result, option.error));
             });
         }
     }
-    _query(resultMode, result, def, errorMsg, multiple) {
+    _select(templateResult, result, def, errorMsg, multiple) {
         if (multiple === true) {
-            switch (resultMode) {
-                case SqlQueryMode.One_Row_One_Column_NotSure: {
+            switch (templateResult) {
+                case SelectResult.One_Row_One_Column_NotSure: {
                     try {
                         return result.map((r) => Object.values(r)[0]);
                     }
                     catch (error) {
                     }
                 }
-                case SqlQueryMode.One_Row_One_Column_Assert: {
+                case SelectResult.One_Row_One_Column_Assert: {
                     try {
                         return iterare(result).map((r) => Object.values(r)[0]).filter((r) => r !== null).toArray();
                     }
                     catch (error) {
                     }
                 }
-                case SqlQueryMode.One_Row_Many_Column_NotSure: {
+                case SelectResult.One_Row_Many_Column_NotSure: {
                     try {
                         return result.map((r) => r[0]);
                     }
                     catch (error) {
                     }
                 }
-                case SqlQueryMode.One_Row_Many_Column_Assert: {
+                case SelectResult.One_Row_Many_Column_Assert: {
                     try {
                         return iterare(result).map((r) => r[0]).filter((r) => r !== null).toArray();
                     }
                     catch (error) {
                     }
                 }
-                case SqlQueryMode.Many_Row_One_Column: {
+                case SelectResult.Many_Row_One_Column: {
                     try {
                         return result.map((rx) => rx.map((r) => Object.values(r)[0]));
                     }
                     catch (error) {
                     }
                 }
-                case SqlQueryMode.Many_Row_Many_Column: {
+                case SelectResult.Many_Row_Many_Column: {
                     return result;
                 }
             }
         }
         else {
-            switch (resultMode) {
-                case SqlQueryMode.One_Row_One_Column_NotSure: {
+            switch (templateResult) {
+                case SelectResult.One_Row_One_Column_NotSure: {
                     try {
                         return Object.values(result[0])[0];
                     }
@@ -1901,7 +2333,7 @@ export class SqlService {
                         return def;
                     }
                 }
-                case SqlQueryMode.One_Row_One_Column_Assert: {
+                case SelectResult.One_Row_One_Column_Assert: {
                     try {
                         return Object.values(result[0])[0];
                     }
@@ -1911,15 +2343,15 @@ export class SqlService {
                         Throw.now(errorMsg ?? 'not found data!');
                     }
                 }
-                case SqlQueryMode.One_Row_Many_Column_NotSure: {
+                case SelectResult.One_Row_Many_Column_NotSure: {
                     return result[0] ?? null;
                 }
-                case SqlQueryMode.One_Row_Many_Column_Assert: {
+                case SelectResult.One_Row_Many_Column_Assert: {
                     const data = result[0];
                     Throw.if(data === null, errorMsg ?? 'not found data!');
                     return data ?? null;
                 }
-                case SqlQueryMode.Many_Row_One_Column: {
+                case SelectResult.Many_Row_One_Column: {
                     try {
                         return result.map((r) => Object.values(r)[0]);
                     }
@@ -1927,7 +2359,7 @@ export class SqlService {
                         return def;
                     }
                 }
-                case SqlQueryMode.Many_Row_Many_Column: {
+                case SelectResult.Many_Row_Many_Column: {
                     return result;
                 }
             }
@@ -1935,11 +2367,11 @@ export class SqlService {
     }
     select(option) {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
-        option.resultMode ?? (option.resultMode = SqlQueryMode.Many_Row_Many_Column);
-        option.sql ?? (option.sql = globalThis[_sqlCache].load(option.sqlId, option.context, option.isPage));
+        option.selectResult ?? (option.selectResult = SelectResult.Many_Row_Many_Column);
         option.defValue ?? (option.defValue = null);
-        logger.debug(option.sql);
         const _params = Object.assign({}, option.context, option.params);
+        option.sql ?? (option.sql = globalThis[_sqlCache].load(option.sqlId, { ctx: option.context, isCount: option.isCount, ..._params }));
+        logger.debug(option.sql);
         const params = [];
         const sql = option.sql?.replace(/\:(\w+)/g, (txt, key) => {
             if (_params.hasOwnProperty(key)) {
@@ -1949,22 +2381,22 @@ export class SqlService {
             }
             return txt;
         });
-        if (option.sync === SqlSyncMode.Sync) {
-            const result = option.conn.query(SqlSyncMode.Sync, sql, params);
-            return this._query(option.resultMode, result, option.defValue, option.errorMsg, option.multiple);
+        if (option.sync === SyncMode.Sync) {
+            const result = option.conn.query(SyncMode.Sync, sql, params);
+            return this._select(option.selectResult, result, option.defValue, option.errorMsg, option.multiple);
         }
         else {
             return new Promise(async (resolve) => {
-                const result = await option.conn.query(SqlSyncMode.Async, sql, params);
-                resolve(this._query(option.resultMode, result, option.defValue, option.errorMsg, option.multiple));
+                const result = await option.conn.query(SyncMode.Async, sql, params);
+                resolve(this._select(option.selectResult, result, option.defValue, option.errorMsg, option.multiple));
             });
         }
     }
     excute(option) {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
-        option.sql ?? (option.sql = globalThis[_sqlCache].load(option.sqlId, option.context));
-        logger.debug(option.sql);
         const _params = Object.assign({}, option.context, option.params);
+        option.sql ?? (option.sql = globalThis[_sqlCache].load(option.sqlId, { ctx: option.context, ..._params }));
+        logger.debug(option.sql);
         const params = [];
         const sql = option.sql?.replace(/\:(\w+)/g, (txt, key) => {
             if (_params.hasOwnProperty(key)) {
@@ -1974,24 +2406,24 @@ export class SqlService {
             }
             return txt;
         });
-        if (option.sync === SqlSyncMode.Sync) {
-            const result = option.conn.execute(SqlSyncMode.Sync, sql, params);
+        if (option.sync === SyncMode.Sync) {
+            const result = option.conn.execute(SyncMode.Sync, sql, params);
             return result.affectedRows;
         }
         else {
             return new Promise(async (resolve) => {
-                const result = await option.conn.execute(SqlSyncMode.Async, sql, params);
+                const result = await option.conn.execute(SyncMode.Async, sql, params);
                 resolve(result.affectedRows);
             });
         }
     }
     transaction(option) {
-        if (option.sync === SqlSyncMode.Sync) {
-            return option.dao.transaction(SqlSyncMode.Sync, option.fn);
+        if (option.sync === SyncMode.Sync) {
+            return option.dao.transaction(SyncMode.Sync, option.fn);
         }
         else {
             return new Promise(async (resolve) => {
-                const rt = await option.dao.transaction(SqlSyncMode.Async, option.fn);
+                const rt = await option.dao.transaction(SyncMode.Async, option.fn);
                 resolve(rt);
             });
         }
@@ -2930,7 +3362,7 @@ class StreamQuery extends StreamBuild {
         this._service = service;
     }
     select(option) {
-        option.sync ?? (option.sync = SqlSyncMode.Async);
+        option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this.where();
         const sql = `
             SELECT
@@ -2938,29 +3370,29 @@ class StreamQuery extends StreamBuild {
             FROM ${this._table}
             ${where ? ' WHERE ' : ''}
             ${where}`;
-        if (option.sync === SqlSyncMode.Async) {
-            switch (option.resultMode) {
-                case SqlQueryMode.Many_Row_Many_Column: return this._service.select({ sync: SqlSyncMode.Async, resultMode: SqlQueryMode.Many_Row_Many_Column, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.Many_Row_One_Column: return this._service.select({ sync: SqlSyncMode.Async, resultMode: SqlQueryMode.Many_Row_One_Column, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.One_Row_Many_Column_Assert: return this._service.select({ sync: SqlSyncMode.Async, resultMode: SqlQueryMode.One_Row_Many_Column_Assert, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.One_Row_One_Column_Assert: return this._service.select({ sync: SqlSyncMode.Async, resultMode: SqlQueryMode.One_Row_One_Column_Assert, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.One_Row_Many_Column_NotSure: return this._service.select({ sync: SqlSyncMode.Async, resultMode: SqlQueryMode.One_Row_Many_Column_NotSure, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.One_Row_One_Column_NotSure: return this._service.select({ sync: SqlSyncMode.Async, resultMode: SqlQueryMode.One_Row_One_Column_NotSure, errorMsg: option.errorMsg, sql, params });
+        if (option.sync === SyncMode.Async) {
+            switch (option.selectResult) {
+                case SelectResult.Many_Row_Many_Column: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.Many_Row_Many_Column, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.Many_Row_One_Column: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.Many_Row_One_Column, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.One_Row_Many_Column_Assert: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.One_Row_Many_Column_Assert, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.One_Row_One_Column_Assert: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.One_Row_One_Column_Assert, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.One_Row_Many_Column_NotSure: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.One_Row_Many_Column_NotSure, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.One_Row_One_Column_NotSure: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.One_Row_One_Column_NotSure, errorMsg: option.errorMsg, sql, params });
             }
         }
         else {
-            switch (option.resultMode) {
-                case SqlQueryMode.Many_Row_Many_Column: return this._service.select({ sync: SqlSyncMode.Sync, resultMode: SqlQueryMode.Many_Row_Many_Column, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.Many_Row_One_Column: return this._service.select({ sync: SqlSyncMode.Sync, resultMode: SqlQueryMode.Many_Row_One_Column, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.One_Row_Many_Column_Assert: return this._service.select({ sync: SqlSyncMode.Sync, resultMode: SqlQueryMode.One_Row_Many_Column_Assert, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.One_Row_One_Column_Assert: return this._service.select({ sync: SqlSyncMode.Sync, resultMode: SqlQueryMode.One_Row_One_Column_Assert, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.One_Row_Many_Column_NotSure: return this._service.select({ sync: SqlSyncMode.Sync, resultMode: SqlQueryMode.One_Row_Many_Column_NotSure, errorMsg: option.errorMsg, sql, params });
-                case SqlQueryMode.One_Row_One_Column_NotSure: return this._service.select({ sync: SqlSyncMode.Sync, resultMode: SqlQueryMode.One_Row_One_Column_NotSure, errorMsg: option.errorMsg, sql, params });
+            switch (option.selectResult) {
+                case SelectResult.Many_Row_Many_Column: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.Many_Row_Many_Column, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.Many_Row_One_Column: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.Many_Row_One_Column, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.One_Row_Many_Column_Assert: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.One_Row_Many_Column_Assert, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.One_Row_One_Column_Assert: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.One_Row_One_Column_Assert, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.One_Row_Many_Column_NotSure: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.One_Row_Many_Column_NotSure, errorMsg: option.errorMsg, sql, params });
+                case SelectResult.One_Row_One_Column_NotSure: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.One_Row_One_Column_NotSure, errorMsg: option.errorMsg, sql, params });
             }
         }
     }
     update(option) {
-        option.sync ?? (option.sync = SqlSyncMode.Async);
+        option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this.where();
         const sets = new Array(...this._updateColumns);
         if (this._updates) {
@@ -2972,11 +3404,11 @@ class StreamQuery extends StreamBuild {
         }
         if (sets.length > 0) {
             const sql = `UPDATE ${this._table} SET ${sets.join(',')} ${where}`;
-            if (option.sync === SqlSyncMode.Async) {
-                return this._service.excute({ sync: SqlSyncMode.Async, sql, params });
+            if (option.sync === SyncMode.Async) {
+                return this._service.excute({ sync: SyncMode.Async, sql, params });
             }
             else {
-                return this._service.excute({ sync: SqlSyncMode.Sync, sql, params });
+                return this._service.excute({ sync: SyncMode.Sync, sql, params });
             }
         }
         else {
@@ -2984,14 +3416,14 @@ class StreamQuery extends StreamBuild {
         }
     }
     delete(option) {
-        option.sync ?? (option.sync = SqlSyncMode.Async);
+        option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this.where();
         const sql = `DELETE FROM ${this._table} ${where}`;
-        if (option.sync === SqlSyncMode.Async) {
-            return this._service.excute({ sync: SqlSyncMode.Async, sql, params });
+        if (option.sync === SyncMode.Async) {
+            return this._service.excute({ sync: SyncMode.Async, sql, params });
         }
         else {
-            return this._service.excute({ sync: SqlSyncMode.Sync, sql, params });
+            return this._service.excute({ sync: SyncMode.Sync, sql, params });
         }
     }
 }
@@ -3213,15 +3645,137 @@ export function MethodCache(config) {
         };
     };
 }
-export const LetsGo = async function (options) {
+class MUParser {
+    constructor(modelName, file) {
+        this.linNumber = 0;
+        this.status = 0;
+        this.lineSeparator = '\n';
+        this.modelName = modelName;
+        this.files = file.replace(/\r/g, '').split(this.lineSeparator);
+        this.skipHeader();
+    }
+    next() {
+        let sqlId = this.readSqlId();
+        if (this.status === MUParser.END || !sqlId) {
+            return null;
+        }
+        // 去掉可能的尾部空格
+        sqlId = sqlId.trim();
+        this.skipComment();
+        if (this.status === MUParser.END) {
+            return null;
+        }
+        const sql = this.readSql();
+        return [`${this.modelName}.${sqlId}`, sql];
+    }
+    skipHeader() {
+        while (true) {
+            const line = this.nextLine();
+            if (!line) {
+                return;
+            }
+            if (this.status === MUParser.END) {
+                return;
+            }
+            if (line.startsWith('===')) {
+                return;
+            }
+        }
+    }
+    nextLine() {
+        const line = this.files[this.linNumber];
+        this.linNumber++;
+        if (line === undefined) {
+            this.status = MUParser.END;
+        }
+        // 保存最后读的俩行
+        this.lastlastLine = this.lastLine;
+        this.lastLine = line;
+        return line;
+    }
+    readSqlId() {
+        return this.lastlastLine;
+    }
+    skipComment() {
+        let findComment = false;
+        while (true) {
+            let line = this.nextLine();
+            if (this.status === MUParser.END || !line) {
+                return;
+            }
+            line = line.trim();
+            if (!findComment && line.length === 0) {
+                continue;
+            }
+            if (line.startsWith('*')) {
+                // 注释符号
+                findComment = true;
+                continue;
+            }
+            else {
+                if (line.length === 0) {
+                    continue;
+                }
+                else if (line.startsWith('```') || line.startsWith('~~~')) {
+                    // 忽略以code block开头的符号
+                    continue;
+                }
+                else {
+                    // 注释结束
+                    return;
+                }
+            }
+        }
+    }
+    readSql() {
+        const list = [];
+        if (this.lastLine) {
+            list.push(this.lastLine);
+            while (true) {
+                const line = this.nextLine();
+                if (line) {
+                    if (this.status === MUParser.END) {
+                        return this.getBuildSql(list);
+                    }
+                    if (line.startsWith('===')) {
+                        // 删除下一个sqlId表示
+                        list.pop();
+                        return this.getBuildSql(list);
+                    }
+                    list.push(line);
+                }
+                else {
+                    return '';
+                }
+            }
+        }
+        else {
+            return '';
+        }
+    }
+    getBuildSql(list) {
+        const sb = [];
+        for (const str of list) {
+            const s = str.trim();
+            if (s.startsWith('```') || s.startsWith('~~~')) {
+                // 忽略以code block开头的符号
+                continue;
+            }
+            sb.push(str);
+        }
+        return sb.join(this.lineSeparator);
+    }
+}
+MUParser.END = 1;
+export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     if (options.sqlDir) {
-        globalThis[_path] = import('path');
-        globalThis[_fs] = import('fs');
+        globalThis[_path] = await import('path');
+        globalThis[_fs] = await import('fs');
     }
     logger.level = options.log ?? 'info';
     globalThis[_sqlCache] = new SqlCache();
-    if (options.sqlCache || options.sqlDir) {
+    if (options.sqlMap || options.sqlDir) {
         await globalThis[_sqlCache].init(options);
     }
     globalThis[_dao] = {