mm_tpl 2.8.0 → 2.9.0

package/lib/lang.js

@@ -154,6 +154,50 @@ Lang.prototype.buildDict = function (force) {
   return Object.assign({}, dict);
 };
 
+/**
+ * 将嵌套语言包字典规范化为 mm_lang 的扁平词条表
+ * mm_lang 的 Lang 只接受 `语言.层级键 → 文本` 的扁平入参，控制键（default、silent）原样保留
+ * @param {Object} dict 语言包字典，语言代码对应嵌套词条对象
+ * @returns {Object} 扁平词条表
+ */
+function flattenLangPack(dict) {
+  var flat = {};
+  for (var key in dict) {
+    if (!Object.prototype.hasOwnProperty.call(dict, key)) {
+      continue;
+    }
+    var val = dict[key];
+    if (val && typeof (val) === 'object' && !Array.isArray(val)) {
+      flattenInto(val, key, flat);
+    } else {
+      flat[key] = val;
+    }
+  }
+  return flat;
+}
+
+/**
+ * 递归展开嵌套词条为点号路径键 - 内部函数
+ * @param {Object} obj 嵌套词条对象
+ * @param {string} prefix 键前缀
+ * @param {Object} flat 输出容器
+ * @returns {void}
+ */
+function flattenInto(obj, prefix, flat) {
+  for (var key in obj) {
+    if (!Object.prototype.hasOwnProperty.call(obj, key)) {
+      continue;
+    }
+    var val = obj[key];
+    var path = prefix + '.' + key;
+    if (val && typeof (val) === 'object' && !Array.isArray(val)) {
+      flattenInto(val, path, flat);
+    } else {
+      flat[path] = val;
+    }
+  }
+}
+
 /**
  * 创建语言实例
  * 语言包字典在实例间共享，仅当前语言各自独立
@@ -166,7 +210,7 @@ Lang.prototype.create = function (config, force) {
   dict.default = config.default_lang || dict.default || 'zh_cn';
   // 词条缺失时静默返回 undefined，日志由模板引擎自身的 log 体系统一输出
   dict.silent = true;
-  var lang = new BaseLang(dict);
+  var lang = new BaseLang(flattenLangPack(dict));
   this.registerPlural(lang, config.plural_rules);
   return lang;
 };

package/lib/tpl.js

@@ -537,22 +537,14 @@ Tpl.prototype.tc = function (key, count, ...args) {
 
 /**
  * 获取支持的语言列表
- * 过滤掉无词条的语言，Lang 内置的 zh_cn、en 空字典不计入
+ * 语言列表来自 mm_lang 的扁平词条表，无词条的语言不会出现，无需过滤空字典
  * @returns {Array<string>} 语言代码数组
  */
 Tpl.prototype.getLangs = function () {
   if (!this.lang) {
     return [];
   }
-  var langs = this.lang.getLangs();
-  var list = [];
-  for (var i = 0; i < langs.length; i++) {
-    var dict = this.lang.config[langs[i]];
-    if (dict && Object.keys(dict).length) {
-      list.push(langs[i]);
-    }
-  }
-  return list;
+  return this.lang.getLangs();
 };
 
 /**
@@ -580,7 +572,8 @@ Tpl.prototype.loadLang = function (lang) {
     return null;
   }
   this.reloadLangs();
-  var dict = this.lang ? this.lang.config[lang] : null;
+  // 通过 getDict 导出该语言的嵌套词条字典（形态与语言包文件一致）
+  var dict = this.lang ? this.lang.getDict(lang) : null;
   if (!dict) {
     this.log('warn', '语言包不存在：' + lang);
     return null;

package/package.json

@@ -1,66 +1,66 @@
-{
-    "name": "mm_tpl",
-    "version": "2.8.0",
-    "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",
-        "mm_lang": "^2.0.0"
-    },
-    "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.9.0",
+    "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",
+        "mm_lang": "^3.0.0"
+    },
+    "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"
+    }
+}