mp-weixin-back 0.0.12 → 0.0.14

package/dist/index.cjs

@@ -33,7 +33,8 @@ function compositionWalk(context, code, sfc, id) {
     pageBackFnName: "onPageBack",
     hasImportRef: false,
     backConfig: { ...context.config },
-    callbackCode: "",
+    onPageBackBodyAst: [],
+    onPageBackCallNodeToRemove: null,
     activeFnName: "activeMpBack",
     inActiveFnName: "inactiveMpBack"
   };
@@ -71,6 +72,7 @@ function compositionWalk(context, code, sfc, id) {
           }
         }
         if (node.type === "ExpressionStatement" && node.expression.type === "CallExpression" && node.expression.callee.loc?.identifierName === pageInfo.pageBackFnName) {
+          pageInfo.onPageBackCallNodeToRemove = node;
           const callback = node.expression.arguments[0];
           const backArguments = node.expression.arguments[1];
           if (backArguments?.type === "ObjectExpression") {
@@ -81,14 +83,9 @@ function compositionWalk(context, code, sfc, id) {
             Object.assign(pageInfo.backConfig, config);
           }
           if (callback && (callback.type === "ArrowFunctionExpression" || callback.type === "FunctionExpression")) {
-            const body = callback.body;
-            if (body.type === "BlockStatement") {
-              pageInfo.callbackCode += body.body.map(
-                // @ts-ignore
-                (statement) => (generate__default.default ? generate__default.default : generate__default)(statement).code
-              ).join("");
-            }
+            pageInfo.onPageBackBodyAst = callback.body.body;
           }
+          return;
         }
         if (node.type === "ExpressionStatement" && node.expression.type === "CallExpression" && node.expression.callee.loc?.identifierName === pageInfo.activeFnName) {
           activeFnCallsToModify.push({
@@ -117,12 +114,39 @@ function compositionWalk(context, code, sfc, id) {
   }
   if (!pageInfo.hasPageBack)
     return code;
+  if (pageInfo.onPageBackCallNodeToRemove) {
+    const scriptSetupOffset = sfc.scriptSetup.loc.start.offset;
+    const nodeToRemove = pageInfo.onPageBackCallNodeToRemove;
+    const globalStart = scriptSetupOffset + nodeToRemove.start;
+    const globalEnd = scriptSetupOffset + nodeToRemove.end;
+    codeMs.remove(globalStart, globalEnd);
+  }
+  let callbackCode = "";
+  if (pageInfo.onPageBackBodyAst.length > 0) {
+    const tempAstRoot = {
+      type: "BlockStatement",
+      body: pageInfo.onPageBackBodyAst
+    };
+    astKit.walkAST(tempAstRoot, {
+      enter(node) {
+        if (node.type === "CallExpression" && node.callee.type === "Identifier") {
+          const createIdentifier = (name) => ({ type: "Identifier", name });
+          if (node.callee.name === pageInfo.activeFnName) {
+            node.arguments.unshift(createIdentifier("__MP_WEIXIN_ACTIVEBACK__"));
+          } else if (node.callee.name === pageInfo.inActiveFnName) {
+            node.arguments.unshift(createIdentifier("__MP_WEIXIN_INACTIVEBACK__"));
+          }
+        }
+      }
+    });
+    callbackCode = pageInfo.onPageBackBodyAst.map((statement) => (generate__default.default ? generate__default.default : generate__default)(statement).code).join("\n");
+  }
   if (code.includes("<page-container")) {
     context.log.debugLog(`${context.getPageById(id)}\u9875\u9762\u5DF2\u6709page-container\u7EC4\u4EF6\uFF0C\u6CE8\u5165\u5931\u8D25`);
     return code;
   }
   if (!pageInfo.backConfig.preventDefault) {
-    pageInfo.callbackCode += "uni.navigateBack({ delta: 1 });";
+    callbackCode += "uni.navigateBack({ delta: 1 });";
   }
   const importUseMpWeixinBack = `import { useMpWeixinBack } from '${virtualFileId}'`;
   const importRefFromVue = !pageInfo.hasImportRef ? `import { ref } from 'vue'` : "";
@@ -154,7 +178,7 @@ function compositionWalk(context, code, sfc, id) {
         __MP_BACK_FREQUENCY__++
       }
       ${configBack}
-      ${pageInfo.callbackCode}
+      ${callbackCode}
     };
   `;
   const { template, scriptSetup } = sfc;

package/dist/index.mjs

@@ -23,7 +23,8 @@ function compositionWalk(context, code, sfc, id) {
     pageBackFnName: "onPageBack",
     hasImportRef: false,
     backConfig: { ...context.config },
-    callbackCode: "",
+    onPageBackBodyAst: [],
+    onPageBackCallNodeToRemove: null,
     activeFnName: "activeMpBack",
     inActiveFnName: "inactiveMpBack"
   };
@@ -61,6 +62,7 @@ function compositionWalk(context, code, sfc, id) {
           }
         }
         if (node.type === "ExpressionStatement" && node.expression.type === "CallExpression" && node.expression.callee.loc?.identifierName === pageInfo.pageBackFnName) {
+          pageInfo.onPageBackCallNodeToRemove = node;
           const callback = node.expression.arguments[0];
           const backArguments = node.expression.arguments[1];
           if (backArguments?.type === "ObjectExpression") {
@@ -71,14 +73,9 @@ function compositionWalk(context, code, sfc, id) {
             Object.assign(pageInfo.backConfig, config);
           }
           if (callback && (callback.type === "ArrowFunctionExpression" || callback.type === "FunctionExpression")) {
-            const body = callback.body;
-            if (body.type === "BlockStatement") {
-              pageInfo.callbackCode += body.body.map(
-                // @ts-ignore
-                (statement) => (generate.default ? generate.default : generate)(statement).code
-              ).join("");
-            }
+            pageInfo.onPageBackBodyAst = callback.body.body;
           }
+          return;
         }
         if (node.type === "ExpressionStatement" && node.expression.type === "CallExpression" && node.expression.callee.loc?.identifierName === pageInfo.activeFnName) {
           activeFnCallsToModify.push({
@@ -107,12 +104,39 @@ function compositionWalk(context, code, sfc, id) {
   }
   if (!pageInfo.hasPageBack)
     return code;
+  if (pageInfo.onPageBackCallNodeToRemove) {
+    const scriptSetupOffset = sfc.scriptSetup.loc.start.offset;
+    const nodeToRemove = pageInfo.onPageBackCallNodeToRemove;
+    const globalStart = scriptSetupOffset + nodeToRemove.start;
+    const globalEnd = scriptSetupOffset + nodeToRemove.end;
+    codeMs.remove(globalStart, globalEnd);
+  }
+  let callbackCode = "";
+  if (pageInfo.onPageBackBodyAst.length > 0) {
+    const tempAstRoot = {
+      type: "BlockStatement",
+      body: pageInfo.onPageBackBodyAst
+    };
+    walkAST(tempAstRoot, {
+      enter(node) {
+        if (node.type === "CallExpression" && node.callee.type === "Identifier") {
+          const createIdentifier = (name) => ({ type: "Identifier", name });
+          if (node.callee.name === pageInfo.activeFnName) {
+            node.arguments.unshift(createIdentifier("__MP_WEIXIN_ACTIVEBACK__"));
+          } else if (node.callee.name === pageInfo.inActiveFnName) {
+            node.arguments.unshift(createIdentifier("__MP_WEIXIN_INACTIVEBACK__"));
+          }
+        }
+      }
+    });
+    callbackCode = pageInfo.onPageBackBodyAst.map((statement) => (generate.default ? generate.default : generate)(statement).code).join("\n");
+  }
   if (code.includes("<page-container")) {
     context.log.debugLog(`${context.getPageById(id)}\u9875\u9762\u5DF2\u6709page-container\u7EC4\u4EF6\uFF0C\u6CE8\u5165\u5931\u8D25`);
     return code;
   }
   if (!pageInfo.backConfig.preventDefault) {
-    pageInfo.callbackCode += "uni.navigateBack({ delta: 1 });";
+    callbackCode += "uni.navigateBack({ delta: 1 });";
   }
   const importUseMpWeixinBack = `import { useMpWeixinBack } from '${virtualFileId}'`;
   const importRefFromVue = !pageInfo.hasImportRef ? `import { ref } from 'vue'` : "";
@@ -144,7 +168,7 @@ function compositionWalk(context, code, sfc, id) {
         __MP_BACK_FREQUENCY__++
       }
       ${configBack}
-      ${pageInfo.callbackCode}
+      ${callbackCode}
     };
   `;
   const { template, scriptSetup } = sfc;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mp-weixin-back",
   "type": "module",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "监听微信小程序的手势返回和页面默认导航栏的返回",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -41,15 +41,10 @@
     "@babel/generator": "^7.26.2",
     "@babel/parser": "^7.26.2",
     "@babel/traverse": "^7.25.9",
-    "@vitejs/plugin-vue": "^5.2.0",
-    "@vue/test-utils": "^2.4.6",
     "ast-kit": "^1.3.1",
-    "happy-dom": "^15.11.6",
     "json5": "^2.2.3",
     "kolorist": "^1.8.0",
-    "magic-string": "^0.30.13",
-    "typescript": "^5.7.2",
-    "vitest": "^2.1.5"
+    "magic-string": "^0.30.13"
   },
   "peerDependencies": {
     "@vue/compiler-sfc": "^2.7.0 || ^3.0.0",
@@ -61,7 +56,12 @@
   "devDependencies": {
     "@types/babel__generator": "^7.6.8",
     "@types/node": "^22.9.3",
+    "@vitejs/plugin-vue": "^5.2.0",
+    "@vue/test-utils": "^2.4.6",
+    "happy-dom": "^15.11.6",
+    "typescript": "^5.7.2",
     "unbuild": "^2.0.0",
+    "vitest": "^2.1.5",
     "vue": "^3.5.13"
   }
 }

package/utils/walker.ts

@@ -4,7 +4,9 @@ import { babelParse, walkAST } from 'ast-kit'
 import { pageContext } from '../src/context'
 import { virtualFileId } from './constant'
 import type {
+  WithStatement,
   BlockStatement,
+  Statement,
   FunctionExpression,
   Node,
   ObjectExpression,
@@ -29,7 +31,8 @@ function compositionWalk(context: pageContext, code: string, sfc: any, id: strin
     pageBackFnName: 'onPageBack',
     hasImportRef: false,
     backConfig: { ...context.config },
-    callbackCode: '',
+    onPageBackBodyAst: [] as Statement[],
+    onPageBackCallNodeToRemove: null as Node | null,
     activeFnName: 'activeMpBack',
     inActiveFnName: 'inactiveMpBack',
   }
@@ -81,6 +84,8 @@ function compositionWalk(context: pageContext, code: string, sfc: any, id: strin
           node.expression.type === 'CallExpression' &&
           node.expression.callee.loc?.identifierName === pageInfo.pageBackFnName
         ) {
+          // 记录下整个 onPageBack(...) 语句节点，以便后续移除
+          pageInfo.onPageBackCallNodeToRemove = node
           const callback = node.expression.arguments[0]
           const backArguments = node.expression.arguments[1]
 
@@ -96,16 +101,11 @@ function compositionWalk(context: pageContext, code: string, sfc: any, id: strin
             callback &&
             (callback.type === 'ArrowFunctionExpression' || callback.type === 'FunctionExpression')
           ) {
-            const body = callback.body
-            if (body.type === 'BlockStatement') {
-              pageInfo.callbackCode += body.body
-                .map(
-                  // @ts-ignore
-                  (statement) => (generate.default ? generate.default : generate)(statement).code
-                )
-                .join('')
-            }
+            pageInfo.onPageBackBodyAst = callback.body.body
           }
+
+          // 跳过此节点的子节点遍历，因为我们将手动处理其内部逻辑
+          return
         }
 
         if (
@@ -146,13 +146,49 @@ function compositionWalk(context: pageContext, code: string, sfc: any, id: strin
   // 没有引入mp-weixin-back-helper
   if (!pageInfo.hasPageBack) return code
 
+  if (pageInfo.onPageBackCallNodeToRemove) {
+    const scriptSetupOffset = sfc.scriptSetup!.loc.start.offset
+    const nodeToRemove = pageInfo.onPageBackCallNodeToRemove as any
+    const globalStart = scriptSetupOffset + nodeToRemove.start
+    const globalEnd = scriptSetupOffset + nodeToRemove.end
+    codeMs.remove(globalStart, globalEnd)
+  }
+
+  let callbackCode = ''
+  if (pageInfo.onPageBackBodyAst.length > 0) {
+    // 包装成一个临时的 AST 根节点以供遍历
+    const tempAstRoot = {
+      type: 'BlockStatement',
+      body: pageInfo.onPageBackBodyAst,
+    } as WithStatement
+
+    walkAST(tempAstRoot, {
+      enter(node: any) {
+        if (node.type === 'CallExpression' && node.callee.type === 'Identifier') {
+          const createIdentifier = (name: string) => ({ type: 'Identifier', name })
+
+          if (node.callee.name === pageInfo.activeFnName) {
+            node.arguments.unshift(createIdentifier('__MP_WEIXIN_ACTIVEBACK__'))
+          } else if (node.callee.name === pageInfo.inActiveFnName) {
+            node.arguments.unshift(createIdentifier('__MP_WEIXIN_INACTIVEBACK__'))
+          }
+        }
+      },
+    })
+
+    callbackCode = pageInfo.onPageBackBodyAst
+      // @ts-ignore
+      .map((statement) => (generate.default ? generate.default : generate)(statement).code)
+      .join('\n')
+  }
+
   if (code.includes('<page-container')) {
     context.log.debugLog(`${context.getPageById(id)}页面已有page-container组件，注入失败`)
     return code
   }
 
   if (!pageInfo.backConfig.preventDefault) {
-    pageInfo.callbackCode += 'uni.navigateBack({ delta: 1 });'
+    callbackCode += 'uni.navigateBack({ delta: 1 });'
   }
 
   const importUseMpWeixinBack = `import { useMpWeixinBack } from '${virtualFileId}'`
@@ -188,7 +224,7 @@ function compositionWalk(context: pageContext, code: string, sfc: any, id: strin
         __MP_BACK_FREQUENCY__++
       }
       ${configBack}
-      ${pageInfo.callbackCode}
+      ${callbackCode}
     };
   `
   const { template, scriptSetup } = sfc