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

package/dist/NunjucksUtil.js

@@ -1,74 +1,64 @@
-import nunjucks, { Template } from 'nunjucks';
-import sqlstring from 'sqlstring';
 import { NunjucksConverter } from "./NunjucksConverter.js";
 import { SqlUtil } from "./SqlUtil.js";
+import nunjucks, { Template } from "nunjucks";
+import sqlstring from "sqlstring";
+
+//#region src/NunjucksUtil.ts
 const compiler = nunjucks.compiler;
 const envs = {};
-const ROOT_RENDER_FUNC = Symbol('rootRenderFunc');
-const RUNTIME = Object.assign({}, nunjucks.runtime, {
-    escapeSQL: function escapeSQL(key, value) {
-        // 如果是预定义 block 则不转义
-        if (this.env.globals[key])
-            return value;
-        return sqlstring.escape(value, true, this.env.timezone);
-    },
-});
+const ROOT_RENDER_FUNC = Symbol("rootRenderFunc");
+const RUNTIME = Object.assign({}, nunjucks.runtime, { escapeSQL: function escapeSQL(key, value) {
+	if (this.env.globals[key]) return value;
+	return sqlstring.escape(value, true, this.env.timezone);
+} });
 function _replaceCodeWithSQLFeature(source) {
-    const funcs = [
-        'convertNormalVariableCode', // 普通变量
-        'convertTernaryCode', // 三目运算
-        'convertNestedObjectCode', // 对象中的变量，如 `user.id`
-        'convertValueInsideFor', // for 中的值需要转义
-    ];
-    return funcs.reduce((source, func) => NunjucksConverter[func](source), source);
+	return [
+		"convertNormalVariableCode",
+		"convertTernaryCode",
+		"convertNestedObjectCode",
+		"convertValueInsideFor"
+	].reduce((source$1, func) => NunjucksConverter[func](source$1), source);
 }
 /**
- * compile the string into function
- * @see https://github.com/mozilla/nunjucks/blob/2fd547f/src/environment.js#L571-L592
- */
+* compile the string into function
+* @see https://github.com/mozilla/nunjucks/blob/2fd547f/src/environment.js#L571-L592
+*/
 function _compile() {
-    let source = compiler.compile(this.tmplStr, this.env.asyncFilters, this.env.extensionsList, this.path, this.env.opts);
-    /**
-     * 将一些 Nunjucks 的 HTML 转义的代码转换成 SQL 防注入的代码
-     */
-    source = _replaceCodeWithSQLFeature(source);
-    // eslint-disable-next-line
-    const props = new Function(source)();
-    this.blocks = this._getBlocks(props);
-    this[ROOT_RENDER_FUNC] = props.root;
-    this.rootRenderFunc = function (env, context, frame, _runtime, cb) {
-        /**
-         * 1. 将 runtime 遗弃，用新的
-         * 2. 移除 SQL 语句中多余空白符
-         */
-        return this[ROOT_RENDER_FUNC](env, context, frame, RUNTIME, function (err, ret) {
-            // istanbul ignore if
-            if (err)
-                return cb(err, ret);
-            return cb(err, SqlUtil.minify(ret || ''));
-        });
-    };
-    this.compiled = true;
+	let source = compiler.compile(this.tmplStr, this.env.asyncFilters, this.env.extensionsList, this.path, this.env.opts);
+	/**
+	* 将一些 Nunjucks 的 HTML 转义的代码转换成 SQL 防注入的代码
+	*/
+	source = _replaceCodeWithSQLFeature(source);
+	const props = new Function(source)();
+	this.blocks = this._getBlocks(props);
+	this[ROOT_RENDER_FUNC] = props.root;
+	this.rootRenderFunc = function(env, context, frame, _runtime, cb) {
+		/**
+		* 1. 将 runtime 遗弃，用新的
+		* 2. 移除 SQL 语句中多余空白符
+		*/
+		return this[ROOT_RENDER_FUNC](env, context, frame, RUNTIME, function(err, ret) {
+			// istanbul ignore if
+			if (err) return cb(err, ret);
+			return cb(err, SqlUtil.minify(ret || ""));
+		});
+	};
+	this.compiled = true;
 }
