webpack-gc-i18n-plugin 1.1.6 → 1.1.8

package/dist/customLoader/index.cjs

@@ -50,6 +50,16 @@ PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 /* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
+var __assign = function () {
+  __assign = Object.assign || function __assign(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 function __awaiter(thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -807,6 +817,13 @@ function createI18nTranslator(createOption) {
     uncodeValue: valStr,
     namespace: nameSpace
   };
+  insertOption?.collector?.record?.({
+    key: option.useValueAsKey ? trimmedValue : generatedKey,
+    value: trimmedValue,
+    namespace: nameSpace,
+    resourcePath: insertOption?.resourcePath,
+    root: insertOption?.root
+  });
   if (option.translateExtends) {
     const {
       handleCodeCall,
@@ -1164,9 +1181,13 @@ function getExpressionPlaceholder(expression) {
     return getExpressionPlaceholder(expression.expression);
   }
   const generateCode = generate__namespace.default?.default || generate__namespace.default || generate__namespace;
-  return generateCode(expression, {
+  return normalizeExpressionPlaceholder(generateCode(expression, {
     comments: false
-  }).code;
+  }).code);
+}
+function normalizeExpressionPlaceholder(placeholder) {
+  if (placeholder === null) return null;
+  return placeholder.replace(/(^|[^\w$])(?:_vm|\$data)\s*\./g, '$1').replace(/(^|[^\w$])(?:_vm|\$data)\s*\[/g, '$1[');
 }
 function optimizeConditionalExpression(expression) {
   if (!types.isConditionalExpression(expression)) return null;
@@ -1412,11 +1433,11 @@ function CallExpressionFn (insertOption) {
             isExpression: true
           });
           path.replaceWith(replaceNode);
-          translateSetLang(replaceNode);
+          translateSetLang(replaceNode, insertOption);
         }
       } else if (option.translateType === TranslateTypeEnum.FULL_AUTO) {
         // 全自动模式下还是只收集 单独 $t 调用
-        if (callee.name === option.translateKey || callee.property && callee.property.name === option.translateKey) translateSetLang(node);
+        if (callee.name === option.translateKey || callee.property && callee.property.name === option.translateKey) translateSetLang(node, insertOption);
       }
     }
   };
@@ -1427,17 +1448,34 @@ function CallExpressionFn (insertOption) {
  * @param node - 调用表达式节点
  * @return
  */
-function translateSetLang(node) {
+function translateSetLang(node, insertOption) {
   // 获取调用表达式的参数
   let arg = node.arguments || [];
   // 提取参数作为值
   // 检查参数是否为字符串字面量
-  const id = types__namespace.isStringLiteral(arg[0]) ? arg[0].value : '';
-  const value = types__namespace.isStringLiteral(arg[1]) ? arg[1].value : '';
+  const idArg = arg[0];
+  const valueArg = arg[1];
+  const id = types__namespace.isStringLiteral(idArg) ? idArg.value : '';
+  const value = types__namespace.isStringLiteral(valueArg) ? valueArg.value : '';
   // 检查 ID 和值是否存在，并且第二个参数是字符串字面量
-  if (id && value && types__namespace.isStringLiteral(arg[1])) {
+  if (id && value && types__namespace.isStringLiteral(idArg) && types__namespace.isStringLiteral(valueArg)) {
+    const resolvedId = resolveLangKey(id, value);
+    if (resolvedId !== id) {
+      idArg.value = resolvedId;
+      idArg.extra = {
+        raw: `'${resolvedId}'`,
+        rawValue: resolvedId
+      };
+    }
     // 调用翻译工具的 setLangObj 方法设置语言对象属性
-    setLangObj(id, value);
+    setLangObj(resolvedId, value);
+    insertOption?.collector?.record?.({
+      key: option.useValueAsKey ? value : resolvedId,
+      value,
+      namespace: option.namespace,
+      resourcePath: insertOption?.resourcePath,
+      root: insertOption?.root
+    });
   }
 }
 
@@ -1592,7 +1630,7 @@ var index$1 = /*#__PURE__*/Object.freeze({
  */
 module.exports = function (source) {
   return __awaiter(this, void 0, void 0, function () {
-    var baseUtils, option$1, filter, global, sourceObj, result, e_1;
+    var baseUtils, option$1, filter, global, loaderOptions, sourceObj, result, e_1;
     var _a;
     return __generator(this, function (_b) {
       switch (_b.label) {
@@ -1610,6 +1648,7 @@ module.exports = function (source) {
           if (option$1.excludedPath.length && baseUtils.checkAgainstRegexArray(global.resourcePath, option$1.excludedPath)) {
             return [2 /*return*/, source]; // 在黑名单目录中的文件，不处理，直接返回原始代码。
           }
+          loaderOptions = global.getOptions ? global.getOptions() : {};
           if (!option$1.translateExtends) return [3 /*break*/, 2];
           return [4 /*yield*/, (_a = option$1.translateExtends) === null || _a === void 0 ? void 0 : _a.handleInitFile(source, global.resourcePath)];
         case 1:
@@ -1625,7 +1664,11 @@ module.exports = function (source) {
           return [4 /*yield*/, babel__namespace.transformAsync(sourceObj.source, {
             configFile: false,
             // 不加载本地 Babel 配置文件
-            plugins: [filter.default(sourceObj)] // 使用核心模块提供的 `filter` 插件
+            plugins: [filter.default(__assign(__assign({}, sourceObj), {
+              resourcePath: global.resourcePath,
+              root: loaderOptions.root || global.rootContext,
+              collector: loaderOptions.collector
+            }))] // 使用核心模块提供的 `filter` 插件
           })
           // 如果转换成功，返回转换后的代码；否则返回空字符串。
           ];