@pierre/diffs 1.0.0 → 1.0.1

package/LICENSE.md

@@ -0,0 +1,189 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1.  Definitions.
+
+    "License" shall mean the terms and conditions for use, reproduction, and
+    distribution as defined by Sections 1 through 9 of this document.
+
+    "Licensor" shall mean the copyright owner or entity authorized by the
+    copyright owner that is granting the License.
+
+    "Legal Entity" shall mean the union of the acting entity and all other
+    entities that control, are controlled by, or are under common control with
+    that entity. For the purposes of this definition, "control" means (i) the
+    power, direct or indirect, to cause the direction or management of such
+    entity, whether by contract or otherwise, or (ii) ownership of fifty percent
+    (50%) or more of the outstanding shares, or (iii) beneficial ownership of
+    such entity.
+
+    "You" (or "Your") shall mean an individual or Legal Entity exercising
+    permissions granted by this License.
+
+    "Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation source, and
+    configuration files.
+
+    "Object" form shall mean any form resulting from mechanical transformation
+    or translation of a Source form, including but not limited to compiled
+    object code, generated documentation, and conversions to other media types.
+
+    "Work" shall mean the work of authorship, whether in Source or Object form,
+    made available under the License, as indicated by a copyright notice that is
+    included in or attached to the work (an example is provided in the Appendix
+    below).
+
+    "Derivative Works" shall mean any work, whether in Source or Object form,
+    that is based on (or derived from) the Work and for which the editorial
+    revisions, annotations, elaborations, or other modifications represent, as a
+    whole, an original work of authorship. For the purposes of this License,
+    Derivative Works shall not include works that remain separable from, or
+    merely link (or bind by name) to the interfaces of, the Work and Derivative
+    Works thereof.
+
+    "Contribution" shall mean any work of authorship, including the original
+    version of the Work and any modifications or additions to that Work or
+    Derivative Works thereof, that is intentionally submitted to Licensor for
+    inclusion in the Work by the copyright owner or by an individual or Legal
+    Entity authorized to submit on behalf of the copyright owner. For the
+    purposes of this definition, "submitted" means any form of electronic,
+    verbal, or written communication sent to the Licensor or its
+    representatives, including but not limited to communication on electronic
+    mailing lists, source code control systems, and issue tracking systems that
+    are managed by, or on behalf of, the Licensor for the purpose of discussing
+    and improving the Work, but excluding communication that is conspicuously
+    marked or otherwise designated in writing by the copyright owner as "Not a
+    Contribution."
+
+    "Contributor" shall mean Licensor and any individual or Legal Entity on
+    behalf of whom a Contribution has been received by Licensor and subsequently
+    incorporated within the Work.
+
+2.  Grant of Copyright License. Subject to the terms and conditions of this
+    License, each Contributor hereby grants to You a perpetual, worldwide,
+    non-exclusive, no-charge, royalty-free, irrevocable copyright license to
+    reproduce, prepare Derivative Works of, publicly display, publicly perform,
+    sublicense, and distribute the Work and such Derivative Works in Source or
+    Object form.
+
+3.  Grant of Patent License. Subject to the terms and conditions of this
+    License, each Contributor hereby grants to You a perpetual, worldwide,
+    non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
+    this section) patent license to make, have made, use, offer to sell, sell,
+    import, and otherwise transfer the Work, where such license applies only to
+    those patent claims licensable by such Contributor that are necessarily
+    infringed by their Contribution(s) alone or by combination of their
+    Contribution(s) with the Work to which such Contribution(s) was submitted.
+    If You institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+    Contribution incorporated within the Work constitutes direct or contributory
+    patent infringement, then any patent licenses granted to You under this
+    License for that Work shall terminate as of the date such litigation is
+    filed.
+
+4.  Redistribution. You may reproduce and distribute copies of the Work or
+    Derivative Works thereof in any medium, with or without modifications, and
+    in Source or Object form, provided that You meet the following conditions:
+
+    (a) You must give any other recipients of the Work or Derivative Works a
+    copy of this License; and
+
+    (b) You must cause any modified files to carry prominent notices stating
+    that You changed the files; and
+
+    (c) You must retain, in the Source form of any Derivative Works that You
+    distribute, all copyright, patent, trademark, and attribution notices from
+    the Source form of the Work, excluding those notices that do not pertain to
+    any part of the Derivative Works; and
+
+    (d) If the Work includes a "NOTICE" text file as part of its distribution,
+    then any Derivative Works that You distribute must include a readable copy
+    of the attribution notices contained within such NOTICE file, excluding
+    those notices that do not pertain to any part of the Derivative Works, in at
+    least one of the following places: within a NOTICE text file distributed as
+    part of the Derivative Works; within the Source form or documentation, if
+    provided along with the Derivative Works; or, within a display generated by
+    the Derivative Works, if and wherever such third-party notices normally
+    appear. The contents of the NOTICE file are for informational purposes only
+    and do not modify the License. You may add Your own attribution notices
+    within Derivative Works that You distribute, alongside or as an addendum to
+    the NOTICE text from the Work, provided that such additional attribution
+    notices cannot be construed as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and may
+    provide additional or different license terms and conditions for use,
+    reproduction, or distribution of Your modifications, or for any such
+    Derivative Works as a whole, provided Your use, reproduction, and
+    distribution of the Work otherwise complies with the conditions stated in
+    this License.
+
+5.  Submission of Contributions. Unless You explicitly state otherwise, any
+    Contribution intentionally submitted for inclusion in the Work by You to the
+    Licensor shall be under the terms and conditions of this License, without
+    any additional terms or conditions. Notwithstanding the above, nothing
+    herein shall supersede or modify the terms of any separate license agreement
+    you may have executed with Licensor regarding such Contributions.
+
+6.  Trademarks. This License does not grant permission to use the trade names,
+    trademarks, service marks, or product names of the Licensor, except as
+    required for reasonable and customary use in describing the origin of the
+    Work and reproducing the content of the NOTICE file.
+
+7.  Disclaimer of Warranty. Unless required by applicable law or agreed to in
+    writing, Licensor provides the Work (and each Contributor provides its
+    Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied, including, without limitation, any
+    warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or
+    FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining
+    the appropriateness of using or redistributing the Work and assume any risks
+    associated with Your exercise of permissions under this License.
+
+8.  Limitation of Liability. In no event and under no legal theory, whether in
+    tort (including negligence), contract, or otherwise, unless required by
+    applicable law (such as deliberate and grossly negligent acts) or agreed to
+    in writing, shall any Contributor be liable to You for damages, including
+    any direct, indirect, special, incidental, or consequential damages of any
+    character arising as a result of this License or out of the use or inability
+    to use the Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all other
+    commercial damages or losses), even if such Contributor has been advised of
+    the possibility of such damages.
+
+9.  Accepting Warranty or Additional Liability. While redistributing the Work or
+    Derivative Works thereof, You may choose to offer, and charge a fee for,
+    acceptance of support, warranty, indemnity, or other liability obligations
+    and/or rights consistent with this License. However, in accepting such
+    obligations, You may act only on Your own behalf and on Your sole
+    responsibility, not on behalf of any other Contributor, and only if You
+    agree to indemnify, defend, and hold each Contributor harmless for any
+    liability incurred by, or claims asserted against, such Contributor by
+    reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+Copyright 2025 Pierre Computer Company
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/dist/utils/parsePatchFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parsePatchFiles.d.ts","names":[],"sources":["../../src/utils/parsePatchFiles.ts"],"sourcesContent":[],"mappings":";;;;;;AAqRA;;;;;;iBAAgB,eAAA,yCAGb"}
+{"version":3,"file":"parsePatchFiles.d.ts","names":[],"sources":["../../src/utils/parsePatchFiles.ts"],"sourcesContent":[],"mappings":";;;;;;AA8RA;;;;;;iBAAgB,eAAA,yCAGb"}

