@chaoswise/intl 2.1.9 → 3.0.0

package/bin/scripts/addLocale.js

@@ -5,11 +5,16 @@ const getWordsByIds = require('./util/getWordsByIds');
 const log = require('./util/log');
 const genXlsx = require('./util/genXlsx');
 const service = require('./service');
+const file = require('./util/file');
+const getGroupName = require('./util/getGroupName');
+const getPkgJson = require('./util/getPkgJson');
 
 async function update() {
   log.info('收集全部词条...');
   const conf = getConf();
   const files = targetOutputFiles(conf);
+  const newWordsFileType = conf.newWordsFileType || 'excel';
+  const isJson = newWordsFileType === 'json';
 
   const info = transformAst('update', files, conf, {});
   const _downloadIds = [...new Set(info.downloadIds.filter(Boolean))];
@@ -26,7 +31,9 @@ async function update() {
   const mainLanguage = languages.filter((l) => l.isMain)[0];
 
   const localeKeys = Object.keys(allWords);
-  const xlsxData = _downloadIds.map((id) => {
+
+  // 构建词条数据的通用函数
+  const buildLocaleObj = (id) => {
     const localeObj = {};
     localeKeys.forEach((key) => {
       if (mainLanguage && key === mainLanguage.key) {
@@ -36,13 +43,30 @@ async function update() {
         localeObj[key] = allWords[key][id] || '待翻译';
       }
     });
-    return {
+    return localeObj;
+  };
+
+  if (isJson) {
+    // 生成 JSON 格式
+    const jsonData = {};
+    _downloadIds.forEach((id) => {
+      jsonData[id] = buildLocaleObj(id);
+    });
+
+    const groupName = getGroupName();
+    const package = getPkgJson();
+    const fileName = `${groupName}_${package.version}.json`;
+    file.write(fileName, JSON.stringify(jsonData, null, 2));
+    log.info(`全部词条请查看： ${fileName}中`);
+  } else {
+    // 生成 Excel 格式
+    const xlsxData = _downloadIds.map((id) => ({
       id,
-      ...localeObj,
-    };
-  });
+      ...buildLocaleObj(id),
+    }));
 
-  await genXlsx(xlsxData);
+    await genXlsx(xlsxData);
+  }
 }
 
 module.exports = update;

package/bin/scripts/util/makeVisitorCollect.js

@@ -159,19 +159,27 @@ module.exports = function (
   }
 
   // XXX: [TRICKY] 防止中文转码为 unicode
+  // 注意：recast 打印 StringLiteral 时直接使用 node.value，而不是 extra.raw
+  // 所以需要直接创建值为 id 的字符串节点，同时保留原始中文在 extra 中
   function hackValue(value, id) {
-    if (id) hacked[id] = true;
+    // 如果 id 未定义，使用 value 作为回退（用于第一次收集阶段）
+    const actualId = id || value;
+    if (actualId) hacked[actualId] = true;
 
     // 字符串默认是单引号，如果模板字符串中出现单引号，需要转义，把 ' 换成 \'
     // 就算用户自定配置字符串为双引号，也没事，默认会转义双引号，但是默认不会处理单引号，所以自己手动处理
-    if (/\'/.test(id)) {
-      id = id.replace(/\'/g, "\\'");
+    let rawValue = actualId;
+    if (/\'/.test(actualId)) {
+      rawValue = actualId.replace(/\'/g, "\\'");
     }
 
-    return Object.assign(t.StringLiteral(value), {
+    // 直接创建值为 actualId 的字符串节点，recast 会使用 node.value 作为输出
+    return Object.assign(t.StringLiteral(actualId), {
       extra: {
-        raw: `'${id}'`, // id
-        rawValue: value, // word
+        raw: `'${rawValue}'`,
+        rawValue: actualId,
+        // 保存原始中文，用于后续需要时使用
+        originalValue: value,
       },
     });
   }

package/bin/scripts/util/transformAst.js

@@ -1,8 +1,7 @@
 const fs = require("fs");
 const path = require("path");
-const prettier = require("prettier");
+const recast = require("recast");
 const babel = require("@babel/core");
-const generate = require("@babel/generator").default;
 const traverse = require("@babel/traverse").default;
 const pluginSyntaxJSX = require("@babel/plugin-syntax-jsx");
 const pluginSyntaxProposalOptionalChaining = require("@babel/plugin-proposal-optional-chaining");
@@ -23,7 +22,9 @@ const log = require("./log");
 // 获取文件中需要忽略转化通用国际化API规范的所有行号
 function getIgnoreLines(ast) {
   const ignoreBlocks = [];
-  for (const comment of ast.comments) {
+
+  // 收集注释的辅助函数
+  function processComment(comment) {
     const { type, value, loc } = comment;
     const last = ignoreBlocks.length - 1;
 
@@ -50,9 +51,25 @@ function getIgnoreLines(ast) {
     }
   }
 
+  // 从 ast.comments 获取注释（Babel 格式）
+  if (ast.comments && Array.isArray(ast.comments)) {
+    for (const comment of ast.comments) {
+      processComment(comment);
+    }
+  }
+
+  // 从 ast.tokens 获取注释（recast 格式）
+  if (ast.tokens && Array.isArray(ast.tokens)) {
+    for (const token of ast.tokens) {
+      if (token.type === "CommentLine" || token.type === "CommentBlock") {
+        processComment(token);
+      }
+    }
+  }
+
   // 如果缺少 disable-enable，直接作用到最后一行
   const len = ignoreBlocks.length;
-  if (len > 0 && !ignoreBlocks[len - 1].end) {
+  if (len > 0 && !ignoreBlocks[len - 1].end && ast.loc && ast.loc.end) {
     ignoreBlocks[len - 1].end = ast.loc.end.line;
   }
 
@@ -89,6 +106,7 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
     sourceType: "module",
     ast: true,
     configFile: false,
+    parserOpts: { tokens: true },
     presets: [
       ...babelPresets,
       [presetTypescript, { isTSX: true, allExtensions: true }],
@@ -116,14 +134,14 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
       specialFileReg.some((item) => {
         if (typeof item === "string") {
           return item === filePath;
-        } else {
+        } else if (item instanceof RegExp) {
           return item.test(filePath);
         }
+        return false;
       })
     ) {
       file.special = true;
     }
-    const isTSX = [".ts", ".tsx"].includes(path.extname(filePath));
 
     const r = {
       allWords,
@@ -137,8 +155,17 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
     const sourceCode = fs.readFileSync(filePath, "utf8");
 
     let ast;
+    let recastAst;
     try {
-      ast = babel.parseSync(sourceCode, transformOptions);
+      // 使用 recast 解析，内部委托给 babel，保留原始格式信息
+      recastAst = recast.parse(sourceCode, {
+        parser: {
+          parse(source) {
+            return babel.parseSync(source, transformOptions);
+          },
+        },
+      });
+      ast = recastAst.program;
     } catch (error) {
       replaceWords &&
         log.error(`文件解析出错：${file.filePath}
@@ -146,7 +173,7 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
       return;
     }
 
-    opts.ignoreLines = getIgnoreLines(ast);
+    opts.ignoreLines = getIgnoreLines(recastAst);
 
     let makeVisitor = makeVisitorCollect;
     if (type === "update") {
@@ -155,7 +182,7 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
 
     try {
       const visitor = makeVisitor(opts, r, file);
-      traverse(ast, visitor);
+      traverse(recastAst, visitor);
     } catch (e) {
       replaceWords &&
         log.error(`文件解析出错：${file.filePath}
@@ -167,11 +194,8 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
     // 在只需要提取中文词条的情况下不传入replaceWords
     if (!replaceWords) return;
 
-    // https://stackoverflow.com/a/55478641
-    let { code } = generate(ast, {
-      retainLines: true,
-      decoratorsBeforeExport: true,
-    });
+    // 使用 recast 输出代码，仅重新打印被修改的 AST 节点，保留原始格式
+    let code = recast.print(recastAst).code;
 
     if (!r.hasTouch) {
       code = sourceCode;
@@ -184,13 +208,7 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
       code = `${importCode}\n${code}`;
     }
 
-    // 自定义格式化代码
     if (r.hasTouch) {
-      if (conf.prettier) {
-        const parser = isTSX ? "typescript" : "babel";
-        code = prettier.format(code, { ...conf.prettier, parser });
-      }
-
       const target = file.currentOutput
         ? filePath.replace(file.currentEntry, file.currentOutput)
         : filePath;

package/lib/react-intl-universal/ReactIntlUniversal.js

@@ -24,8 +24,7 @@ var _cookie = _interopRequireDefault(require("cookie"));
 var _invariant = _interopRequireDefault(require("invariant"));
 var constants = _interopRequireWildcard(require("./constants"));
 var _lodash = _interopRequireDefault(require("lodash.merge"));
-function _getRequireWildcardCache(e) { if ("function" != typeof _WeakMap) return null; var r = new _WeakMap(), t = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? _Object$getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? _Object$defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 String.prototype.defaultMessage = String.prototype.d = function (msg) {
   return this || msg || "";
 };

package/lib/react-intl-universal/index.js

@@ -14,7 +14,7 @@ _Object$defineProperty(exports, "ReactIntlUniversal", {
 exports.load = exports.init = exports.getLocaleFromURL = exports.getLocaleFromLocalStorage = exports.getLocaleFromCookie = exports.getLocaleFromBrowser = exports.getInitOptions = exports.getHTML = exports.getDescendantProp = exports.get = exports.formatMessage = exports.formatHTMLMessage = exports.determineLocale = exports["default"] = void 0;
 var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
 var _ReactIntlUniversal = _interopRequireDefault(require("./ReactIntlUniversal"));
-var _context, _context2, _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context10, _context11, _context12, _context13;
+var _context, _context2, _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context0, _context1, _context10, _context11;
 var defaultInstance = exports["default"] = new _ReactIntlUniversal["default"]();
 // resolved by CommonJS module loader
 defaultInstance.ReactIntlUniversal = _ReactIntlUniversal["default"];
@@ -28,8 +28,8 @@ var init = exports.init = (0, _bind["default"])(_context6 = defaultInstance.init
 var getInitOptions = exports.getInitOptions = (0, _bind["default"])(_context7 = defaultInstance.getInitOptions).call(_context7, defaultInstance);
 var load = exports.load = (0, _bind["default"])(_context8 = defaultInstance.load).call(_context8, defaultInstance);
 var getLocaleFromCookie = exports.getLocaleFromCookie = (0, _bind["default"])(_context9 = defaultInstance.getLocaleFromCookie).call(_context9, defaultInstance);
-var getLocaleFromLocalStorage = exports.getLocaleFromLocalStorage = (0, _bind["default"])(_context10 = defaultInstance.getLocaleFromLocalStorage).call(_context10, defaultInstance);
-var getLocaleFromURL = exports.getLocaleFromURL = (0, _bind["default"])(_context11 = defaultInstance.getLocaleFromURL).call(_context11, defaultInstance);
-var getDescendantProp = exports.getDescendantProp = (0, _bind["default"])(_context12 = defaultInstance.getDescendantProp).call(_context12, defaultInstance);
-var getLocaleFromBrowser = exports.getLocaleFromBrowser = (0, _bind["default"])(_context13 = defaultInstance.getLocaleFromBrowser).call(_context13, defaultInstance);
+var getLocaleFromLocalStorage = exports.getLocaleFromLocalStorage = (0, _bind["default"])(_context0 = defaultInstance.getLocaleFromLocalStorage).call(_context0, defaultInstance);
+var getLocaleFromURL = exports.getLocaleFromURL = (0, _bind["default"])(_context1 = defaultInstance.getLocaleFromURL).call(_context1, defaultInstance);
+var getDescendantProp = exports.getDescendantProp = (0, _bind["default"])(_context10 = defaultInstance.getDescendantProp).call(_context10, defaultInstance);
+var getLocaleFromBrowser = exports.getLocaleFromBrowser = (0, _bind["default"])(_context11 = defaultInstance.getLocaleFromBrowser).call(_context11, defaultInstance);
 // resolved by ECMAScript module loader

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/intl",
-  "version": "2.1.9",
+  "version": "3.0.0",
   "author": "cloudwiser",
   "description": "intl",
   "main": "lib/index.js",
@@ -77,6 +77,7 @@
     "object-keys": "^1.0.11",
     "prettier": "^2.8.1",
     "react-intl-universal": "^2.6.11",
+    "recast": "^0.23.11",
     "uuid": "^9.0.0",
     "xlsx": "^0.18.5"
   },
@@ -89,6 +90,5 @@
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
   },
-  "license": "MIT",
-  "gitHead": "ec323ae8b78cc39ac089839b300f6789272ef6ae"
+  "license": "MIT"
 }