@eggjs/dal-runtime 4.0.0-beta.34 → 4.0.0-beta.36

package/dist/DatabaseForker.js

@@ -1,52 +1,49 @@
-import assert from 'node:assert';
-import { RDSClient } from '@eggjs/rds';
-import {} from "./MySqlDataSource.js";
 import { DaoLoader } from "./DaoLoader.js";
-export class DatabaseForker {
-    env;
-    options;
-    constructor(env, options) {
-        this.env = env;
-        this.options = options;
-    }
-    shouldFork() {
-        return this.env === 'unittest' && !!this.options.forkDb;
-    }
-    async forkDb(moduleDir) {
-        assert(this.shouldFork(), 'fork db only run in unittest');
-        // 尽早判断不应该 fork，避免对 rds pool 配置造成污染
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { name, initSql, forkDb, database, ...mysqlOptions } = this.options;
-        const client = new RDSClient(Object.assign(mysqlOptions));
-        const conn = await client.getConnection();
-        await this.doCreateUtDb(conn);
-        await this.forkTables(conn, moduleDir);
-        conn.release();
-        await client.end();
-    }
-    async forkTables(conn, moduleDir) {
-        const daoClazzList = await DaoLoader.loadDaos(moduleDir);
-        for (const clazz of daoClazzList) {
-            await this.doForkTable(conn, clazz.tableSql);
-        }
-    }
-    async doForkTable(conn, sqlFile) {
-        const sqls = sqlFile.split(';').filter((t) => !!t.trim());
-        for (const sql of sqls) {
-            await conn.query(sql);
-        }
-    }
-    async doCreateUtDb(conn) {
-        await conn.query(`CREATE DATABASE IF NOT EXISTS ${this.options.database};`);
-        await conn.query(`use ${this.options.database};`);
-    }
-    async destroy() {
-        assert(this.shouldFork(), 'fork db only run in unittest');
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { name, initSql, forkDb, database, ...mysqlOptions } = this.options;
-        const client = new RDSClient(Object.assign(mysqlOptions));
-        await client.query(`DROP DATABASE ${database}`);
-        await client.end();
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YWJhc2VGb3JrZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvRGF0YWJhc2VGb3JrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBRWpDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFJdkMsT0FBTyxFQUEwQixNQUFNLHNCQUFzQixDQUFDO0FBQzlELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUUzQyxNQUFNLE9BQU8sY0FBYztJQUNSLEdBQUcsQ0FBUztJQUNaLE9BQU8sQ0FBb0I7SUFFNUMsWUFBWSxHQUFXLEVBQUUsT0FBMEI7UUFDakQsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUN6QixDQUFDO0lBRUQsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDLEdBQUcsS0FBSyxVQUFVLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDO0lBQzFELENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLFNBQWlCO1FBQzVCLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLEVBQUUsOEJBQThCLENBQUMsQ0FBQztRQUMxRCxtQ0FBbUM7UUFDbkMsNkRBQTZEO1FBQzdELE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxZQUFZLEVBQUUsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQzFFLE1BQU0sTUFBTSxHQUFHLElBQUksU0FBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztRQUMxRCxNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUMxQyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDOUIsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQztRQUN2QyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDZixNQUFNLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNyQixDQUFDO0lBRU8sS0FBSyxDQUFDLFVBQVUsQ0FBQyxJQUFtQixFQUFFLFNBQWlCO1FBQzdELE1BQU0sWUFBWSxHQUFHLE1BQU0sU0FBUyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUN6RCxLQUFLLE1BQU0sS0FBSyxJQUFJLFlBQVksRUFBRSxDQUFDO1lBQ2pDLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQy9DLENBQUM7SUFDSCxDQUFDO0lBRU8sS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUFtQixFQUFFLE9BQWU7UUFDNUQsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUMxRCxLQUFLLE1BQU0sR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3ZCLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN4QixDQUFDO0lBQ0gsQ0FBQztJQUVPLEtBQUssQ0FBQyxZQUFZLENBQUMsSUFBbUI7UUFDNUMsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUM7UUFDNUUsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEdBQUcsQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTztRQUNYLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLEVBQUUsOEJBQThCLENBQUMsQ0FBQztRQUMxRCw2REFBNkQ7UUFDN0QsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLFlBQVksRUFBRSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUM7UUFDMUUsTUFBTSxNQUFNLEdBQUcsSUFBSSxTQUFTLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1FBQzFELE1BQU0sTUFBTSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUNoRCxNQUFNLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNyQixDQUFDO0NBQ0YifQ==
+import "./MySqlDataSource.js";
+import assert from "node:assert";
+import { RDSClient } from "@eggjs/rds";
+
+//#region src/DatabaseForker.ts
+var DatabaseForker = class {
+	env;
+	options;
+	constructor(env, options) {
+		this.env = env;
+		this.options = options;
+	}
+	shouldFork() {
+		return this.env === "unittest" && !!this.options.forkDb;
+	}
+	async forkDb(moduleDir) {
+		assert(this.shouldFork(), "fork db only run in unittest");
+		const { name, initSql, forkDb, database, ...mysqlOptions } = this.options;
+		const client = new RDSClient(Object.assign(mysqlOptions));
+		const conn = await client.getConnection();
+		await this.doCreateUtDb(conn);
+		await this.forkTables(conn, moduleDir);
+		conn.release();
+		await client.end();
+	}
+	async forkTables(conn, moduleDir) {
+		const daoClazzList = await DaoLoader.loadDaos(moduleDir);
+		for (const clazz of daoClazzList) await this.doForkTable(conn, clazz.tableSql);
+	}
+	async doForkTable(conn, sqlFile) {
+		const sqls = sqlFile.split(";").filter((t) => !!t.trim());
+		for (const sql of sqls) await conn.query(sql);
+	}
+	async doCreateUtDb(conn) {
+		await conn.query(`CREATE DATABASE IF NOT EXISTS ${this.options.database};`);
+		await conn.query(`use ${this.options.database};`);
+	}
+	async destroy() {
+		assert(this.shouldFork(), "fork db only run in unittest");
+		const { name, initSql, forkDb, database, ...mysqlOptions } = this.options;
+		const client = new RDSClient(Object.assign(mysqlOptions));
+		await client.query(`DROP DATABASE ${database}`);
+		await client.end();
+	}
+};
+
+//#endregion
+export { DatabaseForker };

package/dist/MySqlDataSource.d.ts

@@ -1,23 +1,27 @@
-import type { RDSClientOptions } from '@eggjs/rds';
-import { Base } from 'sdk-base';
-import type { Logger } from '@eggjs/tegg-types';
-export interface DataSourceOptions extends RDSClientOptions {
-    name: string;
-    initSql?: string;
-    forkDb?: boolean;
-    initRetryTimes?: number;
-    logger?: Logger;
+import { Logger } from "@eggjs/tegg-types";
+import { RDSClientOptions } from "@eggjs/rds";
+import { Base } from "sdk-base";
+
+//#region src/MySqlDataSource.d.ts
+interface DataSourceOptions extends RDSClientOptions {
+  name: string;
+  initSql?: string;
+  forkDb?: boolean;
+  initRetryTimes?: number;
+  logger?: Logger;
 }
-export declare class MysqlDataSource extends Base {
-    #private;
-    private client;
-    private readonly initSql;
-    readonly name: string;
-    readonly timezone?: string;
-    readonly rdsOptions: RDSClientOptions;
-    readonly forkDb?: boolean;
-    constructor(options: DataSourceOptions);
-    protected _init(): Promise<void>;
-    query<T = any>(sql: string): Promise<T>;
-    beginTransactionScope<T>(scope: () => Promise<T>): Promise<T>;
+declare class MysqlDataSource extends Base {
+  #private;
+  private client;
+  private readonly initSql;
+  readonly name: string;
+  readonly timezone?: string;
+  readonly rdsOptions: RDSClientOptions;
+  readonly forkDb?: boolean;
+  constructor(options: DataSourceOptions);
+  protected _init(): Promise<void>;
+  query<T = any>(sql: string): Promise<T>;
+  beginTransactionScope<T>(scope: () => Promise<T>): Promise<T>;
 }
+//#endregion
+export { DataSourceOptions, MysqlDataSource };

package/dist/MySqlDataSource.js

@@ -1,56 +1,55 @@
-import { RDSClient } from '@eggjs/rds';
-import { Base } from 'sdk-base';
+import { RDSClient } from "@eggjs/rds";
+import { Base } from "sdk-base";
+
+//#region src/MySqlDataSource.ts
 const DEFAULT_OPTIONS = {
-    supportBigNumbers: true,
-    bigNumberStrings: true,
-    trace: true,
+	supportBigNumbers: true,
+	bigNumberStrings: true,
+	trace: true
 };
-export class MysqlDataSource extends Base {
-    client;
-    initSql;
-    name;
-    timezone;
-    rdsOptions;
-    forkDb;
-    #initRetryTimes;
-    #logger;
-    constructor(options) {
-        super({ initMethod: '_init' });
-        const { name, initSql, forkDb, initRetryTimes, logger, ...mysqlOptions } = options;
-        this.#logger = logger;
-        this.forkDb = forkDb;
-        this.initSql = initSql ?? 'SELECT 1 + 1';
-        this.#initRetryTimes = initRetryTimes;
-        this.name = name;
-        this.timezone = options.timezone;
-        this.rdsOptions = Object.assign({}, DEFAULT_OPTIONS, mysqlOptions);
-        this.client = new RDSClient(this.rdsOptions);
-    }
-    async _init() {
-        if (this.initSql) {
-            await this.#doInit(1);
-        }
-    }
-    async #doInit(tryTimes) {
-        try {
-            this.#logger?.log(`${tryTimes} try to initialize dataSource ${this.name}`);
-            const st = Date.now();
-            await this.client.query(this.initSql);
-            this.#logger?.info(`dataSource initialization cost: ${Date.now() - st}, tryTimes: ${tryTimes}`);
-        }
-        catch (e) {
-            this.#logger?.warn(`failed to initialize dataSource ${this.name}, tryTimes ${tryTimes}`, e);
-            if (!this.#initRetryTimes || tryTimes >= this.#initRetryTimes) {
-                throw e;
-            }
-            await this.#doInit(tryTimes + 1);
-        }
-    }
-    async query(sql) {
-        return this.client.query(sql);
-    }
-    async beginTransactionScope(scope) {
-        return await this.client.beginTransactionScope(scope);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTXlTcWxEYXRhU291cmNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL015U3FsRGF0YVNvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRXZDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFZaEMsTUFBTSxlQUFlLEdBQXFCO0lBQ3hDLGlCQUFpQixFQUFFLElBQUk7SUFDdkIsZ0JBQWdCLEVBQUUsSUFBSTtJQUN0QixLQUFLLEVBQUUsSUFBSTtDQUNaLENBQUM7QUFFRixNQUFNLE9BQU8sZUFBZ0IsU0FBUSxJQUFJO0lBQy9CLE1BQU0sQ0FBWTtJQUNULE9BQU8sQ0FBUztJQUN4QixJQUFJLENBQVM7SUFDYixRQUFRLENBQVU7SUFDbEIsVUFBVSxDQUFtQjtJQUM3QixNQUFNLENBQVc7SUFDakIsZUFBZSxDQUFVO0lBQ3pCLE9BQU8sQ0FBVTtJQUUxQixZQUFZLE9BQTBCO1FBQ3BDLEtBQUssQ0FBQyxFQUFFLFVBQVUsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQy9CLE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxFQUFFLEdBQUcsWUFBWSxFQUFFLEdBQUcsT0FBTyxDQUFDO1FBQ25GLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBTSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxJQUFJLGNBQWMsQ0FBQztRQUN6QyxJQUFJLENBQUMsZUFBZSxHQUFHLGNBQWMsQ0FBQztRQUN0QyxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUM7UUFDakMsSUFBSSxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxlQUFlLEVBQUUsWUFBWSxDQUFDLENBQUM7UUFDbkUsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLFNBQVMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVTLEtBQUssQ0FBQyxLQUFLO1FBQ25CLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2pCLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN4QixDQUFDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBZ0I7UUFDNUIsSUFBSSxDQUFDO1lBQ0gsSUFBSSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsR0FBRyxRQUFRLGlDQUFpQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUMzRSxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDdEIsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDdEMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsbUNBQW1DLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLGVBQWUsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUNsRyxDQUFDO1FBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUNYLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLG1DQUFtQyxJQUFJLENBQUMsSUFBSSxjQUFjLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQzVGLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxJQUFJLFFBQVEsSUFBSSxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7Z0JBQzlELE1BQU0sQ0FBQyxDQUFDO1lBQ1YsQ0FBQztZQUNELE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDbkMsQ0FBQztJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFVLEdBQVc7UUFDOUIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNoQyxDQUFDO0lBRUQsS0FBSyxDQUFDLHFCQUFxQixDQUFJLEtBQXVCO1FBQ3BELE9BQU8sTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLHFCQUFxQixDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3hELENBQUM7Q0FDRiJ9
+var MysqlDataSource = class extends Base {
+	client;
+	initSql;
+	name;
+	timezone;
+	rdsOptions;
+	forkDb;
+	#initRetryTimes;
+	#logger;
+	constructor(options) {
+		super({ initMethod: "_init" });
+		const { name, initSql, forkDb, initRetryTimes, logger, ...mysqlOptions } = options;
+		this.#logger = logger;
+		this.forkDb = forkDb;
+		this.initSql = initSql ?? "SELECT 1 + 1";
+		this.#initRetryTimes = initRetryTimes;
+		this.name = name;
+		this.timezone = options.timezone;
+		this.rdsOptions = Object.assign({}, DEFAULT_OPTIONS, mysqlOptions);
+		this.client = new RDSClient(this.rdsOptions);
+	}
+	async _init() {
+		if (this.initSql) await this.#doInit(1);
+	}
+	async #doInit(tryTimes) {
+		try {
+			this.#logger?.log(`${tryTimes} try to initialize dataSource ${this.name}`);
+			const st = Date.now();
+			await this.client.query(this.initSql);
+			this.#logger?.info(`dataSource initialization cost: ${Date.now() - st}, tryTimes: ${tryTimes}`);
+		} catch (e) {
+			this.#logger?.warn(`failed to initialize dataSource ${this.name}, tryTimes ${tryTimes}`, e);
+			if (!this.#initRetryTimes || tryTimes >= this.#initRetryTimes) throw e;
+			await this.#doInit(tryTimes + 1);
+		}
+	}
+	async query(sql) {
+		return this.client.query(sql);
+	}
+	async beginTransactionScope(scope) {
+		return await this.client.beginTransactionScope(scope);
+	}
+};
+
+//#endregion
+export { MysqlDataSource };

package/dist/NunjucksConverter.d.ts

@@ -1,73 +1,76 @@
-export declare class NunjucksConverter {
-    /**
-     * 将变量 HTML 转义的逻辑改为 MySQL 防注入转义
-     *
-     * eg:
-     *
-     *   output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "allColumns")
-     *
-     *   转换为
-     *
-     *   output += runtime.escapeSQL.call(this, "allColumns", runtime.contextOrFrameLookup(context,  frame, "allColumns")
-     *
-     * @param {String} code 转换前的代码
-     * @return {String} 转换后的代码
-     */
-    static convertNormalVariableCode(code: string): string;
-    /**
-     * 三目运算的 MySQL 防注入转义
-     *
-     * eg:
-     *
-     *   output += runtime.suppressValue((runtime.contextOrFrameLookup(context, frame, "$gmtCreate") !== \
-     *     runtime.contextOrFrameLookup(context, frame, "undefined")?runtime.contextOrFrameLookup(context,\
-     *     frame, "$gmtCreate"):"NOW()"), env.opts.autoescape);
-     *
-     *   转换为
-     *
-     *   output += runtime.suppressValue((runtime.contextOrFrameLookup(...) != ...) ?
-     *     runtime.escapeSQL.call(this, "...", runtime.contextOrFrameLookup(...)) :
-     *     ...)
-     *
-     * @param {String} code 转换前的代码
-     * @return {String} 转换后的代码
-     */
-    static convertTernaryCode(code: string): string;
-    /**
-     * 对象的属性，如 `user.id` 防注入转义
-     *
-     * eg:
-     *   output += runtime.suppressValue(runtime.memberLookup(\
-     *     (runtime.contextOrFrameLookup(context, frame, "user")),"id"), env.opts.autoescape);
-     *
-     * 转换为
-     *
-     *   output += runtime.escapeSQL.call(this, "<...>", runtime.memberLookup(...), env.opts.autoescape);
-     *
-     * 由于 escapeSQL 中是根据 key 与预定义 block 匹配决定是否转义，而 memberLookup 的状态下总的 key 肯定不会匹配，
-     * 所以找一个绝对不会匹配的 "<...>" 传入。事实上它可以是任意一个不会被匹配的字符串，比如说 ">_<" 等。
-     *
-     * @param {String} code 转换前的代码
-     * @return {String} 转换后的代码
-     */
-    static convertNestedObjectCode(code: string): string;
-    /**
-     * For 中的 `t_xxx` 要被转义：
-     *
-     * eg:
-     *   frame.set("...", t_...);
-     *   ...
-     *   output += runtime.suppressValue(t_.., env.opts.autoscape);
-     *
-     * 转换为
-     *
-     *   output += runtime.escapeSQL.call(this, "for.t_...", t_..., env.opts.autoescape);
-     *
-     * 由于 escapeSQL 中是根据 key 与预定义 block 匹配决定是否转义，而 memberLookup 的状态下总的 key 肯定不会匹配，
-     * 所以找一个绝对不会匹配的 "for.t_..." 传入。事实上它可以是任意一个不会被匹配的字符串，比如说 ">_<" 等。
-     *
-     * @param {String} code 转换前的代码
-     * @return {String} 转换后的代码
-     */
-    static convertValueInsideFor(code: string): string;
+//#region src/NunjucksConverter.d.ts
+declare class NunjucksConverter {
+  /**
+  * 将变量 HTML 转义的逻辑改为 MySQL 防注入转义
+  *
+  * eg:
+  *
+  *   output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "allColumns")
+  *
+  *   转换为
+  *
+  *   output += runtime.escapeSQL.call(this, "allColumns", runtime.contextOrFrameLookup(context,  frame, "allColumns")
+  *
+  * @param {String} code 转换前的代码
+  * @return {String} 转换后的代码
+  */
+  static convertNormalVariableCode(code: string): string;
+  /**
+  * 三目运算的 MySQL 防注入转义
+  *
+  * eg:
+  *
+  *   output += runtime.suppressValue((runtime.contextOrFrameLookup(context, frame, "$gmtCreate") !== \
+  *     runtime.contextOrFrameLookup(context, frame, "undefined")?runtime.contextOrFrameLookup(context,\
+  *     frame, "$gmtCreate"):"NOW()"), env.opts.autoescape);
+  *
+  *   转换为
+  *
+  *   output += runtime.suppressValue((runtime.contextOrFrameLookup(...) != ...) ?
+  *     runtime.escapeSQL.call(this, "...", runtime.contextOrFrameLookup(...)) :
+  *     ...)
+  *
+  * @param {String} code 转换前的代码
+  * @return {String} 转换后的代码
+  */
+  static convertTernaryCode(code: string): string;
+  /**
+  * 对象的属性，如 `user.id` 防注入转义
+  *
+  * eg:
+  *   output += runtime.suppressValue(runtime.memberLookup(\
+  *     (runtime.contextOrFrameLookup(context, frame, "user")),"id"), env.opts.autoescape);
+  *
+  * 转换为
+  *
+  *   output += runtime.escapeSQL.call(this, "<...>", runtime.memberLookup(...), env.opts.autoescape);
+  *
+  * 由于 escapeSQL 中是根据 key 与预定义 block 匹配决定是否转义，而 memberLookup 的状态下总的 key 肯定不会匹配，
+  * 所以找一个绝对不会匹配的 "<...>" 传入。事实上它可以是任意一个不会被匹配的字符串，比如说 ">_<" 等。
+  *
+  * @param {String} code 转换前的代码
+  * @return {String} 转换后的代码
+  */
+  static convertNestedObjectCode(code: string): string;
+  /**
+  * For 中的 `t_xxx` 要被转义：
+  *
+  * eg:
+  *   frame.set("...", t_...);
+  *   ...
+  *   output += runtime.suppressValue(t_.., env.opts.autoscape);
+  *
+  * 转换为
+  *
+  *   output += runtime.escapeSQL.call(this, "for.t_...", t_..., env.opts.autoescape);
+  *
+  * 由于 escapeSQL 中是根据 key 与预定义 block 匹配决定是否转义，而 memberLookup 的状态下总的 key 肯定不会匹配，
+  * 所以找一个绝对不会匹配的 "for.t_..." 传入。事实上它可以是任意一个不会被匹配的字符串，比如说 ">_<" 等。
+  *
+  * @param {String} code 转换前的代码
+  * @return {String} 转换后的代码
+  */
+  static convertValueInsideFor(code: string): string;
 }
+//#endregion
+export { NunjucksConverter };

package/dist/NunjucksConverter.js

@@ -1,94 +1,90 @@
-export class NunjucksConverter {
-    /**
-     * 将变量 HTML 转义的逻辑改为 MySQL 防注入转义
-     *
-     * eg:
-     *
-     *   output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "allColumns")
-     *
-     *   转换为
-     *
-     *   output += runtime.escapeSQL.call(this, "allColumns", runtime.contextOrFrameLookup(context,  frame, "allColumns")
-     *
-     * @param {String} code 转换前的代码
-     * @return {String} 转换后的代码
-     */
-    static convertNormalVariableCode(code) {
-        return code.replace(/\Woutput\W*?\+=\W*?runtime\.suppressValue\(runtime\.contextOrFrameLookup\((.+?),(.*?),\W*?"(.+?)"\)/g, '\noutput += runtime.escapeSQL.call(this, "$3", runtime.contextOrFrameLookup($1, $2, "$3")');
-    }
-    /**
-     * 三目运算的 MySQL 防注入转义
-     *
-     * eg:
-     *
-     *   output += runtime.suppressValue((runtime.contextOrFrameLookup(context, frame, "$gmtCreate") !== \
-     *     runtime.contextOrFrameLookup(context, frame, "undefined")?runtime.contextOrFrameLookup(context,\
-     *     frame, "$gmtCreate"):"NOW()"), env.opts.autoescape);
-     *
-     *   转换为
-     *
-     *   output += runtime.suppressValue((runtime.contextOrFrameLookup(...) != ...) ?
-     *     runtime.escapeSQL.call(this, "...", runtime.contextOrFrameLookup(...)) :
-     *     ...)
-     *
-     * @param {String} code 转换前的代码
-     * @return {String} 转换后的代码
-     */
-    static convertTernaryCode(code) {
-        // 先找到所有的 runtime.suppressValue((...?...:...), env...)
-        const ternaryBefore = code.match(/\Woutput\W*?\+=\W*?runtime\.suppressValue\(\(.*\W*?\?\W*?.*?:.*\),\W*?env\.opts\.autoescape/g) || [];
-        // 进行逐一处理
-        const ternaryAfter = ternaryBefore.map((str) => {
-            return str
-                .replace(/([?:])runtime\.contextOrFrameLookup\((.+?),(.*?),\W*?"(.+?)"\)/g, '$1runtime.escapeSQL.call(this, "$4", runtime.contextOrFrameLookup($2, $3, "$4"))')
-                .replace(/env.opts.autoescape$/g, 'false');
-        });
-        // 统一替换
-        for (let i = 0; i < ternaryBefore.length; i++) {
-            code = code.replace(ternaryBefore[i], ternaryAfter[i]);
-        }
-        return code;
-    }
-    /**
-     * 对象的属性，如 `user.id` 防注入转义
-     *
-     * eg:
-     *   output += runtime.suppressValue(runtime.memberLookup(\
-     *     (runtime.contextOrFrameLookup(context, frame, "user")),"id"), env.opts.autoescape);
-     *
-     * 转换为
-     *
-     *   output += runtime.escapeSQL.call(this, "<...>", runtime.memberLookup(...), env.opts.autoescape);
-     *
-     * 由于 escapeSQL 中是根据 key 与预定义 block 匹配决定是否转义，而 memberLookup 的状态下总的 key 肯定不会匹配，
-     * 所以找一个绝对不会匹配的 "<...>" 传入。事实上它可以是任意一个不会被匹配的字符串，比如说 ">_<" 等。
-     *
-     * @param {String} code 转换前的代码
-     * @return {String} 转换后的代码
-     */
-    static convertNestedObjectCode(code) {
-        return code.replace(/\Woutput\W*?\+=\W*?runtime\.suppressValue\(runtime\.memberLookup\((.+?)\), env\.opts\.autoescape\)/g, '\noutput += runtime.escapeSQL.call(this, "<...>", runtime.memberLookup($1), env.opts.autoescape)');
-    }
-    /**
-     * For 中的 `t_xxx` 要被转义：
-     *
-     * eg:
-     *   frame.set("...", t_...);
-     *   ...
-     *   output += runtime.suppressValue(t_.., env.opts.autoscape);
-     *
-     * 转换为
-     *
-     *   output += runtime.escapeSQL.call(this, "for.t_...", t_..., env.opts.autoescape);
-     *
-     * 由于 escapeSQL 中是根据 key 与预定义 block 匹配决定是否转义，而 memberLookup 的状态下总的 key 肯定不会匹配，
-     * 所以找一个绝对不会匹配的 "for.t_..." 传入。事实上它可以是任意一个不会被匹配的字符串，比如说 ">_<" 等。
-     *
-     * @param {String} code 转换前的代码
-     * @return {String} 转换后的代码
-     */
-    static convertValueInsideFor(code) {
-        return code.replace(/\Woutput\W*?\+=\W*?runtime\.suppressValue\((t_\d+), env\.opts\.autoescape\)/g, '\noutput += runtime.escapeSQL.call(this, "for.$1", $1, env.opts.autoescape)');
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTnVuanVja3NDb252ZXJ0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvTnVuanVja3NDb252ZXJ0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLGlCQUFpQjtJQUM1Qjs7Ozs7Ozs7Ozs7OztPQWFHO0lBQ0gsTUFBTSxDQUFDLHlCQUF5QixDQUFDLElBQVk7UUFDM0MsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUNqQixzR0FBc0csRUFDdEcsMkZBQTJGLENBQzVGLENBQUM7SUFDSixDQUFDO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7O09BaUJHO0lBQ0gsTUFBTSxDQUFDLGtCQUFrQixDQUFDLElBQVk7UUFDcEMsc0RBQXNEO1FBQ3RELE1BQU0sYUFBYSxHQUNqQixJQUFJLENBQUMsS0FBSyxDQUFDLDhGQUE4RixDQUFDLElBQUksRUFBRSxDQUFDO1FBRW5ILFNBQVM7UUFDVCxNQUFNLFlBQVksR0FBRyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFDN0MsT0FBTyxHQUFHO2lCQUNQLE9BQU8sQ0FDTixpRUFBaUUsRUFDakUsa0ZBQWtGLENBQ25GO2lCQUNBLE9BQU8sQ0FBQyx1QkFBdUIsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUMvQyxDQUFDLENBQUMsQ0FBQztRQUVILE9BQU87UUFDUCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsYUFBYSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQzlDLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN6RCxDQUFDO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7T0FnQkc7SUFDSCxNQUFNLENBQUMsdUJBQXVCLENBQUMsSUFBWTtRQUN6QyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQ2pCLHFHQUFxRyxFQUNyRyxrR0FBa0csQ0FDbkcsQ0FBQztJQUNKLENBQUM7SUFFRDs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FpQkc7SUFDSCxNQUFNLENBQUMscUJBQXFCLENBQUMsSUFBWTtRQUN2QyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQ2pCLDhFQUE4RSxFQUM5RSw2RUFBNkUsQ0FDOUUsQ0FBQztJQUNKLENBQUM7Q0FDRiJ9
+//#region src/NunjucksConverter.ts
+var NunjucksConverter = class {
+	/**
+	* 将变量 HTML 转义的逻辑改为 MySQL 防注入转义
+	*
+	* eg:
+	*
+	*   output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "allColumns")
+	*
+	*   转换为
+	*
+	*   output += runtime.escapeSQL.call(this, "allColumns", runtime.contextOrFrameLookup(context,  frame, "allColumns")
+	*
+	* @param {String} code 转换前的代码
+	* @return {String} 转换后的代码
+	*/
+	static convertNormalVariableCode(code) {
+		return code.replace(/\Woutput\W*?\+=\W*?runtime\.suppressValue\(runtime\.contextOrFrameLookup\((.+?),(.*?),\W*?"(.+?)"\)/g, "\noutput += runtime.escapeSQL.call(this, \"$3\", runtime.contextOrFrameLookup($1, $2, \"$3\")");
+	}
+	/**
+	* 三目运算的 MySQL 防注入转义
+	*
+	* eg:
+	*
+	*   output += runtime.suppressValue((runtime.contextOrFrameLookup(context, frame, "$gmtCreate") !== \
+	*     runtime.contextOrFrameLookup(context, frame, "undefined")?runtime.contextOrFrameLookup(context,\
+	*     frame, "$gmtCreate"):"NOW()"), env.opts.autoescape);
+	*
+	*   转换为
+	*
+	*   output += runtime.suppressValue((runtime.contextOrFrameLookup(...) != ...) ?
+	*     runtime.escapeSQL.call(this, "...", runtime.contextOrFrameLookup(...)) :
+	*     ...)
+	*
+	* @param {String} code 转换前的代码
+	* @return {String} 转换后的代码
+	*/
+	static convertTernaryCode(code) {
+		const ternaryBefore = code.match(/\Woutput\W*?\+=\W*?runtime\.suppressValue\(\(.*\W*?\?\W*?.*?:.*\),\W*?env\.opts\.autoescape/g) || [];
+		const ternaryAfter = ternaryBefore.map((str) => {
+			return str.replace(/([?:])runtime\.contextOrFrameLookup\((.+?),(.*?),\W*?"(.+?)"\)/g, "$1runtime.escapeSQL.call(this, \"$4\", runtime.contextOrFrameLookup($2, $3, \"$4\"))").replace(/env.opts.autoescape$/g, "false");
+		});
+		for (let i = 0; i < ternaryBefore.length; i++) code = code.replace(ternaryBefore[i], ternaryAfter[i]);
+		return code;
+	}
+	/**
+	* 对象的属性，如 `user.id` 防注入转义
+	*
+	* eg:
+	*   output += runtime.suppressValue(runtime.memberLookup(\
+	*     (runtime.contextOrFrameLookup(context, frame, "user")),"id"), env.opts.autoescape);
+	*
+	* 转换为
+	*
+	*   output += runtime.escapeSQL.call(this, "<...>", runtime.memberLookup(...), env.opts.autoescape);
+	*
+	* 由于 escapeSQL 中是根据 key 与预定义 block 匹配决定是否转义，而 memberLookup 的状态下总的 key 肯定不会匹配，
+	* 所以找一个绝对不会匹配的 "<...>" 传入。事实上它可以是任意一个不会被匹配的字符串，比如说 ">_<" 等。
+	*
+	* @param {String} code 转换前的代码
+	* @return {String} 转换后的代码
+	*/
+	static convertNestedObjectCode(code) {
+		return code.replace(/\Woutput\W*?\+=\W*?runtime\.suppressValue\(runtime\.memberLookup\((.+?)\), env\.opts\.autoescape\)/g, "\noutput += runtime.escapeSQL.call(this, \"<...>\", runtime.memberLookup($1), env.opts.autoescape)");
+	}
+	/**
+	* For 中的 `t_xxx` 要被转义：
+	*
+	* eg:
+	*   frame.set("...", t_...);
+	*   ...
+	*   output += runtime.suppressValue(t_.., env.opts.autoscape);
+	*
+	* 转换为
+	*
+	*   output += runtime.escapeSQL.call(this, "for.t_...", t_..., env.opts.autoescape);
+	*
+	* 由于 escapeSQL 中是根据 key 与预定义 block 匹配决定是否转义，而 memberLookup 的状态下总的 key 肯定不会匹配，
+	* 所以找一个绝对不会匹配的 "for.t_..." 传入。事实上它可以是任意一个不会被匹配的字符串，比如说 ">_<" 等。
+	*
+	* @param {String} code 转换前的代码
+	* @return {String} 转换后的代码
+	*/
+	static convertValueInsideFor(code) {
+		return code.replace(/\Woutput\W*?\+=\W*?runtime\.suppressValue\((t_\d+), env\.opts\.autoescape\)/g, "\noutput += runtime.escapeSQL.call(this, \"for.$1\", $1, env.opts.autoescape)");
+	}
+};
+
+//#endregion
+export { NunjucksConverter };

package/dist/NunjucksUtil.d.ts

@@ -1,5 +1,9 @@
-import { Template, type Environment } from 'nunjucks';
-export declare class NunjucksUtils {
-    static createEnv(modelName: string): Environment;
-    static compile(modelName: string, sqlName: string, sql: string): Template;
+import { Environment, Template } from "nunjucks";
+
+//#region src/NunjucksUtil.d.ts
+declare class NunjucksUtils {
+  static createEnv(modelName: string): Environment;
+  static compile(modelName: string, sqlName: string, sql: string): Template;
 }
+//#endregion
+export { NunjucksUtils };