js-code-detector 0.0.11 → 0.0.12

package/dist/cjs/index.js

@@ -62,6 +62,7 @@ async function umiPluginCallback(api) {
   const usingFileNoPrefix = usingFiles.map((item) => item.filePath.replace(absPathPrefix, ""));
   const groupGitDiffLines = gitDiffDetail.filter((item) => usingFileNoPrefix.includes(item.filePath));
   const reports = (0, import_report_util.createDetectReport)({ groupGitDiffLines, tree, absPathPrefix });
+  (0, import_fs2.writeFileSync)((0, import_path.join)(api.cwd, "reports.json"), JSON.stringify(reports, null, 2), { encoding: "utf-8", flag: "w" });
   const mdContent = (0, import_createMdByJson.createMdByJson)(reports);
   (0, import_fs2.writeFileSync)((0, import_path.join)(api.cwd, jsonName), mdContent, { encoding: "utf-8", flag: "w" });
 }
@@ -150,9 +151,6 @@ async function gitDiffDetect() {
   const mdFileName = `${(0, import_dayjs.default)().format("YYYYMDD_HHmm")}_${jsonName}`;
   (0, import_fs2.writeFileSync)((0, import_path.join)(process.cwd(), mdFileName), content, { encoding: "utf-8", flag: "w" });
   import_utils.logger.info("报告完成: " + mdFileName);
-  (0, import_utils.rimraf)((0, import_path.join)(process.cwd(), today), () => {
-    import_utils.logger.info("临时目录已删除");
-  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -6,6 +6,7 @@ type EffectItem = {
     effects: AstNode[];
 };
 export type BlockReport = {
+    index: number;
     kind: BlockReportKind;
     diff_txt: string[];
     topAdded: AstNode[];
@@ -22,6 +23,7 @@ type Arg = {
     gitDiffItem: GitDiffDetail;
     absPathPrefix: string;
     blockReports: BlockReport[];
+    index: number;
 };
 export default function codeBlockDetect(arg: Arg): void;
 export {};

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

@@ -35,7 +35,8 @@ module.exports = __toCommonJS(code_block_detect_exports);
 var import_path = require("path");
 var import_getAstKitByFilePath = __toESM(require("../ast_util/getAstKitByFilePath"));
 var import_AstUtil = __toESM(require("../ast_util/AstUtil"));
-var createBlockReport = (kind) => ({
+var createBlockReport = (kind, index) => ({
+  index,
   kind,
   diff_txt: [],
   topAdded: [],
@@ -48,22 +49,19 @@ var createBlockReport = (kind) => ({
   removedStillUsing: [],
   removedEffects: []
 });
-var findOrCreateBlockReport = (blockReports, kind, fromHead) => {
-  var _a, _b;
-  if (fromHead) {
-    for (let i = blockReports.length - 1; i >= 0; i--) {
-      if (blockReports[i].kind === kind) {
-        return blockReports[i];
-      }
+var findOrCreateBlockReport = (blockReports, kind, index) => {
+  var _a;
+  if (((_a = blockReports.at(-1)) == null ? void 0 : _a.index) === index) {
+    const res = blockReports.at(-1);
+    if (res.kind !== kind) {
+      res.kind = `${res.kind} | ${kind}`;
     }
+    return res;
   }
-  if (((_a = blockReports.at(-1)) == null ? void 0 : _a.kind) === kind || kind === "Other" && ((_b = blockReports.at(-1)) == null ? void 0 : _b.kind.startsWith("Other:"))) {
-    return blockReports.at(-1);
-  }
-  return createBlockReport(kind);
+  return createBlockReport(kind, index);
 };
 function codeBlockDetect(arg) {
-  const { gitDiffItem, absPathPrefix, blockReports } = arg;
+  const { gitDiffItem, absPathPrefix, blockReports, index } = arg;
   const { filePath, startLineOfNew, items, startLineOfOld } = gitDiffItem;
   const { mapFileLineToNodeSet, mapUuidToNode } = (0, import_getAstKitByFilePath.default)(filePath, absPathPrefix);
   const filePathOfOld = (0, import_path.join)(process.cwd(), "..", "source", filePath);
@@ -76,8 +74,8 @@ function codeBlockDetect(arg) {
     const lineNumberEndOld = lineNumberStartOld + items.filter((item) => item.startsWith("-")).length - 1;
     const addNodes = import_AstUtil.default.getTopScopeNodesByLineNumberRange(mapFileLineToNodeSet, lineNumberStartNew, lineNumberEndNew);
     const removeNodes = import_AstUtil.default.getTopScopeNodesByLineNumberRange(mapFileLineToNodeSetOld, lineNumberStartOld, lineNumberEndOld);
-    iterateNodes(addNodes, "add", { blockReports, programNode });
-    iterateNodes(removeNodes, "remove", { blockReports, programNode });
+    iterateNodes(addNodes, "add", { blockReports, programNode }, index);
+    iterateNodes(removeNodes, "remove", { blockReports, programNode }, index);
     const lastReport = blockReports.at(-1);
     if (lastReport) {
       lastReport.diff_txt = items;
@@ -85,7 +83,7 @@ function codeBlockDetect(arg) {
       lastReport.topRemoved = removeNodes;
     }
   }
-  blockReports.push(createBlockReport("Never"));
+  blockReports.push(createBlockReport("Never", NaN));
 }
 function getPathsOfNode(topScopeNodes) {
   const paths = [];
@@ -108,19 +106,19 @@ function filterBySamePathAndLen(list, sameEffectsPaths) {
 function extractEffectItem(list) {
   return list.map((e) => ({ ...e, effects: e.effects.map((item) => item.ele) }));
 }
-function pushBlockReport(blockReports, blockReport, programNode) {
-  const sameNames = blockReport.added.filter((path) => blockReport.removed.includes(path));
-  if (sameNames.length) {
-    ["added", "removed"].forEach((key) => {
-      blockReport[key] = blockReport[key].filter((path) => !sameNames.includes(path));
-    });
-  }
+function pushBlockReport(blockReports, blockReport, programNode, index) {
   if (blockReport.kind.startsWith("Other:")) {
     ["added", "removed"].forEach((key) => {
       const tailElements = blockReport[key].map((ele) => ele.split(":").at(-1)).filter(Boolean);
       blockReport[key] = [...new Set(tailElements)];
     });
   }
+  const sameNames = blockReport.added.filter((path) => blockReport.removed.includes(path));
+  if (sameNames.length) {
+    ["added", "removed"].forEach((key) => {
+      blockReport[key] = blockReport[key].filter((path) => !sameNames.includes(path));
+    });
+  }
   const addedEffectsList = mapNodePath(blockReport.addedEffects);
   const removedEffectsList = mapNodePath(blockReport.removedEffects);
   const addedEffectsPaths = addedEffectsList.map((item) => item.effects.map(({ path }) => path)).flat();
@@ -132,44 +130,44 @@ function pushBlockReport(blockReports, blockReport, programNode) {
     blockReport.addedEffects = extractEffectItem(addedEffects);
     blockReport.removedEffects = extractEffectItem(removedEffects);
   }
-  if (!blockReports.includes(blockReport) && Object.entries(blockReport).filter((e) => e[0] !== "kind").some((e) => e[1].length)) {
+  if (!blockReports.includes(blockReport)) {
     blockReports.push(blockReport);
   }
 }
-function iterateNodes(topScopeNodes, operation, extra) {
+function iterateNodes(topScopeNodes, operation, extra, index) {
   for (const topScopeNode of topScopeNodes) {
     if (["ImportDeclaration", "ImportSpecifier", "ImportDefaultSpecifier"].includes(topScopeNode.type)) {
-      detectImport({ topScopeNode, operation, extra });
+      detectImport({ topScopeNode, operation, extra }, index);
     } else if (["VariableDeclaration", "VariableDeclarator"].includes(topScopeNode.type) || import_AstUtil.default.isSubNodeOfVariableDeclarator(topScopeNode)) {
-      detectVariableDeclaration({ topScopeNode, operation, extra });
+      detectVariableDeclaration({ topScopeNode, operation, extra }, index);
     } else if (["FunctionDeclaration", "ClassDeclaration"].includes(topScopeNode.type)) {
-      detectFnClsDeclaration({ topScopeNode, operation, extra });
+      detectFnClsDeclaration({ topScopeNode, operation, extra }, index);
     } else if (["UnaryExpression", "UpdateExpression"].includes(topScopeNode.type)) {
-      detectUpdateEffectExp({ topScopeNode, operation, extra });
+      detectUpdateEffectExp({ topScopeNode, operation, extra }, index);
     } else if (["CallExpression"].includes(topScopeNode.type)) {
-      detectFnCallExp({ topScopeNode, operation, extra });
+      detectFnCallExp({ topScopeNode, operation, extra }, index);
     } else if (["AssignmentExpression"].includes(topScopeNode.type)) {
-      detectAssignmentEffectExp({ topScopeNode, operation, extra });
+      detectAssignmentEffectExp({ topScopeNode, operation, extra }, index);
     } else if (["ExpressionStatement"].includes(topScopeNode.type)) {
       const { expression } = topScopeNode;
-      iterateNodes([expression], operation, extra);
+      iterateNodes([expression], operation, extra, index);
     } else {
-      detectOther({ topScopeNode, operation, extra });
+      detectOther({ topScopeNode, operation, extra }, index);
     }
   }
 }
-function detectOther(arg) {
+function detectOther(arg, index) {
   const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Other");
+  const blockReport = findOrCreateBlockReport(blockReports, "Other", index);
   const { added, removed } = blockReport;
   const nodePaths = getPathsOfNode(topScopeNode._util.nodeCollection);
   (operation === "add" ? added : removed).push(...nodePaths);
   blockReport.kind = "Other:" + topScopeNode.type;
-  pushBlockReport(blockReports, blockReport, programNode);
+  pushBlockReport(blockReports, blockReport, programNode, index);
 }
-function detectImport(arg) {
+function detectImport(arg, index) {
   const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Import");
+  const blockReport = findOrCreateBlockReport(blockReports, "Import", index);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   const specifiers = topScopeNode.type === "ImportDeclaration" ? topScopeNode.specifiers : [topScopeNode];
   if (Array.isArray(specifiers)) {
@@ -179,23 +177,23 @@ function detectImport(arg) {
       (operation === "add" ? addedEffects : removedEffects).push({ causeBy: local, effects: [...local._util.effectIds] });
     });
   }
-  pushBlockReport(blockReports, blockReport, programNode);
+  pushBlockReport(blockReports, blockReport, programNode, index);
 }
-function detectFnClsDeclaration(arg) {
+function detectFnClsDeclaration(arg, index) {
   const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Declaration");
+  const blockReport = findOrCreateBlockReport(blockReports, "Declaration", index);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   const { id } = topScopeNode;
   (operation === "add" ? added : removed).push(id.name);
   (operation === "add" ? addedEffects : removedEffects).push({ causeBy: id, effects: [...id._util.effectIds] });
-  pushBlockReport(blockReports, blockReport, programNode);
+  pushBlockReport(blockReports, blockReport, programNode, index);
 }
 function insertPrefix(n, prefix, sep = ":") {
   return [prefix, n].join(sep);
 }
-function detectVariableDeclaration(arg) {
+function detectVariableDeclaration(arg, index) {
   const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Declaration");
+  const blockReport = findOrCreateBlockReport(blockReports, "Declaration", index);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   if (["VariableDeclaration", "VariableDeclarator"].includes(topScopeNode.type)) {
     let declarations = [];
@@ -232,11 +230,11 @@ function detectVariableDeclaration(arg) {
       }
     });
   }
-  pushBlockReport(blockReports, blockReport, programNode);
+  pushBlockReport(blockReports, blockReport, programNode, index);
 }
-function detectUpdateEffectExp(arg) {
+function detectUpdateEffectExp(arg, index) {
   const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "SelfUpdate");
+  const blockReport = findOrCreateBlockReport(blockReports, "SelfUpdate", index);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   const { argument: args } = topScopeNode;
   const createdExpIdSet = /* @__PURE__ */ new Set();
@@ -245,11 +243,11 @@ function detectUpdateEffectExp(arg) {
     (operation === "add" ? added : removed).push(createdExpId.name);
     (operation === "add" ? addedEffects : removedEffects).push({ causeBy: createdExpId, effects: [...createdExpId._util.effectIds] });
   }
-  pushBlockReport(blockReports, blockReport, programNode);
+  pushBlockReport(blockReports, blockReport, programNode, index);
 }
-function detectFnCallExp(arg) {
+function detectFnCallExp(arg, index) {
   const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Invoke");
+  const blockReport = findOrCreateBlockReport(blockReports, "Invoke", index);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   const { callee, arguments: args } = topScopeNode;
   const argsIds = args.map((arg2) => arg2._util.nodeCollection.filter((n) => n.type === "Identifier")).flat();
@@ -263,11 +261,11 @@ function detectFnCallExp(arg) {
     (operation === "add" ? added : removed).push(createdExpId.name);
     (operation === "add" ? addedEffects : removedEffects).push({ causeBy: createdExpId, effects: [...createdExpId._util.effectIds] });
   }
-  pushBlockReport(blockReports, blockReport, programNode);
+  pushBlockReport(blockReports, blockReport, programNode, index);
 }
-function detectAssignmentEffectExp(arg) {
+function detectAssignmentEffectExp(arg, index) {
   const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Assignment");
+  const blockReport = findOrCreateBlockReport(blockReports, "Assignment", index);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   const { left, right } = topScopeNode;
   const idSetLeft = /* @__PURE__ */ new Set();
@@ -281,5 +279,5 @@ function detectAssignmentEffectExp(arg) {
   for (const createdExp of idSetRight) {
     (operation === "add" ? added : removed).push(insertPrefix(createdExp.name, "right"));
   }
-  pushBlockReport(blockReports, blockReport, programNode);
+  pushBlockReport(blockReports, blockReport, programNode, index);
 }

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

@@ -28,22 +28,26 @@ var mapReportType = {
   delete: "删除"
 };
 function createMdByJson(report) {
-  return report.map(reportItemToMd).join("\n\n\n");
+  const allFiles = `# 文件汇总
+${report.map((r) => `- ${r.filePath}`).join("\n")}
+
+`;
+  return allFiles + report.map(reportItemToMd).join("\n\n\n");
 }
 function reportItemToMd(report) {
   const { filePath, filesDependsOnMe, type, dangerIdentifiers, blockReports } = report;
   return [
     `## ${filePath}`,
     `### 类型: ${mapReportType[type]}`,
-    filesDependsOnMe.length > 0 ? `### 依赖${filePath}的文件` : "",
-    ...filesDependsOnMe.map((file) => `- ${file}`),
-    dangerIdentifiers.length > 0 ? `### 重点检查使用的变量` : "",
-    dangerIdentifiers.length > 0 ? `> ${dangerIdentifiers.join(", ")}` : "",
-    blockReports.length > 0 ? `### 代码块分析` : "",
+    filesDependsOnMe.length > 0 ? `### 所影响的文件
+${filesDependsOnMe.map((files) => `- ${files.join("、")}`).join("\n")}` : "",
+    dangerIdentifiers.length > 0 ? `### 重点检查使用的变量
+> ${dangerIdentifiers.join(", ")}` : "",
+    blockReports.length > 0 ? `### 对比分析 共${blockReports.length}处` : "",
     ...blockReports.map(blockReportToMd)
   ].filter(Boolean).join("\n\n");
 }
-function blockReportToMd(block) {
+function blockReportToMd(block, index) {
   const {
     kind,
     diff_txt,
@@ -53,17 +57,19 @@ function blockReportToMd(block) {
     removedEffects
   } = block;
   return [
-    `#### 修改分类: ${kind}`,
-    `- 原始diff内容`,
-    `\`\`\`txt
+    `### 对比${index + 1}分析`,
+    `- 原始diff内容
+\`\`\`txt
 ${diff_txt.join("\n")}
 \`\`\``,
-    added.length > 0 ? `- 新增标识符` : "",
-    added.length > 0 ? `> ${added.join(", ")}` : "",
-    addedEffects.length > 0 ? `- 新增标识符影响` : "",
+    `#### 修改分类: ${kind}`,
+    added.length > 0 ? `- 新增标识符
+> ${added.join(", ")}` : "",
+    addedEffects.length > 0 ? `- 新增标识符影响
+` : "",
     addedEffects.map(({ causeBy, effects }) => `> ${causeBy}相关: ${effects.join()}`).join("\n\n"),
-    removed.length > 0 ? `- 删除标识符` : "",
-    removed.length > 0 ? `> ${removed.join(", ")}` : "",
+    removed.length > 0 ? `- 删除标识符
+> ${removed.join(", ")}` : "",
     removedEffects.length > 0 ? `- 删除标识符影响` : "",
     removedEffects.map(({ causeBy, effects }) => `> ${causeBy}相关: ${effects.join()}`).join("\n\n")
   ].filter(Boolean).join("\n\n");

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

@@ -0,0 +1 @@
+export default function getFileDepends(filePath: string, tree: Record<string, string[]>): string[][];

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

@@ -0,0 +1,38 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/util/report_util/getFileDepends.ts
+var getFileDepends_exports = {};
+__export(getFileDepends_exports, {
+  default: () => getFileDepends
+});
+module.exports = __toCommonJS(getFileDepends_exports);
+function getFileDepends(filePath, tree) {
+  const res = [];
+  getFileDependsRecursive(res, [filePath], Object.entries(tree), 2);
+  return res;
+}
+function getFileDependsRecursive(res, filePaths, treeEntries, maxTry) {
+  const depends = filePaths.map((f) => treeEntries.filter((entry) => entry[1].includes(f)).map((e) => e[0])).flat();
+  if (depends.length > 0) {
+    res.push(depends);
+    if (maxTry === 0)
+      return;
+    getFileDependsRecursive(res, depends, treeEntries, maxTry - 1);
+  }
+}

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

@@ -3,7 +3,7 @@ import { BlockReport } from "./report_util/code_block_detect";
 export type DetectReport = {
     filePath: string;
     type: "modify" | "add" | "delete";
-    filesDependsOnMe: string[];
+    filesDependsOnMe: string[][];
     dangerIdentifiers: string[];
     blockReports: BlockReport[];
 };
@@ -22,6 +22,7 @@ export declare function createDetectReport(arg: Arg): {
             causeBy: string;
             effects: (string | undefined)[];
         }[];
+        index: number;
         diff_txt: string[];
         added: string[];
         addedNotUsed: string[];
@@ -32,7 +33,7 @@ export declare function createDetectReport(arg: Arg): {
     }[];
     filePath: string;
     type: "add" | "modify" | "delete";
-    filesDependsOnMe: string[];
+    filesDependsOnMe: string[][];
     dangerIdentifiers: string[];
 }[];
 export {};

package/dist/cjs/util/report_util.js

@@ -36,13 +36,13 @@ var import_code_block_detect = __toESM(require("./report_util/code_block_detect"
 var import_getAstKitByFilePath = __toESM(require("./ast_util/getAstKitByFilePath"));
 var import_AstUtil = __toESM(require("./ast_util/AstUtil"));
 var import_file_identifier_detect = require("./report_util/file_identifier_detect");
+var import_getFileDepends = __toESM(require("./report_util/getFileDepends"));
 function createDetectReport(arg) {
   const { groupGitDiffLines, tree, absPathPrefix } = arg;
   const reports = [];
-  const entries = Object.entries(tree);
-  groupGitDiffLines.forEach((item) => {
+  groupGitDiffLines.forEach((item, index) => {
     const { filePath, type } = item;
-    const filesDependsOnMe = entries.filter((entry) => entry[1].includes(filePath)).map((e) => e[0]);
+    const filesDependsOnMe = (0, import_getFileDepends.default)(filePath, tree);
     let reportItem = reports.find((e) => e.filePath === filePath);
     if (!reportItem) {
       reportItem = {
@@ -56,7 +56,7 @@ function createDetectReport(arg) {
     }
     reportItem.dangerIdentifiers = (0, import_file_identifier_detect.fileIdentifierDetect)(filePath, absPathPrefix);
     if (type === "modify") {
-      (0, import_code_block_detect.default)({ gitDiffItem: item, absPathPrefix, blockReports: reportItem.blockReports });
+      (0, import_code_block_detect.default)({ gitDiffItem: item, absPathPrefix, blockReports: reportItem.blockReports, index });
     }
   });
   return reports.map((report) => {

package/package.json

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