diff --git a/.mocharc.js b/.mocharc.js
index ab96a00..cf1fcd1 100644
--- a/.mocharc.js
+++ b/.mocharc.js
@@ -1,6 +1,6 @@
module.exports = {
require: ["@babel/register"],
recursive: true,
- spec: "test/**/llw.test.js",
+ spec: "test/**/*.test.js",
timeout: 20000,
}
\ No newline at end of file
diff --git a/test/node-modules/cases/wcc.test.js b/test/node-modules/cases/wcc.test.js
new file mode 100644
index 0000000..e6ffacc
--- /dev/null
+++ b/test/node-modules/cases/wcc.test.js
@@ -0,0 +1,51 @@
+const assert = require("assert");
+const ASTHelper = require("../../runner/ast-helper");
+const path = require("path");
+const fs = require("fs");
+const COMPILER = require('../wcc_node/lib/index')
+
+const originDE = assert.deepEqual
+assert.deepEqual = function(){
+ // console.log(arguments[0])
+ try {
+ originDE.apply(this, arguments)
+ } catch (error) {
+ console.log('\t默认deepEqual检测失败,尝试检测语法')
+ const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]))
+ const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]))
+ originDE(dw, dn);
+ }
+}
+
+describe("wcc - lla", function () {
+ describe("lla: node output should deep equal with wine", function () {
+ it("case1", async function () {
+ const casePath = path.resolve(__dirname, './wcc/case1')
+ const configPath = path.resolve(__dirname, './wcc/case1/config.json')
+ const projectPath = path.resolve(
+ __dirname,
+ "../../examples/miniprogram-demo/miniprogram"
+ );
+ const storagePath = path.resolve(
+ __dirname,
+ `wcc/case1/output`
+ );
+ const config = JSON.parse(fs.readFileSync(configPath).toString());
+ config.cwd = path.join(configPath, config.cwd)
+ try {
+ fs.mkdirSync(storagePath, { recursive: true });
+ } catch (error) {}
+
+ let nodeResult = await COMPILER.wcc(config);
+ nodeResult = nodeResult.substring(0, nodeResult.length - 1)
+
+ const wineResult = fs.readFileSync(`${casePath}/output/wcc_node_wine.js`)
+ fs.writeFileSync(
+ `${storagePath}/node-output.js`,
+ nodeResult
+ );
+ assert.equal(wineResult, nodeResult);
+ });
+
+ });
+});
\ No newline at end of file
diff --git a/test/node-modules/cases/wcc/case1/config.json b/test/node-modules/cases/wcc/case1/config.json
index 000c20a..d965728 100644
--- a/test/node-modules/cases/wcc/case1/config.json
+++ b/test/node-modules/cases/wcc/case1/config.json
@@ -9,6 +9,6 @@
"replaceContent": {
"./packageComponent/pages/camera-scan-code/camera-scan-code.wxml": "\n\n\n\n \n\n \n \n \n \n \n \n \n \n \n \n\n \n\n"
},
- "cwd": "miniprogram-demo/miniprogram/",
+ "cwd": "../../../../../examples/miniprogram-demo/miniprogram/",
"lazyloadConfig": ""
}
\ No newline at end of file
diff --git a/test/node-modules/wcc_node b/test/node-modules/wcc_node
new file mode 120000
index 0000000..75bce1e
--- /dev/null
+++ b/test/node-modules/wcc_node
@@ -0,0 +1 @@
+../../wcc_node
\ No newline at end of file
diff --git a/test/node-modules/wcc_test.js b/test/node-modules/wcc_test.js
index 608a880..9d6cc88 100755
--- a/test/node-modules/wcc_test.js
+++ b/test/node-modules/wcc_test.js
@@ -5,165 +5,10 @@ const path = require('path')
const scan = require('./utils/scan')
const MODE = typeof nw === 'object' ? 'wine' : 'linux'
-const wcc_options = []
-const wcc_options1 = {
- "files": ["./miniprogram_npm/miniprogram-barrage/index.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml", "./miniprogram_npm/wxml-to-canvas/index.wxml", "./page/API/index.wxml", "./page/API/components/set-tab-bar/set-tab-bar.wxml", "./page/cloud/index.wxml", "./page/common/foot.wxml", "./page/common/head.wxml", "./page/component/index.wxml", "./page/extend/index.wxml"],
- "debugWXS": false,
- "debug": true,
- "genfuncname": "$gwx",
- "isCut": true,
- "wxmlCompileConfig": "9>_<1027./miniprogram_npm/miniprogram-barrage/index.wxml>_<10270>_<1027./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml>_<10270>_<1027./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml>_<10270>_<1027./miniprogram_npm/wxml-to-canvas/index.wxml>_<10270>_<1027./page/API/index.wxml>_<10271>_<1027set-tab-bar>_<1027./page/API/components/set-tab-bar/set-tab-bar.wxml>_<10270>_<1027./page/cloud/index.wxml>_<10270>_<1027./page/component/index.wxml>_<10270>_<1027./page/extend/index.wxml>_<10270",
- "wxmlCompileConfigSplit": ">_<1027",
- "replaceContent": {
- "./packageComponent/pages/camera-scan-code/camera-scan-code.wxml": "\n\n\n\n \n\n \n \n \n \n \n \n \n \n \n \n\n \n\n"
- },
- "cwd": "/mnt/disk1/WeChatProjects/miniprogram-demo/miniprogram/",
- "lazyloadConfig": ""
-}
-wcc_options.push([wcc_options1, 1])
-const wcc_options2 = {
- "files": ["./miniprogram_npm/miniprogram-barrage/index.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml", "./miniprogram_npm/wxml-to-canvas/index.wxml", "./page/API/index.wxml", "./page/API/components/set-tab-bar/set-tab-bar.wxml", "./page/cloud/index.wxml", "./page/common/foot.wxml", "./page/common/head.wxml", "./page/component/index.wxml", "./page/extend/index.wxml", "./packageComponent/pages/canvas/canvas-2d/canvas-2d.wxml", "./packageComponent/pages/canvas/webgl/webgl.wxml", "./packageComponent/pages/content/icon/icon.wxml", "./packageComponent/pages/content/progress/progress.wxml", "./packageComponent/pages/content/rich-text/rich-text.wxml", "./packageComponent/pages/content/text/text.wxml", "./packageComponent/pages/form/button/button.wxml", "./packageComponent/pages/form/checkbox/checkbox.wxml", "./packageComponent/pages/form/editor/editor.wxml", "./packageComponent/pages/form/form/form.wxml", "./packageComponent/pages/form/input/input.wxml", "./packageComponent/pages/form/label/label.wxml", "./packageComponent/pages/form/picker/picker.wxml", "./packageComponent/pages/form/picker-view/picker-view.wxml", "./packageComponent/pages/form/radio/radio.wxml", "./packageComponent/pages/form/slider/slider.wxml", "./packageComponent/pages/form/switch/switch.wxml", "./packageComponent/pages/form/textarea/textarea.wxml", "./packageComponent/pages/map/map/map.wxml", "./packageComponent/pages/media/camera/camera.wxml", "./packageComponent/pages/media/image/image.wxml", "./packageComponent/pages/media/live-player/live-player.wxml", "./packageComponent/pages/media/live-pusher/live-pusher.wxml", "./packageComponent/pages/media/video/video.wxml", "./packageComponent/pages/nav/navigator/navigator.wxml", "./packageComponent/pages/obstacle-free/aria-component/aria-component.wxml", "./packageComponent/pages/open/ad/ad.wxml", "./packageComponent/pages/open/open-data/open-data.wxml", "./packageComponent/pages/open/web-view/web-view.wxml", "./packageComponent/pages/view/cover-view/cover-view.wxml", "./packageComponent/pages/view/movable-view/movable-view.wxml", "./packageComponent/pages/view/scroll-view/scroll-view.wxml", "./packageComponent/pages/view/swiper/swiper.wxml", "./packageComponent/pages/view/view/view.wxml"],
- "debugWXS": false,
- "debug": true,
- "genfuncname": "$7061636b616765436f6d706f6e656e742f",
- "wxmlCompileConfig": "34>_<3253./packageComponent/pages/canvas/canvas-2d/canvas-2d.wxml>_<32530>_<3253./packageComponent/pages/canvas/webgl/webgl.wxml>_<32530>_<3253./packageComponent/pages/content/icon/icon.wxml>_<32530>_<3253./packageComponent/pages/content/progress/progress.wxml>_<32530>_<3253./packageComponent/pages/content/rich-text/rich-text.wxml>_<32530>_<3253./packageComponent/pages/content/text/text.wxml>_<32530>_<3253./packageComponent/pages/form/button/button.wxml>_<32530>_<3253./packageComponent/pages/form/checkbox/checkbox.wxml>_<32530>_<3253./packageComponent/pages/form/editor/editor.wxml>_<32530>_<3253./packageComponent/pages/form/form/form.wxml>_<32530>_<3253./packageComponent/pages/form/input/input.wxml>_<32530>_<3253./packageComponent/pages/form/label/label.wxml>_<32530>_<3253./packageComponent/pages/form/picker/picker.wxml>_<32530>_<3253./packageComponent/pages/form/picker-view/picker-view.wxml>_<32530>_<3253./packageComponent/pages/form/radio/radio.wxml>_<32530>_<3253./packageComponent/pages/form/slider/slider.wxml>_<32530>_<3253./packageComponent/pages/form/switch/switch.wxml>_<32530>_<3253./packageComponent/pages/form/textarea/textarea.wxml>_<32530>_<3253./packageComponent/pages/map/map/map.wxml>_<32530>_<3253./packageComponent/pages/media/camera/camera.wxml>_<32530>_<3253./packageComponent/pages/media/image/image.wxml>_<32530>_<3253./packageComponent/pages/media/live-player/live-player.wxml>_<32530>_<3253./packageComponent/pages/media/live-pusher/live-pusher.wxml>_<32530>_<3253./packageComponent/pages/media/video/video.wxml>_<32530>_<3253./packageComponent/pages/nav/navigator/navigator.wxml>_<32530>_<3253./packageComponent/pages/obstacle-free/aria-component/aria-component.wxml>_<32530>_<3253./packageComponent/pages/open/ad/ad.wxml>_<32530>_<3253./packageComponent/pages/open/open-data/open-data.wxml>_<32530>_<3253./packageComponent/pages/open/web-view/web-view.wxml>_<32530>_<3253./packageComponent/pages/view/cover-view/cover-view.wxml>_<32530>_<3253./packageComponent/pages/view/movable-view/movable-view.wxml>_<32530>_<3253./packageComponent/pages/view/scroll-view/scroll-view.wxml>_<32530>_<3253./packageComponent/pages/view/swiper/swiper.wxml>_<32530>_<3253./packageComponent/pages/view/view/view.wxml>_<32530",
- "wxmlCompileConfigSplit": ">_<3253",
- "replaceContent": {
- "./packageComponent/pages/camera-scan-code/camera-scan-code.wxml": "\n\n\n\n \n\n \n \n \n \n \n \n \n \n \n \n\n \n\n"
- },
- "cwd": "/mnt/disk1/WeChatProjects/miniprogram-demo/miniprogram/",
- "lazyloadConfig": ""
-}
-wcc_options.push([wcc_options2, 2])
-const wcc_options3 = {
- "files": ["./miniprogram_npm/miniprogram-barrage/index.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml", "./miniprogram_npm/wxml-to-canvas/index.wxml", "./page/API/index.wxml", "./page/API/components/set-tab-bar/set-tab-bar.wxml", "./page/cloud/index.wxml", "./page/common/foot.wxml", "./page/common/head.wxml", "./page/component/index.wxml", "./page/extend/index.wxml"],
- "debugWXS": false,
- "debug": true,
- "genfuncname": "$gwx",
- "isCut": true,
- "wxmlCompileConfig": "9>_<3589./miniprogram_npm/miniprogram-barrage/index.wxml>_<35890>_<3589./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml>_<35890>_<3589./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml>_<35890>_<3589./miniprogram_npm/wxml-to-canvas/index.wxml>_<35890>_<3589./page/API/index.wxml>_<35891>_<3589set-tab-bar>_<3589./page/API/components/set-tab-bar/set-tab-bar.wxml>_<35890>_<3589./page/cloud/index.wxml>_<35890>_<3589./page/component/index.wxml>_<35890>_<3589./page/extend/index.wxml>_<35890",
- "wxmlCompileConfigSplit": ">_<3589",
- "replaceContent": {
- "./packageComponent/pages/camera-scan-code/camera-scan-code.wxml": "\n\n\n\n \n\n \n \n \n \n \n \n \n \n \n \n\n \n\n"
- },
- "cwd": "/mnt/disk1/WeChatProjects/miniprogram-demo/miniprogram/",
- "lazyloadConfig": ""
-}
-wcc_options.push([wcc_options3, 3])
-const wcc_options4 = {
- "files": ["./miniprogram_npm/miniprogram-barrage/index.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml", "./miniprogram_npm/wxml-to-canvas/index.wxml", "./page/API/index.wxml", "./page/API/components/set-tab-bar/set-tab-bar.wxml", "./page/cloud/index.wxml", "./page/common/foot.wxml", "./page/common/head.wxml", "./page/component/index.wxml", "./page/extend/index.wxml"],
- "debugWXS": false,
- "debug": true,
- "genfuncname": "$gwx",
- "wxmlCompileConfig": "9>_<5170./miniprogram_npm/miniprogram-barrage/index.wxml>_<51700>_<5170./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml>_<51700>_<5170./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml>_<51700>_<5170./miniprogram_npm/wxml-to-canvas/index.wxml>_<51700>_<5170./page/API/index.wxml>_<51701>_<5170set-tab-bar>_<5170./page/API/components/set-tab-bar/set-tab-bar.wxml>_<51700>_<5170./page/cloud/index.wxml>_<51700>_<5170./page/component/index.wxml>_<51700>_<5170./page/extend/index.wxml>_<51700",
- "wxmlCompileConfigSplit": ">_<5170",
- "replaceContent": {
- "./packageComponent/pages/camera-scan-code/camera-scan-code.wxml": "\n\n\n\n \n\n \n \n \n \n \n \n \n \n \n \n\n \n\n"
- },
- "cwd": "/mnt/disk1/WeChatProjects/miniprogram-demo/miniprogram/",
- "lazyloadConfig": ""
-}
-wcc_options.push([wcc_options4, 4])
-const wcc_options5 = {
- "files": ["./miniprogram_npm/miniprogram-barrage/index.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml", "./miniprogram_npm/wxml-to-canvas/index.wxml", "./page/API/index.wxml", "./page/API/components/set-tab-bar/set-tab-bar.wxml", "./page/cloud/index.wxml", "./page/common/foot.wxml", "./page/common/head.wxml", "./page/component/index.wxml", "./page/extend/index.wxml", "./packageComponent/pages/canvas/canvas-2d/canvas-2d.wxml", "./packageComponent/pages/canvas/webgl/webgl.wxml", "./packageComponent/pages/content/icon/icon.wxml", "./packageComponent/pages/content/progress/progress.wxml", "./packageComponent/pages/content/rich-text/rich-text.wxml", "./packageComponent/pages/content/text/text.wxml", "./packageComponent/pages/form/button/button.wxml", "./packageComponent/pages/form/checkbox/checkbox.wxml", "./packageComponent/pages/form/editor/editor.wxml", "./packageComponent/pages/form/form/form.wxml", "./packageComponent/pages/form/input/input.wxml", "./packageComponent/pages/form/label/label.wxml", "./packageComponent/pages/form/picker/picker.wxml", "./packageComponent/pages/form/picker-view/picker-view.wxml", "./packageComponent/pages/form/radio/radio.wxml", "./packageComponent/pages/form/slider/slider.wxml", "./packageComponent/pages/form/switch/switch.wxml", "./packageComponent/pages/form/textarea/textarea.wxml", "./packageComponent/pages/map/map/map.wxml", "./packageComponent/pages/media/camera/camera.wxml", "./packageComponent/pages/media/image/image.wxml", "./packageComponent/pages/media/live-player/live-player.wxml", "./packageComponent/pages/media/live-pusher/live-pusher.wxml", "./packageComponent/pages/media/video/video.wxml", "./packageComponent/pages/nav/navigator/navigator.wxml", "./packageComponent/pages/obstacle-free/aria-component/aria-component.wxml", "./packageComponent/pages/open/ad/ad.wxml", "./packageComponent/pages/open/open-data/open-data.wxml", "./packageComponent/pages/open/web-view/web-view.wxml", "./packageComponent/pages/view/cover-view/cover-view.wxml", "./packageComponent/pages/view/movable-view/movable-view.wxml", "./packageComponent/pages/view/scroll-view/scroll-view.wxml", "./packageComponent/pages/view/swiper/swiper.wxml", "./packageComponent/pages/view/view/view.wxml"],
- "debugWXS": false,
- "debug": true,
- "genfuncname": "$7061636b616765436f6d706f6e656e742f",
- "isCut": true,
- "wxmlCompileConfig": "34>_<6946./packageComponent/pages/canvas/canvas-2d/canvas-2d.wxml>_<69460>_<6946./packageComponent/pages/canvas/webgl/webgl.wxml>_<69460>_<6946./packageComponent/pages/content/icon/icon.wxml>_<69460>_<6946./packageComponent/pages/content/progress/progress.wxml>_<69460>_<6946./packageComponent/pages/content/rich-text/rich-text.wxml>_<69460>_<6946./packageComponent/pages/content/text/text.wxml>_<69460>_<6946./packageComponent/pages/form/button/button.wxml>_<69460>_<6946./packageComponent/pages/form/checkbox/checkbox.wxml>_<69460>_<6946./packageComponent/pages/form/editor/editor.wxml>_<69460>_<6946./packageComponent/pages/form/form/form.wxml>_<69460>_<6946./packageComponent/pages/form/input/input.wxml>_<69460>_<6946./packageComponent/pages/form/label/label.wxml>_<69460>_<6946./packageComponent/pages/form/picker/picker.wxml>_<69460>_<6946./packageComponent/pages/form/picker-view/picker-view.wxml>_<69460>_<6946./packageComponent/pages/form/radio/radio.wxml>_<69460>_<6946./packageComponent/pages/form/slider/slider.wxml>_<69460>_<6946./packageComponent/pages/form/switch/switch.wxml>_<69460>_<6946./packageComponent/pages/form/textarea/textarea.wxml>_<69460>_<6946./packageComponent/pages/map/map/map.wxml>_<69460>_<6946./packageComponent/pages/media/camera/camera.wxml>_<69460>_<6946./packageComponent/pages/media/image/image.wxml>_<69460>_<6946./packageComponent/pages/media/live-player/live-player.wxml>_<69460>_<6946./packageComponent/pages/media/live-pusher/live-pusher.wxml>_<69460>_<6946./packageComponent/pages/media/video/video.wxml>_<69460>_<6946./packageComponent/pages/nav/navigator/navigator.wxml>_<69460>_<6946./packageComponent/pages/obstacle-free/aria-component/aria-component.wxml>_<69460>_<6946./packageComponent/pages/open/ad/ad.wxml>_<69460>_<6946./packageComponent/pages/open/open-data/open-data.wxml>_<69460>_<6946./packageComponent/pages/open/web-view/web-view.wxml>_<69460>_<6946./packageComponent/pages/view/cover-view/cover-view.wxml>_<69460>_<6946./packageComponent/pages/view/movable-view/movable-view.wxml>_<69460>_<6946./packageComponent/pages/view/scroll-view/scroll-view.wxml>_<69460>_<6946./packageComponent/pages/view/swiper/swiper.wxml>_<69460>_<6946./packageComponent/pages/view/view/view.wxml>_<69460",
- "wxmlCompileConfigSplit": ">_<6946",
- "replaceContent": {
- "./packageComponent/pages/camera-scan-code/camera-scan-code.wxml": "\n\n\n\n \n\n \n \n \n \n \n \n \n \n \n \n\n \n\n"
- },
- "cwd": "/mnt/disk1/WeChatProjects/miniprogram-demo/miniprogram/",
- "lazyloadConfig": ""
-}
-wcc_options.push([wcc_options5, 5])
-const wcc_options6 = {
- "files": ["./miniprogram_npm/miniprogram-barrage/index.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml", "./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml", "./miniprogram_npm/wxml-to-canvas/index.wxml", "./page/API/index.wxml", "./page/API/components/set-tab-bar/set-tab-bar.wxml", "./page/cloud/index.wxml", "./page/common/foot.wxml", "./page/common/head.wxml", "./page/component/index.wxml", "./page/extend/index.wxml"],
- "debugWXS": false,
- "debug": true,
- "genfuncname": "$gwx",
- "wxmlCompileConfig": "9>_<4575./miniprogram_npm/miniprogram-barrage/index.wxml>_<45750>_<4575./miniprogram_npm/miniprogram-recycle-view/recycle-item.wxml>_<45750>_<4575./miniprogram_npm/miniprogram-recycle-view/recycle-view.wxml>_<45750>_<4575./miniprogram_npm/wxml-to-canvas/index.wxml>_<45750>_<4575./page/API/index.wxml>_<45751>_<4575set-tab-bar>_<4575./page/API/components/set-tab-bar/set-tab-bar.wxml>_<45750>_<4575./page/cloud/index.wxml>_<45750>_<4575./page/component/index.wxml>_<45750>_<4575./page/extend/index.wxml>_<45750",
- "wxmlCompileConfigSplit": ">_<4575",
- "replaceContent": {
- "./page/component/index.wxml": "\n \n \n \n 以下将展示小程序官方组件能力,组件样式仅供参考,开发者可根据自身需求自定义组件样式,具体属性参数详见 小程序开发文档。\n \n \n \n \n \n \n {{item.name}}\n \n \n \n\n \n \n \n \n {{page.name}}\n \n \n \n {{page}}\n {{page}}\n adsfdrvnujre\n \n \n \n \n \n \n \n \n \n"
- },
- "cwd": "/mnt/disk1/WeChatProjects/miniprogram-demo/miniprogram/",
- "lazyloadConfig": "./miniprogram_npm/miniprogram-barrage/index>_<4575./miniprogram_npm/miniprogram-recycle-view/recycle-item>_<4575./miniprogram_npm/miniprogram-recycle-view/recycle-view>_<4575./miniprogram_npm/wxml-to-canvas/index>_<4575./page/API/index>_<4575./page/API/components/set-tab-bar/set-tab-bar>_<4575./page/cloud/index>_<4575./page/component/index>_<4575./page/extend/index"
-}
-wcc_options.push([wcc_options6, 6])
-
-const wcc_options7 = {
- "files": ["./pages/index/index.wxml", "./pages/logs/logs.wxml"],
- "debugWXS": false,
- "debug": true,
- "genfuncname": "$gwx",
- "wxmlCompileConfig": "2>_<4665./pages/index/index.wxml>_<46650>_<4665./pages/logs/logs.wxml>_<46650",
- "wxmlCompileConfigSplit": ">_<4665",
- "replaceContent": {
- "./pages/index/index.wxml": "\n\n \n odd \n \n \n even \n \n\n \n \n \n\n\n \n {{index}}: {{msg}} \n Time: {{time}} \n \n\n\n\n \n \n \n \n \n \n \n \n \n \n 请使用1.4.4及以上版本基础库 \n \n \n \n {{userInfo.nickName}}\n \n \n \n {{motto}}\n \n"
- },
- "cwd": "/mnt/disk1/WeChatProjects/we1",
- "lazyloadConfig": "./pages/index/index>_<4665./pages/logs/logs"
-}
-wcc_options.push([wcc_options7, 7])
-const wcc_options8 = {
- "pageCount": 2,
- "files": ["./pages/index/index.wxss", "./pages/logs/logs.wxss", "./app.wxss"],
- "cwd": "/mnt/disk1/WeChatProjects/we1",
- "lazyload": true,
- "replaceContent": {
- "./pages/index/index.wxss": "/**index.wxss**/\n.userinfo {\n display: flex;\n flex-direction: column;\n align-items: center;\n color: #aaa;\n}\n\n.userinfo-avatar {\n overflow: hidden;\n width: 128rpx;\n height: 128rpx;\n margin: 20rpx;\n border-radius: 50%;\n}\n\n.usermotto {\n margin-top: 200px;\n}"
- },
- "debug": true
-}
-// wcc_options.push([wcc_options8, 8])
-const wcc_options9 = {
- "pageCount": 2,
- "files": ["./pages/index/index.wxss", "./pages/logs/logs.wxss", "./app.wxss"],
- "cwd": "/mnt/disk1/WeChatProjects/we1",
- "replaceContent": {
- "./pages/index/index.wxss": "/**index.wxss**/\n.userinfo {\n display: flex;\n flex-direction: column;\n align-items: center;\n color: #aaa;\n}\n\n.userinfo-avatar {\n overflow: hidden;\n width: 128rpx;\n height: 128rpx;\n margin: 20rpx;\n border-radius: 50%;\n}\n\n.usermotto {\n margin-top: 200px;\n}"
- },
- "debug": true
-}
-wcc_options.push([wcc_options9, 9])
-const wcc_options10 = {
- "files": ["./pages/index/index.wxml", "./pages/logs/logs.wxml"],
- "debugWXS": false,
- "debug": true,
- "genfuncname": "$gwx",
- "isCut": true,
- "wxmlCompileConfig": "2>_<8436./pages/index/index.wxml>_<84360>_<8436./pages/logs/logs.wxml>_<84360",
- "wxmlCompileConfigSplit": ">_<8436",
- "replaceContent": {
- "./pages/index/index.wxml": "\n\n \n odd \n \n \n even \n \n\n \n \n \n\n\n \n {{index}}: {{msg}} \n Time: {{time}} \n \n\n\n\n \n \n \n \n \n \n \n \n \n \n 请使用1.4.4及以上版本基础库 \n \n \n \n {{userInfo.nickName}}\n \n \n \n {{motto}}\n \n"
- },
- "cwd": "/mnt/disk1/WeChatProjects/we1",
- "lazyloadConfig": ""
-}
-wcc_options.push([wcc_options10, 10])
-const wcc_options11 = {
- "files": ["./pages/index/index.wxml", "./pages/logs/logs.wxml"],
- "debugWXS": false,
- "debug": true,
- "genfuncname": "$gwx",
- "isCut": true,
- "wxmlCompileConfig": "2>_<6482./pages/index/index.wxml>_<64820>_<6482./pages/logs/logs.wxml>_<64820",
- "wxmlCompileConfigSplit": ">_<6482",
- "replaceContent": {
- "./pages/index/index.wxml": "\n\n \n odd \n \n \n even \n \n\n \n \n \n\n\n \n {{index}}: {{msg}} \n Time: {{time}} \n \n\n\n\n \n \n \n \n \n \n \n \n \n \n 请使用1.4.4及以上版本基础库 \n \n \n \n {{userInfo.nickName}}\n \n \n \n {{motto}}\n \n"
- },
- "cwd": "/mnt/disk1/WeChatProjects/we1",
- "lazyloadConfig": "./pages/index/index>_<6482./pages/logs/logs"
-}
-wcc_options.push([wcc_options11, 11])
-
const run = async (filepath) => {
const configStr = fs.readFileSync(filepath).toString()
const options = JSON.parse(configStr)
- options.cwd = path.join(__dirname, '../examples', options.cwd)
+ options.cwd = path.join(filepath, options.cwd)
const outputPath = path.dirname(filepath) + '/output'
console.log('outputPath:', outputPath)
try {
diff --git a/test/runner/code.js b/test/runner/code.js
deleted file mode 100644
index 6554e3f..0000000
--- a/test/runner/code.js
+++ /dev/null
@@ -1,48 +0,0 @@
-
-const keyword = `abstract|arguments|boolean|break|byte|case|catch|char|class|const|continue|debugger|default|delete|do|double|else|enum|eval|export|extends|false|final|finally|float|for|function|goto|if|implements|import|in|instanceof|int|interface|let|long|native|new|null|package|private|protected|public|return|short|static|super|switch|synchronized|this|throw|throws|transient|true|try|typeof|var|void|volatile|while|with|yield|Array|Date|eval|function|hasOwnProperty|Infinity|isFinite|isNaN|isPrototypeOf|length|Math|NaN|name|Number|Object|prototype|String|toString|undefined|valueOf`;
-const keywords = keyword.split("|");
-function delVariables(code) {
- code = " " + code + " ";
-
- let pos1 = 0,
- pos2 = 0;
- let len = code.length;
- let isVariables = false;
- let ret = "";
- while (pos1 < len) {
- pos2++;
- if (isVariables) {
- if (
- code
- .substring(pos2, pos2 + 2)
- .replace(/[0-9a-zA-Z_][^a-zA-Z_0-9]/g, "") == ""
- ) {
- isVariables = false;
- const vv = code.substring(pos1, pos2 + 1);
- if (keywords.includes(vv)) {
- ret += vv;
- //System.out.println("vv="+vv);
- }
- pos1 = pos2 + 1;
- }
- } else {
- if (
- code
- .substring(pos2, pos2 + 2)
- .replace(/[^\._a-zA-Z][_a-zA-Z]/, "") == ""
- ) {
- isVariables = true;
- ret += code.substring(pos1, pos2 + 1);
- //System.out.println(code.substring(pos1,pos2+1));
- pos1 = pos2 + 1;
- }
- }
- if (pos2 == len) break;
- }
-
- return ret.toString().trim();
- //return code.replaceAll("(?<=([^\\._a-zA-Z]))[a-zA-Z_]+[0-9_a-zA-Z]*(?=([^a-zA-Z_]))", "");
-}
-export{
- delVariables
-}
diff --git a/test/wcc/lla/lla.test.js b/test/wcc/lla/lla.test.js
index 5168c3f..c2b5963 100644
--- a/test/wcc/lla/lla.test.js
+++ b/test/wcc/lla/lla.test.js
@@ -1,7 +1,7 @@
const assert = require("assert");
const node = require("../../runner/node");
const wine = require("../../runner/wine");
-const CODE = require("../../runner/code");
+const ASTHelper = require("../../runner/ast-helper");
const path = require("path");
const fs = require("fs");
@@ -11,11 +11,10 @@ assert.deepEqual = function(){
try {
originDE.apply(this, arguments)
} catch (error) {
-
- const dw = CODE.delVariables(JSON.stringify(arguments[0]))
- const dn = CODE.delVariables(JSON.stringify(arguments[1]))
- console.log('\tdeepEqual检测失败,尝试检测语法(测试中)')
- assert.equal(dw, dn);
+ console.log('\t默认deepEqual检测失败,尝试检测语法')
+ const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]))
+ const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]))
+ originDE(dw, dn);
}
}
diff --git a/test/wcsc/ll.test.js b/test/wcsc/ll.test.js
index a6a4d06..c9ccfd9 100644
--- a/test/wcsc/ll.test.js
+++ b/test/wcsc/ll.test.js
@@ -46,11 +46,11 @@ describe("wcsc", function () {
fs.mkdirSync(storagePath, {recursive: true});
} catch (error) {}
fs.writeFileSync(
- `${storagePath}/wine.json`,
+ `${storagePath}/wine-output.json`,
JSON.stringify(w, null, 4)
);
fs.writeFileSync(
- `${storagePath}/node.json`,
+ `${storagePath}/node-output.json`,
JSON.stringify(n, null, 4)
);
assert.deepEqual(w, n);
@@ -68,11 +68,11 @@ describe("wcsc", function () {
fs.mkdirSync(storagePath, {recursive: true});
} catch (error) {}
fs.writeFileSync(
- `${storagePath}/wine.json`,
+ `${storagePath}/wine-output.json`,
JSON.stringify(w, null, 4)
);
fs.writeFileSync(
- `${storagePath}/node.json`,
+ `${storagePath}/node-output.json`,
JSON.stringify(n, null, 4)
);
assert.deepEqual(w, n);
diff --git a/wcc_node/lib/wcc.js b/wcc_node/lib/wcc.js
index b828648..c970ffc 100644
--- a/wcc_node/lib/wcc.js
+++ b/wcc_node/lib/wcc.js
@@ -40,7 +40,7 @@ exports = async function (options) {
},
options,
)
-
+
return new Promise(async (resolve, reject) => {
let st = Date.now()