mm_tpl 2.4.7 → 2.4.9

package/index.js

@@ -1,4 +1,4 @@
-const template = require('art-template');
+const engine = require('art-template');
 const {
 	Base
 } = require('mm_expand');
@@ -25,26 +25,51 @@ if (!$.hook) {
  * @class
  */
 class Tpl extends Base {
+	static config = {
+		/**
+		 * 模板根目录
+		 */
+		root: $.run_path + '',
+		/**
+		 * 默认模板目录
+		 */
+		default_dir: "./template/",
+		/**
+		 * 默认主题
+		 */
+		default_theme: 'default',
+		/**
+		 * 模板文件扩展名
+		 */
+		extname: ".html",
+		/**
+		 * 模板规则
+		 */
+		rules: [nativeRule, artRule, htmlRule, jsRule, pyRule, pyRule2],
+		/**
+		 * 缓存根目录
+		 */
+		cache_root: './cache'.fullname(),
+		/**
+		 * 缓存文件扩展名
+		 */
+		cache_extname: '.cache.html',
+		/**
+		 * 变换字符串
+		 */
+		change_str: ['\\#', '\\<', '\\${', '\\*', '\\"""'],
+	};
 	/**
 	 * 创建模板实例
 	 * @param {Object} config - 配置选项
 	 */
 	constructor(config) {
-		super(Object.assign({
-			root: $.runPath + '',
-			default_dir: "./template/",
-			default_theme: 'default',
-			extname: ".html",
-			rules: [nativeRule, artRule, htmlRule, jsRule, pyRule, pyRule2],
-			cache_root: './cache'.fullname(),
-			cache_extname: '.cache.html',
-			change_str: ["\\#", "\\<", "\\${", "\\/*", '\\"""'],
-		}, config));
+		super(config);
 
 		/**
 		 * 模板引擎
 		 */
-		this.template = template;
+		this.engine = engine;
 
 		/**
 		 * 视图数据
@@ -54,7 +79,7 @@ class Tpl extends Base {
 		/**
 		 * 模板根目录
 		 */
-		this.dir = "./template/";
+		this.dir = './template/';
 
 		/**
 		 * 当前主题
@@ -75,28 +100,23 @@ class Tpl extends Base {
 		/**
 		 * 初始化
 		 */
-		this.init(config);
+		this._init();
 	}
 }
 
 /**
- * 设置配置
- * @param {Object} config - 配置参数
+ * 初始化模板
  */
-Tpl.prototype.setConfig = function (config) {
-	if (config) {
-		this.config = Object.assign(this.config, config);
-	}
+Tpl.prototype._initTpl = function () {
 	var cg = this.config;
 	for (var key in cg) {
-		template.defaults[key] = cg[key];
+		this.engine.defaults[key] = cg[key];
 	}
 	if (!cg.cache_root.hasDir()) {
 		cg.cache_root.addDir()
 	}
 };
 
-
 /**
  * 执行钩子函数
  * @param {string} name - 钩子名称
@@ -129,7 +149,8 @@ Tpl.prototype._initBefore = function (config) { }
  */
 Tpl.prototype._initMain = function (config) {
 	this.setConfig(config);
-}
+	this._initTpl();
+};
 
 /**
  * 初始化后处理
@@ -149,17 +170,17 @@ Tpl.prototype._initAfter = function (config) {
 		this.regex_out.push(new RegExp(rx_out, "gi"));
 		this.str_out.push(str.replace("\\", ""));
 	}
-}
+};
 
 /**
  * 初始化模板
  * @param {Object} config - 配置参数
  */
-Tpl.prototype.init = function (config) {
+Tpl.prototype._init = function (config) {
 	this._initBefore(config);
 	this._initMain(config);
 	this._initAfter(config);
-}
+};
 
 /**
  * 转义字符
@@ -266,7 +287,7 @@ Tpl.prototype._renderMain = function (body, model, options) {
 			globalBag: $.globalBag
 		}, model);
 		this.loadFunc(m);
-		ret = template.render(body, m, options);
+		ret = this.engine.render(body, m, options);
 	}
 	return ret;
 };
@@ -332,7 +353,7 @@ Tpl.prototype.render = function (body, model, options) {
  * @returns {Function} 渲染函数
  */
 Tpl.prototype.compile = function (body, options) {
-	return template.compile(body, options);
+	return this.engine.compile(body, options);
 };
 
 /**
@@ -367,7 +388,8 @@ Tpl.prototype.view = function (file, model, options) {
 		this.error = {
 			code: 10000,
 			message: f + "文件不存在！"
-		}
+		};
+		this.log('error', '渲染模板文件失败', this.error);
 	}
 	else {
 		var body = f.loadText();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_tpl",
-    "version": "2.4.7",
+    "version": "2.4.9",
     "description": "Super Meimei Template Engine - High-performance template engine based on art-template with MVC pattern, hook system, theme switching and caching mechanism",
     "main": "index.js",
     "scripts": {
@@ -34,7 +34,7 @@
     "homepage": "https://gitee.com/qiuwenwu91/mm_tpl#readme",
     "dependencies": {
         "art-template": "^4.13.4",
-        "mm_expand": "^1.9.7"
+        "mm_expand": "^2.0.8"
     },
     "engines": {
         "node": ">=12.0.0"