baja-lite 1.0.2 → 1.0.4

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');
@@ -213,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;
@@ -228,7 +229,7 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -246,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]) {
@@ -264,7 +265,7 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -282,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') {
@@ -298,7 +299,7 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -316,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') {
@@ -332,7 +333,7 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -350,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') {
@@ -364,7 +365,7 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -390,10 +391,15 @@ class Mysql {
             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) {
@@ -402,7 +408,7 @@ class Mysql {
             return null;
         }
         ;
-        return new Promise(async (resolve) => {
+        return new Promise(async (resolve, reject) => {
             let needCommit = false;
             let newConn = false;
             if (!conn) {
@@ -432,7 +438,7 @@ class Mysql {
                 logger.debug('rollback end!');
                 conn[_inTransaction] = false;
                 logger.error(error);
-                throw error;
+                reject(error);
             }
             finally {
                 try {
@@ -688,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 });
@@ -699,7 +705,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -717,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);
@@ -728,7 +734,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -746,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);
@@ -757,7 +763,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -775,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);
@@ -786,7 +792,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -804,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);
@@ -815,7 +821,7 @@ class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                throw error;
+                reject(error);
             }
         });
     }
@@ -875,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
@@ -1023,7 +1296,7 @@ function P(skipConn = false) {
             }
             else if (this[_dbType] === DBType.SqliteRemote) {
                 Throw.if(option.sync === SyncMode.Sync, 'SqliteRemote remote can not sync!');
-                return new Promise(async (resolve) => {
+                return new Promise(async (resolve, reject) => {
                     // 连接共享
                     if (skipConn === false && !option.conn) {
                         (option).conn = await option.dao.createConnection(SyncMode.Async);
@@ -1091,7 +1364,7 @@ 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) {
@@ -1105,7 +1378,7 @@ 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) {
@@ -1120,7 +1393,7 @@ 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) {
@@ -1200,17 +1473,17 @@ export const Field = (config) => {
                 break;
             }
             case SqlType.float: {
-                field[DBType.Mysql] = `${field.esName} float(${config.length1 ?? 1}, ${config.length2 ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
+                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.length1 ?? 1}, ${config.length2 ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
+                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.length1 ?? 1}, ${config.length2 ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
+                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;
             }
@@ -1255,12 +1528,12 @@ export const Field = (config) => {
                 break;
             }
             case SqlType.char: {
-                field[DBType.Mysql] = `${field.esName} char(${config.length1 ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                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.length1 ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
+                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;
             }
@@ -2095,10 +2368,10 @@ export class SqlService {
     select(option) {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
         option.selectResult ?? (option.selectResult = SelectResult.Many_Row_Many_Column);
-        option.sql ?? (option.sql = globalThis[_sqlCache].load(option.sqlId, option.context, option.isPage));
         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)) {
@@ -2121,9 +2394,9 @@ export class SqlService {
     }
     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)) {
@@ -3372,15 +3645,137 @@ export function MethodCache(config) {
         };
     };
 }
+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] = {