Fixed merge conflict

es6.js

@@ -1,21 +1,37 @@
 const fs = require("fs");
+const path = require("path");
+const prettier = require("prettier");
+const { exec } = require("child_process");
+
+async function fix(path) {
+    new Promise(res => {
+        exec(`yarn eslint --fix ${path}`, () => {
+            res();
+        });
+    });
+}
 
-const srcName = process.argv[2];
+async function handleFile(srcName) {
+    const sourceCode = fs.readFileSync(srcName).toString();
 
-const sourceCode = fs.readFileSync(srcName).toString();
+    const result = /BI\.(.*?)\s\=\sBI\.inherit\(/.exec(sourceCode);
+    if (!result) {
+        console.log(`可能是已经es6过了 ${srcName}`);
 
-const clzName = /BI\.(.*?)\s\=\sBI\.inherit\(/.exec(sourceCode)[1];
+        return;
+    }
+    const clzName = result[1];
 
-const superName = /inherit\(BI\.(.*?),/.exec(sourceCode)[1];
+    const superName = /inherit\(BI\.(.*?),/.exec(sourceCode)[1];
 
-// const xtype = /BI.shortcut\(\"(.*?)\"/.exec(sourceCode)[1];
+    // const xtype = /BI.shortcut\(\"(.*?)\"/.exec(sourceCode)[1];
 
-const collection = {
+    const collection = {
         "static": {},
         attr: {},
-};
+    };
 
-const BI = {
+    const BI = {
         inherit(_, options) {
             collection.methods = Object.keys(options)
                 .filter(key => typeof options[key] === "function")
@@ -31,34 +47,34 @@ const BI = {
         shortcut(xtype) {
             collection.xtype = xtype;
         },
-};
+    };
 
-eval(sourceCode);
+    eval(sourceCode);
 
-let M = "";
+    let M = "";
-let E = "";
+    let E = "";
-let I = "";
+    let I = "";
-let A = "";
+    let A = "";
 
-const coreImport = {
+    const coreImport = {
         shortcut: true,
-};
+    };
 
-if (superName === "Widget") {
+    if (superName === "Widget") {
         coreImport.Widget = true;
-}
+    }
 
-Object.keys(collection.attr).forEach(key => {
+    Object.keys(collection.attr).forEach(key => {
         A = `${key} = ${JSON.stringify(collection.attr[key])};`;
-});
+    });
 
-// 静态方法
+    // 静态方法
-Object.keys(collection.static).forEach(key => {
+    Object.keys(collection.static).forEach(key => {
         E += `\tstatic ${key} = "${collection.static[key]}"\n`;
-});
+    });
 
-// 对函数进行替换
+    // 对函数进行替换
-collection.methods.forEach(el => {
+    collection.methods.forEach(el => {
         let f = `${el.toString().replace(/^function/, el.name)}\n`;
 
         // 换 BI.Button.superclass
@@ -118,13 +134,13 @@ collection.methods.forEach(el => {
         });
 
         M += `${f}\n`;
-});
+    });
 
-Object.keys(coreImport).forEach(el => {
+    Object.keys(coreImport).forEach(el => {
         I += `${el},`;
-});
+    });
 
-const outputCode = `
+    const outputCode = `
 import {${I}} from "@/core"
 
 @shortcut()
@@ -139,5 +155,36 @@ ${M}
 }
 `;
 
-// fs.writeFileSync(`${srcName}.js.raw`, sourceCode);
+    const prettierCode = prettier.format(outputCode);
-fs.writeFileSync(srcName, outputCode);
+    fs.writeFileSync(srcName, prettierCode);
+    await fix(srcName);
+
+    return clzName;
+}
+
+async function traverse(srcName) {
+    if (srcName.indexOf("__test__") >= 0) return;
+
+    if (srcName.endsWith(".js")) {
+        return await handleFile(srcName);
+    } else {
+        const stat = fs.statSync(srcName);
+        const flag = stat.isDirectory();
+        if (flag) {
+            const files = fs.readdirSync(srcName);
+            // let indexContent = "";
+            for (let i = 0; i < files.length; i++) {
+                const file = files[i];
+                await traverse(path.resolve(srcName, file));
+                // const clzName = await traverse(path.resolve(srcName, file));
+                // const moduleName = path.basename(srcName).replace(/.js$/, "");
+                // if (clzName) {
+                //     indexContent += `export { ${clzName} } from '${moduleName}'\n`;
+                // }
+            }
+        }
+    }
+}
+
+const srcName = process.argv[2];
+traverse(srcName);

package.json

@@ -25,7 +25,7 @@
     "cross-env": "6.0.0",
     "css-loader": "3.0.0",
     "es6-promise": "4.2.8",
-    "eslint": "6.0.1",
+    "eslint": "7.32.0",
     "expose-loader": "0.7.5",
     "express": "4.15.2",
     "fork-ts-checker-webpack-plugin": "1.4.3",
@@ -47,6 +47,7 @@
     "optimize-css-assets-webpack-plugin": "5.0.3",
     "postcss-loader": "3.0.0",
     "postcss-simple-vars": "5.0.2",
+    "prettier": "2.8.2",
     "puppeteer": "^13.3.0",
     "rimraf": "3.0.2",
     "script-loader": "0.7.2",