package/dist/utils/parsePatchFiles.js

@@ -131,7 +131,7 @@ function processPatch(data, cacheKeyPrefix) {
 				collapsedBefore: 0,
 				splitLineCount: 0,
 				splitLineStart: 0,
-				unifiedLineCount: lines.length,
+				unifiedLineCount: 0,
 				unifiedLineStart: 0,
 				additionCount: parseInt(match[4] ?? "1"),
 				additionStart: parseInt(match[3]),
@@ -150,7 +150,13 @@ function processPatch(data, cacheKeyPrefix) {
 			hunkData.collapsedBefore = Math.max(hunkData.additionStart - 1 - lastHunkEnd, 0);
 			currentFile.hunks.push(hunkData);
 			lastHunkEnd = hunkData.additionStart + hunkData.additionCount - 1;
-			hunkData.splitLineCount = Math.max(hunkData.additionCount, hunkData.deletionCount);
+			for (const content of hunkContent) if (content.type === "context") {
+				hunkData.splitLineCount += content.lines.length;
+				hunkData.unifiedLineCount += content.lines.length;
+			} else {
+				hunkData.splitLineCount += Math.max(content.additions.length, content.deletions.length);
+				hunkData.unifiedLineCount += content.deletions.length + content.additions.length;
+			}
 			hunkData.splitLineStart = currentFile.splitLineCount;
 			hunkData.unifiedLineStart = currentFile.unifiedLineCount;
 			currentFile.splitLineCount += hunkData.splitLineCount;

package/dist/utils/parsePatchFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"parsePatchFiles.js","names":["patchMetadata: string | undefined","files: FileDiffMetadata[]","currentFile: FileDiffMetadata | undefined","hunkContent: (ContextContent | ChangeContent)[]","currentContent: ContextContent | ChangeContent | undefined","lastLineType: 'context' | 'addition' | 'deletion' | undefined","hunkData: Hunk","patches: ParsedPatch[]"],"sources":["../../src/utils/parsePatchFiles.ts"],"sourcesContent":["import {\n  ALTERNATE_FILE_NAMES_GIT,\n  COMMIT_METADATA_SPLIT,\n  FILENAME_HEADER_REGEX,\n  FILENAME_HEADER_REGEX_GIT,\n  FILE_CONTEXT_BLOB,\n  FILE_MODE_FROM_INDEX,\n  GIT_DIFF_FILE_BREAK_REGEX,\n  HUNK_HEADER,\n  SPLIT_WITH_NEWLINES,\n  UNIFIED_DIFF_FILE_BREAK_REGEX,\n} from '../constants';\nimport type {\n  ChangeContent,\n  ContextContent,\n  FileDiffMetadata,\n  Hunk,\n  ParsedPatch,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { parseLineType } from './parseLineType';\n\nfunction processPatch(data: string, cacheKeyPrefix?: string): ParsedPatch {\n  const isGitDiff = GIT_DIFF_FILE_BREAK_REGEX.test(data);\n  const rawFiles = data.split(\n    isGitDiff ? GIT_DIFF_FILE_BREAK_REGEX : UNIFIED_DIFF_FILE_BREAK_REGEX\n  );\n  let patchMetadata: string | undefined;\n  const files: FileDiffMetadata[] = [];\n  let currentFile: FileDiffMetadata | undefined;\n  for (const file of rawFiles) {\n    if (isGitDiff && !GIT_DIFF_FILE_BREAK_REGEX.test(file)) {\n      if (patchMetadata == null) {\n        patchMetadata = file;\n      } else {\n        console.error('parsePatchContent: unknown file blob:', file);\n      }\n      // If we get in here, it's most likely the introductory metadata from the\n      // patch, or something is fucked with the diff format\n      continue;\n    } else if (!isGitDiff && !UNIFIED_DIFF_FILE_BREAK_REGEX.test(file)) {\n      if (patchMetadata == null) {\n        patchMetadata = file;\n      } else {\n        console.error('parsePatchContent: unknown file blob:', file);\n      }\n      continue;\n    }\n    let lastHunkEnd = 0;\n    const hunks = file.split(FILE_CONTEXT_BLOB);\n    currentFile = undefined;\n    for (const hunk of hunks) {\n      const lines = hunk.split(SPLIT_WITH_NEWLINES);\n      const firstLine = lines.shift();\n      if (firstLine == null) {\n        console.error('parsePatchContent: invalid hunk', hunk);\n        continue;\n      }\n      const match = firstLine.match(HUNK_HEADER);\n      const hunkContent: (ContextContent | ChangeContent)[] = [];\n      let additionLines = 0;\n      let deletionLines = 0;\n      if (match == null || currentFile == null) {\n        if (currentFile != null) {\n          console.error('parsePatchContent: Invalid hunk', hunk);\n          continue;\n        }\n        currentFile = {\n          name: '',\n          prevName: undefined,\n          type: 'change',\n          hunks: [],\n          splitLineCount: 0,\n          unifiedLineCount: 0,\n          cacheKey:\n            cacheKeyPrefix != null\n              ? `${cacheKeyPrefix}-${files.length}`\n              : undefined,\n        };\n        // Push that first line back into the group of lines so we can properly\n        // parse it out\n        lines.unshift(firstLine);\n        for (const line of lines) {\n          const filenameMatch = line.match(\n            isGitDiff ? FILENAME_HEADER_REGEX_GIT : FILENAME_HEADER_REGEX\n          );\n          if (line.startsWith('diff --git')) {\n            const [, , prevName, , name] =\n              line.trim().match(ALTERNATE_FILE_NAMES_GIT) ?? [];\n            currentFile.name = name.trim();\n            if (prevName !== name) {\n              currentFile.prevName = prevName.trim();\n            }\n          } else if (filenameMatch != null) {\n            const [, type, fileName] = filenameMatch;\n            if (type === '---' && fileName !== '/dev/null') {\n              currentFile.prevName = fileName.trim();\n              currentFile.name = fileName.trim();\n            } else if (type === '+++' && fileName !== '/dev/null') {\n              currentFile.name = fileName.trim();\n            }\n          }\n          // Git diffs have a bunch of additional metadata we can pull from\n          else if (isGitDiff) {\n            if (line.startsWith('new mode ')) {\n              currentFile.mode = line.replace('new mode', '').trim();\n            }\n            if (line.startsWith('old mode ')) {\n              currentFile.oldMode = line.replace('old mode', '').trim();\n            }\n            if (line.startsWith('new file mode')) {\n              currentFile.type = 'new';\n              currentFile.mode = line.replace('new file mode', '').trim();\n            }\n            if (line.startsWith('deleted file mode')) {\n              currentFile.type = 'deleted';\n              currentFile.mode = line.replace('deleted file mode', '').trim();\n            }\n            if (line.startsWith('similarity index')) {\n              if (line.startsWith('similarity index 100%')) {\n                currentFile.type = 'rename-pure';\n              } else {\n                currentFile.type = 'rename-changed';\n              }\n            }\n            if (line.startsWith('index ')) {\n              const [, mode] = line.trim().match(FILE_MODE_FROM_INDEX) ?? [];\n              if (mode != null) {\n                currentFile.mode = mode;\n              }\n            }\n            // We have to handle these for pure renames because there won't be\n            // --- and +++ lines\n            if (line.startsWith('rename from ')) {\n              currentFile.prevName = line.replace('rename from ', '');\n            }\n            if (line.startsWith('rename to ')) {\n              currentFile.name = line.replace('rename to ', '').trim();\n            }\n          }\n        }\n        continue;\n      } else {\n        let currentContent: ContextContent | ChangeContent | undefined;\n        let lastLineType: 'context' | 'addition' | 'deletion' | undefined;\n        // Strip trailing bare newlines (format-patch separators between commits)\n        while (\n          lines.length > 0 &&\n          (lines[lines.length - 1] === '\\n' || lines[lines.length - 1] === '')\n        ) {\n          lines.pop();\n        }\n        for (const rawLine of lines) {\n          const parsedLine = parseLineType(rawLine);\n          if (parsedLine == null) {\n            continue;\n          }\n          const { type, line } = parsedLine;\n          if (type === 'addition') {\n            if (currentContent == null || currentContent.type !== 'change') {\n              currentContent = createContentGroup('change');\n              hunkContent.push(currentContent);\n            }\n            currentContent.additions.push(line);\n            additionLines++;\n            lastLineType = 'addition';\n          } else if (type === 'deletion') {\n            if (currentContent == null || currentContent.type !== 'change') {\n              currentContent = createContentGroup('change');\n              hunkContent.push(currentContent);\n            }\n            currentContent.deletions.push(line);\n            deletionLines++;\n            lastLineType = 'deletion';\n          } else if (type === 'context') {\n            if (currentContent == null || currentContent.type !== 'context') {\n              currentContent = createContentGroup('context');\n              hunkContent.push(currentContent);\n            }\n            currentContent.lines.push(line);\n            lastLineType = 'context';\n          } else if (type === 'metadata' && currentContent != null) {\n            if (currentContent.type === 'context') {\n              currentContent.noEOFCR = true;\n            } else if (lastLineType === 'deletion') {\n              currentContent.noEOFCRDeletions = true;\n              const lastIndex = currentContent.deletions.length - 1;\n              if (lastIndex >= 0) {\n                currentContent.deletions[lastIndex] = cleanLastNewline(\n                  currentContent.deletions[lastIndex]\n                );\n              }\n            } else if (lastLineType === 'addition') {\n              currentContent.noEOFCRAdditions = true;\n              const lastIndex = currentContent.additions.length - 1;\n              if (lastIndex >= 0) {\n                currentContent.additions[lastIndex] = cleanLastNewline(\n                  currentContent.additions[lastIndex]\n                );\n              }\n            }\n          }\n        }\n      }\n      const hunkData: Hunk = {\n        collapsedBefore: 0,\n        splitLineCount: 0,\n        splitLineStart: 0,\n        unifiedLineCount: lines.length,\n        unifiedLineStart: 0,\n        additionCount: parseInt(match[4] ?? '1'),\n        additionStart: parseInt(match[3]),\n        additionLines,\n        deletionCount: parseInt(match[2] ?? '1'),\n        deletionStart: parseInt(match[1]),\n        deletionLines,\n        hunkContent,\n        hunkContext: match[5],\n        hunkSpecs: firstLine,\n      };\n      if (\n        isNaN(hunkData.additionCount) ||\n        isNaN(hunkData.deletionCount) ||\n        isNaN(hunkData.additionStart) ||\n        isNaN(hunkData.deletionStart)\n      ) {\n        console.error('parsePatchContent: invalid hunk metadata', hunkData);\n        continue;\n      }\n      hunkData.collapsedBefore = Math.max(\n        hunkData.additionStart - 1 - lastHunkEnd,\n        0\n      );\n      currentFile.hunks.push(hunkData);\n      lastHunkEnd = hunkData.additionStart + hunkData.additionCount - 1;\n      hunkData.splitLineCount = Math.max(\n        hunkData.additionCount,\n        hunkData.deletionCount\n      );\n      hunkData.splitLineStart = currentFile.splitLineCount;\n      hunkData.unifiedLineStart = currentFile.unifiedLineCount;\n\n      currentFile.splitLineCount += hunkData.splitLineCount;\n      currentFile.unifiedLineCount += hunkData.unifiedLineCount;\n    }\n    if (currentFile != null) {\n      if (\n        !isGitDiff &&\n        currentFile.prevName != null &&\n        currentFile.name !== currentFile.prevName\n      ) {\n        if (currentFile.hunks.length > 0) {\n          currentFile.type = 'rename-changed';\n        } else {\n          currentFile.type = 'rename-pure';\n        }\n      }\n      if (\n        currentFile.type !== 'rename-pure' &&\n        currentFile.type !== 'rename-changed'\n      ) {\n        currentFile.prevName = undefined;\n      }\n      files.push(currentFile);\n    }\n  }\n  return { patchMetadata, files };\n}\n\n/**\n * Parses a patch file string into an array of parsed patches.\n *\n * @param data - The raw patch file content (supports multi-commit patches)\n * @param cacheKeyPrefix - Optional prefix for generating cache keys. When provided,\n *   each file in the patch will get a cache key in the format `prefix-patchIndex-fileIndex`.\n *   This enables caching of rendered diff results in the worker pool.\n */\nexport function parsePatchFiles(\n  data: string,\n  cacheKeyPrefix?: string\n): ParsedPatch[] {\n  // NOTE(amadeus): This function is pretty forgiving in that it can accept a\n  // patch file that includes commit metdata, multiple commits, or not\n  const patches: ParsedPatch[] = [];\n  for (const patch of data.split(COMMIT_METADATA_SPLIT)) {\n    try {\n      patches.push(\n        processPatch(\n          patch,\n          cacheKeyPrefix != null\n            ? `${cacheKeyPrefix}-${patches.length}`\n            : undefined\n        )\n      );\n    } catch (error) {\n      console.error(error);\n    }\n  }\n  return patches;\n}\n\nfunction createContentGroup(type: 'change'): ChangeContent;\nfunction createContentGroup(type: 'context'): ContextContent;\nfunction createContentGroup(\n  type: 'change' | 'context'\n): ChangeContent | ContextContent {\n  if (type === 'change') {\n    return {\n      type: 'change',\n      additions: [],\n      deletions: [],\n      noEOFCRAdditions: false,\n      noEOFCRDeletions: false,\n    };\n  }\n  return { type: 'context', lines: [], noEOFCR: false };\n}\n"],"mappings":"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"}
+{"version":3,"file":"parsePatchFiles.js","names":["patchMetadata: string | undefined","files: FileDiffMetadata[]","currentFile: FileDiffMetadata | undefined","hunkContent: (ContextContent | ChangeContent)[]","currentContent: ContextContent | ChangeContent | undefined","lastLineType: 'context' | 'addition' | 'deletion' | undefined","hunkData: Hunk","patches: ParsedPatch[]"],"sources":["../../src/utils/parsePatchFiles.ts"],"sourcesContent":["import {\n  ALTERNATE_FILE_NAMES_GIT,\n  COMMIT_METADATA_SPLIT,\n  FILENAME_HEADER_REGEX,\n  FILENAME_HEADER_REGEX_GIT,\n  FILE_CONTEXT_BLOB,\n  FILE_MODE_FROM_INDEX,\n  GIT_DIFF_FILE_BREAK_REGEX,\n  HUNK_HEADER,\n  SPLIT_WITH_NEWLINES,\n  UNIFIED_DIFF_FILE_BREAK_REGEX,\n} from '../constants';\nimport type {\n  ChangeContent,\n  ContextContent,\n  FileDiffMetadata,\n  Hunk,\n  ParsedPatch,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { parseLineType } from './parseLineType';\n\nfunction processPatch(data: string, cacheKeyPrefix?: string): ParsedPatch {\n  const isGitDiff = GIT_DIFF_FILE_BREAK_REGEX.test(data);\n  const rawFiles = data.split(\n    isGitDiff ? GIT_DIFF_FILE_BREAK_REGEX : UNIFIED_DIFF_FILE_BREAK_REGEX\n  );\n  let patchMetadata: string | undefined;\n  const files: FileDiffMetadata[] = [];\n  let currentFile: FileDiffMetadata | undefined;\n  for (const file of rawFiles) {\n    if (isGitDiff && !GIT_DIFF_FILE_BREAK_REGEX.test(file)) {\n      if (patchMetadata == null) {\n        patchMetadata = file;\n      } else {\n        console.error('parsePatchContent: unknown file blob:', file);\n      }\n      // If we get in here, it's most likely the introductory metadata from the\n      // patch, or something is fucked with the diff format\n      continue;\n    } else if (!isGitDiff && !UNIFIED_DIFF_FILE_BREAK_REGEX.test(file)) {\n      if (patchMetadata == null) {\n        patchMetadata = file;\n      } else {\n        console.error('parsePatchContent: unknown file blob:', file);\n      }\n      continue;\n    }\n    let lastHunkEnd = 0;\n    const hunks = file.split(FILE_CONTEXT_BLOB);\n    currentFile = undefined;\n    for (const hunk of hunks) {\n      const lines = hunk.split(SPLIT_WITH_NEWLINES);\n      const firstLine = lines.shift();\n      if (firstLine == null) {\n        console.error('parsePatchContent: invalid hunk', hunk);\n        continue;\n      }\n      const match = firstLine.match(HUNK_HEADER);\n      const hunkContent: (ContextContent | ChangeContent)[] = [];\n      let additionLines = 0;\n      let deletionLines = 0;\n      if (match == null || currentFile == null) {\n        if (currentFile != null) {\n          console.error('parsePatchContent: Invalid hunk', hunk);\n          continue;\n        }\n        currentFile = {\n          name: '',\n          prevName: undefined,\n          type: 'change',\n          hunks: [],\n          splitLineCount: 0,\n          unifiedLineCount: 0,\n          cacheKey:\n            cacheKeyPrefix != null\n              ? `${cacheKeyPrefix}-${files.length}`\n              : undefined,\n        };\n        // Push that first line back into the group of lines so we can properly\n        // parse it out\n        lines.unshift(firstLine);\n        for (const line of lines) {\n          const filenameMatch = line.match(\n            isGitDiff ? FILENAME_HEADER_REGEX_GIT : FILENAME_HEADER_REGEX\n          );\n          if (line.startsWith('diff --git')) {\n            const [, , prevName, , name] =\n              line.trim().match(ALTERNATE_FILE_NAMES_GIT) ?? [];\n            currentFile.name = name.trim();\n            if (prevName !== name) {\n              currentFile.prevName = prevName.trim();\n            }\n          } else if (filenameMatch != null) {\n            const [, type, fileName] = filenameMatch;\n            if (type === '---' && fileName !== '/dev/null') {\n              currentFile.prevName = fileName.trim();\n              currentFile.name = fileName.trim();\n            } else if (type === '+++' && fileName !== '/dev/null') {\n              currentFile.name = fileName.trim();\n            }\n          }\n          // Git diffs have a bunch of additional metadata we can pull from\n          else if (isGitDiff) {\n            if (line.startsWith('new mode ')) {\n              currentFile.mode = line.replace('new mode', '').trim();\n            }\n            if (line.startsWith('old mode ')) {\n              currentFile.oldMode = line.replace('old mode', '').trim();\n            }\n            if (line.startsWith('new file mode')) {\n              currentFile.type = 'new';\n              currentFile.mode = line.replace('new file mode', '').trim();\n            }\n            if (line.startsWith('deleted file mode')) {\n              currentFile.type = 'deleted';\n              currentFile.mode = line.replace('deleted file mode', '').trim();\n            }\n            if (line.startsWith('similarity index')) {\n              if (line.startsWith('similarity index 100%')) {\n                currentFile.type = 'rename-pure';\n              } else {\n                currentFile.type = 'rename-changed';\n              }\n            }\n            if (line.startsWith('index ')) {\n              const [, mode] = line.trim().match(FILE_MODE_FROM_INDEX) ?? [];\n              if (mode != null) {\n                currentFile.mode = mode;\n              }\n            }\n            // We have to handle these for pure renames because there won't be\n            // --- and +++ lines\n            if (line.startsWith('rename from ')) {\n              currentFile.prevName = line.replace('rename from ', '');\n            }\n            if (line.startsWith('rename to ')) {\n              currentFile.name = line.replace('rename to ', '').trim();\n            }\n          }\n        }\n        continue;\n      } else {\n        let currentContent: ContextContent | ChangeContent | undefined;\n        let lastLineType: 'context' | 'addition' | 'deletion' | undefined;\n        // Strip trailing bare newlines (format-patch separators between commits)\n        while (\n          lines.length > 0 &&\n          (lines[lines.length - 1] === '\\n' || lines[lines.length - 1] === '')\n        ) {\n          lines.pop();\n        }\n        for (const rawLine of lines) {\n          const parsedLine = parseLineType(rawLine);\n          if (parsedLine == null) {\n            continue;\n          }\n          const { type, line } = parsedLine;\n          if (type === 'addition') {\n            if (currentContent == null || currentContent.type !== 'change') {\n              currentContent = createContentGroup('change');\n              hunkContent.push(currentContent);\n            }\n            currentContent.additions.push(line);\n            additionLines++;\n            lastLineType = 'addition';\n          } else if (type === 'deletion') {\n            if (currentContent == null || currentContent.type !== 'change') {\n              currentContent = createContentGroup('change');\n              hunkContent.push(currentContent);\n            }\n            currentContent.deletions.push(line);\n            deletionLines++;\n            lastLineType = 'deletion';\n          } else if (type === 'context') {\n            if (currentContent == null || currentContent.type !== 'context') {\n              currentContent = createContentGroup('context');\n              hunkContent.push(currentContent);\n            }\n            currentContent.lines.push(line);\n            lastLineType = 'context';\n          } else if (type === 'metadata' && currentContent != null) {\n            if (currentContent.type === 'context') {\n              currentContent.noEOFCR = true;\n            } else if (lastLineType === 'deletion') {\n              currentContent.noEOFCRDeletions = true;\n              const lastIndex = currentContent.deletions.length - 1;\n              if (lastIndex >= 0) {\n                currentContent.deletions[lastIndex] = cleanLastNewline(\n                  currentContent.deletions[lastIndex]\n                );\n              }\n            } else if (lastLineType === 'addition') {\n              currentContent.noEOFCRAdditions = true;\n              const lastIndex = currentContent.additions.length - 1;\n              if (lastIndex >= 0) {\n                currentContent.additions[lastIndex] = cleanLastNewline(\n                  currentContent.additions[lastIndex]\n                );\n              }\n            }\n          }\n        }\n      }\n      const hunkData: Hunk = {\n        collapsedBefore: 0,\n        splitLineCount: 0,\n        splitLineStart: 0,\n        unifiedLineCount: 0,\n        unifiedLineStart: 0,\n        additionCount: parseInt(match[4] ?? '1'),\n        additionStart: parseInt(match[3]),\n        additionLines,\n        deletionCount: parseInt(match[2] ?? '1'),\n        deletionStart: parseInt(match[1]),\n        deletionLines,\n        hunkContent,\n        hunkContext: match[5],\n        hunkSpecs: firstLine,\n      };\n      if (\n        isNaN(hunkData.additionCount) ||\n        isNaN(hunkData.deletionCount) ||\n        isNaN(hunkData.additionStart) ||\n        isNaN(hunkData.deletionStart)\n      ) {\n        console.error('parsePatchContent: invalid hunk metadata', hunkData);\n        continue;\n      }\n      hunkData.collapsedBefore = Math.max(\n        hunkData.additionStart - 1 - lastHunkEnd,\n        0\n      );\n      currentFile.hunks.push(hunkData);\n      lastHunkEnd = hunkData.additionStart + hunkData.additionCount - 1;\n      for (const content of hunkContent) {\n        if (content.type === 'context') {\n          hunkData.splitLineCount += content.lines.length;\n          hunkData.unifiedLineCount += content.lines.length;\n        } else {\n          hunkData.splitLineCount += Math.max(\n            content.additions.length,\n            content.deletions.length\n          );\n          hunkData.unifiedLineCount +=\n            content.deletions.length + content.additions.length;\n        }\n      }\n      hunkData.splitLineStart = currentFile.splitLineCount;\n      hunkData.unifiedLineStart = currentFile.unifiedLineCount;\n\n      currentFile.splitLineCount += hunkData.splitLineCount;\n      currentFile.unifiedLineCount += hunkData.unifiedLineCount;\n    }\n    if (currentFile != null) {\n      if (\n        !isGitDiff &&\n        currentFile.prevName != null &&\n        currentFile.name !== currentFile.prevName\n      ) {\n        if (currentFile.hunks.length > 0) {\n          currentFile.type = 'rename-changed';\n        } else {\n          currentFile.type = 'rename-pure';\n        }\n      }\n      if (\n        currentFile.type !== 'rename-pure' &&\n        currentFile.type !== 'rename-changed'\n      ) {\n        currentFile.prevName = undefined;\n      }\n      files.push(currentFile);\n    }\n  }\n  return { patchMetadata, files };\n}\n\n/**\n * Parses a patch file string into an array of parsed patches.\n *\n * @param data - The raw patch file content (supports multi-commit patches)\n * @param cacheKeyPrefix - Optional prefix for generating cache keys. When provided,\n *   each file in the patch will get a cache key in the format `prefix-patchIndex-fileIndex`.\n *   This enables caching of rendered diff results in the worker pool.\n */\nexport function parsePatchFiles(\n  data: string,\n  cacheKeyPrefix?: string\n): ParsedPatch[] {\n  // NOTE(amadeus): This function is pretty forgiving in that it can accept a\n  // patch file that includes commit metdata, multiple commits, or not\n  const patches: ParsedPatch[] = [];\n  for (const patch of data.split(COMMIT_METADATA_SPLIT)) {\n    try {\n      patches.push(\n        processPatch(\n          patch,\n          cacheKeyPrefix != null\n            ? `${cacheKeyPrefix}-${patches.length}`\n            : undefined\n        )\n      );\n    } catch (error) {\n      console.error(error);\n    }\n  }\n  return patches;\n}\n\nfunction createContentGroup(type: 'change'): ChangeContent;\nfunction createContentGroup(type: 'context'): ContextContent;\nfunction createContentGroup(\n  type: 'change' | 'context'\n): ChangeContent | ContextContent {\n  if (type === 'change') {\n    return {\n      type: 'change',\n      additions: [],\n      deletions: [],\n      noEOFCRAdditions: false,\n      noEOFCRDeletions: false,\n    };\n  }\n  return { type: 'context', lines: [], noEOFCR: false };\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pierre/diffs",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "license": "apache-2.0",
   "scripts": {
@@ -41,7 +41,7 @@
   },
   "files": [
     "dist",
-    "LICENSE.txt",
+    "LICENSE.md",
     "README.md"
   ],
   "devDependencies": {
@@ -58,7 +58,7 @@
     "typescript": "5.9.2"
   },
   "dependencies": {
-    "@shikijs/core": "3.19.0",
+    "@shikijs/core": "^3.0.0",
     "@shikijs/engine-javascript": "3.19.0",
     "@shikijs/transformers": "3.19.0",
     "diff": "8.0.2",

package/LICENSE.txt

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1.  Definitions.
-
-    "License" shall mean the terms and conditions for use, reproduction,
-    and distribution as defined by Sections 1 through 9 of this document.
-
-    "Licensor" shall mean the copyright owner or entity authorized by
-    the copyright owner that is granting the License.
-
-    "Legal Entity" shall mean the union of the acting entity and all
-    other entities that control, are controlled by, or are under common
-    control with that entity. For the purposes of this definition,
-    "control" means (i) the power, direct or indirect, to cause the
-    direction or management of such entity, whether by contract or
-    otherwise, or (ii) ownership of fifty percent (50%) or more of the
-    outstanding shares, or (iii) beneficial ownership of such entity.
-
-    "You" (or "Your") shall mean an individual or Legal Entity
-    exercising permissions granted by this License.
-
-    "Source" form shall mean the preferred form for making modifications,
-    including but not limited to software source code, documentation
-    source, and configuration files.
-
-    "Object" form shall mean any form resulting from mechanical
-    transformation or translation of a Source form, including but
-    not limited to compiled object code, generated documentation,
-    and conversions to other media types.
-
-    "Work" shall mean the work of authorship, whether in Source or
-    Object form, made available under the License, as indicated by a
-    copyright notice that is included in or attached to the work
-    (an example is provided in the Appendix below).
-
-    "Derivative Works" shall mean any work, whether in Source or Object
-    form, that is based on (or derived from) the Work and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship. For the purposes
-    of this License, Derivative Works shall not include works that remain
-    separable from, or merely link (or bind by name) to the interfaces of,
-    the Work and Derivative Works thereof.
-
-    "Contribution" shall mean any work of authorship, including
-    the original version of the Work and any modifications or additions
-    to that Work or Derivative Works thereof, that is intentionally
-    submitted to Licensor for inclusion in the Work by the copyright owner
-    or by an individual or Legal Entity authorized to submit on behalf of
-    the copyright owner. For the purposes of this definition, "submitted"
-    means any form of electronic, verbal, or written communication sent
-    to the Licensor or its representatives, including but not limited to
-    communication on electronic mailing lists, source code control systems,
-    and issue tracking systems that are managed by, or on behalf of, the
-    Licensor for the purpose of discussing and improving the Work, but
-    excluding communication that is conspicuously marked or otherwise
-    designated in writing by the copyright owner as "Not a Contribution."
-
-    "Contributor" shall mean Licensor and any individual or Legal Entity
-    on behalf of whom a Contribution has been received by Licensor and
-    subsequently incorporated within the Work.
-
-2.  Grant of Copyright License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    copyright license to reproduce, prepare Derivative Works of,
-    publicly display, publicly perform, sublicense, and distribute the
-    Work and such Derivative Works in Source or Object form.
-
-3.  Grant of Patent License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    (except as stated in this section) patent license to make, have made,
-    use, offer to sell, sell, import, and otherwise transfer the Work,
-    where such license applies only to those patent claims licensable
-    by such Contributor that are necessarily infringed by their
-    Contribution(s) alone or by combination of their Contribution(s)
-    with the Work to which such Contribution(s) was submitted. If You
-    institute patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Work
-    or a Contribution incorporated within the Work constitutes direct
-    or contributory patent infringement, then any patent licenses
-    granted to You under this License for that Work shall terminate
-    as of the date such litigation is filed.
-
-4.  Redistribution. You may reproduce and distribute copies of the
-    Work or Derivative Works thereof in any medium, with or without
-    modifications, and in Source or Object form, provided that You
-    meet the following conditions:
-
-    (a) You must give any other recipients of the Work or
-    Derivative Works a copy of this License; and
-
-    (b) You must cause any modified files to carry prominent notices
-    stating that You changed the files; and
-
-    (c) You must retain, in the Source form of any Derivative Works
-    that You distribute, all copyright, patent, trademark, and
-    attribution notices from the Source form of the Work,
-    excluding those notices that do not pertain to any part of
-    the Derivative Works; and
-
-    (d) If the Work includes a "NOTICE" text file as part of its
-    distribution, then any Derivative Works that You distribute must
-    include a readable copy of the attribution notices contained
-    within such NOTICE file, excluding those notices that do not
-    pertain to any part of the Derivative Works, in at least one
-    of the following places: within a NOTICE text file distributed
-    as part of the Derivative Works; within the Source form or
-    documentation, if provided along with the Derivative Works; or,
-    within a display generated by the Derivative Works, if and
-    wherever such third-party notices normally appear. The contents
-    of the NOTICE file are for informational purposes only and
-    do not modify the License. You may add Your own attribution
-    notices within Derivative Works that You distribute, alongside
-    or as an addendum to the NOTICE text from the Work, provided
-    that such additional attribution notices cannot be construed
-    as modifying the License.
-
-    You may add Your own copyright statement to Your modifications and
-    may provide additional or different license terms and conditions
-    for use, reproduction, or distribution of Your modifications, or
-    for any such Derivative Works as a whole, provided Your use,
-    reproduction, and distribution of the Work otherwise complies with
-    the conditions stated in this License.
-
-5.  Submission of Contributions. Unless You explicitly state otherwise,
-    any Contribution intentionally submitted for inclusion in the Work
-    by You to the Licensor shall be under the terms and conditions of
-    this License, without any additional terms or conditions.
-    Notwithstanding the above, nothing herein shall supersede or modify
-    the terms of any separate license agreement you may have executed
-    with Licensor regarding such Contributions.
-
-6.  Trademarks. This License does not grant permission to use the trade
-    names, trademarks, service marks, or product names of the Licensor,
-    except as required for reasonable and customary use in describing the
-    origin of the Work and reproducing the content of the NOTICE file.
-
-7.  Disclaimer of Warranty. Unless required by applicable law or
-    agreed to in writing, Licensor provides the Work (and each
-    Contributor provides its Contributions) on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-    implied, including, without limitation, any warranties or conditions
-    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-    PARTICULAR PURPOSE. You are solely responsible for determining the
-    appropriateness of using or redistributing the Work and assume any
-    risks associated with Your exercise of permissions under this License.
-
-8.  Limitation of Liability. In no event and under no legal theory,
-    whether in tort (including negligence), contract, or otherwise,
-    unless required by applicable law (such as deliberate and grossly
-    negligent acts) or agreed to in writing, shall any Contributor be
-    liable to You for damages, including any direct, indirect, special,
-    incidental, or consequential damages of any character arising as a
-    result of this License or out of the use or inability to use the
-    Work (including but not limited to damages for loss of goodwill,
-    work stoppage, computer failure or malfunction, or any and all
-    other commercial damages or losses), even if such Contributor
-    has been advised of the possibility of such damages.
-
-9.  Accepting Warranty or Additional Liability. While redistributing
-    the Work or Derivative Works thereof, You may choose to offer,
-    and charge a fee for, acceptance of support, warranty, indemnity,
-    or other liability obligations and/or rights consistent with this
-    License. However, in accepting such obligations, You may act only
-    on Your own behalf and on Your sole responsibility, not on behalf
-    of any other Contributor, and only if You agree to indemnify,
-    defend, and hold each Contributor harmless for any liability
-    incurred by, or claims asserted against, such Contributor by reason
-    of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-Copyright 2025 Pierre Computer Company
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.