@kezh/my-custom-js-converter 1.0.1 → 1.1.2

package/core/context/map_context.d.ts

@@ -12,6 +12,7 @@ export declare class MapContext {
     getMethodNamesByMod(name: string): string[];
     getDependencyNameByMod(name: string): string[];
     getSrcPathByMod(name: string): string | undefined;
+    getAbsoluteSrcPathByMod(name: string): string | undefined;
     static readFromLocal(inDir: string): MapContext;
     private init;
     private writeToLocal;

package/core/context/map_context.js

@@ -8,6 +8,7 @@ const map_config_1 = require("../config/map_config");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const ast_1 = require("../util/ast");
+const parent_path_1 = require("../util/parent_path");
 class MapContext {
     constructor(srcPath = "", entry = "", outDir = "", initMap = false) {
         this.map = new map_config_1.MapConfig();
@@ -47,6 +48,13 @@ class MapContext {
         var _a;
         return (_a = this.getMod(name)) === null || _a === void 0 ? void 0 : _a.src;
     }
+    getAbsoluteSrcPathByMod(name) {
+        const srcPath = this.getSrcPathByMod(name);
+        const parentRootDir = (0, parent_path_1.getParentRootDir)();
+        return parentRootDir && srcPath
+            ? path_1.default.resolve(parentRootDir, srcPath)
+            : srcPath;
+    }
     static readFromLocal(inDir) {
         const inPath = path_1.default.join(inDir, MapContext.SAVE_FILE);
         console.log(`input map => ${inPath}`);
@@ -59,7 +67,7 @@ class MapContext {
         }
         catch (err) {
             console.log("the map is not found!");
-            console.log(err);
+            // console.log(err);
         }
         return new MapContext();
     }
@@ -98,7 +106,8 @@ class MapContext {
             const dep = new map_config_1.Dependency(requireMethodNamesByMod.get(name));
             dependencies[name] = dep;
         });
-        const mod = new map_config_1.Mod(inPath, dependencies);
+        const parentRootDir = (0, parent_path_1.getParentRootDir)();
+        const mod = new map_config_1.Mod(parentRootDir ? path_1.default.relative(parentRootDir, inPath) : inPath, dependencies);
         this.appendModMap(mod, root, entry);
         [...requireModPathByName.entries()].forEach(([name, modPath]) => {
             this.buildMapContext(modPath, name, false);
@@ -112,7 +121,7 @@ class MapContext {
             const mod = this.getMod(modName);
             const dependencies = mod.dependencies;
             Object.keys(dependencies).forEach((depName) => {
-                const srcAst = (0, ast_1.parseSrcAst)(this.getSrcPathByMod(depName));
+                const srcAst = (0, ast_1.parseSrcAst)(this.getAbsoluteSrcPathByMod(depName));
                 const methodNames = (0, ast_1.getObjectMethodNames)((0, ast_1.getObjectMethodsByEntryAndMethodNames)(srcAst, depName, dependencies[depName].methods));
                 dependencies[depName].methods = methodNames;
             });
@@ -124,7 +133,7 @@ class MapContext {
     shaking() {
         const astMap = new Map();
         this.getModNames().forEach((mod) => {
-            astMap.set(mod, (0, ast_1.parseSrcAst)(this.getMod(mod).src));
+            astMap.set(mod, (0, ast_1.parseSrcAst)(this.getAbsoluteSrcPathByMod(mod)));
         });
         const useMethodNameMap = new Map();
         this.getModNames().forEach((mod) => {

package/core/decode/index.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const os_1 = require("os");
 const prettier_1 = __importDefault(require("prettier"));
 const config_1 = require("../config");
 const scanf_1 = require("../scanf");
@@ -36,7 +37,7 @@ function decoding$0(inPath, outPath, config) {
     let src = fs_1.default.readFileSync(inPath, {
         encoding: "utf-8"
     });
-    src = `const ${config.decode.mount} = {${src}};\r\nmodule.exports = ${config.decode.mount};`;
+    src = `const ${config.decode.mount} = {${src}};${os_1.EOL}module.exports = ${config.decode.mount};`;
     const srcAst = (0, parser_1.parse)(src);
     if (!core_1.types.isNode(srcAst)) {
         return;
@@ -44,7 +45,7 @@ function decoding$0(inPath, outPath, config) {
     (0, ast_1.importMods)(path_1.default.dirname(outPath), srcAst, mapContext);
     (0, ast_1.deleteModMethods)(srcAst, mapContext);
     let { code: dist } = (0, generator_1.default)(srcAst, { compact: true });
-    dist = dist.replace(/},\n\n/g, "},\n");
+    dist = dist.replace(/},\n\n/g, `},${os_1.EOL}`);
     dist = prettier_1.default.format(dist, {
         parser: "babel",
         trailingComma: "none"

package/core/encode/index.js

@@ -27,8 +27,7 @@ const ast_1 = require("../util/ast");
 function encoding$0(mapContext, entry) {
     const modNames = mapContext.getModNames();
     return modNames.flatMap((name) => {
-        const mod = mapContext.getMod(name);
-        const srcAst = (0, ast_1.parseSrcAst)(mod === null || mod === void 0 ? void 0 : mod.src);
+        const srcAst = (0, ast_1.parseSrcAst)(mapContext.getAbsoluteSrcPathByMod(name));
         // console.log(`import => ${name}`);
         const srcMethods = [];
         const self = name === "self";

package/core/util/ast.js

@@ -11,6 +11,7 @@ const generator_1 = __importDefault(require("@babel/generator"));
 const core_1 = require("@babel/core");
 const scanf_1 = require("../scanf");
 const path_1 = require("path");
+const os_1 = require("os");
 function parseSrcAst(srcPath) {
     if (!srcPath) {
         return;
@@ -32,7 +33,7 @@ function outputObjectMethods(outPath, methods) {
     })
         .map((m) => (0, generator_1.default)(m))
         .map((m) => m.code)
-        .join(",\n");
+        .join(`,${os_1.EOL}`);
     fs_1.default.writeFileSync(outPath, dist, "utf-8");
 }
 exports.outputObjectMethods = outputObjectMethods;
@@ -327,7 +328,7 @@ exports.getDependentMethodNames = getDependentMethodNames;
 function importMods(outDir, srcAst, mapContext) {
     const depNames = mapContext.getDependencyNameByMod("self");
     const importMods = depNames.map((name) => {
-        const srcPath = mapContext.getSrcPathByMod(name);
+        const srcPath = mapContext.getAbsoluteSrcPathByMod(name);
         const requireFrom = (0, path_1.relative)(outDir, srcPath.replace(/(index)?\.js$/, "")).replace(/[\\]+/g, "/");
         const variableDeclarator = core_1.types.variableDeclarator(core_1.types.identifier(name), core_1.types.callExpression(core_1.types.identifier("require"), [
             core_1.types.stringLiteral(requireFrom)

package/core/util/parent_path.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 获取父项目根路径
+ * @returns 若被父项目依赖则返回父项目根目录,否则返回undefined
+ */
+export declare function getParentRootDir(): string | undefined;

package/core/util/parent_path.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getParentRootDir = void 0;
+/**
+ * 获取父项目根路径
+ * @returns 若被父项目依赖则返回父项目根目录,否则返回undefined
+ */
+function getParentRootDir() {
+    const curDir = __dirname;
+    if (curDir.search(/node_modules.*/) === -1) {
+        return undefined;
+    }
+    return curDir.replace(/node_modules.*/g, "");
+}
+exports.getParentRootDir = getParentRootDir;

package/package.json

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