-export class NunjucksUtils {
-    static createEnv(modelName) {
-        if (envs[modelName])
-            return envs[modelName];
-        const env = (envs[modelName] = nunjucks.configure({
-            autoescape: false,
-        }));
-        return env;
-    }
-    static compile(modelName, sqlName, sql) {
-        // istanbul ignore if
-        if (!envs[modelName]) {
-            throw new Error(`you should create an Environment for ${modelName} first.`);
-        }
-        const template = new Template(sql, envs[modelName], `egg-dal:MySQL:${modelName}:${sqlName}`, false);
-        // 做一些 hack，使得支持 MySQL 的一些 Escape
-        template._compile = _compile;
-        template.compile();
-        return template;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTnVuanVja3NVdGlsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL051bmp1Y2tzVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLFFBQVEsRUFBRSxFQUFFLFFBQVEsRUFBb0IsTUFBTSxVQUFVLENBQUM7QUFDaEUsT0FBTyxTQUFTLE1BQU0sV0FBVyxDQUFDO0FBRWxDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzNELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdkMsTUFBTSxRQUFRLEdBQUksUUFBZ0IsQ0FBQyxRQUFRLENBQUM7QUFDNUMsTUFBTSxJQUFJLEdBQWdDLEVBQUUsQ0FBQztBQUU3QyxNQUFNLGdCQUFnQixHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0FBQ2xELE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLFFBQVEsQ0FBQyxPQUFPLEVBQUU7SUFDbEQsU0FBUyxFQUFFLFNBQVMsU0FBUyxDQUFZLEdBQVcsRUFBRSxLQUFjO1FBQ2xFLG9CQUFvQjtRQUNwQixJQUFJLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQztZQUFFLE9BQU8sS0FBSyxDQUFDO1FBQ3hDLE9BQU8sU0FBUyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDMUQsQ0FBQztDQUNGLENBQUMsQ0FBQztBQUVILFNBQVMsMEJBQTBCLENBQUMsTUFBYztJQUNoRCxNQUFNLEtBQUssR0FBRztRQUNaLDJCQUEyQixFQUFFLE9BQU87UUFDcEMsb0JBQW9CLEVBQUUsT0FBTztRQUM3Qix5QkFBeUIsRUFBRSxxQkFBcUI7UUFDaEQsdUJBQXVCLEVBQUUsY0FBYztLQUMvQixDQUFDO0lBRVgsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxFQUFFLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7QUFDakYsQ0FBQztBQUVEOzs7R0FHRztBQUNILFNBQVMsUUFBUTtJQUNmLElBQUksTUFBTSxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdEg7O09BRUc7SUFDSCxNQUFNLEdBQUcsMEJBQTBCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFNUMsMkJBQTJCO0lBQzNCLE1BQU0sS0FBSyxHQUFHLElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7SUFFckMsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3JDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUM7SUFDcEMsSUFBSSxDQUFDLGNBQWMsR0FBRyxVQUFVLEdBQWdCLEVBQUUsT0FBWSxFQUFFLEtBQVUsRUFBRSxRQUFhLEVBQUUsRUFBTztRQUNoRzs7O1dBR0c7UUFDSCxPQUFPLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxVQUFVLEdBQWlCLEVBQUUsR0FBVztZQUNsRyxxQkFBcUI7WUFDckIsSUFBSSxHQUFHO2dCQUFFLE9BQU8sRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQztZQUM3QixPQUFPLEVBQUUsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztRQUM1QyxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQztJQUNGLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDO0FBQ3ZCLENBQUM7QUFFRCxNQUFNLE9BQU8sYUFBYTtJQUN4QixNQUFNLENBQUMsU0FBUyxDQUFDLFNBQWlCO1FBQ2hDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQztZQUFFLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRTVDLE1BQU0sR0FBRyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUM7WUFDaEQsVUFBVSxFQUFFLEtBQUs7U0FDbEIsQ0FBQyxDQUFDLENBQUM7UUFFSixPQUFPLEdBQUcsQ0FBQztJQUNiLENBQUM7SUFFRCxNQUFNLENBQUMsT0FBTyxDQUFDLFNBQWlCLEVBQUUsT0FBZSxFQUFFLEdBQVc7UUFDNUQscUJBQXFCO1FBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztZQUNyQixNQUFNLElBQUksS0FBSyxDQUFDLHdDQUF3QyxTQUFTLFNBQVMsQ0FBQyxDQUFDO1FBQzlFLENBQUM7UUFFRCxNQUFNLFFBQVEsR0FBRyxJQUFJLFFBQVEsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLGlCQUFpQixTQUFTLElBQUksT0FBTyxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFFcEcsaUNBQWlDO1FBQ2hDLFFBQWdCLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztRQUNyQyxRQUFnQixDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRTVCLE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7Q0FDRiJ9
+var NunjucksUtils = class {
+	static createEnv(modelName) {
+		if (envs[modelName]) return envs[modelName];
+		return envs[modelName] = nunjucks.configure({ autoescape: false });
+	}
+	static compile(modelName, sqlName, sql) {
+		// istanbul ignore if
+		if (!envs[modelName]) throw new Error(`you should create an Environment for ${modelName} first.`);
+		const template = new Template(sql, envs[modelName], `egg-dal:MySQL:${modelName}:${sqlName}`, false);
+		template._compile = _compile;
+		template.compile();
+		return template;
+	}
+};
+
+//#endregion
+export { NunjucksUtils };

package/dist/SqlGenerator.d.ts

@@ -1,9 +1,13 @@
-import { TableModel } from '@eggjs/dal-decorator';
-export declare class SqlGenerator {
-    private formatComment;
-    private generateColumn;
-    private generateColumnType;
-    private generateIndex;
-    private generateTableOptions;
-    generate(tableModel: TableModel): string;
+import { TableModel } from "@eggjs/dal-decorator";
+
+//#region src/SqlGenerator.d.ts
+declare class SqlGenerator {
+  private formatComment;
+  private generateColumn;
+  private generateColumnType;
+  private generateIndex;
+  private generateTableOptions;
+  generate(tableModel: TableModel): string;
 }
+//#endregion
+export { SqlGenerator };