Merge pull request #2260 from didi/fix-mode-dd-build-error

fix: 修复输出dd时memberChain多个处理改变path后编译报错问题

Author: hiyuki

packages/webpack-plugin/lib/utils/chain-assign.js

@@ -0,0 +1,55 @@
+/**
+ * 链式合并方法的工具函数
+ *
+ * 在多条件分支下使用 Object.assign 会导致同名方法被覆盖，
+ * 这个函数通过创建组合函数来确保所有方法都能按顺序执行。
+ *
+ * @param {Object} target - 目标 visitor 对象
+ * @param {Object} source - 要链式分配的 visitor 方法对象
+ **/
+
+// 辅助函数：将 visitor 的所有钩子添加到结果中
+function mergeVisitorHooks (result, visitor) {
+  result.enter = result.enter.concat(visitor.enter)
+  result.exit = result.exit.concat(visitor.exit)
+  return result
+}
+
+function normalizeVisitor(visitor) {
+  if (Array.isArray(visitor.enter) && Array.isArray(visitor.exit)) {
+    return visitor
+  }
+  if (typeof visitor === 'function') {
+    return { enter: [visitor], exit: [] }
+  }
+
+  if (visitor.enter) {
+    if (!Array.isArray(visitor.enter)) {
+      visitor.enter = [visitor.enter]
+    }
+  } else {
+    visitor.enter = []
+  }
+
+  if (visitor.exit) {
+    if (!Array.isArray(visitor.exit)) {
+      visitor.exit = [visitor.exit]
+    }
+  } else {
+    visitor.exit = []
+  }
+  return visitor
+}
+
+module.exports = function mergeVisitors (target, source) {
+  for (const [key, value] of Object.entries(source)) {
+    if (!target[key]) {
+      target[key] = normalizeVisitor(value)
+    } else {
+      // 合并现有值和新值
+      target[key] = mergeVisitorHooks(normalizeVisitor(target[key]), normalizeVisitor(value))
+    }
+  }
+
+  return target
+}

packages/webpack-plugin/lib/utils/merge-visitors.js

@@ -4,7 +4,7 @@ const t = require('@babel/types')
 const generate = require('@babel/generator').default
 const parseRequest = require('../utils/parse-request')
 const isEmptyObject = require('../utils/is-empty-object')
-const chainAssign = require('../utils/chain-assign')
+const mergeVisitors = require('../utils/merge-visitors')
 const parseQuery = require('loader-utils').parseQuery
 
 module.exports = function (content) {
@@ -31,7 +31,7 @@ module.exports = function (content) {
         '  __mpx_args__[i] = arguments[i];\n' +
         '}'
       ).program.body
-      chainAssign(visitor, {
+      mergeVisitors(visitor, {
         Identifier (path) {
           if (path.node.name === 'arguments') {
             path.node.name = '__mpx_args__'
@@ -66,7 +66,7 @@ module.exports = function (content) {
     }
 
     if (mode !== 'wx') {
-      chainAssign(visitor, {
+      mergeVisitors(visitor, {
         CallExpression (path) {
           const callee = path.node.callee
           if (t.isIdentifier(callee) && callee.name === 'getRegExp') {
@@ -81,7 +81,7 @@ module.exports = function (content) {
   }
 
   if (mode === 'dd') {
-    chainAssign(visitor, {
+    mergeVisitors(visitor, {
       MemberExpression (path) {
         const property = path.node.property
         if (
@@ -96,11 +96,14 @@ module.exports = function (content) {
   }
 
   if (!module.wxs) {
-    chainAssign(visitor, {
+    mergeVisitors(visitor, {
       MemberExpression (path) {
+        if (!t.isMemberExpression(path.node)) {
+          return
+        }
         const property = path.node.property
         if (
-          (property.name === 'constructor' || property.value === 'constructor') &&
+          property && (property.name === 'constructor' || property.value === 'constructor') &&
           !(t.isMemberExpression(path.parent) && path.parentKey === 'object')
         ) {
           path.replaceWith(t.memberExpression(path.node, t.identifier('name')))