js-code-detector 0.0.51 → 0.0.52

package/dist/cjs/index.d.ts

@@ -20,7 +20,7 @@ export declare function gitDiffDetect(): Promise<{
                 effectsDownstream: string[];
             }[];
         }[];
-        type: "modify" | "add" | "delete";
+        type: "add" | "delete" | "modify";
         filesDependsOnMe: string[];
         undefinedIdentifiers: string[];
         filePath: string;

package/dist/cjs/services/projectServiceClass/UmiProjectService.js

@@ -96,5 +96,10 @@ var UmiProjectService = class {
       return effectedExportNames.includes(value);
     });
     this.outputResult.effectedImportUsage = effectedImportUsage;
+    const token = this.detectService.gitInfo.token;
+    if (!token) {
+      const pwd = (0, import_path.join)(this.detectService.directoryInfo.tmpWorkDir, "..");
+      (0, import_fs.writeFileSync)((0, import_path.join)(pwd, "effectedImportUsage.json"), JSON.stringify({ tree: madgeResult == null ? void 0 : madgeResult.tree, projectFileList, possibleEffectedFiles, gitDiffDetailFiles: gitDiffDetail.map((e) => e.filePath), validGitDiffDetail, effectedImportUsage }, null, 2));
+    }
   }
 };

package/dist/cjs/services/projectServiceClass/VueProjectService.d.ts

@@ -12,6 +12,7 @@ export default class VueProjectService implements ProjectService {
         webpackConfigPath: string;
         webpackConfigTextLines: string[];
         entryFiles: string[];
+        extensions: string[];
     };
     constructor(detectService: DetectService);
     run(): Promise<void>;
@@ -22,9 +23,11 @@ export default class VueProjectService implements ProjectService {
     createSimpleWebpackConfig(): {
         resolve: {
             alias: Record<string, any>;
+            extensions: string[];
         };
     };
     getEntryFiles(): void;
+    getWebpackExtensions(): void;
     getWebpackAlias(): void;
     getMadgeResult(): Promise<void>;
     collectEffectedFiles(): Promise<void>;

package/dist/cjs/services/projectServiceClass/VueProjectService.js

@@ -58,7 +58,8 @@ var VueProjectService = class {
       madgeResult: null,
       webpackConfigPath: "",
       webpackConfigTextLines: [],
-      entryFiles: []
+      entryFiles: [],
+      extensions: []
     };
     this.detectService = detectService;
   }
