js-code-detector 0.0.13 → 0.0.14

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

@@ -7,7 +7,7 @@ type EffectItem = {
 };
 export type BlockReport = {
     index: number;
-    kind: BlockReportKind;
+    kindList: BlockReportKind[];
     diff_txt: string[];
     topAdded: AstNode[];
     topRemoved: AstNode[];

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

@@ -37,7 +37,7 @@ var import_getAstKitByFilePath = __toESM(require("../ast_util/getAstKitByFilePat
 var import_AstUtil = __toESM(require("../ast_util/AstUtil"));
 var createBlockReport = (kind, index) => ({
   index,
-  kind,
+  kindList: [kind],
   diff_txt: [],
   topAdded: [],
   topRemoved: [],
@@ -49,9 +49,11 @@ var createBlockReport = (kind, index) => ({
   removedStillUsing: [],
   removedEffects: []
 });
-var findOrCreateBlockReport = (blockReports, kind, index) => {
-  const res = blockReports.find((item) => item.index === index && item.kind === kind);
-  return res || createBlockReport(kind, index);
+var findOrCreateBlockReport = (blockReports, kind, index, diff_txt) => {
+  const res = blockReports.find((item) => item.index === index) || createBlockReport(kind, index);
+  res.diff_txt = diff_txt;
+  res.kindList = res.kindList.includes(kind) ? res.kindList : [...res.kindList, kind];
+  return res;
 };
 function codeBlockDetect(arg) {
   const { gitDiffItem, absPathPrefix, blockReports, index } = arg;
@@ -67,14 +69,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 }, index);
-    iterateNodes(removeNodes, "remove", { blockReports, programNode }, index);
-    const lastReport = blockReports.at(-1);
-    if (lastReport) {
-      lastReport.diff_txt = items;
-      lastReport.topAdded = addNodes;
-      lastReport.topRemoved = removeNodes;
-    }
+    iterateNodes(addNodes, "add", { blockReports, programNode, diff_txt: items }, index);
+    iterateNodes(removeNodes, "remove", { blockReports, programNode, diff_txt: items }, index);
   }
   blockReports.push(createBlockReport("Never", NaN));
 }
@@ -100,7 +96,7 @@ function extractEffectItem(list) {
   return list.map((e) => ({ ...e, effects: e.effects.map((item) => item.ele) }));
 }
 function pushBlockReport(blockReports, blockReport, programNode, index) {
-  if (blockReport.kind.startsWith("Other:")) {
+  if (blockReport.kindList.includes("Other")) {
     ["added", "removed"].forEach((key) => {
       const tailElements = blockReport[key].map((ele) => ele.split(":").at(-1)).filter(Boolean);
       blockReport[key] = [...new Set(tailElements)];
@@ -150,17 +146,16 @@ function iterateNodes(topScopeNodes, operation, extra, index) {
   }
 }
 function detectOther(arg, index) {
-  const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Other", index);
+  const { topScopeNode, operation, extra: { blockReports, programNode, diff_txt } } = arg;
+  const blockReport = findOrCreateBlockReport(blockReports, "Other", index, diff_txt);
   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, index);
 }
 function detectImport(arg, index) {
-  const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Import", index);
+  const { topScopeNode, operation, extra: { blockReports, programNode, diff_txt } } = arg;
+  const blockReport = findOrCreateBlockReport(blockReports, "Import", index, diff_txt);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   const specifiers = topScopeNode.type === "ImportDeclaration" ? topScopeNode.specifiers : [topScopeNode];
   if (Array.isArray(specifiers)) {
@@ -173,8 +168,8 @@ function detectImport(arg, index) {
   pushBlockReport(blockReports, blockReport, programNode, index);
 }
 function detectFnClsDeclaration(arg, index) {
-  const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Declaration", index);
+  const { topScopeNode, operation, extra: { blockReports, programNode, diff_txt } } = arg;
+  const blockReport = findOrCreateBlockReport(blockReports, "Declaration", index, diff_txt);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   const { id } = topScopeNode;
   (operation === "add" ? added : removed).push(id.name);
@@ -185,8 +180,8 @@ function insertPrefix(n, prefix, sep = ":") {
   return [prefix, n].join(sep);
 }
 function detectVariableDeclaration(arg, index) {
-  const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Declaration", index);
+  const { topScopeNode, operation, extra: { blockReports, programNode, diff_txt } } = arg;
+  const blockReport = findOrCreateBlockReport(blockReports, "Declaration", index, diff_txt);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   if (["VariableDeclaration", "VariableDeclarator"].includes(topScopeNode.type)) {
     let declarations = [];
@@ -226,8 +221,8 @@ function detectVariableDeclaration(arg, index) {
   pushBlockReport(blockReports, blockReport, programNode, index);
 }
 function detectUpdateEffectExp(arg, index) {
-  const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "SelfUpdate", index);
+  const { topScopeNode, operation, extra: { blockReports, programNode, diff_txt } } = arg;
+  const blockReport = findOrCreateBlockReport(blockReports, "SelfUpdate", index, diff_txt);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   const { argument: args } = topScopeNode;
   const createdExpIdSet = /* @__PURE__ */ new Set();
@@ -239,8 +234,8 @@ function detectUpdateEffectExp(arg, index) {
   pushBlockReport(blockReports, blockReport, programNode, index);
 }
 function detectFnCallExp(arg, index) {
-  const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Invoke", index);
+  const { topScopeNode, operation, extra: { blockReports, programNode, diff_txt } } = arg;
+  const blockReport = findOrCreateBlockReport(blockReports, "Invoke", index, diff_txt);
   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();
@@ -257,8 +252,8 @@ function detectFnCallExp(arg, index) {
   pushBlockReport(blockReports, blockReport, programNode, index);
 }
 function detectAssignmentEffectExp(arg, index) {
-  const { topScopeNode, operation, extra: { blockReports, programNode } } = arg;
-  const blockReport = findOrCreateBlockReport(blockReports, "Assignment", index);
+  const { topScopeNode, operation, extra: { blockReports, programNode, diff_txt } } = arg;
+  const blockReport = findOrCreateBlockReport(blockReports, "Assignment", index, diff_txt);
   const { added, removed, addedEffects, removedEffects } = blockReport;
   const { left, right } = topScopeNode;
   const idSetLeft = /* @__PURE__ */ new Set();

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

@@ -49,7 +49,7 @@ ${filesDependsOnMe.map((files) => `- ${files.join("、")}`).join("\n")}` : "",
 }
 function blockReportToMd(block, index) {
   const {
-    kind,
+    kindList,
     diff_txt,
     added,
     addedEffects,
@@ -57,12 +57,11 @@ function blockReportToMd(block, index) {
     removedEffects
   } = block;
   return [
-    `### 对比${index + 1}分析`,
+    `### 对比${index + 1}分析, 节点种类${kindList.join()}`,
     `- 原始diff内容
 \`\`\`txt
 ${diff_txt.join("\n")}
 \`\`\``,
-    `#### 修改分类: ${kind}`,
     added.length > 0 ? `- 新增标识符
 > ${added.join(", ")}` : "",
     addedEffects.length > 0 ? `- 新增标识符影响

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

@@ -29,10 +29,10 @@ export declare function createDetectReport(arg: Arg): {
         addedNotFound: string[];
         removed: string[];
         removedStillUsing: string[];
-        kind: "Import" | "Declaration" | "Assignment" | "SelfUpdate" | "Invoke" | "Other" | "Never";
+        kindList: ("Import" | "Declaration" | "Assignment" | "SelfUpdate" | "Invoke" | "Other" | "Never")[];
     }[];
     filePath: string;
-    type: "add" | "modify" | "delete";
+    type: "modify" | "add" | "delete";
     filesDependsOnMe: string[][];
     dangerIdentifiers: string[];
 }[];

package/dist/cjs/util/report_util.js

@@ -65,8 +65,8 @@ function createDetectReport(arg) {
     const allNodes = new Map([...astKit.mapUuidToNode.values()].map((ele) => [import_AstUtil.default.getNodePath(ele), ele]));
     return {
       ...report,
-      blockReports: report.blockReports.filter((e) => e.kind !== "Never").map((blockReport) => {
-        const { kind, addedEffects, removedEffects, topAdded, topRemoved, ...rest } = blockReport;
+      blockReports: report.blockReports.filter((e) => !e.kindList.includes("Never")).map((blockReport) => {
+        const { kindList, addedEffects, removedEffects, topAdded, topRemoved, ...rest } = blockReport;
         const removedEffectsInfos = removedEffects.map((item) => {
           const tmpList = item.effects.map((ele) => {
             const nodePath = import_AstUtil.default.getNodePath(ele);
@@ -87,7 +87,7 @@ function createDetectReport(arg) {
           };
         }).filter((item) => item.effects.length > 0);
         return {
-          kind,
+          kindList,
           ...rest,
           addedEffects: addedEffectsInfos,
           removedEffects: removedEffectsInfos

package/package.json

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