mp-weixin-back 0.0.5 → 0.0.7

package/build.config.ts

@@ -8,5 +8,5 @@ export default defineBuildConfig({
     emitCJS: true,
   },
   failOnWarn: false,
-  externals: ['vite', 'vue']
-})
+  externals: ['vite', 'vue', '@babel/generator'],
+})

package/dist/index.cjs

@@ -3,6 +3,7 @@
 const path = require('path');
 const fs = require('fs');
 const JSON5 = require('json5');
+const kolorist = require('kolorist');
 const generate = require('@babel/generator');
 const compilerSfc = require('@vue/compiler-sfc');
 const astKit = require('ast-kit');
@@ -63,14 +64,17 @@ async function transformVueFile(code, id) {
           const callback = node.expression.arguments[0];
           const backArguments = node.expression.arguments[1];
           if (backArguments && backArguments.type == "ObjectExpression") {
-            const config = new Function(`return (${generate__default(backArguments).code});`)();
+            const config = new Function(
+              // @ts-ignore
+              `return (${(generate__default.default ? generate__default.default : generate__default)(backArguments).code});`
+            )();
             pageBackConfig = { ...pageBackConfig, ...config };
           }
           if (callback && (callback.type === "ArrowFunctionExpression" || callback.type === "FunctionExpression")) {
             const body = callback.body;
             if (body.type === "BlockStatement") {
               body.body.forEach((statement) => {
-                callbackCode += generate__default(statement).code;
+                callbackCode += (generate__default.default ? generate__default.default : generate__default)(statement).code;
               });
             }
           }
@@ -80,6 +84,7 @@ async function transformVueFile(code, id) {
   }
   if (!hasPageBack)
     return;
+  this.log.devLog(`\u9875\u9762${this.getPageById(id)}\u6CE8\u5165mp-weixin-back`);
   if (!pageBackConfig.preventDefault) {
     callbackCode += `uni.navigateBack({ delta: 1 });`;
   }
@@ -145,6 +150,19 @@ class pageContext {
   constructor(config) {
     __publicField(this, "config");
     __publicField(this, "pages", []);
+    __publicField(this, "log", {
+      info: (text) => {
+        console.log(kolorist.white(text));
+      },
+      error: (text) => {
+        console.log(kolorist.red(text));
+      },
+      devLog: (text) => {
+        if (this.config.mode === "development" && this.config.debug) {
+          console.log(kolorist.green(text));
+        }
+      }
+    });
     this.config = config;
   }
   getPagesJsonPath() {
@@ -168,16 +186,19 @@ class pageContext {
         this.pages.push(...mainPages);
       }
       if (subpackages) {
-        const root = subpackages.root;
-        const subPages = subpackages.pages.reduce((acc, current) => {
-          acc.push(`${root}/${current.path}`.replace("//", "/"));
-          return acc;
-        }, []);
-        this.pages.push(...subPages);
+        for (let i = 0; i < subpackages.length; i++) {
+          const element = subpackages[i];
+          const root = element.root;
+          const subPages = element.pages.reduce((acc, current) => {
+            acc.push(`${root}/${current.path}`.replace("//", "/"));
+            return acc;
+          }, []);
+          this.pages.push(...subPages);
+        }
       }
     } catch (error) {
-      console.error("\u8BFB\u53D6pages.json\u6587\u4EF6\u5931\u8D25");
-      console.error(error);
+      this.log.error("\u8BFB\u53D6pages.json\u6587\u4EF6\u5931\u8D25");
+      this.log.devLog(String(error));
     }
   }
   // 获取指定id的page
@@ -195,7 +216,8 @@ function MpBackPlugin(userOptions = {}) {
   let context;
   const defaultOptions = {
     preventDefault: false,
-    frequency: 1
+    frequency: 1,
+    debug: false
   };
   const options = { ...defaultOptions, ...userOptions };
   return {

package/dist/index.d.cts

@@ -10,6 +10,10 @@ type Config = {
      * 阻止次数，默认是 `1`
      */
     frequency: number;
+    /**
+     * 调试模式
+     */
+    debug: boolean;
     /**
      * 页面回退时触发
      */

package/dist/index.d.mts

@@ -10,6 +10,10 @@ type Config = {
      * 阻止次数，默认是 `1`
      */
     frequency: number;
+    /**
+     * 调试模式
+     */
+    debug: boolean;
     /**
      * 页面回退时触发
      */

package/dist/index.d.ts

@@ -10,6 +10,10 @@ type Config = {
      * 阻止次数，默认是 `1`
      */
     frequency: number;
+    /**
+     * 调试模式
+     */
+    debug: boolean;
     /**
      * 页面回退时触发
      */

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 import JSON5 from 'json5';
+import { white, red, green } from 'kolorist';
 import generate from '@babel/generator';
 import { parse } from '@vue/compiler-sfc';
 import { babelParse, walkAST } from 'ast-kit';
@@ -54,14 +55,17 @@ async function transformVueFile(code, id) {
           const callback = node.expression.arguments[0];
           const backArguments = node.expression.arguments[1];
           if (backArguments && backArguments.type == "ObjectExpression") {
-            const config = new Function(`return (${generate(backArguments).code});`)();
+            const config = new Function(
+              // @ts-ignore
+              `return (${(generate.default ? generate.default : generate)(backArguments).code});`
+            )();
             pageBackConfig = { ...pageBackConfig, ...config };
           }
           if (callback && (callback.type === "ArrowFunctionExpression" || callback.type === "FunctionExpression")) {
             const body = callback.body;
             if (body.type === "BlockStatement") {
               body.body.forEach((statement) => {
-                callbackCode += generate(statement).code;
+                callbackCode += (generate.default ? generate.default : generate)(statement).code;
               });
             }
           }
@@ -71,6 +75,7 @@ async function transformVueFile(code, id) {
   }
   if (!hasPageBack)
     return;
+  this.log.devLog(`\u9875\u9762${this.getPageById(id)}\u6CE8\u5165mp-weixin-back`);
   if (!pageBackConfig.preventDefault) {
     callbackCode += `uni.navigateBack({ delta: 1 });`;
   }
@@ -136,6 +141,19 @@ class pageContext {
   constructor(config) {
     __publicField(this, "config");
     __publicField(this, "pages", []);
+    __publicField(this, "log", {
+      info: (text) => {
+        console.log(white(text));
+      },
+      error: (text) => {
+        console.log(red(text));
+      },
+      devLog: (text) => {
+        if (this.config.mode === "development" && this.config.debug) {
+          console.log(green(text));
+        }
+      }
+    });
     this.config = config;
   }
   getPagesJsonPath() {
@@ -159,16 +177,19 @@ class pageContext {
         this.pages.push(...mainPages);
       }
       if (subpackages) {
-        const root = subpackages.root;
-        const subPages = subpackages.pages.reduce((acc, current) => {
-          acc.push(`${root}/${current.path}`.replace("//", "/"));
-          return acc;
-        }, []);
-        this.pages.push(...subPages);
+        for (let i = 0; i < subpackages.length; i++) {
+          const element = subpackages[i];
+          const root = element.root;
+          const subPages = element.pages.reduce((acc, current) => {
+            acc.push(`${root}/${current.path}`.replace("//", "/"));
+            return acc;
+          }, []);
+          this.pages.push(...subPages);
+        }
       }
     } catch (error) {
-      console.error("\u8BFB\u53D6pages.json\u6587\u4EF6\u5931\u8D25");
-      console.error(error);
+      this.log.error("\u8BFB\u53D6pages.json\u6587\u4EF6\u5931\u8D25");
+      this.log.devLog(String(error));
     }
   }
   // 获取指定id的page
@@ -186,7 +207,8 @@ function MpBackPlugin(userOptions = {}) {
   let context;
   const defaultOptions = {
     preventDefault: false,
-    frequency: 1
+    frequency: 1,
+    debug: false
   };
   const options = { ...defaultOptions, ...userOptions };
   return {

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "mp-weixin-back",
   "type": "module",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "监听微信小程序的手势返回和页面默认导航栏的返回",
-  "main": "./dist/index.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "scripts": {
     "build": "unbuild",
     "test": "vitest"
@@ -46,6 +48,7 @@
     "ast-kit": "^1.3.1",
     "happy-dom": "^15.11.6",
     "json5": "^2.2.3",
+    "kolorist": "^1.8.0",
     "typescript": "^5.7.2",
     "vitest": "^2.1.5"
   },

package/src/context.ts

@@ -1,12 +1,26 @@
 import path from 'path'
 import fs from 'fs'
 import JSON5 from 'json5'
+import { red, white, green } from 'kolorist'
 import { ContextConfig, PagesJson } from '../types'
 import { transformVueFile } from '../utils'
 
 export class pageContext {
   config: ContextConfig
   pages: string[] = []
+  log = {
+    info: (text: string) => {
+      console.log(white(text))
+    },
+    error: (text: string) => {
+      console.log(red(text))
+    },
+    devLog: (text: string) => {
+      if (this.config.mode === 'development' && this.config.debug) {
+        console.log(green(text))
+      }
+    },
+  }
 
   constructor(config: ContextConfig) {
     this.config = config
@@ -31,16 +45,19 @@ export class pageContext {
         this.pages.push(...mainPages)
       }
       if (subpackages) {
-        const root = subpackages.root
-        const subPages = subpackages.pages.reduce((acc: string[], current) => {
-          acc.push(`${root}/${current.path}`.replace('//', '/'))
-          return acc
-        }, [])
-        this.pages.push(...subPages)
+        for (let i = 0; i < subpackages.length; i++) {
+          const element = subpackages[i]
+          const root = element.root
+          const subPages = element.pages.reduce((acc: string[], current) => {
+            acc.push(`${root}/${current.path}`.replace('//', '/'))
+            return acc
+          }, [])
+          this.pages.push(...subPages)
+        }
       }
-    } catch (error) {
-      console.error('读取pages.json文件失败')
-      console.error(error)
+    } catch (error: unknown) {
+      this.log.error('读取pages.json文件失败')
+      this.log.devLog(String(error))
     }
   }
   // 获取指定id的page

package/src/index.ts

@@ -9,6 +9,7 @@ function MpBackPlugin(userOptions: UserOptions = {}): Plugin {
   const defaultOptions: Config = {
     preventDefault: false,
     frequency: 1,
+    debug: false,
   }
   const options = { ...defaultOptions, ...userOptions }
 

package/types/index.ts

@@ -9,6 +9,10 @@ export type Config = {
    * 阻止次数，默认是 `1`
    */
   frequency: number
+  /**
+   * 调试模式
+   */
+  debug: boolean
   /**
    * 页面回退时触发
    */
@@ -31,5 +35,5 @@ type Pages = { path: string }[]
 
 export type PagesJson = {
   pages: Pages
-  subpackages: { root: string; pages: Pages }
+  subpackages: { root: string; pages: Pages }[]
 }

package/utils/index.ts

@@ -71,7 +71,10 @@ export async function transformVueFile(this: pageContext, code: string, id: stri
           const backArguments = node.expression.arguments[1]
           // 第二个参数为object才有效，覆盖插件传入的配置
           if (backArguments && backArguments.type == 'ObjectExpression') {
-            const config = new Function(`return (${generate(backArguments).code});`)()
+            const config = new Function(
+              // @ts-ignore
+              `return (${(generate.default ? generate.default : generate)(backArguments).code});`
+            )()
             pageBackConfig = { ...pageBackConfig, ...config }
           }
 
@@ -83,7 +86,8 @@ export async function transformVueFile(this: pageContext, code: string, id: stri
             if (body.type === 'BlockStatement') {
               // 遍历 BlockStatement 的内容
               body.body.forEach((statement) => {
-                callbackCode += generate(statement).code // 将 AST 节点生成代码
+                // @ts-ignore
+                callbackCode += (generate.default ? generate.default : generate)(statement).code // 将 AST 节点生成代码
               })
             }
           }
@@ -94,6 +98,8 @@ export async function transformVueFile(this: pageContext, code: string, id: stri
 
   if (!hasPageBack) return
 
+  this.log.devLog(`页面${this.getPageById(id)}注入mp-weixin-back`)
+
   // 不阻止默认行为就返回到上一层
   if (!pageBackConfig.preventDefault) {
     callbackCode += `uni.navigateBack({ delta: 1 });`