mm_tpl 2.7.2 → 2.7.4

package/lib/tpl_rule.js

@@ -73,7 +73,7 @@ var artRule = {
 
     // 旧版语法升级提示
     var warn = function warn(oldSyntax, newSyntax) {
-      $.log.warn((options.filename || 'anonymous') + ':' + (match.line + 1) + ':' + (match.start + 1) + '\n' + (
+      console.warn((options.filename || 'anonymous') + ':' + (match.line + 1) + ':' + (match.start + 1) + '\n' + (
         'Template upgrade: ${' + oldSyntax + '} -> ${' + newSyntax + '}'));
     };
 

package/lib/util.js

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const crypto = require('crypto');
 
 /**
  * 模板工具类
@@ -72,6 +73,122 @@ class TplUtil {
     }
     return body;
   }
+
+  /**
+   * 深度合并对象
+   * 目标已有的键：同为对象则递归合并，类型相同则转换后覆盖，类型不同保持原值
+   * 目标没有的键：supplement 为 true 时补充，否则跳过
+   * @param {Object} target - 被合并的对象
+   * @param {Object} source - 用作合并的对象
+   * @param {boolean} supplement - 是否补充目标没有的键
+   * @returns {Object} 修改后的目标对象
+   */
+  static mergeDeep(target, source, supplement) {
+    if (!target || !source || typeof (target) !== 'object' || typeof (source) !== 'object') {
+      return target;
+    }
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(target, key)) {
+        var target_val = target[key];
+        var source_val = source[key];
+        if (typeof (target_val) === 'object' && typeof (source_val) === 'object') {
+          TplUtil.mergeDeep(target_val, source_val, supplement);
+        } else if (typeof (target_val) === typeof (source_val)) {
+          target[key] = TplUtil._convertValue(target_val, source_val);
+        }
+      } else if (supplement) {
+        target[key] = source[key];
+      }
+    }
+    return target;
+  }
+
+  /**
+   * 按目标值的类型转换源值
+   * @param {any} target_val - 目标值
+   * @param {any} source_val - 源值
+   * @returns {any} 转换后的值
+   * @private
+   */
+  static _convertValue(target_val, source_val) {
+    var target_type = typeof (target_val);
+    if (target_type === 'number') {
+      var num = Number(source_val);
+      return isNaN(num) ? 0 : num;
+    }
+    if (target_type === 'boolean') {
+      if (source_val === '0' || source_val === 'false' || source_val === 'False') {
+        return false;
+      }
+      if (source_val === '1' || source_val === 'true' || source_val === 'True') {
+        return true;
+      }
+      return Boolean(source_val);
+    }
+    if (target_type === 'string') {
+      return String(source_val);
+    }
+    return source_val;
+  }
+
+  /**
+   * 深拷贝对象或值
+   * 仅处理数组与普通对象，最大递归深度 10，超出时直接返回原值
+   * @param {any} source - 源对象或值
+   * @param {number} depth - 当前递归深度，内部使用
+   * @returns {any} 拷贝后的对象或值
+   * @private
+   */
+  static cloneDeep(source, depth) {
+    var level = depth || 0;
+    if (level > 10 || !source || typeof (source) !== 'object') {
+      return source;
+    }
+    if (Array.isArray(source)) {
+      var new_arr = [];
+      for (var i = 0; i < source.length; i++) {
+        new_arr.push(TplUtil.cloneDeep(source[i], level + 1));
+      }
+      return new_arr;
+    }
+    var new_obj = {};
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        new_obj[key] = TplUtil.cloneDeep(source[key], level + 1);
+      }
+    }
+    return new_obj;
+  }
+
+  /**
+   * 计算字符串的 MD5 值
+   * @param {string} str - 原始字符串
+   * @returns {string} 十六进制摘要
+   */
+  static md5(str) {
+    return crypto.createHash('md5').update(str + '').digest('hex');
+  }
+
+  /**
+   * 取两个标记符之间的子串
+   * 任一标记符不存在时返回空字符串
+   * @param {string} str - 原始字符串
+   * @param {string} left_str - 左侧标记符
+   * @param {string} right_str - 右侧标记符
+   * @returns {string} 截取后的字符串
+   */
+  static between(str, left_str, right_str) {
+    var start = (str + '').indexOf(left_str);
+    if (start === -1) {
+      return '';
+    }
+    var from = start + left_str.length;
+    var end = (str + '').indexOf(right_str, from);
+    if (end === -1) {
+      return '';
+    }
+    return (str + '').substring(from, end);
+  }
 }
 
 module.exports = {

package/package.json

@@ -1,62 +1,65 @@
-{
-    "name": "mm_tpl",
-    "version": "2.7.2",
-    "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",
-    "io": true,
-    "priority": 100,
-    "scripts": {
-        "dev": "nodemon test.js",
-        "demo": "node example/demo.js",
-        "test": "node test.js",
-        "coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://gitee.com/qiuwenwu91/mm_tpl.git"
-    },
-    "keywords": [
-        "mm_mod",
-        "mm_infra",
-        "mm_web",
-        "template",
-        "engine",
-        "mvc",
-        "web",
-        "view",
-        "render",
-        "art-template",
-        "hook",
-        "theme",
-        "cache",
-        "nodejs",
-        "javascript"
-    ],
-    "author": "邱文武",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://gitee.com/qiuwenwu91/mm_tpl/issues"
-    },
-    "homepage": "https://gitee.com/qiuwenwu91/mm_tpl#readme",
-    "dependencies": {
-        "art-template": "^4.13.4",
-        "mm_expand": "^2.5.4"
-    },
-    "engines": {
-        "node": ">=12.0.0"
-    },
-    "files": [
-        "index.js",
-        "hook.js",
-        "tpl_rule.js",
-        "lib/",
-        "doc/",
-        "README.md",
-        "README_EN.md",
-        "package.json"
-    ],
-    "devDependencies": {
-        "eslint": "^9.39.5",
-        "eslint-plugin-jsdoc": "^65.0.0"
-    }
-}
+{
+    "name": "mm_tpl",
+    "version": "2.7.4",
+    "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",
+    "io": true,
+    "priority": 100,
+    "scripts": {
+        "dev": "nodemon test.js",
+        "demo": "node example/demo.js",
+        "test": "node test.js",
+        "coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitee.com/qiuwenwu91/mm_tpl.git"
+    },
+    "keywords": [
+        "mm_mod",
+        "mm_infra",
+        "mm_common",
+        "mm_web",
+        "template",
+        "engine",
+        "mvc",
+        "web",
+        "view",
+        "render",
+        "art-template",
+        "hook",
+        "theme",
+        "cache",
+        "nodejs",
+        "javascript"
+    ],
+    "layer": "infra",
+    "group": "common",
+    "author": "邱文武",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://gitee.com/qiuwenwu91/mm_tpl/issues"
+    },
+    "homepage": "https://gitee.com/qiuwenwu91/mm_tpl#readme",
+    "dependencies": {
+        "art-template": "4.13.4",
+        "mm_corejs": "^1.1.6"
+    },
+    "engines": {
+        "node": ">=12.0.0"
+    },
+    "files": [
+        "index.js",
+        "hook.js",
+        "tpl_rule.js",
+        "lib/",
+        "doc/",
+        "README.md",
+        "README_EN.md",
+        "package.json"
+    ],
+    "devDependencies": {
+        "eslint": "^9.39.5",
+        "eslint-plugin-jsdoc": "^65.0.0"
+    }
+}