feat: add changed mode data

yeonjuan · yeonjuan · commit 7daca63f449f · 2026-02-14T01:31:01.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ demo/parse-git-diff.js
 !.yarn/sdks
 !.yarn/versions
 playground-out
+.DS_Store
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/src/__fixtures__/mode-change-with-rename b/src/__fixtures__/mode-change-with-rename
@@ -0,0 +1,6 @@
+diff --git a/run.sh b/script.sh
+old mode 100755
+new mode 100644
+similarity index 100%
+rename from run.sh
+rename to script.sh
diff --git a/src/__tests__/__snapshots__/31-no-prefix.test.ts.snap b/src/__tests__/__snapshots__/31-no-prefix.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`issue 31-no-prefix parse \`31-no-prefix\` 1`] = `
 {
@@ -1177,6 +1177,8 @@ exports[`issue 31-no-prefix parse \`31-no-prefix\` 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "var/folders/kt/zd3bfncd0c3gjx25hbcq483c0000gn/T/epicshop/diff/advanced-react-apis/09.03.solution/dn2ncwjsbmo/index.tsx",
       "type": "ChangedFile",
     },
diff --git a/src/__tests__/__snapshots__/31.test.ts.snap b/src/__tests__/__snapshots__/31.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`issue 31 parse \`31\` 1`] = `
 {
@@ -410,6 +410,8 @@ exports[`issue 31 parse \`31\` 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "var/folders/kt/zd3bfncd0c3gjx25hbcq483c0000gn/T/epicshop/diff/advanced-react-apis/04.01.solution/7h2jowvfi2q/index.tsx",
       "type": "ChangedFile",
     },
diff --git a/src/__tests__/__snapshots__/all.test.ts.snap b/src/__tests__/__snapshots__/all.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`aa parse \`all\` 1`] = `
 {
@@ -31,6 +31,8 @@ exports[`aa parse \`all\` 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "rename.md",
       "type": "ChangedFile",
     },
@@ -112,11 +114,15 @@ exports[`aa parse \`all\` 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "rename.md",
       "type": "ChangedFile",
     },
     {
       "chunks": [],
+      "newMode": undefined,
+      "oldMode": undefined,
       "pathAfter": "rename.md",
       "pathBefore": "newfile.md",
       "type": "RenamedFile",
diff --git a/src/__tests__/__snapshots__/chunk-context.test.ts.snap b/src/__tests__/__snapshots__/chunk-context.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`chunk-context parse \`chunk-context\` 1`] = `
 {
@@ -31,6 +31,8 @@ exports[`chunk-context parse \`chunk-context\` 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "rename.js",
       "type": "ChangedFile",
     },
diff --git a/src/__tests__/__snapshots__/conflict-file.test.ts.snap b/src/__tests__/__snapshots__/conflict-file.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`conflict-file parse \`conflict-file\` 1`] = `
 {
@@ -92,6 +92,8 @@ exports[`conflict-file parse \`conflict-file\` 1`] = `
           "type": "CombinedChunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "README.md",
       "type": "ChangedFile",
     },
diff --git a/src/__tests__/__snapshots__/deleted-line.test.ts.snap b/src/__tests__/__snapshots__/deleted-line.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`deleted-line parse \`deleted-line\` 1`] = `
 {
@@ -31,6 +31,8 @@ exports[`deleted-line parse \`deleted-line\` 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "rename.md",
       "type": "ChangedFile",
     },
diff --git a/src/__tests__/__snapshots__/message-line.test.ts.snap b/src/__tests__/__snapshots__/message-line.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`message-line parse \`message-line\` 1`] = `
 {
@@ -40,6 +40,8 @@ exports[`message-line parse \`message-line\` 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "rename.md",
       "type": "ChangedFile",
     },
@@ -80,6 +82,8 @@ exports[`message-line parse \`message-line\` 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "rename2.md",
       "type": "ChangedFile",
     },
diff --git a/src/__tests__/__snapshots__/mode-change.test.ts.snap b/src/__tests__/__snapshots__/mode-change.test.ts.snap
@@ -5,6 +5,8 @@ exports[`mode-change parse mode change followed by another file 1`] = `
   "files": [
     {
       "chunks": [],
+      "newMode": "100755",
+      "oldMode": "100644",
       "path": "script.sh",
       "type": "ChangedFile",
     },
@@ -41,6 +43,8 @@ exports[`mode-change parse mode change followed by another file 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "readme.md",
       "type": "ChangedFile",
     },
@@ -85,6 +89,8 @@ exports[`mode-change parse mode change with content changes 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": "100755",
+      "oldMode": "100644",
       "path": "script.sh",
       "type": "ChangedFile",
     },
@@ -93,11 +99,29 @@ exports[`mode-change parse mode change with content changes 1`] = `
 }
 `;
 
+exports[`mode-change parse mode change with rename 1`] = `
+{
+  "files": [
+    {
+      "chunks": [],
+      "newMode": "100644",
+      "oldMode": "100755",
+      "pathAfter": "script.sh",
+      "pathBefore": "run.sh",
+      "type": "RenamedFile",
+    },
+  ],
+  "type": "GitDiff",
+}
+`;
+
 exports[`mode-change parse mode-only change 1`] = `
 {
   "files": [
     {
       "chunks": [],
+      "newMode": "100755",
+      "oldMode": "100644",
       "path": "script.sh",
       "type": "ChangedFile",
     },
diff --git a/src/__tests__/__snapshots__/new-line.test.ts.snap b/src/__tests__/__snapshots__/new-line.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`new-line parse \`new-line\` 1`] = `
 {
@@ -31,6 +31,8 @@ exports[`new-line parse \`new-line\` 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "rename.md",
       "type": "ChangedFile",
     },
diff --git a/src/__tests__/__snapshots__/renamed-empty.test.ts.snap b/src/__tests__/__snapshots__/renamed-empty.test.ts.snap
@@ -1,10 +1,12 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`renamed-empty parse \`renamed-empty\` 1`] = `
 {
   "files": [
     {
       "chunks": [],
+      "newMode": undefined,
+      "oldMode": undefined,
       "pathAfter": "src/renamed-empty",
       "pathBefore": "src/empty",
       "type": "RenamedFile",
diff --git a/src/__tests__/__snapshots__/renamed-file.test.ts.snap b/src/__tests__/__snapshots__/renamed-file.test.ts.snap
@@ -1,10 +1,12 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`renamed-file parse \`renamed-file\` 1`] = `
 {
   "files": [
     {
       "chunks": [],
+      "newMode": undefined,
+      "oldMode": undefined,
       "pathAfter": "rename.md",
       "pathBefore": "newfile.md",
       "type": "RenamedFile",
diff --git a/src/__tests__/__snapshots__/unified.test.ts.snap b/src/__tests__/__snapshots__/unified.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`unified parse \`unified 1`] = `
 {
@@ -25,6 +25,8 @@ exports[`unified parse \`unified 1`] = `
           "type": "Chunk",
         },
       ],
+      "newMode": undefined,
+      "oldMode": undefined,
       "path": "test.txt",
       "type": "ChangedFile",
     },
diff --git a/src/__tests__/mode-change.test.ts b/src/__tests__/mode-change.test.ts
@@ -39,4 +39,10 @@ describe('mode-change', () => {
     });
     expect(result).toMatchSnapshot();
   });
+
+  it('parse mode change with rename', () => {
+    const fixture = getFixture('mode-change-with-rename');
+    const result = parseGitDiff(fixture);
+    expect(result).toMatchSnapshot();
+  });
 });
diff --git a/src/constants.ts b/src/constants.ts
@@ -14,7 +14,7 @@ export const FileType = {
 
 export const ExtendedHeader = {
   Index: 'index',
-  Old: 'old',
+  OldMode: 'old mode',
   NewMode: 'new mode',
   Copy: 'copy',
   Similarity: 'similarity',
diff --git a/src/parse-git-diff.ts b/src/parse-git-diff.ts
@@ -29,11 +29,12 @@ export default function parseGitDiff(
 
 function parseFileChanges(ctx: Context): AnyFileChange[] {
   const changedFiles: AnyFileChange[] = [];
+  console.log('start');
   while (!ctx.isEof()) {
     const changed = parseFileChange(ctx);
+    console.log({ changed });
     if (!changed) {
-      ctx.nextLine();
-      continue;
+      break;
     }
     changedFiles.push(changed);
   }
@@ -50,6 +51,8 @@ function parseFileChange(ctx: Context): AnyFileChange | undefined {
   let isRename = false;
   let pathBefore = '';
   let pathAfter = '';
+  let oldMode: string | undefined = undefined;
+  let newMode: string | undefined = undefined;
   while (!ctx.isEof()) {
     const extHeader = parseExtendedHeader(ctx);
     if (!extHeader) {
@@ -71,6 +74,12 @@ function parseFileChange(ctx: Context): AnyFileChange | undefined {
       isRename = true;
       pathAfter = extHeader.path as string;
     }
+    if (extHeader.type === ExtendedHeader.OldMode) {
+      oldMode = extHeader.mode;
+    }
+    if (extHeader.type === ExtendedHeader.NewMode) {
+      newMode = extHeader.mode;
+    }
   }
 
   const changeMarkers = parseChangeMarkers(ctx);
@@ -107,12 +116,24 @@ function parseFileChange(ctx: Context): AnyFileChange | undefined {
       pathAfter,
       pathBefore,
       chunks,
+      oldMode,
+      newMode,
     };
   } else if (changeMarkers) {
     return {
       type: FileType.Changed,
       chunks,
       path: changeMarkers.added,
+      oldMode,
+      newMode,
+    };
+  } else if (oldMode && newMode && comparisonLineParsed) {
+    return {
+      type: FileType.Changed,
+      chunks,
+      path: comparisonLineParsed.to,
+      oldMode,
+      newMode,
     };
   } else if (
     chunks.length &&
@@ -124,12 +145,6 @@ function parseFileChange(ctx: Context): AnyFileChange | undefined {
       chunks,
       path: chunks[0].pathAfter,
     };
-  } else if (comparisonLineParsed?.to) {
-    return {
-      type: FileType.Changed,
-      chunks,
-      path: comparisonLineParsed.to,
-    };
   }
   return;
 }
@@ -228,6 +243,14 @@ function parseExtendedHeader(ctx: Context) {
       type,
       path: line.slice(`${type} `.length),
     } as const;
+  } else if (
+    type === ExtendedHeader.OldMode ||
+    type === ExtendedHeader.NewMode
+  ) {
+    return {
+      type,
+      mode: line.slice(`${type} `.length),
+    } as const;
   } else if (type) {
     return {
       type,
diff --git a/src/types.ts b/src/types.ts
@@ -61,6 +61,8 @@ export type AnyChunk = Chunk | CombinedChunk | BinaryFilesChunk;
 export interface ChangedFile extends Base<typeof FileType.Changed> {
   path: string;
   chunks: AnyChunk[];
+  oldMode?: string;
+  newMode?: string;
 }
 
 export interface AddedFile extends Base<typeof FileType.Added> {
@@ -77,6 +79,8 @@ export interface RenamedFile extends Base<typeof FileType.Renamed> {
   pathBefore: string;
   pathAfter: string;
   chunks: AnyChunk[];
+  oldMode?: string;
+  newMode?: string;
 }
 
 export type AnyFileChange = ChangedFile | AddedFile | DeletedFile | RenamedFile;