@@ -82,13 +83,16 @@ var VueProjectService = class {
     const targetDirPath = this.detectService.directoryInfo.targetBranchDir;
     this.vueHelpInfo.webpackConfigTextLines = webpackConfigText.split("\n");
     this.getWebpackAlias();
+    this.getWebpackExtensions();
     this.getEntryFiles();
+    import_utils.logger.info("生成简单的 webpack 配置...");
     const wb = this.createSimpleWebpackConfig();
     (0, import_fs.writeFileSync)(this.vueHelpInfo.webpackConfigPath = (0, import_path.join)(targetDirPath, "webpack.config.js"), `module.exports = ${JSON.stringify(wb, null, 2)}`, "utf-8");
     await this.getMadgeResult();
   }
   async getWebpackConfigText() {
     const targetDirPath = this.detectService.directoryInfo.targetBranchDir;
+    import_utils.logger.info("执行 npx vue-cli-service inspect");
     let [err, data] = await (0, import_await_to_js.default)(import_utils.execa.execa(`cd ${targetDirPath} && npx vue-cli-service inspect`, { shell: true }));
     if (err) {
       await import_utils.execa.execa(`cd ${targetDirPath} && yarn`, { shell: true });
@@ -103,7 +107,8 @@ var VueProjectService = class {
   createSimpleWebpackConfig() {
     return {
       resolve: {
-        alias: this.helpInfo.parsedAlias
+        alias: this.helpInfo.parsedAlias,
+        extensions: this.vueHelpInfo.extensions
       }
     };
   }
@@ -127,7 +132,26 @@ var VueProjectService = class {
     entryObject = eval(`(${entryLinesJoin})`);
     this.vueHelpInfo.entryFiles = Object.values({ ...entryObject }).flat();
   }
+  getWebpackExtensions() {
+    import_utils.logger.info("获取 webpack extensions...");
+    const lines = this.vueHelpInfo.webpackConfigTextLines;
+    let extensions = "";
+    let extensionsFind = false;
+    for (const line of lines) {
+      if (!extensionsFind && line.trim().startsWith("extensions:")) {
+        extensionsFind = true;
+        extensions += line.trim().replace(/^\s*extensions:\s*/, "");
+      } else if (extensionsFind && line.trim().startsWith("]")) {
+        extensions += line.replace(/,/g, "");
+        break;
+      } else if (extensionsFind) {
+        extensions += line.trim();
+      }
+    }
+    this.vueHelpInfo.extensions = eval(`(${extensions})`);
+  }
   getWebpackAlias() {
+    import_utils.logger.info("获取 webpack alias...");
     const lines = this.vueHelpInfo.webpackConfigTextLines;
     const aliasLines = [];
     let aliasFind = false;
@@ -150,8 +174,9 @@ var VueProjectService = class {
     const entryFilePath = this.vueHelpInfo.entryFiles.map((file) => (0, import_path.join)(targetBranchDir, file));
     const madgeConfig = {
       baseDir: this.detectService.directoryInfo.targetBranchDir,
-      fileExtensions: ["js", "ts", "jsx", "tsx", "vue"],
-      webpackConfig: this.vueHelpInfo.webpackConfigPath
+      fileExtensions: this.vueHelpInfo.extensions.map((ext) => ext.replace(/^\./, "")),
+      webpackConfig: this.vueHelpInfo.webpackConfigPath,
+      excludeRegExp: [/node_modules/]
     };
     const res = await (0, import_madge.default)(entryFilePath, madgeConfig);
     this.vueHelpInfo.madgeResult = res;
@@ -170,7 +195,8 @@ var VueProjectService = class {
     }, []);
     const possibleEffectedFiles = (0, import_collectUpstreamFiles.default)(madgeResult, validModifiedFiles);
     const possibleEffectedFilesFullPath = possibleEffectedFiles.map((file) => (0, import_path.join)(absPathPrefix, file));
-    const { import2export, indirectExportMembers } = (0, import_createDependenceMap.createExportedNameToReferenceLocalSet)(possibleEffectedFilesFullPath, parsedAlias, absPathPrefix, projectFileList);
+    const mapRef = (0, import_createDependenceMap.createExportedNameToReferenceLocalSet)(possibleEffectedFilesFullPath, parsedAlias, absPathPrefix, projectFileList);
+    const { import2export, indirectExportMembers } = mapRef;
     const gitDiffDetail = this.gitDiffDetail;
     const validGitDiffDetail = gitDiffDetail.filter((item) => possibleEffectedFiles.includes(item.filePath));
     const effectedExportNames = validGitDiffDetail.map((item) => {
@@ -185,7 +211,7 @@ var VueProjectService = class {
     const token = this.detectService.gitInfo.token;
     if (!token) {
       const pwd = (0, import_path.join)(this.detectService.directoryInfo.tmpWorkDir, "..");
-      (0, import_fs.writeFileSync)((0, import_path.join)(pwd, "effectedImportUsage.json"), JSON.stringify(effectedImportUsage, null, 2));
+      (0, import_fs.writeFileSync)((0, import_path.join)(pwd, "effectedImportUsage.json"), JSON.stringify({ webpackConfig: this.createSimpleWebpackConfig(), tree: madgeResult == null ? void 0 : madgeResult.tree, projectFileList, possibleEffectedFiles, gitDiffDetailFiles: gitDiffDetail.map((e) => e.filePath), validGitDiffDetail, effectedImportUsage, ...mapRef }, null, 2));
     }
   }
 };

package/dist/cjs/util/report_util/filterEffectedExportMember.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(filterEffectedExportMember_exports);
 var import_getAstKitByFilePath = __toESM(require("../ast_util/getAstKitByFilePath"));
 var import_AstUtil = __toESM(require("../ast_util/AstUtil"));
 function filterEffectedExportMember(filePath, absPathPrefix, startLine, endLine) {
-  const astKit = (0, import_getAstKitByFilePath.default)(filePath, absPathPrefix);
+  const astKit = (0, import_getAstKitByFilePath.default)(filePath, absPathPrefix, (travelNode) => ["VElement", "ImportDeclaration", "ExportAllDeclaration", "ExportNamedDeclaration", "ExportDefaultDeclaration"].includes(travelNode.type));
   const { mapFileLineToNodeSet } = astKit;
   const topScopeNodes = import_AstUtil.default.getTopScopeNodesByLineNumberRange(mapFileLineToNodeSet, startLine, endLine);
   const exportMembers = topScopeNodes.map((node) => import_AstUtil.default.findExportedMembersNameFromAncestors(node)).flat();

package/dist/cjs/util/report_util/generateGitDiffReport.d.ts

@@ -26,7 +26,7 @@ export declare function generateGitDiffReport(arg: {
                 effectsDownstream: string[];
             }[];
         }[];
-        type: "delete" | "modify" | "add";
+        type: "add" | "delete" | "modify";
         filesDependsOnMe: string[];
         undefinedIdentifiers: string[];
         filePath: string;

package/dist/cjs/util/report_util/resolveImportPath.js

@@ -62,7 +62,7 @@ function getDirName(filePath) {
   }
   return normalized.slice(0, lastSlashIndex);
 }
-function resolveImportPath(alias, importPath, currentFilePath, extensions = [".js", ".ts", ".jsx", ".tsx"]) {
+function resolveImportPath(alias, importPath, currentFilePath, extensions = [".js", ".ts", ".jsx", ".tsx", ".vue"]) {
   if (importPath.startsWith(".")) {
     const currentDir = getDirName(currentFilePath);
     const absolutePath = joinPath(currentDir, importPath);

package/dist/cjs/util/report_util.d.ts

@@ -37,7 +37,7 @@ export declare function createDetectReport(arg: Arg): {
             effectsDownstream: string[];
         }[];
     }[];
-    type: "delete" | "modify" | "add";
+    type: "add" | "delete" | "modify";
     filesDependsOnMe: string[];
     undefinedIdentifiers: string[];
     filePath: string;

package/dist/cjs/util/shared/gitDiffTool.d.ts

@@ -26,7 +26,7 @@ export declare function gitDiffTool(arg: {
                 effectsDownstream: string[];
             }[];
         }[];
-        type: "modify" | "add" | "delete";
+        type: "add" | "delete" | "modify";
         filesDependsOnMe: string[];
         undefinedIdentifiers: string[];
         filePath: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-code-detector",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "description": "",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",