@kezh/my-custom-js-converter 0.0.25 → 0.0.27

package/core/config/index.d.ts

@@ -6,6 +6,7 @@ export declare namespace Config {
         decode: DecodeConfig;
         baseDir: string;
         target: string[];
+        workDir: string;
         customConfig: string;
     }
     interface SubConfig {

package/core/config/index.js

@@ -32,6 +32,7 @@ function config() {
         },
         baseDir: "",
         target: [""],
+        workDir: ".setting",
         customConfig: "config.json",
     };
     const curDir = __dirname;
@@ -42,9 +43,11 @@ function config() {
         const json = fs_1.default.readFileSync(configPath, { encoding: "utf-8" });
         const customConfig = JSON.parse(json);
         defConfig.baseDir = baseDir;
-        defConfig.target = customConfig.target;
-        defConfig.encode = customConfig.encode;
-        defConfig.decode = customConfig.decode;
+        Object.keys(customConfig).map(key => key).forEach((key) => {
+            if (customConfig[key]) {
+                defConfig[key] = customConfig[key];
+            }
+        });
     }
     catch (err) { }
     return defConfig;

package/core/decode.js

@@ -16,6 +16,7 @@ const TARGET_DIR = (0, scanf_1.scanfCodeDirs)(config_1.default.baseDir, config_1
 const DECODE_FILE = config_1.default.decode.file;
 const OUTPUT_FILE = config_1.default.decode.output;
 const MOUNT = config_1.default.decode.mount;
+const WORK_DIR = config_1.default.workDir;
 const CUSTOM_CONFIG = config_1.default.customConfig;
 (function decoding(targetDirs = TARGET_DIR) {
     console.log("scanf dirs => ");
@@ -44,16 +45,18 @@ function decoding$0(inPath, outPath, mount = MOUNT) {
     importMods(path_1.default.dirname(outPath), customConfig.mod, srcAst);
     deleteModMethods(customConfig.mod, srcAst);
     let { code: dist } = (0, generator_1.default)(srcAst);
-    dist = dist.replace(/},\n\n/g, '},\n');
+    dist = dist.replace(/},\n\n/g, "},\n");
     dist = prettier_1.default.format(dist, {
-        parser: 'babel',
-        trailingComma: 'none'
+        parser: "babel",
+        trailingComma: "none"
     });
     fs_1.default.writeFileSync(outPath, dist, "utf-8");
 }
 function importMods(outDir, mods, srcAst) {
     const importMods = mods.map((mod) => {
-        const requireFrom = path_1.default.relative(outDir, mod.path.replace(/index\.js$/, '')).replace(/[\\]+/g, '/');
+        const requireFrom = path_1.default
+            .relative(outDir, mod.path.replace(/index\.js$/, ""))
+            .replace(/[\\]+/g, "/");
         const variableDeclarator = core_1.types.variableDeclarator(core_1.types.identifier(mod.name), core_1.types.callExpression(core_1.types.identifier("require"), [
             core_1.types.stringLiteral(requireFrom)
         ]));
@@ -98,8 +101,8 @@ function deleteModMethods(mods, srcAst) {
         }
     });
 }
-function loadCustomConfig(inPath, config = CUSTOM_CONFIG) {
-    const configPath = path_1.default.join(inPath, config);
+function loadCustomConfig(inPath, workDir = WORK_DIR, config = CUSTOM_CONFIG) {
+    const configPath = path_1.default.join(inPath, workDir, config);
     let configObj = {
         mod: [],
         version: ""

package/core/encode.js

@@ -39,6 +39,7 @@ const ENCODE_FILE = config_1.default.encode.file;
 const OUTPUT_FILE = config_1.default.encode.output;
 const ENTRY = config_1.default.encode.entry;
 const IGNORE_MOD = config_1.default.encode.ignoreMod;
+const WORK_DIR = config_1.default.workDir;
 const CUSTOM_CONFIG = config_1.default.customConfig;
 (function encoding(targetDirs = TARGET_DIR) {
     console.log("scanf dirs => ");
@@ -326,6 +327,12 @@ function modifyModMethods(mod, methodNames, modAst) {
                 if (methodNames.includes(property.name)) {
                     if (core_1.types.isIdentifier(path.node.object) ||
                         core_1.types.isThisExpression(path.node.object)) {
+                        if (core_1.types.isIdentifier(path.node.object)) {
+                            const object = path.node.object;
+                            if (object.name !== mod) {
+                                return;
+                            }
+                        }
                         property.name = `${property.name}__${mod}`;
                     }
                 }
@@ -333,13 +340,14 @@ function modifyModMethods(mod, methodNames, modAst) {
         }
     });
 }
-function refreshCustomConfig(modPathByName, inPath, config = CUSTOM_CONFIG) {
-    const configPath = path_1.default.join(inPath, config);
+function refreshCustomConfig(modPathByName, inPath, workDir = WORK_DIR, custConfig = CUSTOM_CONFIG) {
+    const configPath = path_1.default.join(inPath, workDir, custConfig);
     let configObj = {
         mod: [],
         version: ""
     };
     try {
+        mkWorkDir(inPath);
         fs_1.default.accessSync(configPath, fs_1.default.constants.F_OK);
         const data = fs_1.default.readFileSync(configPath, { encoding: "utf-8" });
         configObj = JSON.parse(data);
@@ -350,3 +358,12 @@ function refreshCustomConfig(modPathByName, inPath, config = CUSTOM_CONFIG) {
     configObj.mod = [...modPathByName.entries()].map(([key, value]) => new config_1.Config.Mod(key, value));
     fs_1.default.writeFileSync(configPath, JSON.stringify(configObj, null, 4), "utf-8");
 }
+function mkWorkDir(inPath, workDir = WORK_DIR) {
+    const workDirPath = path_1.default.join(inPath, workDir);
+    try {
+        fs_1.default.accessSync(workDirPath);
+    }
+    catch (err) {
+        fs_1.default.mkdirSync(workDirPath);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kezh/my-custom-js-converter",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "description": "自定义代码转换器",
   "main": "index.js",
   "bin": {