[FEAT] CSMDict 최신 → 과거 순서 정렬

[FEAT] CSMDict 최신 → 과거 순서 정렬

Author: chae-dahee

packages/analysis-engine/src/csm.spec.ts

@@ -84,7 +84,7 @@ describe("csm", () => {
         expect(nonMergeCSMNodes.length).toBeGreaterThan(0);
 
         // 0,1,4,5 commits have no-squash-commits
-        const expectedNonMergeCommitIds = ["0", "1", "4", "5"];
+        const expectedNonMergeCommitIds = ["5", "4", "1", "0"];
         const nonMergeCommitIds = nonMergeCSMNodes.map((csmNode) => csmNode.base.commit.id);
         nonMergeCommitIds.forEach((commitId) => {
           expect(expectedNonMergeCommitIds.includes(commitId)).toBe(true);
@@ -97,7 +97,7 @@ describe("csm", () => {
         expect(mergeCSMNodes.length).toBeGreaterThan(0);
 
         // 2,3 commits have sqaush-commits
-        const expectedMergeCommitIds = ["2", "3"];
+        const expectedMergeCommitIds = ["3", "2"];
         const mergeCommitIds = mergeCSMNodes.map((csmNode) => csmNode.base.commit.id);
         mergeCommitIds.forEach((commitId) => {
           expect(expectedMergeCommitIds.includes(commitId)).toBe(true);
@@ -132,11 +132,11 @@ describe("csm", () => {
     });
 
     it("has squash-commits", () => {
-      const expectedBaseCommitIds = ["0", "1", "6", "7", "8", "9", "10", "11"];
+      const expectedBaseCommitIds = ["11", "10", "9", "8", "7", "6", "1", "0"];
       expect(csmDict.sub1.map((node) => node.base.commit.id)).toEqual(expectedBaseCommitIds);
 
       const mergeCommitNodes = csmDict.sub1.filter((node) => node.source.length);
-      const expectedMergeCommitIds = ["8", "11"];
+      const expectedMergeCommitIds = ["11", "8"];
       expect(mergeCommitNodes.map((node) => node.base.commit.id)).toEqual(expectedMergeCommitIds);
 
       const expectedSquashCommitIds: Record<string, string[]> = {

packages/analysis-engine/src/csm.ts

@@ -1,7 +1,13 @@
 import { convertPRCommitsToCommitNodes, convertPRDetailToCommitRaw } from "./pullRequest";
 import type { CommitDict, CommitNode, CSMDictionary, CSMNode, PullRequest, PullRequestDict, StemDict } from "./types";
 
-const buildCSMNode = (baseCommitNode: CommitNode, commitDict: CommitDict, stemDict: StemDict): CSMNode => {
+/**
+ *
+ * @param baseCommitNode merge-commit node
+ * @param commitDict commit-node dictionary
+ * @returns
+ */
+const buildCSMNode = (baseCommitNode: CommitNode, commitDict: CommitDict): CSMNode => {
   const mergeParentCommit = commitDict.get(baseCommitNode.commit.parents[1]);
   if (!mergeParentCommit) {
     return {
@@ -10,46 +16,51 @@ const buildCSMNode = (baseCommitNode: CommitNode, commitDict: CommitDict, stemDi
     };
   }
 
-  const squashCommitNodes: CommitNode[] = [];
-
-  const squashTaskQueue: CommitNode[] = [mergeParentCommit];
-  while (squashTaskQueue.length > 0) {
-    // get target
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const squashStartNode = squashTaskQueue.shift()!;
+  // 1. stop point: first-parent of baseCommitNode
+  const baseAncestors = new Set<string>();
+  const baseParentsQueue: CommitNode[] = [];
+  const firstParent = commitDict.get(baseCommitNode.commit.parents[0]);
+  if (firstParent) {
+    baseParentsQueue.push(firstParent);
+  }
 
-    // get target's stem
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const squashStemId = squashStartNode.stemId!;
-    const squashStem = stemDict.get(squashStemId);
-    if (!squashStem) {
+  while (baseParentsQueue.length > 0) {
+    const node = baseParentsQueue.shift();
+    if (!node || baseAncestors.has(node.commit.id)) {
       continue;
     }
+    baseAncestors.add(node.commit.id);
+    for (const pId of node.commit.parents) {
+      const parentNode = commitDict.get(pId);
+      if (parentNode) {
+        baseParentsQueue.push(parentNode);
+      }
+    }
+  }
 
-    // prepare squash
-    const squashStemLastIndex = squashStem.nodes.length - 1;
-    const squashStartNodeIndex = squashStem.nodes.findIndex(({ commit: { id } }) => id === squashStartNode.commit.id);
-    const spliceCount = squashStemLastIndex - squashStartNodeIndex + 1;
+  // 2. find squash-commits by DFS
+  const squashCommitNodes: CommitNode[] = [];
+  const squashTaskStack: CommitNode[] = [mergeParentCommit];
+  const visited = new Set<string>();
 
-    // squash
-    const spliceCommitNodes = squashStem.nodes.splice(squashStartNodeIndex, spliceCount);
-    squashCommitNodes.push(...spliceCommitNodes);
+  while (squashTaskStack.length > 0) {
+    const currentNode = squashTaskStack.pop()!; // LIFO
 
-    // check nested-merge
-    const nestedMergeParentCommitIds = spliceCommitNodes
-      .filter((node) => node.commit.parents.length > 1)
-      .map((node) => node.commit.parents)
-      .reduce((pCommitIds, parents) => [...pCommitIds, ...parents], []);
-    const nestedMergeParentCommits = nestedMergeParentCommitIds
-      .map((commitId) => commitDict.get(commitId))
-      .filter((node): node is CommitNode => node !== undefined)
-      .filter((node) => node.stemId !== baseCommitNode.stemId && node.stemId !== squashStemId);
+    if (!currentNode || visited.has(currentNode.commit.id) || baseAncestors.has(currentNode.commit.id)) {
+      continue;
+    }
 
-    squashTaskQueue.push(...nestedMergeParentCommits);
+    visited.add(currentNode.commit.id);
+    squashCommitNodes.push(currentNode);
+    // add parents to stack
+    for (const parentId of currentNode.commit.parents) {
+      const parentNode = commitDict.get(parentId);
+      if (parentNode) {
+        squashTaskStack.push(parentNode);
+      }
+    }
   }
 
-  squashCommitNodes.sort((a, b) => a.commit.sequence - b.commit.sequence);
-
   return {
     base: baseCommitNode,
     source: squashCommitNodes,
@@ -101,9 +112,9 @@ export const buildCSMDict = (
   );
 
   const csmDict: CSMDictionary = {};
-  const stemNodes = masterStem.nodes.reverse(); // start on root-node
+  const stemNodes = masterStem.nodes; // start on latest-node
   csmDict[baseBranchName] = stemNodes.map((commitNode) => {
-    const csmNode = buildCSMNode(commitNode, commitDict, stemDict);
+    const csmNode = buildCSMNode(commitNode, commitDict);
     const pr = prDictByMergedCommitSha.get(csmNode.base.commit.id);
     return pr ? buildCSMNodeWithPullRequest(csmNode, pr) : csmNode;
   });

packages/view/src/hooks/useAnalayzedData.ts

@@ -11,7 +11,7 @@ export const useAnalayzedData = () => {
 
   const handleChangeAnalyzedData = (analyzedData: ClusterNode[]) => {
     setData(analyzedData);
-    setFilteredData([...analyzedData.reverse()]);
+    setFilteredData([...analyzedData]);
     setSelectedData([]);
     setLoading(false);
   };