mirror of
https://github.com/msojocs/wx-compiler.git
synced 2025-07-19 00:00:04 +08:00
fix: 循环检测
This commit is contained in:
parent
dfa388b4f0
commit
2637bd92d9
@ -5,16 +5,15 @@ const scan = require("../../utils/scan");
|
|||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const COMPILER = require("../../../../wcc_node/lib/index");
|
const COMPILER = require("../../../../wcc_node/lib/index");
|
||||||
|
|
||||||
const originDE = assert.deepEqual;
|
assert.deepEqual2 = function () {
|
||||||
assert.deepEqual = function () {
|
|
||||||
// console.log(arguments[0])
|
// console.log(arguments[0])
|
||||||
try {
|
try {
|
||||||
originDE.apply(this, arguments);
|
assert.deepEqual.apply(this, arguments);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log("\t默认deepEqual检测失败,尝试检测语法");
|
console.log("\t默认deepEqual检测失败,尝试检测语法");
|
||||||
const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]));
|
const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]));
|
||||||
const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]));
|
const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]));
|
||||||
originDE(dw, dn);
|
assert.deepEqual(dw, dn);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -45,7 +44,7 @@ describe("module wcc", function () {
|
|||||||
`${casePath}/output/wine-output.json`
|
`${casePath}/output/wine-output.json`
|
||||||
));
|
));
|
||||||
fs.writeFileSync(`${storagePath}/node-output.json`, JSON.stringify(nodeResult, null, 4));
|
fs.writeFileSync(`${storagePath}/node-output.json`, JSON.stringify(nodeResult, null, 4));
|
||||||
assert.deepEqual(wineResult, nodeResult);
|
assert.deepEqual2(wineResult, nodeResult);
|
||||||
}else{
|
}else{
|
||||||
nodeResult = nodeResult.substring(0, nodeResult.length - 1);
|
nodeResult = nodeResult.substring(0, nodeResult.length - 1);
|
||||||
const wineResult = fs.readFileSync(
|
const wineResult = fs.readFileSync(
|
||||||
|
@ -5,16 +5,15 @@ const scan = require("../../utils/scan");
|
|||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const COMPILER = require("../../../../wcc_node/lib/index");
|
const COMPILER = require("../../../../wcc_node/lib/index");
|
||||||
|
|
||||||
const originDE = assert.deepEqual;
|
assert.deepEqual2 = function () {
|
||||||
assert.deepEqual = function () {
|
|
||||||
// console.log(arguments[0])
|
// console.log(arguments[0])
|
||||||
try {
|
try {
|
||||||
originDE.apply(this, arguments);
|
assert.deepEqual.apply(this, arguments);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log("\t默认deepEqual检测失败,尝试检测语法");
|
console.log("\t默认deepEqual检测失败,尝试检测语法");
|
||||||
const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]));
|
const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]));
|
||||||
const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]));
|
const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]));
|
||||||
originDE(dw, dn);
|
assert.deepEqual(dw, dn);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -44,7 +43,7 @@ describe("module wcsc", function () {
|
|||||||
`${casePath}/output/wine-output.json`
|
`${casePath}/output/wine-output.json`
|
||||||
).toString());
|
).toString());
|
||||||
fs.writeFileSync(`${storagePath}/node-output.json`, JSON.stringify(nodeResult, null, 4));
|
fs.writeFileSync(`${storagePath}/node-output.json`, JSON.stringify(nodeResult, null, 4));
|
||||||
assert.deepEqual(wineResult, nodeResult);
|
assert.deepEqual2(wineResult, nodeResult);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,7 @@ const wcc = (args, projectPath, outputPath = undefined) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export {
|
module.exports= {
|
||||||
wcsc,
|
wcsc,
|
||||||
wcc
|
wcc
|
||||||
}
|
}
|
@ -73,7 +73,7 @@ const wcc = (args, projectPath) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export {
|
module.exports = {
|
||||||
wcsc,
|
wcsc,
|
||||||
wcc
|
wcc
|
||||||
}
|
}
|
@ -5,16 +5,15 @@ const ASTHelper = require("../../runner/ast-helper");
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
|
|
||||||
const originDE = assert.deepEqual
|
assert.deepEqual2 = function(){
|
||||||
assert.deepEqual = function(){
|
|
||||||
// console.log(arguments[0])
|
// console.log(arguments[0])
|
||||||
try {
|
try {
|
||||||
originDE.apply(this, arguments)
|
assert.deepEqual.apply(this, arguments)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log('\t默认deepEqual检测失败,尝试检测语法')
|
console.log('\t默认deepEqual检测失败,尝试检测语法')
|
||||||
const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]))
|
const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]))
|
||||||
const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]))
|
const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]))
|
||||||
originDE(dw, dn);
|
assert.deepEqual(dw, dn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,7 +73,7 @@ describe("wcc - lla", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("组件 - 视图容器", async function () {
|
it("组件 - 视图容器", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -136,8 +135,10 @@ describe("wcc - lla", function () {
|
|||||||
try {
|
try {
|
||||||
fs.mkdirSync(storagePath, { recursive: true });
|
fs.mkdirSync(storagePath, { recursive: true });
|
||||||
} catch (error) {}
|
} catch (error) {}
|
||||||
const w = JSON.parse(await wine.wcc(args, projectPath));
|
|
||||||
const n = JSON.parse(await node.wcc(args, projectPath, storagePath));
|
const n = JSON.parse(await node.wcc(args, projectPath, storagePath));
|
||||||
|
// console.log(n)
|
||||||
|
const w = JSON.parse(await wine.wcc(args, projectPath));
|
||||||
|
console.log(w)
|
||||||
fs.writeFileSync(
|
fs.writeFileSync(
|
||||||
`${storagePath}/wine-output.json`,
|
`${storagePath}/wine-output.json`,
|
||||||
JSON.stringify(w, null, 4)
|
JSON.stringify(w, null, 4)
|
||||||
@ -146,7 +147,8 @@ describe("wcc - lla", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
console.log(w, n)
|
||||||
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("组件 - skyline", async function () {
|
it("组件 - skyline", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -188,7 +190,7 @@ describe("wcc - lla", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("组件 - skyline - 自定义路由 #变量名不同导致比较不通过,需要手动检查", async function () {
|
it("组件 - skyline - 自定义路由 #变量名不同导致比较不通过,需要手动检查", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -239,7 +241,7 @@ describe("wcc - lla", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("扩展能力 - 表单 - cell", async function () {
|
it("扩展能力 - 表单 - cell", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -332,7 +334,7 @@ describe("wcc - lla", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("接口 - 微信登录", async function () {
|
it("接口 - 微信登录", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -447,7 +449,7 @@ describe("wcc - lla", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -5,16 +5,15 @@ const ASTHelper = require("../../runner/ast-helper");
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
|
|
||||||
const originDE = assert.deepEqual
|
assert.deepEqual2 = function(){
|
||||||
assert.deepEqual = function(){
|
|
||||||
// console.log(arguments[0])
|
// console.log(arguments[0])
|
||||||
try {
|
try {
|
||||||
originDE.apply(this, arguments)
|
assert.deepEqual.apply(this, arguments)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log('\t默认deepEqual检测失败,尝试检测语法')
|
console.log('\t默认deepEqual检测失败,尝试检测语法')
|
||||||
const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]))
|
const dw = ASTHelper.code2ast(JSON.stringify(arguments[0]))
|
||||||
const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]))
|
const dn = ASTHelper.code2ast(JSON.stringify(arguments[1]))
|
||||||
originDE(dw, dn);
|
assert.deepEqual(dw, dn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,7 +73,7 @@ describe("wcc - llw", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("组件 - 视图容器", async function () {
|
it("组件 - 视图容器", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -146,7 +145,7 @@ describe("wcc - llw", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("组件 - skyline", async function () {
|
it("组件 - skyline", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -188,7 +187,7 @@ describe("wcc - llw", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("组件 - skyline - 自定义路由 # 变量名不同,需要手动检测", async function () {
|
it("组件 - skyline - 自定义路由 # 变量名不同,需要手动检测", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -239,7 +238,7 @@ describe("wcc - llw", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("扩展能力 - 表单 - cell # 变量名不同,需要手动检测", async function () {
|
it("扩展能力 - 表单 - cell # 变量名不同,需要手动检测", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -290,7 +289,7 @@ describe("wcc - llw", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
it("接口 - 微信登录", async function () {
|
it("接口 - 微信登录", async function () {
|
||||||
const projectPath = path.resolve(
|
const projectPath = path.resolve(
|
||||||
@ -405,7 +404,7 @@ describe("wcc - llw", function () {
|
|||||||
`${storagePath}/node-output.json`,
|
`${storagePath}/node-output.json`,
|
||||||
JSON.stringify(n, null, 4)
|
JSON.stringify(n, null, 4)
|
||||||
);
|
);
|
||||||
assert.deepEqual(w, n);
|
assert.deepEqual2(w, n);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
const assert = require("assert");
|
const assert = require("assert");
|
||||||
const node = require("../runner/node");
|
const node = require("../../runner/node");
|
||||||
const wine = require("../runner/wine");
|
const wine = require("../../runner/wine");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
const assert = require("assert");
|
const assert = require("assert");
|
||||||
const node = require("../runner/node");
|
const node = require("../../runner/node");
|
||||||
const wine = require("../runner/wine");
|
const wine = require("../../runner/wine");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user