Fix author long names

Author: dherault

src/index.ts

@@ -97,7 +97,7 @@ function parseGitPatch(patch: string) {
         nA++
         nB++
 
-        if (line === '-- ') {
+        if (line === '-- ' || line === '--') {
           return
         }
         if (line.startsWith('+')) {
@@ -141,7 +141,12 @@ function splitMetaInfo(patch: string, lines: string[]) {
 
   const [, hash] = match1
 
-  const authorLine = lines.shift()
+  let authorLine = lines.shift()
+
+  // Parsing of long names
+  while (lines[0].startsWith(' ')) {
+    authorLine += ` ${lines.shift()}`
+  }
 
   if (!authorLine) return null
 
@@ -165,7 +170,7 @@ function splitMetaInfo(patch: string, lines: string[]) {
 
   return {
     hash,
-    authorName,
+    authorName: formatAuthorName(authorName),
     authorEmail,
     date,
     message,
@@ -196,4 +201,8 @@ function splitIntoParts(lines: string[], separator: string) {
   return parts
 }
 
+function formatAuthorName(name: string) {
+  return (name.startsWith('"') && name.endsWith('"') ? name.slice(1, -1) : name).trim()
+}
+
 export default parseGitPatch

test/index.test.ts

@@ -333,11 +333,9 @@ test('parses a add and delete patch', () => {
 test('parses a add and delete patch with hyphen', () => {
   const result = parse(data['hyphen.patch'])
 
-  console.log('result', JSON.stringify(parse(data['hyphen.patch']), null, 2))
-
   expect(result).toEqual({
     hash: '89afcd42fb6f2602fbcd03d6e5573b1859347787',
-    authorName: '"Restyled.io"',
+    authorName: 'Restyled.io',
     authorEmail: '[email protected]',
     date: 'Fri, 17 Jan 2025 18:09:56 +0000',
     message: '[PATCH 2/2] Restyled by prettier-yaml',
@@ -372,3 +370,45 @@ test('parses a add and delete patch with hyphen', () => {
 test('parses a complex patch 2', () => {
   parse(data['complex.patch'])
 })
+
+test('parses a long author name', () => {
+  const result = parse(data['one-file-author-line-break.patch'])
+
+  expect(result).toEqual({
+    hash: '0f6f88c98fff3afa0289f46bf4eab469f45eebc6',
+    date: 'Sat, 25 Jan 2020 19:21:35 +0200',
+    message: '[PATCH] JSON stringify string responses',
+    authorEmail: '[email protected]',
+    authorName: 'Really long name spanning lots of characters',
+    files: [
+      {
+        added: false,
+        deleted: false,
+        beforeName: 'src/events/http/HttpServer.js',
+        afterName: 'src/events/http/HttpServer.js',
+        modifiedLines: [
+          {
+            line: '        if (result && typeof result.body !== \'undefined\') {',
+            lineNumber: 773,
+            added: false,
+          },
+          {
+            line: '        if (typeof result === \'string\') {',
+            lineNumber: 773,
+            added: true,
+          },
+          {
+            line: '          response.source = JSON.stringify(result)',
+            lineNumber: 774,
+            added: true,
+          },
+          {
+            line: '        } else if (result && typeof result.body !== \'undefined\') {',
+            lineNumber: 775,
+            added: true,
+          },
+        ],
+      },
+    ],
+  })
+})

test/tests-data/one-file-author-line-break.patch

@@ -0,0 +1,27 @@
+From 0f6f88c98fff3afa0289f46bf4eab469f45eebc6 Mon Sep 17 00:00:00 2001
+From: Really long name spanning lots of characters
+ <[email protected]>
+Date: Sat, 25 Jan 2020 19:21:35 +0200
+Subject: [PATCH] JSON stringify string responses
+
+---
+ src/events/http/HttpServer.js | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/events/http/HttpServer.js b/src/events/http/HttpServer.js
+index 20bf454..c0fdafb 100644
+--- a/src/events/http/HttpServer.js
++++ b/src/events/http/HttpServer.js
+@@ -770,7 +770,9 @@ export default class HttpServer {
+           override: false,
+         })
+
+-        if (result && typeof result.body !== 'undefined') {
++        if (typeof result === 'string') {
++          response.source = JSON.stringify(result)
++        } else if (result && typeof result.body !== 'undefined') {
+           if (result.isBase64Encoded) {
+             response.encoding = 'binary'
+             response.source = Buffer.from(result.body, 'base64')
+--
+2.21.1 (Apple Git-122.3)