@pierre/diffs 1.1.0-beta.6 → 1.1.0-beta.8

package/dist/utils/parsePatchFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"parsePatchFiles.js","names":["patchMetadata: string | undefined","files: FileDiffMetadata[]","currentFile: FileDiffMetadata | undefined","currentContent: ContextContent | ChangeContent | undefined","lastLineType: 'context' | 'addition' | 'deletion' | undefined","hunkData: Hunk","lastHunkEnd","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  GIT_DIFF_FILE_BREAK_REGEX,\n  HUNK_HEADER,\n  INDEX_LINE_METADATA,\n  SPLIT_WITH_NEWLINES,\n  UNIFIED_DIFF_FILE_BREAK_REGEX,\n} from '../constants';\nimport type {\n  ChangeContent,\n  ContextContent,\n  FileContents,\n  FileDiffMetadata,\n  Hunk,\n  ParsedPatch,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { parseLineType } from './parseLineType';\n\nexport function processPatch(\n  data: string,\n  cacheKeyPrefix?: string\n): 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  for (const fileOrPatchMetadata of rawFiles) {\n    if (isGitDiff && !GIT_DIFF_FILE_BREAK_REGEX.test(fileOrPatchMetadata)) {\n      if (patchMetadata == null) {\n        patchMetadata = fileOrPatchMetadata;\n      } else {\n        console.error(\n          'parsePatchContent: unknown file blob:',\n          fileOrPatchMetadata\n        );\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 (\n      !isGitDiff &&\n      !UNIFIED_DIFF_FILE_BREAK_REGEX.test(fileOrPatchMetadata)\n    ) {\n      if (patchMetadata == null) {\n        patchMetadata = fileOrPatchMetadata;\n      } else {\n        console.error(\n          'parsePatchContent: unknown file blob:',\n          fileOrPatchMetadata\n        );\n      }\n      continue;\n    }\n    const currentFile = processFile(fileOrPatchMetadata, {\n      cacheKey:\n        cacheKeyPrefix != null\n          ? `${cacheKeyPrefix}-${files.length}`\n          : undefined,\n      isGitDiff,\n    });\n    if (currentFile != null) {\n      files.push(currentFile);\n    }\n  }\n  return { patchMetadata, files };\n}\n\ninterface ProcessFileOptions {\n  cacheKey?: string;\n  isGitDiff?: boolean;\n  oldFile?: FileContents;\n  newFile?: FileContents;\n}\n\nexport function processFile(\n  fileDiffString: string,\n  {\n    cacheKey,\n    isGitDiff = GIT_DIFF_FILE_BREAK_REGEX.test(fileDiffString),\n    oldFile,\n    newFile,\n  }: ProcessFileOptions = {}\n): FileDiffMetadata | undefined {\n  let lastHunkEnd = 0;\n  const hunks = fileDiffString.split(FILE_CONTEXT_BLOB);\n  let currentFile: FileDiffMetadata | undefined;\n  const isPartial = oldFile == null || newFile == null;\n  let deletionLineIndex = 0;\n  let additionLineIndex = 0;\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 fileHeaderMatch = firstLine.match(HUNK_HEADER);\n    let additionLines = 0;\n    let deletionLines = 0;\n    // Setup currentFile, this should be the first iteration of our hunks, and\n    // technically not a hunk\n    if (fileHeaderMatch == null || currentFile == null) {\n      if (currentFile != null) {\n        console.error('parsePatchContent: Invalid hunk', hunk);\n        continue;\n      }\n      currentFile = {\n        name: '',\n        type: 'change',\n        hunks: [],\n        splitLineCount: 0,\n        unifiedLineCount: 0,\n        isPartial,\n        additionLines:\n          !isPartial && oldFile != null && newFile != null\n            ? newFile.contents.split(SPLIT_WITH_NEWLINES)\n            : [],\n        deletionLines:\n          !isPartial && oldFile != null && newFile != null\n            ? oldFile.contents.split(SPLIT_WITH_NEWLINES)\n            : [],\n        cacheKey,\n      };\n      // If either file is technically empty, then we should empty the\n      // arrays respectively\n      if (currentFile.additionLines.length === 1 && newFile?.contents === '') {\n        currentFile.additionLines.length = 0;\n      }\n      if (currentFile.deletionLines.length === 1 && oldFile?.contents === '') {\n        currentFile.deletionLines.length = 0;\n      }\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.prevMode = 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 [, prevObjectId, newObjectId, mode] =\n              line.trim().match(INDEX_LINE_METADATA) ?? [];\n            if (prevObjectId != null) {\n              currentFile.prevObjectId = prevObjectId;\n            }\n            if (newObjectId != null) {\n              currentFile.newObjectId = newObjectId;\n            }\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    }\n\n    // Otherwise, time to start parsing out the hunk\n    let currentContent: ContextContent | ChangeContent | undefined;\n    let lastLineType: 'context' | 'addition' | 'deletion' | undefined;\n\n    // Strip trailing bare newlines (format-patch separators between commits)\n    // if needed\n    while (\n      lines.length > 0 &&\n      (lines[lines.length - 1] === '\\n' ||\n        lines[lines.length - 1] === '\\r' ||\n        lines[lines.length - 1] === '\\r\\n' ||\n        lines[lines.length - 1] === '')\n    ) {\n      lines.pop();\n    }\n\n    const additionStart = parseInt(fileHeaderMatch[3]);\n    const deletionStart = parseInt(fileHeaderMatch[1]);\n    deletionLineIndex = isPartial ? deletionLineIndex : deletionStart - 1;\n    additionLineIndex = isPartial ? additionLineIndex : additionStart - 1;\n\n    const hunkData: Hunk = {\n      collapsedBefore: 0,\n\n      splitLineCount: 0,\n      splitLineStart: 0,\n\n      unifiedLineCount: 0,\n      unifiedLineStart: 0,\n\n      additionCount: parseInt(fileHeaderMatch[4] ?? '1'),\n      additionStart,\n      additionLines,\n\n      deletionCount: parseInt(fileHeaderMatch[2] ?? '1'),\n      deletionStart,\n      deletionLines,\n\n      deletionLineIndex,\n      additionLineIndex,\n\n      hunkContent: [],\n      hunkContext: fileHeaderMatch[5],\n      hunkSpecs: firstLine,\n\n      noEOFCRAdditions: false,\n      noEOFCRDeletions: false,\n    };\n\n    // Lets validate out hunkData to ensure there's no broken data from the\n    // regex\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\n    // Now we process each line of the hunk\n    for (const rawLine of lines) {\n      const parsedLine = parseLineType(rawLine);\n      // If we can't properly process the line, well, lets just try to salvage\n      // things and continue... It's possible an AI generated diff might have\n      // some stray blank lines or something in there\n      if (parsedLine == null) {\n        console.error('processFile: invalid rawLine:', rawLine);\n        continue;\n      }\n\n      const { type, line } = parsedLine;\n      if (type === 'addition') {\n        if (currentContent == null || currentContent.type !== 'change') {\n          currentContent = createContentGroup(\n            'change',\n            deletionLineIndex,\n            additionLineIndex\n          );\n          hunkData.hunkContent.push(currentContent);\n        }\n        additionLineIndex++;\n        if (isPartial) {\n          currentFile.additionLines.push(line);\n        }\n        currentContent.additions++;\n        additionLines++;\n        lastLineType = 'addition';\n      } else if (type === 'deletion') {\n        if (currentContent == null || currentContent.type !== 'change') {\n          currentContent = createContentGroup(\n            'change',\n            deletionLineIndex,\n            additionLineIndex\n          );\n          hunkData.hunkContent.push(currentContent);\n        }\n        deletionLineIndex++;\n        if (isPartial) {\n          currentFile.deletionLines.push(line);\n        }\n        currentContent.deletions++;\n        deletionLines++;\n        lastLineType = 'deletion';\n      } else if (type === 'context') {\n        if (currentContent == null || currentContent.type !== 'context') {\n          currentContent = createContentGroup(\n            'context',\n            deletionLineIndex,\n            additionLineIndex\n          );\n          hunkData.hunkContent.push(currentContent);\n        }\n        additionLineIndex++;\n        deletionLineIndex++;\n        if (isPartial) {\n          currentFile.deletionLines.push(line);\n          currentFile.additionLines.push(line);\n        }\n        currentContent.lines++;\n        lastLineType = 'context';\n      } else if (type === 'metadata' && currentContent != null) {\n        if (currentContent.type === 'context') {\n          hunkData.noEOFCRAdditions = true;\n          hunkData.noEOFCRDeletions = true;\n        } else if (lastLineType === 'deletion') {\n          hunkData.noEOFCRDeletions = true;\n        } else if (lastLineType === 'addition') {\n          hunkData.noEOFCRAdditions = true;\n        }\n        // If we're dealing with partial content from a diff, we need to strip\n        // newlines manually from the content\n        if (\n          isPartial &&\n          (lastLineType === 'addition' || lastLineType === 'context')\n        ) {\n          const lastIndex = currentFile.additionLines.length - 1;\n          if (lastIndex >= 0) {\n            currentFile.additionLines[lastIndex] = cleanLastNewline(\n              currentFile.additionLines[lastIndex]\n            );\n          }\n        }\n        if (\n          isPartial &&\n          (lastLineType === 'deletion' || lastLineType === 'context')\n        ) {\n          const lastIndex = currentFile.deletionLines.length - 1;\n          if (lastIndex >= 0) {\n            currentFile.deletionLines[lastIndex] = cleanLastNewline(\n              currentFile.deletionLines[lastIndex]\n            );\n          }\n        }\n      }\n    }\n\n    hunkData.additionLines = additionLines;\n    hunkData.deletionLines = deletionLines;\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 hunkData.hunkContent) {\n      if (content.type === 'context') {\n        hunkData.splitLineCount += content.lines;\n        hunkData.unifiedLineCount += content.lines;\n      } else {\n        hunkData.splitLineCount += Math.max(\n          content.additions,\n          content.deletions\n        );\n        hunkData.unifiedLineCount += content.deletions + content.additions;\n      }\n    }\n    hunkData.splitLineStart =\n      currentFile.splitLineCount + hunkData.collapsedBefore;\n    hunkData.unifiedLineStart =\n      currentFile.unifiedLineCount + hunkData.collapsedBefore;\n\n    currentFile.splitLineCount +=\n      hunkData.collapsedBefore + hunkData.splitLineCount;\n    currentFile.unifiedLineCount +=\n      hunkData.collapsedBefore + hunkData.unifiedLineCount;\n  }\n  if (currentFile == null) {\n    return undefined;\n  }\n\n  // Account for collapsed lines after the final hunk and increment the\n  // split/unified counts properly\n  if (\n    currentFile.hunks.length > 0 &&\n    !isPartial &&\n    currentFile.additionLines.length > 0 &&\n    currentFile.deletionLines.length > 0\n  ) {\n    const lastHunk = currentFile.hunks[currentFile.hunks.length - 1];\n    const lastHunkEnd = lastHunk.additionStart + lastHunk.additionCount - 1;\n    const totalFileLines = currentFile.additionLines.length;\n    const collapsedAfter = Math.max(totalFileLines - lastHunkEnd, 0);\n    currentFile.splitLineCount += collapsedAfter;\n    currentFile.unifiedLineCount += collapsedAfter;\n  }\n\n  // If this isn't a git diff style patch, then we'll need to sus out some\n  // additional metadata manually\n  if (!isGitDiff) {\n    if (\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    // Sort of a hack for detecting deleted/added files...\n    else if (newFile != null && newFile.contents === '') {\n      currentFile.type = 'deleted';\n    } else if (oldFile != null && oldFile.contents === '') {\n      currentFile.type = 'new';\n    }\n  }\n  if (\n    currentFile.type !== 'rename-pure' &&\n    currentFile.type !== 'rename-changed'\n  ) {\n    currentFile.prevName = undefined;\n  }\n  return currentFile;\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(\n  type: 'change',\n  deletionLineIndex: number,\n  additionLineIndex: number\n): ChangeContent;\nfunction createContentGroup(\n  type: 'context',\n  deletionLineIndex: number,\n  additionLineIndex: number\n): ContextContent;\nfunction createContentGroup(\n  type: 'change' | 'context',\n  deletionLineIndex: number,\n  additionLineIndex: number\n): ChangeContent | ContextContent {\n  if (type === 'change') {\n    return {\n      type: 'change',\n      additions: 0,\n      deletions: 0,\n      additionLineIndex,\n      deletionLineIndex,\n    };\n  }\n  return {\n    type: 'context',\n    lines: 0,\n    additionLineIndex,\n    deletionLineIndex,\n  };\n}\n"],"mappings":";;;;;AAuBA,SAAgB,aACd,MACA,gBACa;CACb,MAAM,YAAY,0BAA0B,KAAK,KAAK;CACtD,MAAM,WAAW,KAAK,MACpB,YAAY,4BAA4B,8BACzC;CACD,IAAIA;CACJ,MAAMC,QAA4B,EAAE;AACpC,MAAK,MAAM,uBAAuB,UAAU;AAC1C,MAAI,aAAa,CAAC,0BAA0B,KAAK,oBAAoB,EAAE;AACrE,OAAI,iBAAiB,KACnB,iBAAgB;OAEhB,SAAQ,MACN,yCACA,oBACD;AAIH;aAEA,CAAC,aACD,CAAC,8BAA8B,KAAK,oBAAoB,EACxD;AACA,OAAI,iBAAiB,KACnB,iBAAgB;OAEhB,SAAQ,MACN,yCACA,oBACD;AAEH;;EAEF,MAAM,cAAc,YAAY,qBAAqB;GACnD,UACE,kBAAkB,OACd,GAAG,eAAe,GAAG,MAAM,WAC3B;GACN;GACD,CAAC;AACF,MAAI,eAAe,KACjB,OAAM,KAAK,YAAY;;AAG3B,QAAO;EAAE;EAAe;EAAO;;AAUjC,SAAgB,YACd,gBACA,EACE,UACA,YAAY,0BAA0B,KAAK,eAAe,EAC1D,SACA,YACsB,EAAE,EACI;CAC9B,IAAI,cAAc;CAClB,MAAM,QAAQ,eAAe,MAAM,kBAAkB;CACrD,IAAIC;CACJ,MAAM,YAAY,WAAW,QAAQ,WAAW;CAChD,IAAI,oBAAoB;CACxB,IAAI,oBAAoB;AACxB,MAAK,MAAM,QAAQ,OAAO;EACxB,MAAM,QAAQ,KAAK,MAAM,oBAAoB;EAC7C,MAAM,YAAY,MAAM,OAAO;AAC/B,MAAI,aAAa,MAAM;AACrB,WAAQ,MAAM,mCAAmC,KAAK;AACtD;;EAEF,MAAM,kBAAkB,UAAU,MAAM,YAAY;EACpD,IAAI,gBAAgB;EACpB,IAAI,gBAAgB;AAGpB,MAAI,mBAAmB,QAAQ,eAAe,MAAM;AAClD,OAAI,eAAe,MAAM;AACvB,YAAQ,MAAM,mCAAmC,KAAK;AACtD;;AAEF,iBAAc;IACZ,MAAM;IACN,MAAM;IACN,OAAO,EAAE;IACT,gBAAgB;IAChB,kBAAkB;IAClB;IACA,eACE,CAAC,aAAa,WAAW,QAAQ,WAAW,OACxC,QAAQ,SAAS,MAAM,oBAAoB,GAC3C,EAAE;IACR,eACE,CAAC,aAAa,WAAW,QAAQ,WAAW,OACxC,QAAQ,SAAS,MAAM,oBAAoB,GAC3C,EAAE;IACR;IACD;AAGD,OAAI,YAAY,cAAc,WAAW,KAAK,SAAS,aAAa,GAClE,aAAY,cAAc,SAAS;AAErC,OAAI,YAAY,cAAc,WAAW,KAAK,SAAS,aAAa,GAClE,aAAY,cAAc,SAAS;AAKrC,SAAM,QAAQ,UAAU;AACxB,QAAK,MAAM,QAAQ,OAAO;IACxB,MAAM,gBAAgB,KAAK,MACzB,YAAY,4BAA4B,sBACzC;AACD,QAAI,KAAK,WAAW,aAAa,EAAE;KACjC,MAAM,KAAK,YAAY,QACrB,KAAK,MAAM,CAAC,MAAM,yBAAyB,IAAI,EAAE;AACnD,iBAAY,OAAO,KAAK,MAAM;AAC9B,SAAI,aAAa,KACf,aAAY,WAAW,SAAS,MAAM;eAE/B,iBAAiB,MAAM;KAChC,MAAM,GAAG,MAAM,YAAY;AAC3B,SAAI,SAAS,SAAS,aAAa,aAAa;AAC9C,kBAAY,WAAW,SAAS,MAAM;AACtC,kBAAY,OAAO,SAAS,MAAM;gBACzB,SAAS,SAAS,aAAa,YACxC,aAAY,OAAO,SAAS,MAAM;eAI7B,WAAW;AAClB,SAAI,KAAK,WAAW,YAAY,CAC9B,aAAY,OAAO,KAAK,QAAQ,YAAY,GAAG,CAAC,MAAM;AAExD,SAAI,KAAK,WAAW,YAAY,CAC9B,aAAY,WAAW,KAAK,QAAQ,YAAY,GAAG,CAAC,MAAM;AAE5D,SAAI,KAAK,WAAW,gBAAgB,EAAE;AACpC,kBAAY,OAAO;AACnB,kBAAY,OAAO,KAAK,QAAQ,iBAAiB,GAAG,CAAC,MAAM;;AAE7D,SAAI,KAAK,WAAW,oBAAoB,EAAE;AACxC,kBAAY,OAAO;AACnB,kBAAY,OAAO,KAAK,QAAQ,qBAAqB,GAAG,CAAC,MAAM;;AAEjE,SAAI,KAAK,WAAW,mBAAmB,CACrC,KAAI,KAAK,WAAW,wBAAwB,CAC1C,aAAY,OAAO;SAEnB,aAAY,OAAO;AAGvB,SAAI,KAAK,WAAW,SAAS,EAAE;MAC7B,MAAM,GAAG,cAAc,aAAa,QAClC,KAAK,MAAM,CAAC,MAAM,oBAAoB,IAAI,EAAE;AAC9C,UAAI,gBAAgB,KAClB,aAAY,eAAe;AAE7B,UAAI,eAAe,KACjB,aAAY,cAAc;AAE5B,UAAI,QAAQ,KACV,aAAY,OAAO;;AAKvB,SAAI,KAAK,WAAW,eAAe,CACjC,aAAY,WAAW,KAAK,QAAQ,gBAAgB,GAAG;AAEzD,SAAI,KAAK,WAAW,aAAa,CAC/B,aAAY,OAAO,KAAK,QAAQ,cAAc,GAAG,CAAC,MAAM;;;AAI9D;;EAIF,IAAIC;EACJ,IAAIC;AAIJ,SACE,MAAM,SAAS,MACd,MAAM,MAAM,SAAS,OAAO,QAC3B,MAAM,MAAM,SAAS,OAAO,QAC5B,MAAM,MAAM,SAAS,OAAO,UAC5B,MAAM,MAAM,SAAS,OAAO,IAE9B,OAAM,KAAK;EAGb,MAAM,gBAAgB,SAAS,gBAAgB,GAAG;EAClD,MAAM,gBAAgB,SAAS,gBAAgB,GAAG;AAClD,sBAAoB,YAAY,oBAAoB,gBAAgB;AACpE,sBAAoB,YAAY,oBAAoB,gBAAgB;EAEpE,MAAMC,WAAiB;GACrB,iBAAiB;GAEjB,gBAAgB;GAChB,gBAAgB;GAEhB,kBAAkB;GAClB,kBAAkB;GAElB,eAAe,SAAS,gBAAgB,MAAM,IAAI;GAClD;GACA;GAEA,eAAe,SAAS,gBAAgB,MAAM,IAAI;GAClD;GACA;GAEA;GACA;GAEA,aAAa,EAAE;GACf,aAAa,gBAAgB;GAC7B,WAAW;GAEX,kBAAkB;GAClB,kBAAkB;GACnB;AAID,MACE,MAAM,SAAS,cAAc,IAC7B,MAAM,SAAS,cAAc,IAC7B,MAAM,SAAS,cAAc,IAC7B,MAAM,SAAS,cAAc,EAC7B;AACA,WAAQ,MAAM,4CAA4C,SAAS;AACnE;;AAIF,OAAK,MAAM,WAAW,OAAO;GAC3B,MAAM,aAAa,cAAc,QAAQ;AAIzC,OAAI,cAAc,MAAM;AACtB,YAAQ,MAAM,iCAAiC,QAAQ;AACvD;;GAGF,MAAM,EAAE,MAAM,SAAS;AACvB,OAAI,SAAS,YAAY;AACvB,QAAI,kBAAkB,QAAQ,eAAe,SAAS,UAAU;AAC9D,sBAAiB,mBACf,UACA,mBACA,kBACD;AACD,cAAS,YAAY,KAAK,eAAe;;AAE3C;AACA,QAAI,UACF,aAAY,cAAc,KAAK,KAAK;AAEtC,mBAAe;AACf;AACA,mBAAe;cACN,SAAS,YAAY;AAC9B,QAAI,kBAAkB,QAAQ,eAAe,SAAS,UAAU;AAC9D,sBAAiB,mBACf,UACA,mBACA,kBACD;AACD,cAAS,YAAY,KAAK,eAAe;;AAE3C;AACA,QAAI,UACF,aAAY,cAAc,KAAK,KAAK;AAEtC,mBAAe;AACf;AACA,mBAAe;cACN,SAAS,WAAW;AAC7B,QAAI,kBAAkB,QAAQ,eAAe,SAAS,WAAW;AAC/D,sBAAiB,mBACf,WACA,mBACA,kBACD;AACD,cAAS,YAAY,KAAK,eAAe;;AAE3C;AACA;AACA,QAAI,WAAW;AACb,iBAAY,cAAc,KAAK,KAAK;AACpC,iBAAY,cAAc,KAAK,KAAK;;AAEtC,mBAAe;AACf,mBAAe;cACN,SAAS,cAAc,kBAAkB,MAAM;AACxD,QAAI,eAAe,SAAS,WAAW;AACrC,cAAS,mBAAmB;AAC5B,cAAS,mBAAmB;eACnB,iBAAiB,WAC1B,UAAS,mBAAmB;aACnB,iBAAiB,WAC1B,UAAS,mBAAmB;AAI9B,QACE,cACC,iBAAiB,cAAc,iBAAiB,YACjD;KACA,MAAM,YAAY,YAAY,cAAc,SAAS;AACrD,SAAI,aAAa,EACf,aAAY,cAAc,aAAa,iBACrC,YAAY,cAAc,WAC3B;;AAGL,QACE,cACC,iBAAiB,cAAc,iBAAiB,YACjD;KACA,MAAM,YAAY,YAAY,cAAc,SAAS;AACrD,SAAI,aAAa,EACf,aAAY,cAAc,aAAa,iBACrC,YAAY,cAAc,WAC3B;;;;AAMT,WAAS,gBAAgB;AACzB,WAAS,gBAAgB;AAEzB,WAAS,kBAAkB,KAAK,IAC9B,SAAS,gBAAgB,IAAI,aAC7B,EACD;AACD,cAAY,MAAM,KAAK,SAAS;AAChC,gBAAc,SAAS,gBAAgB,SAAS,gBAAgB;AAChE,OAAK,MAAM,WAAW,SAAS,YAC7B,KAAI,QAAQ,SAAS,WAAW;AAC9B,YAAS,kBAAkB,QAAQ;AACnC,YAAS,oBAAoB,QAAQ;SAChC;AACL,YAAS,kBAAkB,KAAK,IAC9B,QAAQ,WACR,QAAQ,UACT;AACD,YAAS,oBAAoB,QAAQ,YAAY,QAAQ;;AAG7D,WAAS,iBACP,YAAY,iBAAiB,SAAS;AACxC,WAAS,mBACP,YAAY,mBAAmB,SAAS;AAE1C,cAAY,kBACV,SAAS,kBAAkB,SAAS;AACtC,cAAY,oBACV,SAAS,kBAAkB,SAAS;;AAExC,KAAI,eAAe,KACjB;AAKF,KACE,YAAY,MAAM,SAAS,KAC3B,CAAC,aACD,YAAY,cAAc,SAAS,KACnC,YAAY,cAAc,SAAS,GACnC;EACA,MAAM,WAAW,YAAY,MAAM,YAAY,MAAM,SAAS;EAC9D,MAAMC,gBAAc,SAAS,gBAAgB,SAAS,gBAAgB;EACtE,MAAM,iBAAiB,YAAY,cAAc;EACjD,MAAM,iBAAiB,KAAK,IAAI,iBAAiBA,eAAa,EAAE;AAChE,cAAY,kBAAkB;AAC9B,cAAY,oBAAoB;;AAKlC,KAAI,CAAC,WACH;MACE,YAAY,YAAY,QACxB,YAAY,SAAS,YAAY,SAEjC,KAAI,YAAY,MAAM,SAAS,EAC7B,aAAY,OAAO;MAEnB,aAAY,OAAO;WAId,WAAW,QAAQ,QAAQ,aAAa,GAC/C,aAAY,OAAO;WACV,WAAW,QAAQ,QAAQ,aAAa,GACjD,aAAY,OAAO;;AAGvB,KACE,YAAY,SAAS,iBACrB,YAAY,SAAS,iBAErB,aAAY,WAAW;AAEzB,QAAO;;;;;;;;;;AAWT,SAAgB,gBACd,MACA,gBACe;CAGf,MAAMC,UAAyB,EAAE;AACjC,MAAK,MAAM,SAAS,KAAK,MAAM,sBAAsB,CACnD,KAAI;AACF,UAAQ,KACN,aACE,OACA,kBAAkB,OACd,GAAG,eAAe,GAAG,QAAQ,WAC7B,OACL,CACF;UACM,OAAO;AACd,UAAQ,MAAM,MAAM;;AAGxB,QAAO;;AAaT,SAAS,mBACP,MACA,mBACA,mBACgC;AAChC,KAAI,SAAS,SACX,QAAO;EACL,MAAM;EACN,WAAW;EACX,WAAW;EACX;EACA;EACD;AAEH,QAAO;EACL,MAAM;EACN,OAAO;EACP;EACA;EACD"}
+{"version":3,"file":"parsePatchFiles.js","names":["patchMetadata: string | undefined","files: FileDiffMetadata[]","currentFile: FileDiffMetadata | undefined","currentContent: ContextContent | ChangeContent | undefined","lastLineType: 'context' | 'addition' | 'deletion' | undefined","hunkData: Hunk","lastHunkEnd","patches: ParsedPatch[]"],"sources":["../../src/utils/parsePatchFiles.ts"],"sourcesContent":["import {\n  ALTERNATE_FILE_NAMES_GIT,\n  COMMIT_METADATA_SPLIT,\n  FILE_CONTEXT_BLOB,\n  FILENAME_HEADER_REGEX,\n  FILENAME_HEADER_REGEX_GIT,\n  GIT_DIFF_FILE_BREAK_REGEX,\n  HUNK_HEADER,\n  INDEX_LINE_METADATA,\n  SPLIT_WITH_NEWLINES,\n  UNIFIED_DIFF_FILE_BREAK_REGEX,\n} from '../constants';\nimport type {\n  ChangeContent,\n  ContextContent,\n  FileContents,\n  FileDiffMetadata,\n  Hunk,\n  ParsedPatch,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { parseLineType } from './parseLineType';\n\nexport function processPatch(\n  data: string,\n  cacheKeyPrefix?: string,\n  throwOnError = false\n): 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  for (const fileOrPatchMetadata of rawFiles) {\n    if (isGitDiff && !GIT_DIFF_FILE_BREAK_REGEX.test(fileOrPatchMetadata)) {\n      if (patchMetadata == null) {\n        patchMetadata = fileOrPatchMetadata;\n      } else {\n        if (throwOnError) {\n          throw Error('parsePatchContent: unknown file blob');\n        } else {\n          console.error(\n            'parsePatchContent: unknown file blob:',\n            fileOrPatchMetadata\n          );\n        }\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 (\n      !isGitDiff &&\n      !UNIFIED_DIFF_FILE_BREAK_REGEX.test(fileOrPatchMetadata)\n    ) {\n      if (patchMetadata == null) {\n        patchMetadata = fileOrPatchMetadata;\n      } else {\n        if (throwOnError) {\n          throw Error('parsePatchContent: unknown file blob');\n        } else {\n          console.error(\n            'parsePatchContent: unknown file blob:',\n            fileOrPatchMetadata\n          );\n        }\n      }\n      continue;\n    }\n    const currentFile = processFile(fileOrPatchMetadata, {\n      cacheKey:\n        cacheKeyPrefix != null\n          ? `${cacheKeyPrefix}-${files.length}`\n          : undefined,\n      isGitDiff,\n      throwOnError,\n    });\n    if (currentFile != null) {\n      files.push(currentFile);\n    }\n  }\n  return { patchMetadata, files };\n}\n\ninterface ProcessFileOptions {\n  cacheKey?: string;\n  isGitDiff?: boolean;\n  oldFile?: FileContents;\n  newFile?: FileContents;\n  throwOnError?: boolean;\n}\n\nexport function processFile(\n  fileDiffString: string,\n  {\n    cacheKey,\n    isGitDiff = GIT_DIFF_FILE_BREAK_REGEX.test(fileDiffString),\n    oldFile,\n    newFile,\n    throwOnError = false,\n  }: ProcessFileOptions = {}\n): FileDiffMetadata | undefined {\n  let lastHunkEnd = 0;\n  const hunks = fileDiffString.split(FILE_CONTEXT_BLOB);\n  let currentFile: FileDiffMetadata | undefined;\n  const isPartial = oldFile == null || newFile == null;\n  let deletionLineIndex = 0;\n  let additionLineIndex = 0;\n  for (const hunk of hunks) {\n    const lines = hunk.split(SPLIT_WITH_NEWLINES);\n    const firstLine = lines.shift();\n    if (firstLine == null) {\n      if (throwOnError) {\n        throw Error('parsePatchContent: invalid hunk');\n      } else {\n        console.error('parsePatchContent: invalid hunk', hunk);\n      }\n      continue;\n    }\n    const fileHeaderMatch = firstLine.match(HUNK_HEADER);\n    let additionLines = 0;\n    let deletionLines = 0;\n    // Setup currentFile, this should be the first iteration of our hunks, and\n    // technically not a hunk\n    if (fileHeaderMatch == null || currentFile == null) {\n      if (currentFile != null) {\n        if (throwOnError) {\n          throw Error('parsePatchContent: Invalid hunk');\n        } else {\n          console.error('parsePatchContent: Invalid hunk', hunk);\n        }\n        continue;\n      }\n      currentFile = {\n        name: '',\n        type: 'change',\n        hunks: [],\n        splitLineCount: 0,\n        unifiedLineCount: 0,\n        isPartial,\n        additionLines:\n          !isPartial && oldFile != null && newFile != null\n            ? newFile.contents.split(SPLIT_WITH_NEWLINES)\n            : [],\n        deletionLines:\n          !isPartial && oldFile != null && newFile != null\n            ? oldFile.contents.split(SPLIT_WITH_NEWLINES)\n            : [],\n        cacheKey,\n      };\n      // If either file is technically empty, then we should empty the\n      // arrays respectively\n      if (currentFile.additionLines.length === 1 && newFile?.contents === '') {\n        currentFile.additionLines.length = 0;\n      }\n      if (currentFile.deletionLines.length === 1 && oldFile?.contents === '') {\n        currentFile.deletionLines.length = 0;\n      }\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.prevMode = 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 [, prevObjectId, newObjectId, mode] =\n              line.trim().match(INDEX_LINE_METADATA) ?? [];\n            if (prevObjectId != null) {\n              currentFile.prevObjectId = prevObjectId;\n            }\n            if (newObjectId != null) {\n              currentFile.newObjectId = newObjectId;\n            }\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    }\n\n    // Otherwise, time to start parsing out the hunk\n    let currentContent: ContextContent | ChangeContent | undefined;\n    let lastLineType: 'context' | 'addition' | 'deletion' | undefined;\n\n    // Strip trailing bare newlines (format-patch separators between commits)\n    // if needed\n    while (\n      lines.length > 0 &&\n      (lines[lines.length - 1] === '\\n' ||\n        lines[lines.length - 1] === '\\r' ||\n        lines[lines.length - 1] === '\\r\\n' ||\n        lines[lines.length - 1] === '')\n    ) {\n      lines.pop();\n    }\n\n    const additionStart = parseInt(fileHeaderMatch[3]);\n    const deletionStart = parseInt(fileHeaderMatch[1]);\n    deletionLineIndex = isPartial ? deletionLineIndex : deletionStart - 1;\n    additionLineIndex = isPartial ? additionLineIndex : additionStart - 1;\n\n    const hunkData: Hunk = {\n      collapsedBefore: 0,\n\n      splitLineCount: 0,\n      splitLineStart: 0,\n\n      unifiedLineCount: 0,\n      unifiedLineStart: 0,\n\n      additionCount: parseInt(fileHeaderMatch[4] ?? '1'),\n      additionStart,\n      additionLines,\n\n      deletionCount: parseInt(fileHeaderMatch[2] ?? '1'),\n      deletionStart,\n      deletionLines,\n\n      deletionLineIndex,\n      additionLineIndex,\n\n      hunkContent: [],\n      hunkContext: fileHeaderMatch[5],\n      hunkSpecs: firstLine,\n\n      noEOFCRAdditions: false,\n      noEOFCRDeletions: false,\n    };\n\n    // Lets validate out hunkData to ensure there's no broken data from the\n    // regex\n    if (\n      isNaN(hunkData.additionCount) ||\n      isNaN(hunkData.deletionCount) ||\n      isNaN(hunkData.additionStart) ||\n      isNaN(hunkData.deletionStart)\n    ) {\n      if (throwOnError) {\n        throw Error('parsePatchContent: invalid hunk metadata');\n      } else {\n        console.error('parsePatchContent: invalid hunk metadata', hunkData);\n      }\n      continue;\n    }\n\n    // Now we process each line of the hunk\n    for (const rawLine of lines) {\n      const parsedLine = parseLineType(rawLine);\n      // If we can't properly process the line, well, lets just try to salvage\n      // things and continue... It's possible an AI generated diff might have\n      // some stray blank lines or something in there\n      if (parsedLine == null) {\n        console.error('processFile: invalid rawLine:', rawLine);\n        continue;\n      }\n\n      const { type, line } = parsedLine;\n      if (type === 'addition') {\n        if (currentContent == null || currentContent.type !== 'change') {\n          currentContent = createContentGroup(\n            'change',\n            deletionLineIndex,\n            additionLineIndex\n          );\n          hunkData.hunkContent.push(currentContent);\n        }\n        additionLineIndex++;\n        if (isPartial) {\n          currentFile.additionLines.push(line);\n        }\n        currentContent.additions++;\n        additionLines++;\n        lastLineType = 'addition';\n      } else if (type === 'deletion') {\n        if (currentContent == null || currentContent.type !== 'change') {\n          currentContent = createContentGroup(\n            'change',\n            deletionLineIndex,\n            additionLineIndex\n          );\n          hunkData.hunkContent.push(currentContent);\n        }\n        deletionLineIndex++;\n        if (isPartial) {\n          currentFile.deletionLines.push(line);\n        }\n        currentContent.deletions++;\n        deletionLines++;\n        lastLineType = 'deletion';\n      } else if (type === 'context') {\n        if (currentContent == null || currentContent.type !== 'context') {\n          currentContent = createContentGroup(\n            'context',\n            deletionLineIndex,\n            additionLineIndex\n          );\n          hunkData.hunkContent.push(currentContent);\n        }\n        additionLineIndex++;\n        deletionLineIndex++;\n        if (isPartial) {\n          currentFile.deletionLines.push(line);\n          currentFile.additionLines.push(line);\n        }\n        currentContent.lines++;\n        lastLineType = 'context';\n      } else if (type === 'metadata' && currentContent != null) {\n        if (currentContent.type === 'context') {\n          hunkData.noEOFCRAdditions = true;\n          hunkData.noEOFCRDeletions = true;\n        } else if (lastLineType === 'deletion') {\n          hunkData.noEOFCRDeletions = true;\n        } else if (lastLineType === 'addition') {\n          hunkData.noEOFCRAdditions = true;\n        }\n        // If we're dealing with partial content from a diff, we need to strip\n        // newlines manually from the content\n        if (\n          isPartial &&\n          (lastLineType === 'addition' || lastLineType === 'context')\n        ) {\n          const lastIndex = currentFile.additionLines.length - 1;\n          if (lastIndex >= 0) {\n            currentFile.additionLines[lastIndex] = cleanLastNewline(\n              currentFile.additionLines[lastIndex]\n            );\n          }\n        }\n        if (\n          isPartial &&\n          (lastLineType === 'deletion' || lastLineType === 'context')\n        ) {\n          const lastIndex = currentFile.deletionLines.length - 1;\n          if (lastIndex >= 0) {\n            currentFile.deletionLines[lastIndex] = cleanLastNewline(\n              currentFile.deletionLines[lastIndex]\n            );\n          }\n        }\n      }\n    }\n\n    hunkData.additionLines = additionLines;\n    hunkData.deletionLines = deletionLines;\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 hunkData.hunkContent) {\n      if (content.type === 'context') {\n        hunkData.splitLineCount += content.lines;\n        hunkData.unifiedLineCount += content.lines;\n      } else {\n        hunkData.splitLineCount += Math.max(\n          content.additions,\n          content.deletions\n        );\n        hunkData.unifiedLineCount += content.deletions + content.additions;\n      }\n    }\n    hunkData.splitLineStart =\n      currentFile.splitLineCount + hunkData.collapsedBefore;\n    hunkData.unifiedLineStart =\n      currentFile.unifiedLineCount + hunkData.collapsedBefore;\n\n    currentFile.splitLineCount +=\n      hunkData.collapsedBefore + hunkData.splitLineCount;\n    currentFile.unifiedLineCount +=\n      hunkData.collapsedBefore + hunkData.unifiedLineCount;\n  }\n  if (currentFile == null) {\n    return undefined;\n  }\n\n  // Account for collapsed lines after the final hunk and increment the\n  // split/unified counts properly\n  if (\n    currentFile.hunks.length > 0 &&\n    !isPartial &&\n    currentFile.additionLines.length > 0 &&\n    currentFile.deletionLines.length > 0\n  ) {\n    const lastHunk = currentFile.hunks[currentFile.hunks.length - 1];\n    const lastHunkEnd = lastHunk.additionStart + lastHunk.additionCount - 1;\n    const totalFileLines = currentFile.additionLines.length;\n    const collapsedAfter = Math.max(totalFileLines - lastHunkEnd, 0);\n    currentFile.splitLineCount += collapsedAfter;\n    currentFile.unifiedLineCount += collapsedAfter;\n  }\n\n  // If this isn't a git diff style patch, then we'll need to sus out some\n  // additional metadata manually\n  if (!isGitDiff) {\n    if (\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    // Sort of a hack for detecting deleted/added files...\n    else if (newFile != null && newFile.contents === '') {\n      currentFile.type = 'deleted';\n    } else if (oldFile != null && oldFile.contents === '') {\n      currentFile.type = 'new';\n    }\n  }\n  if (\n    currentFile.type !== 'rename-pure' &&\n    currentFile.type !== 'rename-changed'\n  ) {\n    currentFile.prevName = undefined;\n  }\n  return currentFile;\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  throwOnError = false\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          throwOnError\n        )\n      );\n    } catch (error) {\n      if (throwOnError) {\n        throw error;\n      } else {\n        console.error(error);\n      }\n    }\n  }\n  return patches;\n}\n\nfunction createContentGroup(\n  type: 'change',\n  deletionLineIndex: number,\n  additionLineIndex: number\n): ChangeContent;\nfunction createContentGroup(\n  type: 'context',\n  deletionLineIndex: number,\n  additionLineIndex: number\n): ContextContent;\nfunction createContentGroup(\n  type: 'change' | 'context',\n  deletionLineIndex: number,\n  additionLineIndex: number\n): ChangeContent | ContextContent {\n  if (type === 'change') {\n    return {\n      type: 'change',\n      additions: 0,\n      deletions: 0,\n      additionLineIndex,\n      deletionLineIndex,\n    };\n  }\n  return {\n    type: 'context',\n    lines: 0,\n    additionLineIndex,\n    deletionLineIndex,\n  };\n}\n"],"mappings":";;;;;AAuBA,SAAgB,aACd,MACA,gBACA,eAAe,OACF;CACb,MAAM,YAAY,0BAA0B,KAAK,KAAK;CACtD,MAAM,WAAW,KAAK,MACpB,YAAY,4BAA4B,8BACzC;CACD,IAAIA;CACJ,MAAMC,QAA4B,EAAE;AACpC,MAAK,MAAM,uBAAuB,UAAU;AAC1C,MAAI,aAAa,CAAC,0BAA0B,KAAK,oBAAoB,EAAE;AACrE,OAAI,iBAAiB,KACnB,iBAAgB;YAEZ,aACF,OAAM,MAAM,uCAAuC;OAEnD,SAAQ,MACN,yCACA,oBACD;AAKL;aAEA,CAAC,aACD,CAAC,8BAA8B,KAAK,oBAAoB,EACxD;AACA,OAAI,iBAAiB,KACnB,iBAAgB;YAEZ,aACF,OAAM,MAAM,uCAAuC;OAEnD,SAAQ,MACN,yCACA,oBACD;AAGL;;EAEF,MAAM,cAAc,YAAY,qBAAqB;GACnD,UACE,kBAAkB,OACd,GAAG,eAAe,GAAG,MAAM,WAC3B;GACN;GACA;GACD,CAAC;AACF,MAAI,eAAe,KACjB,OAAM,KAAK,YAAY;;AAG3B,QAAO;EAAE;EAAe;EAAO;;AAWjC,SAAgB,YACd,gBACA,EACE,UACA,YAAY,0BAA0B,KAAK,eAAe,EAC1D,SACA,SACA,eAAe,UACO,EAAE,EACI;CAC9B,IAAI,cAAc;CAClB,MAAM,QAAQ,eAAe,MAAM,kBAAkB;CACrD,IAAIC;CACJ,MAAM,YAAY,WAAW,QAAQ,WAAW;CAChD,IAAI,oBAAoB;CACxB,IAAI,oBAAoB;AACxB,MAAK,MAAM,QAAQ,OAAO;EACxB,MAAM,QAAQ,KAAK,MAAM,oBAAoB;EAC7C,MAAM,YAAY,MAAM,OAAO;AAC/B,MAAI,aAAa,MAAM;AACrB,OAAI,aACF,OAAM,MAAM,kCAAkC;OAE9C,SAAQ,MAAM,mCAAmC,KAAK;AAExD;;EAEF,MAAM,kBAAkB,UAAU,MAAM,YAAY;EACpD,IAAI,gBAAgB;EACpB,IAAI,gBAAgB;AAGpB,MAAI,mBAAmB,QAAQ,eAAe,MAAM;AAClD,OAAI,eAAe,MAAM;AACvB,QAAI,aACF,OAAM,MAAM,kCAAkC;QAE9C,SAAQ,MAAM,mCAAmC,KAAK;AAExD;;AAEF,iBAAc;IACZ,MAAM;IACN,MAAM;IACN,OAAO,EAAE;IACT,gBAAgB;IAChB,kBAAkB;IAClB;IACA,eACE,CAAC,aAAa,WAAW,QAAQ,WAAW,OACxC,QAAQ,SAAS,MAAM,oBAAoB,GAC3C,EAAE;IACR,eACE,CAAC,aAAa,WAAW,QAAQ,WAAW,OACxC,QAAQ,SAAS,MAAM,oBAAoB,GAC3C,EAAE;IACR;IACD;AAGD,OAAI,YAAY,cAAc,WAAW,KAAK,SAAS,aAAa,GAClE,aAAY,cAAc,SAAS;AAErC,OAAI,YAAY,cAAc,WAAW,KAAK,SAAS,aAAa,GAClE,aAAY,cAAc,SAAS;AAKrC,SAAM,QAAQ,UAAU;AACxB,QAAK,MAAM,QAAQ,OAAO;IACxB,MAAM,gBAAgB,KAAK,MACzB,YAAY,4BAA4B,sBACzC;AACD,QAAI,KAAK,WAAW,aAAa,EAAE;KACjC,MAAM,KAAK,YAAY,QACrB,KAAK,MAAM,CAAC,MAAM,yBAAyB,IAAI,EAAE;AACnD,iBAAY,OAAO,KAAK,MAAM;AAC9B,SAAI,aAAa,KACf,aAAY,WAAW,SAAS,MAAM;eAE/B,iBAAiB,MAAM;KAChC,MAAM,GAAG,MAAM,YAAY;AAC3B,SAAI,SAAS,SAAS,aAAa,aAAa;AAC9C,kBAAY,WAAW,SAAS,MAAM;AACtC,kBAAY,OAAO,SAAS,MAAM;gBACzB,SAAS,SAAS,aAAa,YACxC,aAAY,OAAO,SAAS,MAAM;eAI7B,WAAW;AAClB,SAAI,KAAK,WAAW,YAAY,CAC9B,aAAY,OAAO,KAAK,QAAQ,YAAY,GAAG,CAAC,MAAM;AAExD,SAAI,KAAK,WAAW,YAAY,CAC9B,aAAY,WAAW,KAAK,QAAQ,YAAY,GAAG,CAAC,MAAM;AAE5D,SAAI,KAAK,WAAW,gBAAgB,EAAE;AACpC,kBAAY,OAAO;AACnB,kBAAY,OAAO,KAAK,QAAQ,iBAAiB,GAAG,CAAC,MAAM;;AAE7D,SAAI,KAAK,WAAW,oBAAoB,EAAE;AACxC,kBAAY,OAAO;AACnB,kBAAY,OAAO,KAAK,QAAQ,qBAAqB,GAAG,CAAC,MAAM;;AAEjE,SAAI,KAAK,WAAW,mBAAmB,CACrC,KAAI,KAAK,WAAW,wBAAwB,CAC1C,aAAY,OAAO;SAEnB,aAAY,OAAO;AAGvB,SAAI,KAAK,WAAW,SAAS,EAAE;MAC7B,MAAM,GAAG,cAAc,aAAa,QAClC,KAAK,MAAM,CAAC,MAAM,oBAAoB,IAAI,EAAE;AAC9C,UAAI,gBAAgB,KAClB,aAAY,eAAe;AAE7B,UAAI,eAAe,KACjB,aAAY,cAAc;AAE5B,UAAI,QAAQ,KACV,aAAY,OAAO;;AAKvB,SAAI,KAAK,WAAW,eAAe,CACjC,aAAY,WAAW,KAAK,QAAQ,gBAAgB,GAAG;AAEzD,SAAI,KAAK,WAAW,aAAa,CAC/B,aAAY,OAAO,KAAK,QAAQ,cAAc,GAAG,CAAC,MAAM;;;AAI9D;;EAIF,IAAIC;EACJ,IAAIC;AAIJ,SACE,MAAM,SAAS,MACd,MAAM,MAAM,SAAS,OAAO,QAC3B,MAAM,MAAM,SAAS,OAAO,QAC5B,MAAM,MAAM,SAAS,OAAO,UAC5B,MAAM,MAAM,SAAS,OAAO,IAE9B,OAAM,KAAK;EAGb,MAAM,gBAAgB,SAAS,gBAAgB,GAAG;EAClD,MAAM,gBAAgB,SAAS,gBAAgB,GAAG;AAClD,sBAAoB,YAAY,oBAAoB,gBAAgB;AACpE,sBAAoB,YAAY,oBAAoB,gBAAgB;EAEpE,MAAMC,WAAiB;GACrB,iBAAiB;GAEjB,gBAAgB;GAChB,gBAAgB;GAEhB,kBAAkB;GAClB,kBAAkB;GAElB,eAAe,SAAS,gBAAgB,MAAM,IAAI;GAClD;GACA;GAEA,eAAe,SAAS,gBAAgB,MAAM,IAAI;GAClD;GACA;GAEA;GACA;GAEA,aAAa,EAAE;GACf,aAAa,gBAAgB;GAC7B,WAAW;GAEX,kBAAkB;GAClB,kBAAkB;GACnB;AAID,MACE,MAAM,SAAS,cAAc,IAC7B,MAAM,SAAS,cAAc,IAC7B,MAAM,SAAS,cAAc,IAC7B,MAAM,SAAS,cAAc,EAC7B;AACA,OAAI,aACF,OAAM,MAAM,2CAA2C;OAEvD,SAAQ,MAAM,4CAA4C,SAAS;AAErE;;AAIF,OAAK,MAAM,WAAW,OAAO;GAC3B,MAAM,aAAa,cAAc,QAAQ;AAIzC,OAAI,cAAc,MAAM;AACtB,YAAQ,MAAM,iCAAiC,QAAQ;AACvD;;GAGF,MAAM,EAAE,MAAM,SAAS;AACvB,OAAI,SAAS,YAAY;AACvB,QAAI,kBAAkB,QAAQ,eAAe,SAAS,UAAU;AAC9D,sBAAiB,mBACf,UACA,mBACA,kBACD;AACD,cAAS,YAAY,KAAK,eAAe;;AAE3C;AACA,QAAI,UACF,aAAY,cAAc,KAAK,KAAK;AAEtC,mBAAe;AACf;AACA,mBAAe;cACN,SAAS,YAAY;AAC9B,QAAI,kBAAkB,QAAQ,eAAe,SAAS,UAAU;AAC9D,sBAAiB,mBACf,UACA,mBACA,kBACD;AACD,cAAS,YAAY,KAAK,eAAe;;AAE3C;AACA,QAAI,UACF,aAAY,cAAc,KAAK,KAAK;AAEtC,mBAAe;AACf;AACA,mBAAe;cACN,SAAS,WAAW;AAC7B,QAAI,kBAAkB,QAAQ,eAAe,SAAS,WAAW;AAC/D,sBAAiB,mBACf,WACA,mBACA,kBACD;AACD,cAAS,YAAY,KAAK,eAAe;;AAE3C;AACA;AACA,QAAI,WAAW;AACb,iBAAY,cAAc,KAAK,KAAK;AACpC,iBAAY,cAAc,KAAK,KAAK;;AAEtC,mBAAe;AACf,mBAAe;cACN,SAAS,cAAc,kBAAkB,MAAM;AACxD,QAAI,eAAe,SAAS,WAAW;AACrC,cAAS,mBAAmB;AAC5B,cAAS,mBAAmB;eACnB,iBAAiB,WAC1B,UAAS,mBAAmB;aACnB,iBAAiB,WAC1B,UAAS,mBAAmB;AAI9B,QACE,cACC,iBAAiB,cAAc,iBAAiB,YACjD;KACA,MAAM,YAAY,YAAY,cAAc,SAAS;AACrD,SAAI,aAAa,EACf,aAAY,cAAc,aAAa,iBACrC,YAAY,cAAc,WAC3B;;AAGL,QACE,cACC,iBAAiB,cAAc,iBAAiB,YACjD;KACA,MAAM,YAAY,YAAY,cAAc,SAAS;AACrD,SAAI,aAAa,EACf,aAAY,cAAc,aAAa,iBACrC,YAAY,cAAc,WAC3B;;;;AAMT,WAAS,gBAAgB;AACzB,WAAS,gBAAgB;AAEzB,WAAS,kBAAkB,KAAK,IAC9B,SAAS,gBAAgB,IAAI,aAC7B,EACD;AACD,cAAY,MAAM,KAAK,SAAS;AAChC,gBAAc,SAAS,gBAAgB,SAAS,gBAAgB;AAChE,OAAK,MAAM,WAAW,SAAS,YAC7B,KAAI,QAAQ,SAAS,WAAW;AAC9B,YAAS,kBAAkB,QAAQ;AACnC,YAAS,oBAAoB,QAAQ;SAChC;AACL,YAAS,kBAAkB,KAAK,IAC9B,QAAQ,WACR,QAAQ,UACT;AACD,YAAS,oBAAoB,QAAQ,YAAY,QAAQ;;AAG7D,WAAS,iBACP,YAAY,iBAAiB,SAAS;AACxC,WAAS,mBACP,YAAY,mBAAmB,SAAS;AAE1C,cAAY,kBACV,SAAS,kBAAkB,SAAS;AACtC,cAAY,oBACV,SAAS,kBAAkB,SAAS;;AAExC,KAAI,eAAe,KACjB;AAKF,KACE,YAAY,MAAM,SAAS,KAC3B,CAAC,aACD,YAAY,cAAc,SAAS,KACnC,YAAY,cAAc,SAAS,GACnC;EACA,MAAM,WAAW,YAAY,MAAM,YAAY,MAAM,SAAS;EAC9D,MAAMC,gBAAc,SAAS,gBAAgB,SAAS,gBAAgB;EACtE,MAAM,iBAAiB,YAAY,cAAc;EACjD,MAAM,iBAAiB,KAAK,IAAI,iBAAiBA,eAAa,EAAE;AAChE,cAAY,kBAAkB;AAC9B,cAAY,oBAAoB;;AAKlC,KAAI,CAAC,WACH;MACE,YAAY,YAAY,QACxB,YAAY,SAAS,YAAY,SAEjC,KAAI,YAAY,MAAM,SAAS,EAC7B,aAAY,OAAO;MAEnB,aAAY,OAAO;WAId,WAAW,QAAQ,QAAQ,aAAa,GAC/C,aAAY,OAAO;WACV,WAAW,QAAQ,QAAQ,aAAa,GACjD,aAAY,OAAO;;AAGvB,KACE,YAAY,SAAS,iBACrB,YAAY,SAAS,iBAErB,aAAY,WAAW;AAEzB,QAAO;;;;;;;;;;AAWT,SAAgB,gBACd,MACA,gBACA,eAAe,OACA;CAGf,MAAMC,UAAyB,EAAE;AACjC,MAAK,MAAM,SAAS,KAAK,MAAM,sBAAsB,CACnD,KAAI;AACF,UAAQ,KACN,aACE,OACA,kBAAkB,OACd,GAAG,eAAe,GAAG,QAAQ,WAC7B,QACJ,aACD,CACF;UACM,OAAO;AACd,MAAI,aACF,OAAM;MAEN,SAAQ,MAAM,MAAM;;AAI1B,QAAO;;AAaT,SAAS,mBACP,MACA,mBACA,mBACgC;AAChC,KAAI,SAAS,SACX,QAAO;EACL,MAAM;EACN,WAAW;EACX,WAAW;EACX;EACA;EACD;AAEH,QAAO;EACL,MAAM;EACN,OAAO;EACP;EACA;EACD"}

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

@@ -1 +1 @@
-{"version":3,"file":"prerenderHTMLIfNecessary.d.ts","names":[],"sources":["../../src/utils/prerenderHTMLIfNecessary.ts"],"sourcesContent":[],"mappings":";iBAAgB,wBAAA,UACL"}
+{"version":3,"file":"prerenderHTMLIfNecessary.d.ts","names":["prerenderHTMLIfNecessary","HTMLElement"],"sources":["../../src/utils/prerenderHTMLIfNecessary.d.ts"],"sourcesContent":["export declare function prerenderHTMLIfNecessary(element: HTMLElement, html: string | undefined): void;\n//# sourceMappingURL=prerenderHTMLIfNecessary.d.ts.map"],"mappings":";iBAAwBA,wBAAAA,UAAkCC"}

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

@@ -1 +1 @@
-{"version":3,"file":"processLine.d.ts","names":[],"sources":["../../src/utils/processLine.ts"],"sourcesContent":[],"mappings":";;;;iBAKgB,WAAA,OACR,8BAEC,oBACN"}
+{"version":3,"file":"processLine.d.ts","names":["ElementContent","Element","HASTElement","SharedRenderState","processLine"],"sources":["../../src/utils/processLine.d.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\nimport type { SharedRenderState } from '../types';\nexport declare function processLine(node: HASTElement, line: number, state: SharedRenderState): ElementContent;\n//# sourceMappingURL=processLine.d.ts.map"],"mappings":";;;;iBAEwBI,WAAAA,OAAkBF,8BAAkCC,oBAAoBH"}

package/dist/utils/processLine.js

@@ -1,4 +1,4 @@
-import { createHastElement, createTextNodeElement } from "./hast_utils.js";
+import { createTextNodeElement } from "./hast_utils.js";
 
 //#region src/utils/processLine.ts
 function processLine(node, line, state) {
@@ -12,30 +12,13 @@ function processLine(node, line, state) {
 		});
 		throw new Error(errorMessage);
 	}
-	node.tagName = "span";
-	node.properties["data-column-content"] = "";
+	node.tagName = "div";
+	node.properties["data-line"] = lineInfo.lineNumber;
+	node.properties["data-alt-line"] = lineInfo.altLineNumber;
+	node.properties["data-line-type"] = lineInfo.type;
+	node.properties["data-line-index"] = lineInfo.lineIndex;
 	if (node.children.length === 0) node.children.push(createTextNodeElement("\n"));
-	return createHastElement({
-		tagName: "div",
-		children: [createHastElement({
-			tagName: "span",
-			children: [createHastElement({
-				tagName: "span",
-				children: [{
-					type: "text",
-					value: `${lineInfo.lineNumber}`
-				}],
-				properties: { "data-line-number-content": "" }
-			})],
-			properties: { "data-column-number": "" }
-		}), node],
-		properties: {
-			"data-line": lineInfo.lineNumber,
-			"data-alt-line": lineInfo.altLineNumber,
-			"data-line-type": lineInfo.type,
-			"data-line-index": lineInfo.lineIndex
-		}
-	});
+	return node;
 }
 
 //#endregion

package/dist/utils/processLine.js.map

@@ -1 +1 @@
-{"version":3,"file":"processLine.js","names":[],"sources":["../../src/utils/processLine.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\n\nimport type { SharedRenderState } from '../types';\nimport { createHastElement, createTextNodeElement } from './hast_utils';\n\nexport function processLine(\n  node: HASTElement,\n  line: number,\n  state: SharedRenderState\n): ElementContent {\n  const lineInfo =\n    typeof state.lineInfo === 'function'\n      ? state.lineInfo(line)\n      : state.lineInfo[line - 1];\n  if (lineInfo == null) {\n    const errorMessage = `processLine: line ${line}, contains no state.lineInfo`;\n    console.error(errorMessage, { node, line, state });\n    throw new Error(errorMessage);\n  }\n  // We need to convert the current line to a div but keep all the decorations\n  // that may be applied\n  node.tagName = 'span';\n  node.properties['data-column-content'] = '';\n\n  // NOTE(amadeus): We need to push newline characters into empty rows or else\n  // copy/pasta will have issues\n  if (node.children.length === 0) {\n    node.children.push(createTextNodeElement('\\n'));\n  }\n  const children = [\n    createHastElement({\n      tagName: 'span',\n      children: [\n        createHastElement({\n          tagName: 'span',\n          children: [{ type: 'text', value: `${lineInfo.lineNumber}` }],\n          properties: { 'data-line-number-content': '' },\n        }),\n      ],\n      properties: { 'data-column-number': '' },\n    }),\n    node,\n  ];\n  return createHastElement({\n    tagName: 'div',\n    children,\n    properties: {\n      'data-line': lineInfo.lineNumber,\n      'data-alt-line': lineInfo.altLineNumber,\n      'data-line-type': lineInfo.type,\n      'data-line-index': lineInfo.lineIndex,\n    },\n  });\n}\n"],"mappings":";;;AAKA,SAAgB,YACd,MACA,MACA,OACgB;CAChB,MAAM,WACJ,OAAO,MAAM,aAAa,aACtB,MAAM,SAAS,KAAK,GACpB,MAAM,SAAS,OAAO;AAC5B,KAAI,YAAY,MAAM;EACpB,MAAM,eAAe,qBAAqB,KAAK;AAC/C,UAAQ,MAAM,cAAc;GAAE;GAAM;GAAM;GAAO,CAAC;AAClD,QAAM,IAAI,MAAM,aAAa;;AAI/B,MAAK,UAAU;AACf,MAAK,WAAW,yBAAyB;AAIzC,KAAI,KAAK,SAAS,WAAW,EAC3B,MAAK,SAAS,KAAK,sBAAsB,KAAK,CAAC;AAgBjD,QAAO,kBAAkB;EACvB,SAAS;EACT,UAhBe,CACf,kBAAkB;GAChB,SAAS;GACT,UAAU,CACR,kBAAkB;IAChB,SAAS;IACT,UAAU,CAAC;KAAE,MAAM;KAAQ,OAAO,GAAG,SAAS;KAAc,CAAC;IAC7D,YAAY,EAAE,4BAA4B,IAAI;IAC/C,CAAC,CACH;GACD,YAAY,EAAE,sBAAsB,IAAI;GACzC,CAAC,EACF,KACD;EAIC,YAAY;GACV,aAAa,SAAS;GACtB,iBAAiB,SAAS;GAC1B,kBAAkB,SAAS;GAC3B,mBAAmB,SAAS;GAC7B;EACF,CAAC"}
+{"version":3,"file":"processLine.js","names":[],"sources":["../../src/utils/processLine.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\n\nimport type { SharedRenderState } from '../types';\nimport { createTextNodeElement } from './hast_utils';\n\nexport function processLine(\n  node: HASTElement,\n  line: number,\n  state: SharedRenderState\n): ElementContent {\n  const lineInfo =\n    typeof state.lineInfo === 'function'\n      ? state.lineInfo(line)\n      : state.lineInfo[line - 1];\n  if (lineInfo == null) {\n    const errorMessage = `processLine: line ${line}, contains no state.lineInfo`;\n    console.error(errorMessage, { node, line, state });\n    throw new Error(errorMessage);\n  }\n  // We need to convert the current line to a div but keep all the decorations\n  // that may be applied\n  node.tagName = 'div';\n  node.properties['data-line'] = lineInfo.lineNumber;\n  node.properties['data-alt-line'] = lineInfo.altLineNumber;\n  node.properties['data-line-type'] = lineInfo.type;\n  node.properties['data-line-index'] = lineInfo.lineIndex;\n\n  // NOTE(amadeus): We need to push newline characters into empty rows or else\n  // copy/pasta will have issues\n  if (node.children.length === 0) {\n    node.children.push(createTextNodeElement('\\n'));\n  }\n\n  return node;\n}\n"],"mappings":";;;AAKA,SAAgB,YACd,MACA,MACA,OACgB;CAChB,MAAM,WACJ,OAAO,MAAM,aAAa,aACtB,MAAM,SAAS,KAAK,GACpB,MAAM,SAAS,OAAO;AAC5B,KAAI,YAAY,MAAM;EACpB,MAAM,eAAe,qBAAqB,KAAK;AAC/C,UAAQ,MAAM,cAAc;GAAE;GAAM;GAAM;GAAO,CAAC;AAClD,QAAM,IAAI,MAAM,aAAa;;AAI/B,MAAK,UAAU;AACf,MAAK,WAAW,eAAe,SAAS;AACxC,MAAK,WAAW,mBAAmB,SAAS;AAC5C,MAAK,WAAW,oBAAoB,SAAS;AAC7C,MAAK,WAAW,qBAAqB,SAAS;AAI9C,KAAI,KAAK,SAAS,WAAW,EAC3B,MAAK,SAAS,KAAK,sBAAsB,KAAK,CAAC;AAGjD,QAAO"}

package/dist/utils/renderDiffWithHighlighter.d.ts

@@ -1,4 +1,4 @@
-import { DiffsHighlighter, FileDiffMetadata, ForcePlainTextOptions, RenderDiffOptions, ThemedDiffResult } from "../types.js";
+import { DiffsHighlighter, FileDiffMetadata, ForceDiffPlainTextOptions, RenderDiffOptions, ThemedDiffResult } from "../types.js";
 
 //#region src/utils/renderDiffWithHighlighter.d.ts
 declare function renderDiffWithHighlighter(diff: FileDiffMetadata, highlighter: DiffsHighlighter, options: RenderDiffOptions, {
@@ -7,7 +7,7 @@ declare function renderDiffWithHighlighter(diff: FileDiffMetadata, highlighter:
   totalLines,
   expandedHunks,
   collapsedContextThreshold
-}?: ForcePlainTextOptions): ThemedDiffResult;
+}?: ForceDiffPlainTextOptions): ThemedDiffResult;
 //#endregion
 export { renderDiffWithHighlighter };
 //# sourceMappingURL=renderDiffWithHighlighter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"renderDiffWithHighlighter.d.ts","names":[],"sources":["../../src/utils/renderDiffWithHighlighter.ts"],"sourcesContent":[],"mappings":";;;iBAqCgB,yBAAA,OACR,+BACO,2BACJ;;;;;;IAON,wBACF"}
+{"version":3,"file":"renderDiffWithHighlighter.d.ts","names":["DiffsHighlighter","FileDiffMetadata","ForceDiffPlainTextOptions","RenderDiffOptions","ThemedDiffResult","renderDiffWithHighlighter","forcePlainText","startingLine","totalLines","expandedHunks","collapsedContextThreshold"],"sources":["../../src/utils/renderDiffWithHighlighter.d.ts"],"sourcesContent":["import type { DiffsHighlighter, FileDiffMetadata, ForceDiffPlainTextOptions, RenderDiffOptions, ThemedDiffResult } from '../types';\nexport declare function renderDiffWithHighlighter(diff: FileDiffMetadata, highlighter: DiffsHighlighter, options: RenderDiffOptions, { forcePlainText, startingLine, totalLines, expandedHunks, collapsedContextThreshold }?: ForceDiffPlainTextOptions): ThemedDiffResult;\n//# sourceMappingURL=renderDiffWithHighlighter.d.ts.map"],"mappings":";;;iBACwBK,yBAAAA,OAAgCJ,+BAA+BD,2BAA2BG;;;;;;IAA4GD,4BAA4BE"}

package/dist/utils/renderDiffWithHighlighter.js

@@ -64,33 +64,34 @@ function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText,
 		totalLines,
 		expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,
 		collapsedContextThreshold,
-		callback: ({ hunkIndex, additionLineIndex, deletionLineIndex, additionLineNumber, deletionLineNumber, unifiedAdditionLineIndex, unifiedDeletionLineIndex, splitLineIndex, type }) => {
+		callback: ({ hunkIndex, additionLine, deletionLine, type }) => {
 			const bucket = getBucketForHunk(hunkIndex);
-			if (type === "change" && lineDiffType !== "none" && additionLineIndex != null && deletionLineIndex != null) computeLineDiffDecorations({
-				additionLine: diff.additionLines[additionLineIndex],
-				deletionLine: diff.deletionLines[deletionLineIndex],
+			const splitLineIndex = additionLine != null ? additionLine.splitLineIndex : deletionLine.splitLineIndex;
+			if (type === "change" && additionLine != null && deletionLine != null) computeLineDiffDecorations({
+				additionLine: diff.additionLines[additionLine.lineIndex],
+				deletionLine: diff.deletionLines[deletionLine.lineIndex],
 				deletionLineIndex: bucket.deletionContent.length,
 				additionLineIndex: bucket.additionContent.length,
 				deletionDecorations: bucket.deletionDecorations,
 				additionDecorations: bucket.additionDecorations,
 				lineDiffType
 			});
-			if (deletionLineIndex != null && deletionLineNumber != null && unifiedDeletionLineIndex != null) {
-				appendContent(diff.deletionLines[deletionLineIndex], deletionLineIndex, bucket.deletionSegments, bucket.deletionContent);
+			if (deletionLine != null) {
+				appendContent(diff.deletionLines[deletionLine.lineIndex], deletionLine.lineIndex, bucket.deletionSegments, bucket.deletionContent);
 				bucket.deletionInfo.push({
 					type: type === "change" ? "change-deletion" : type,
-					lineNumber: deletionLineNumber,
-					altLineNumber: type === "change" ? void 0 : additionLineNumber ?? void 0,
-					lineIndex: `${unifiedDeletionLineIndex},${splitLineIndex}`
+					lineNumber: deletionLine.lineNumber,
+					altLineNumber: type === "change" ? void 0 : additionLine.lineNumber ?? void 0,
+					lineIndex: `${deletionLine.unifiedLineIndex},${splitLineIndex}`
 				});
 			}
-			if (additionLineIndex != null && additionLineNumber != null && unifiedAdditionLineIndex != null) {
-				appendContent(diff.additionLines[additionLineIndex], additionLineIndex, bucket.additionSegments, bucket.additionContent);
+			if (additionLine != null) {
+				appendContent(diff.additionLines[additionLine.lineIndex], additionLine.lineIndex, bucket.additionSegments, bucket.additionContent);
 				bucket.additionInfo.push({
 					type: type === "change" ? "change-addition" : type,
-					lineNumber: additionLineNumber,
-					altLineNumber: type === "change" ? void 0 : deletionLineNumber ?? void 0,
-					lineIndex: `${unifiedAdditionLineIndex},${splitLineIndex}`
+					lineNumber: additionLine.lineNumber,
+					altLineNumber: type === "change" ? void 0 : deletionLine.lineNumber ?? void 0,
+					lineIndex: `${additionLine.unifiedLineIndex},${splitLineIndex}`
 				});
 			}
 		}

package/dist/utils/renderDiffWithHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderDiffWithHighlighter.js","names":["DEFAULT_PLAIN_TEXT_OPTIONS: ForcePlainTextOptions","code: RenderDiffFilesResult","deletionSpans: [0 | 1, string][]","additionSpans: [0 | 1, string][]","hastConfig: CodeToHastOptions<DiffsThemeNames>"],"sources":["../../src/utils/renderDiffWithHighlighter.ts"],"sourcesContent":["import { diffChars, diffWordsWithSpace } from 'diff';\n\nimport {\n  DEFAULT_COLLAPSED_CONTEXT_THRESHOLD,\n  DEFAULT_THEMES,\n} from '../constants';\nimport type {\n  CodeToHastOptions,\n  DecorationItem,\n  DiffsHighlighter,\n  DiffsThemeNames,\n  FileContents,\n  FileDiffMetadata,\n  ForcePlainTextOptions,\n  LineDiffTypes,\n  LineInfo,\n  RenderDiffFilesResult,\n  RenderDiffOptions,\n  SupportedLanguages,\n  ThemedDiffResult,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\nimport { iterateOverDiff } from './iterateOverDiff';\nimport {\n  createDiffSpanDecoration,\n  pushOrJoinSpan,\n} from './parseDiffDecorations';\n\nconst DEFAULT_PLAIN_TEXT_OPTIONS: ForcePlainTextOptions = {\n  forcePlainText: false,\n};\n\nexport function renderDiffWithHighlighter(\n  diff: FileDiffMetadata,\n  highlighter: DiffsHighlighter,\n  options: RenderDiffOptions,\n  {\n    forcePlainText,\n    startingLine,\n    totalLines,\n    expandedHunks,\n    collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD,\n  }: ForcePlainTextOptions = DEFAULT_PLAIN_TEXT_OPTIONS\n): ThemedDiffResult {\n  if (forcePlainText) {\n    startingLine ??= 0;\n    totalLines ??= Infinity;\n  } else {\n    // If we aren't forcing plain text, then we intentionally do not support\n    // ranges for highlighting as that could break the syntax highlighting, we\n    // we override any values that may have been passed in.  Maybe one day we\n    // warn about this?\n    startingLine = 0;\n    totalLines = Infinity;\n  }\n  const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;\n  const baseThemeType = (() => {\n    const theme = options.theme ?? DEFAULT_THEMES;\n    if (typeof theme === 'string') {\n      return highlighter.getTheme(theme).type;\n    }\n    return undefined;\n  })();\n  const themeStyles = getHighlighterThemeStyles({\n    theme: options.theme,\n    highlighter,\n  });\n\n  // If we have a large file and we are rendering the WHOLE plain diff ast,\n  // then we should remove the lineDiffType to make sure things render quickly.\n  // For highlighted ASTs or windowed highlights, we should just inherit the\n  // setting\n  const lineDiffType =\n    forcePlainText &&\n    !isWindowedHighlight &&\n    (diff.unifiedLineCount > 1000 || diff.splitLineCount > 1000)\n      ? 'none'\n      : options.lineDiffType;\n\n  const code: RenderDiffFilesResult = {\n    deletionLines: [],\n    additionLines: [],\n  };\n\n  const shouldGroupAll = !forcePlainText && !diff.isPartial;\n  const expandedHunksForIteration = forcePlainText ? expandedHunks : undefined;\n  const buckets = new Map<number, RenderBucket>();\n  function getBucketForHunk(hunkIndex: number) {\n    const index = shouldGroupAll ? 0 : hunkIndex;\n    const bucket = buckets.get(index) ?? createBucket();\n    buckets.set(index, bucket);\n    return bucket;\n  }\n\n  function appendContent(\n    lineContent: string,\n    lineIndex: number,\n    segments: HighlightSegment[],\n    contentWrapper: FakeArrayType\n  ) {\n    if (isWindowedHighlight) {\n      let segment = segments.at(-1);\n      if (\n        segment == null ||\n        segment.targetIndex + segment.count !== lineIndex\n      ) {\n        segment = {\n          targetIndex: lineIndex,\n          originalOffset: contentWrapper.length,\n          count: 0,\n        };\n        segments.push(segment);\n      }\n      segment.count++;\n    }\n    contentWrapper.push(lineContent);\n  }\n\n  iterateOverDiff({\n    diff,\n    diffStyle: 'both',\n    startingLine,\n    totalLines,\n    expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,\n    collapsedContextThreshold,\n    callback: ({\n      hunkIndex,\n      additionLineIndex,\n      deletionLineIndex,\n      additionLineNumber,\n      deletionLineNumber,\n      unifiedAdditionLineIndex,\n      unifiedDeletionLineIndex,\n      splitLineIndex,\n      type,\n    }) => {\n      const bucket = getBucketForHunk(hunkIndex);\n\n      if (\n        type === 'change' &&\n        lineDiffType !== 'none' &&\n        additionLineIndex != null &&\n        deletionLineIndex != null\n      ) {\n        computeLineDiffDecorations({\n          additionLine: diff.additionLines[additionLineIndex],\n          deletionLine: diff.deletionLines[deletionLineIndex],\n          deletionLineIndex: bucket.deletionContent.length,\n          additionLineIndex: bucket.additionContent.length,\n          deletionDecorations: bucket.deletionDecorations,\n          additionDecorations: bucket.additionDecorations,\n          lineDiffType,\n        });\n      }\n\n      if (\n        deletionLineIndex != null &&\n        deletionLineNumber != null &&\n        unifiedDeletionLineIndex != null\n      ) {\n        appendContent(\n          diff.deletionLines[deletionLineIndex],\n          deletionLineIndex,\n          bucket.deletionSegments,\n          bucket.deletionContent\n        );\n        bucket.deletionInfo.push({\n          type: type === 'change' ? 'change-deletion' : type,\n          lineNumber: deletionLineNumber,\n          altLineNumber:\n            type === 'change' ? undefined : (additionLineNumber ?? undefined),\n          lineIndex: `${unifiedDeletionLineIndex},${splitLineIndex}`,\n        });\n      }\n\n      if (\n        additionLineIndex != null &&\n        additionLineNumber != null &&\n        unifiedAdditionLineIndex != null\n      ) {\n        appendContent(\n          diff.additionLines[additionLineIndex],\n          additionLineIndex,\n          bucket.additionSegments,\n          bucket.additionContent\n        );\n        bucket.additionInfo.push({\n          type: type === 'change' ? 'change-addition' : type,\n          lineNumber: additionLineNumber,\n          altLineNumber:\n            type === 'change' ? undefined : (deletionLineNumber ?? undefined),\n          lineIndex: `${unifiedAdditionLineIndex},${splitLineIndex}`,\n        });\n      }\n    },\n  });\n\n  for (const bucket of buckets.values()) {\n    if (\n      bucket.deletionContent.length === 0 &&\n      bucket.additionContent.length === 0\n    ) {\n      continue;\n    }\n\n    const deletionFile = {\n      name: diff.prevName ?? diff.name,\n      contents: bucket.deletionContent.value,\n    };\n    const additionFile = {\n      name: diff.name,\n      contents: bucket.additionContent.value,\n    };\n    const { deletionLines, additionLines } = renderTwoFiles({\n      deletionFile,\n      deletionInfo: bucket.deletionInfo,\n      deletionDecorations: bucket.deletionDecorations,\n\n      additionFile,\n      additionInfo: bucket.additionInfo,\n      additionDecorations: bucket.additionDecorations,\n\n      highlighter,\n      options,\n      languageOverride: forcePlainText ? 'text' : diff.lang,\n    });\n\n    if (shouldGroupAll) {\n      code.deletionLines = deletionLines;\n      code.additionLines = additionLines;\n      continue;\n    }\n\n    if (bucket.deletionSegments.length > 0) {\n      for (const seg of bucket.deletionSegments) {\n        for (let i = 0; i < seg.count; i++) {\n          code.deletionLines[seg.targetIndex + i] =\n            deletionLines[seg.originalOffset + i];\n        }\n      }\n    } else {\n      code.deletionLines.push(...deletionLines);\n    }\n    if (bucket.additionSegments.length > 0) {\n      for (const seg of bucket.additionSegments) {\n        for (let i = 0; i < seg.count; i++) {\n          code.additionLines[seg.targetIndex + i] =\n            additionLines[seg.originalOffset + i];\n        }\n      }\n    } else {\n      code.additionLines.push(...additionLines);\n    }\n  }\n\n  return { code, themeStyles, baseThemeType };\n}\n\ninterface ProcessLineDiffProps {\n  deletionLine: string | undefined;\n  additionLine: string | undefined;\n  deletionLineIndex: number;\n  additionLineIndex: number;\n  deletionDecorations: DecorationItem[];\n  additionDecorations: DecorationItem[];\n  lineDiffType: LineDiffTypes;\n}\n\nfunction computeLineDiffDecorations({\n  deletionLine,\n  additionLine,\n  deletionLineIndex,\n  additionLineIndex,\n  deletionDecorations,\n  additionDecorations,\n  lineDiffType,\n}: ProcessLineDiffProps) {\n  if (deletionLine == null || additionLine == null || lineDiffType === 'none') {\n    return;\n  }\n  deletionLine = cleanLastNewline(deletionLine);\n  additionLine = cleanLastNewline(additionLine);\n  // NOTE(amadeus): Because we visually trim trailing newlines when rendering,\n  // we also gotta make sure the diff parsing doesn't include the newline\n  // character that could be there...\n  const lineDiff =\n    lineDiffType === 'char'\n      ? diffChars(deletionLine, additionLine)\n      : diffWordsWithSpace(deletionLine, additionLine);\n  const deletionSpans: [0 | 1, string][] = [];\n  const additionSpans: [0 | 1, string][] = [];\n  const enableJoin = lineDiffType === 'word-alt';\n  const lastItem = lineDiff.at(-1);\n  for (const item of lineDiff) {\n    const isLastItem = item === lastItem;\n    if (!item.added && !item.removed) {\n      pushOrJoinSpan({\n        item,\n        arr: deletionSpans,\n        enableJoin,\n        isNeutral: true,\n        isLastItem,\n      });\n      pushOrJoinSpan({\n        item,\n        arr: additionSpans,\n        enableJoin,\n        isNeutral: true,\n        isLastItem,\n      });\n    } else if (item.removed) {\n      pushOrJoinSpan({ item, arr: deletionSpans, enableJoin, isLastItem });\n    } else {\n      pushOrJoinSpan({ item, arr: additionSpans, enableJoin, isLastItem });\n    }\n  }\n  let spanIndex = 0;\n  for (const span of deletionSpans) {\n    if (span[0] === 1) {\n      deletionDecorations.push(\n        createDiffSpanDecoration({\n          line: deletionLineIndex,\n          spanStart: spanIndex,\n          spanLength: span[1].length,\n        })\n      );\n    }\n    spanIndex += span[1].length;\n  }\n  spanIndex = 0;\n  for (const span of additionSpans) {\n    if (span[0] === 1) {\n      additionDecorations.push(\n        createDiffSpanDecoration({\n          line: additionLineIndex,\n          spanStart: spanIndex,\n          spanLength: span[1].length,\n        })\n      );\n    }\n    spanIndex += span[1].length;\n  }\n}\n\ninterface HighlightSegment {\n  // The where the highlighted region starts\n  originalOffset: number;\n  // Where to place the highlighted line in RenderDiffFilesResult\n  targetIndex: number;\n  // Number of highlighted lines\n  count: number;\n}\n\ninterface FakeArrayType {\n  push(value: string): void;\n  value: string;\n  length: number;\n}\n\ninterface RenderBucket {\n  deletionContent: FakeArrayType;\n  additionContent: FakeArrayType;\n  deletionInfo: (LineInfo | undefined)[];\n  additionInfo: (LineInfo | undefined)[];\n  deletionDecorations: DecorationItem[];\n  additionDecorations: DecorationItem[];\n  deletionSegments: HighlightSegment[];\n  additionSegments: HighlightSegment[];\n}\n\nfunction createBucket(): RenderBucket {\n  return {\n    deletionContent: {\n      push(value: string) {\n        this.value += value;\n        this.length++;\n      },\n      value: '',\n      length: 0,\n    },\n    additionContent: {\n      push(value: string) {\n        this.value += value;\n        this.length++;\n      },\n      value: '',\n      length: 0,\n    },\n    deletionInfo: [],\n    additionInfo: [],\n    deletionDecorations: [],\n    additionDecorations: [],\n    deletionSegments: [],\n    additionSegments: [],\n  };\n}\n\ninterface RenderTwoFilesProps {\n  deletionFile: FileContents;\n  additionFile: FileContents;\n  deletionInfo: (LineInfo | undefined)[];\n  additionInfo: (LineInfo | undefined)[];\n  deletionDecorations: DecorationItem[];\n  additionDecorations: DecorationItem[];\n  options: RenderDiffOptions;\n  highlighter: DiffsHighlighter;\n  languageOverride: SupportedLanguages | undefined;\n}\n\nfunction renderTwoFiles({\n  deletionFile,\n  additionFile,\n  deletionInfo,\n  additionInfo,\n  highlighter,\n  deletionDecorations,\n  additionDecorations,\n  languageOverride,\n  options: { theme: themeOrThemes = DEFAULT_THEMES, ...options },\n}: RenderTwoFilesProps): RenderDiffFilesResult {\n  const deletionLang =\n    languageOverride ?? getFiletypeFromFileName(deletionFile.name);\n  const additionLang =\n    languageOverride ?? getFiletypeFromFileName(additionFile.name);\n  const { state, transformers } = createTransformerWithState();\n  const hastConfig: CodeToHastOptions<DiffsThemeNames> = (() => {\n    return typeof themeOrThemes === 'string'\n      ? {\n          ...options,\n          // language will be overwritten for each highlight\n          lang: 'text',\n          theme: themeOrThemes,\n          transformers,\n          decorations: undefined,\n          defaultColor: false,\n          cssVariablePrefix: formatCSSVariablePrefix('token'),\n        }\n      : {\n          ...options,\n          // language will be overwritten for each highlight\n          lang: 'text',\n          themes: themeOrThemes,\n          transformers,\n          decorations: undefined,\n          defaultColor: false,\n          cssVariablePrefix: formatCSSVariablePrefix('token'),\n        };\n  })();\n\n  const deletionLines = (() => {\n    if (deletionFile.contents === '') {\n      return [];\n    }\n    hastConfig.lang = deletionLang;\n    state.lineInfo = deletionInfo;\n    hastConfig.decorations = deletionDecorations;\n    return getLineNodes(\n      highlighter.codeToHast(\n        cleanLastNewline(deletionFile.contents),\n        hastConfig\n      )\n    );\n  })();\n  const additionLines = (() => {\n    if (additionFile.contents === '') {\n      return [];\n    }\n    hastConfig.lang = additionLang;\n    hastConfig.decorations = additionDecorations;\n    state.lineInfo = additionInfo;\n    return getLineNodes(\n      highlighter.codeToHast(\n        cleanLastNewline(additionFile.contents),\n        hastConfig\n      )\n    );\n  })();\n\n  return { deletionLines, additionLines };\n}\n"],"mappings":"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"}
+{"version":3,"file":"renderDiffWithHighlighter.js","names":["DEFAULT_PLAIN_TEXT_OPTIONS: ForceDiffPlainTextOptions","code: RenderDiffFilesResult","deletionSpans: [0 | 1, string][]","additionSpans: [0 | 1, string][]","hastConfig: CodeToHastOptions<DiffsThemeNames>"],"sources":["../../src/utils/renderDiffWithHighlighter.ts"],"sourcesContent":["import { diffChars, diffWordsWithSpace } from 'diff';\n\nimport {\n  DEFAULT_COLLAPSED_CONTEXT_THRESHOLD,\n  DEFAULT_THEMES,\n} from '../constants';\nimport type {\n  CodeToHastOptions,\n  DecorationItem,\n  DiffsHighlighter,\n  DiffsThemeNames,\n  FileContents,\n  FileDiffMetadata,\n  ForceDiffPlainTextOptions,\n  LineDiffTypes,\n  LineInfo,\n  RenderDiffFilesResult,\n  RenderDiffOptions,\n  SupportedLanguages,\n  ThemedDiffResult,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\nimport { iterateOverDiff } from './iterateOverDiff';\nimport {\n  createDiffSpanDecoration,\n  pushOrJoinSpan,\n} from './parseDiffDecorations';\n\nconst DEFAULT_PLAIN_TEXT_OPTIONS: ForceDiffPlainTextOptions = {\n  forcePlainText: false,\n};\n\nexport function renderDiffWithHighlighter(\n  diff: FileDiffMetadata,\n  highlighter: DiffsHighlighter,\n  options: RenderDiffOptions,\n  {\n    forcePlainText,\n    startingLine,\n    totalLines,\n    expandedHunks,\n    collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD,\n  }: ForceDiffPlainTextOptions = DEFAULT_PLAIN_TEXT_OPTIONS\n): ThemedDiffResult {\n  if (forcePlainText) {\n    startingLine ??= 0;\n    totalLines ??= Infinity;\n  } else {\n    // If we aren't forcing plain text, then we intentionally do not support\n    // ranges for highlighting as that could break the syntax highlighting, we\n    // we override any values that may have been passed in.  Maybe one day we\n    // warn about this?\n    startingLine = 0;\n    totalLines = Infinity;\n  }\n  const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;\n  const baseThemeType = (() => {\n    const theme = options.theme ?? DEFAULT_THEMES;\n    if (typeof theme === 'string') {\n      return highlighter.getTheme(theme).type;\n    }\n    return undefined;\n  })();\n  const themeStyles = getHighlighterThemeStyles({\n    theme: options.theme,\n    highlighter,\n  });\n\n  // If we have a large file and we are rendering the WHOLE plain diff ast,\n  // then we should remove the lineDiffType to make sure things render quickly.\n  // For highlighted ASTs or windowed highlights, we should just inherit the\n  // setting\n  const lineDiffType =\n    forcePlainText &&\n    !isWindowedHighlight &&\n    (diff.unifiedLineCount > 1000 || diff.splitLineCount > 1000)\n      ? 'none'\n      : options.lineDiffType;\n\n  const code: RenderDiffFilesResult = {\n    deletionLines: [],\n    additionLines: [],\n  };\n\n  const shouldGroupAll = !forcePlainText && !diff.isPartial;\n  const expandedHunksForIteration = forcePlainText ? expandedHunks : undefined;\n  const buckets = new Map<number, RenderBucket>();\n  function getBucketForHunk(hunkIndex: number) {\n    const index = shouldGroupAll ? 0 : hunkIndex;\n    const bucket = buckets.get(index) ?? createBucket();\n    buckets.set(index, bucket);\n    return bucket;\n  }\n\n  function appendContent(\n    lineContent: string,\n    lineIndex: number,\n    segments: HighlightSegment[],\n    contentWrapper: FakeArrayType\n  ) {\n    if (isWindowedHighlight) {\n      let segment = segments.at(-1);\n      if (\n        segment == null ||\n        segment.targetIndex + segment.count !== lineIndex\n      ) {\n        segment = {\n          targetIndex: lineIndex,\n          originalOffset: contentWrapper.length,\n          count: 0,\n        };\n        segments.push(segment);\n      }\n      segment.count++;\n    }\n    contentWrapper.push(lineContent);\n  }\n\n  iterateOverDiff({\n    diff,\n    diffStyle: 'both',\n    startingLine,\n    totalLines,\n    expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,\n    collapsedContextThreshold,\n    callback: ({ hunkIndex, additionLine, deletionLine, type }) => {\n      const bucket = getBucketForHunk(hunkIndex);\n      const splitLineIndex =\n        additionLine != null\n          ? additionLine.splitLineIndex\n          : deletionLine.splitLineIndex;\n\n      if (type === 'change' && additionLine != null && deletionLine != null) {\n        computeLineDiffDecorations({\n          additionLine: diff.additionLines[additionLine.lineIndex],\n          deletionLine: diff.deletionLines[deletionLine.lineIndex],\n          deletionLineIndex: bucket.deletionContent.length,\n          additionLineIndex: bucket.additionContent.length,\n          deletionDecorations: bucket.deletionDecorations,\n          additionDecorations: bucket.additionDecorations,\n          lineDiffType,\n        });\n      }\n\n      if (deletionLine != null) {\n        appendContent(\n          diff.deletionLines[deletionLine.lineIndex],\n          deletionLine.lineIndex,\n          bucket.deletionSegments,\n          bucket.deletionContent\n        );\n        bucket.deletionInfo.push({\n          type: type === 'change' ? 'change-deletion' : type,\n          lineNumber: deletionLine.lineNumber,\n          altLineNumber:\n            type === 'change'\n              ? undefined\n              : (additionLine.lineNumber ?? undefined),\n          lineIndex: `${deletionLine.unifiedLineIndex},${splitLineIndex}`,\n        });\n      }\n\n      if (additionLine != null) {\n        appendContent(\n          diff.additionLines[additionLine.lineIndex],\n          additionLine.lineIndex,\n          bucket.additionSegments,\n          bucket.additionContent\n        );\n        bucket.additionInfo.push({\n          type: type === 'change' ? 'change-addition' : type,\n          lineNumber: additionLine.lineNumber,\n          altLineNumber:\n            type === 'change'\n              ? undefined\n              : (deletionLine.lineNumber ?? undefined),\n          lineIndex: `${additionLine.unifiedLineIndex},${splitLineIndex}`,\n        });\n      }\n    },\n  });\n\n  for (const bucket of buckets.values()) {\n    if (\n      bucket.deletionContent.length === 0 &&\n      bucket.additionContent.length === 0\n    ) {\n      continue;\n    }\n\n    const deletionFile = {\n      name: diff.prevName ?? diff.name,\n      contents: bucket.deletionContent.value,\n    };\n    const additionFile = {\n      name: diff.name,\n      contents: bucket.additionContent.value,\n    };\n    const { deletionLines, additionLines } = renderTwoFiles({\n      deletionFile,\n      deletionInfo: bucket.deletionInfo,\n      deletionDecorations: bucket.deletionDecorations,\n\n      additionFile,\n      additionInfo: bucket.additionInfo,\n      additionDecorations: bucket.additionDecorations,\n\n      highlighter,\n      options,\n      languageOverride: forcePlainText ? 'text' : diff.lang,\n    });\n\n    if (shouldGroupAll) {\n      code.deletionLines = deletionLines;\n      code.additionLines = additionLines;\n      continue;\n    }\n\n    if (bucket.deletionSegments.length > 0) {\n      for (const seg of bucket.deletionSegments) {\n        for (let i = 0; i < seg.count; i++) {\n          code.deletionLines[seg.targetIndex + i] =\n            deletionLines[seg.originalOffset + i];\n        }\n      }\n    } else {\n      code.deletionLines.push(...deletionLines);\n    }\n    if (bucket.additionSegments.length > 0) {\n      for (const seg of bucket.additionSegments) {\n        for (let i = 0; i < seg.count; i++) {\n          code.additionLines[seg.targetIndex + i] =\n            additionLines[seg.originalOffset + i];\n        }\n      }\n    } else {\n      code.additionLines.push(...additionLines);\n    }\n  }\n\n  return { code, themeStyles, baseThemeType };\n}\n\ninterface ProcessLineDiffProps {\n  deletionLine: string | undefined;\n  additionLine: string | undefined;\n  deletionLineIndex: number;\n  additionLineIndex: number;\n  deletionDecorations: DecorationItem[];\n  additionDecorations: DecorationItem[];\n  lineDiffType: LineDiffTypes;\n}\n\nfunction computeLineDiffDecorations({\n  deletionLine,\n  additionLine,\n  deletionLineIndex,\n  additionLineIndex,\n  deletionDecorations,\n  additionDecorations,\n  lineDiffType,\n}: ProcessLineDiffProps) {\n  if (deletionLine == null || additionLine == null || lineDiffType === 'none') {\n    return;\n  }\n  deletionLine = cleanLastNewline(deletionLine);\n  additionLine = cleanLastNewline(additionLine);\n  // NOTE(amadeus): Because we visually trim trailing newlines when rendering,\n  // we also gotta make sure the diff parsing doesn't include the newline\n  // character that could be there...\n  const lineDiff =\n    lineDiffType === 'char'\n      ? diffChars(deletionLine, additionLine)\n      : diffWordsWithSpace(deletionLine, additionLine);\n  const deletionSpans: [0 | 1, string][] = [];\n  const additionSpans: [0 | 1, string][] = [];\n  const enableJoin = lineDiffType === 'word-alt';\n  const lastItem = lineDiff.at(-1);\n  for (const item of lineDiff) {\n    const isLastItem = item === lastItem;\n    if (!item.added && !item.removed) {\n      pushOrJoinSpan({\n        item,\n        arr: deletionSpans,\n        enableJoin,\n        isNeutral: true,\n        isLastItem,\n      });\n      pushOrJoinSpan({\n        item,\n        arr: additionSpans,\n        enableJoin,\n        isNeutral: true,\n        isLastItem,\n      });\n    } else if (item.removed) {\n      pushOrJoinSpan({ item, arr: deletionSpans, enableJoin, isLastItem });\n    } else {\n      pushOrJoinSpan({ item, arr: additionSpans, enableJoin, isLastItem });\n    }\n  }\n  let spanIndex = 0;\n  for (const span of deletionSpans) {\n    if (span[0] === 1) {\n      deletionDecorations.push(\n        createDiffSpanDecoration({\n          line: deletionLineIndex,\n          spanStart: spanIndex,\n          spanLength: span[1].length,\n        })\n      );\n    }\n    spanIndex += span[1].length;\n  }\n  spanIndex = 0;\n  for (const span of additionSpans) {\n    if (span[0] === 1) {\n      additionDecorations.push(\n        createDiffSpanDecoration({\n          line: additionLineIndex,\n          spanStart: spanIndex,\n          spanLength: span[1].length,\n        })\n      );\n    }\n    spanIndex += span[1].length;\n  }\n}\n\ninterface HighlightSegment {\n  // The where the highlighted region starts\n  originalOffset: number;\n  // Where to place the highlighted line in RenderDiffFilesResult\n  targetIndex: number;\n  // Number of highlighted lines\n  count: number;\n}\n\ninterface FakeArrayType {\n  push(value: string): void;\n  value: string;\n  length: number;\n}\n\ninterface RenderBucket {\n  deletionContent: FakeArrayType;\n  additionContent: FakeArrayType;\n  deletionInfo: (LineInfo | undefined)[];\n  additionInfo: (LineInfo | undefined)[];\n  deletionDecorations: DecorationItem[];\n  additionDecorations: DecorationItem[];\n  deletionSegments: HighlightSegment[];\n  additionSegments: HighlightSegment[];\n}\n\nfunction createBucket(): RenderBucket {\n  return {\n    deletionContent: {\n      push(value: string) {\n        this.value += value;\n        this.length++;\n      },\n      value: '',\n      length: 0,\n    },\n    additionContent: {\n      push(value: string) {\n        this.value += value;\n        this.length++;\n      },\n      value: '',\n      length: 0,\n    },\n    deletionInfo: [],\n    additionInfo: [],\n    deletionDecorations: [],\n    additionDecorations: [],\n    deletionSegments: [],\n    additionSegments: [],\n  };\n}\n\ninterface RenderTwoFilesProps {\n  deletionFile: FileContents;\n  additionFile: FileContents;\n  deletionInfo: (LineInfo | undefined)[];\n  additionInfo: (LineInfo | undefined)[];\n  deletionDecorations: DecorationItem[];\n  additionDecorations: DecorationItem[];\n  options: RenderDiffOptions;\n  highlighter: DiffsHighlighter;\n  languageOverride: SupportedLanguages | undefined;\n}\n\nfunction renderTwoFiles({\n  deletionFile,\n  additionFile,\n  deletionInfo,\n  additionInfo,\n  highlighter,\n  deletionDecorations,\n  additionDecorations,\n  languageOverride,\n  options: { theme: themeOrThemes = DEFAULT_THEMES, ...options },\n}: RenderTwoFilesProps): RenderDiffFilesResult {\n  const deletionLang =\n    languageOverride ?? getFiletypeFromFileName(deletionFile.name);\n  const additionLang =\n    languageOverride ?? getFiletypeFromFileName(additionFile.name);\n  const { state, transformers } = createTransformerWithState();\n  const hastConfig: CodeToHastOptions<DiffsThemeNames> = (() => {\n    return typeof themeOrThemes === 'string'\n      ? {\n          ...options,\n          // language will be overwritten for each highlight\n          lang: 'text',\n          theme: themeOrThemes,\n          transformers,\n          decorations: undefined,\n          defaultColor: false,\n          cssVariablePrefix: formatCSSVariablePrefix('token'),\n        }\n      : {\n          ...options,\n          // language will be overwritten for each highlight\n          lang: 'text',\n          themes: themeOrThemes,\n          transformers,\n          decorations: undefined,\n          defaultColor: false,\n          cssVariablePrefix: formatCSSVariablePrefix('token'),\n        };\n  })();\n\n  const deletionLines = (() => {\n    if (deletionFile.contents === '') {\n      return [];\n    }\n    hastConfig.lang = deletionLang;\n    state.lineInfo = deletionInfo;\n    hastConfig.decorations = deletionDecorations;\n    return getLineNodes(\n      highlighter.codeToHast(\n        cleanLastNewline(deletionFile.contents),\n        hastConfig\n      )\n    );\n  })();\n  const additionLines = (() => {\n    if (additionFile.contents === '') {\n      return [];\n    }\n    hastConfig.lang = additionLang;\n    hastConfig.decorations = additionDecorations;\n    state.lineInfo = additionInfo;\n    return getLineNodes(\n      highlighter.codeToHast(\n        cleanLastNewline(additionFile.contents),\n        hastConfig\n      )\n    );\n  })();\n\n  return { deletionLines, additionLines };\n}\n"],"mappings":"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"}

package/dist/utils/renderFileWithHighlighter.d.ts

@@ -1,10 +1,15 @@
-import { DiffsHighlighter, FileContents, RenderFileOptions, ThemedFileResult } from "../types.js";
+import { DiffsHighlighter, FileContents, ForceFilePlainTextOptions, RenderFileOptions, ThemedFileResult } from "../types.js";
 
 //#region src/utils/renderFileWithHighlighter.d.ts
 declare function renderFileWithHighlighter(file: FileContents, highlighter: DiffsHighlighter, {
   theme,
   tokenizeMaxLineLength
-}: RenderFileOptions, forcePlainText?: boolean): ThemedFileResult;
+}: RenderFileOptions, {
+  forcePlainText,
+  startingLine,
+  totalLines,
+  lines
+}?: ForceFilePlainTextOptions): ThemedFileResult;
 //#endregion
 export { renderFileWithHighlighter };
 //# sourceMappingURL=renderFileWithHighlighter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"renderFileWithHighlighter.d.ts","names":[],"sources":["../../src/utils/renderFileWithHighlighter.ts"],"sourcesContent":[],"mappings":";;;iBAgBgB,yBAAA,OACR,2BACO;;;GACsC,8CAElD"}
+{"version":3,"file":"renderFileWithHighlighter.d.ts","names":["DiffsHighlighter","FileContents","ForceFilePlainTextOptions","RenderFileOptions","ThemedFileResult","renderFileWithHighlighter","theme","tokenizeMaxLineLength","forcePlainText","startingLine","totalLines","lines"],"sources":["../../src/utils/renderFileWithHighlighter.d.ts"],"sourcesContent":["import type { DiffsHighlighter, FileContents, ForceFilePlainTextOptions, RenderFileOptions, ThemedFileResult } from '../types';\nexport declare function renderFileWithHighlighter(file: FileContents, highlighter: DiffsHighlighter, { theme, tokenizeMaxLineLength }: RenderFileOptions, { forcePlainText, startingLine, totalLines, lines }?: ForceFilePlainTextOptions): ThemedFileResult;\n//# sourceMappingURL=renderFileWithHighlighter.d.ts.map"],"mappings":";;;iBACwBK,yBAAAA,OAAgCJ,2BAA2BD;;;GAAoDG;;;;;IAAyED,4BAA4BE"}

package/dist/utils/renderFileWithHighlighter.js

@@ -1,13 +1,24 @@
 import { DEFAULT_THEMES } from "../constants.js";
 import { getFiletypeFromFileName } from "./getFiletypeFromFileName.js";
+import { iterateOverFile } from "./iterateOverFile.js";
 import { cleanLastNewline } from "./cleanLastNewline.js";
 import { createTransformerWithState } from "./createTransformerWithState.js";
 import { formatCSSVariablePrefix } from "./formatCSSVariablePrefix.js";
 import { getHighlighterThemeStyles } from "./getHighlighterThemeStyles.js";
 import { getLineNodes } from "./getLineNodes.js";
+import { splitFileContents } from "./splitFileContents.js";
 
 //#region src/utils/renderFileWithHighlighter.ts
-function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES, tokenizeMaxLineLength }, forcePlainText = false) {
+const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
+function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES, tokenizeMaxLineLength }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
+	if (forcePlainText) {
+		startingLine ??= 0;
+		totalLines ??= Infinity;
+	} else {
+		startingLine = 0;
+		totalLines = Infinity;
+	}
+	const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
 	const { state, transformers } = createTransformerWithState();
 	const lang = forcePlainText ? "text" : file.lang ?? getFiletypeFromFileName(file.name);
 	const baseThemeType = (() => {
@@ -19,8 +30,8 @@ function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES,
 	});
 	state.lineInfo = (shikiLineNumber) => ({
 		type: "context",
-		lineIndex: shikiLineNumber - 1,
-		lineNumber: shikiLineNumber
+		lineIndex: shikiLineNumber - 1 + startingLine,
+		lineNumber: shikiLineNumber + startingLine
 	});
 	const hastConfig = (() => {
 		if (typeof theme === "string") return {
@@ -40,12 +51,27 @@ function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES,
 			tokenizeMaxLineLength
 		};
 	})();
+	const highlightedLines = getLineNodes(highlighter.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? splitFileContents(file.contents), startingLine, totalLines) : cleanLastNewline(file.contents), hastConfig));
+	const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
+	if (isWindowedHighlight) code.push(...highlightedLines);
 	return {
-		code: getLineNodes(highlighter.codeToHast(cleanLastNewline(file.contents), hastConfig)),
+		code,
 		themeStyles,
 		baseThemeType
 	};
 }
+function extractWindowedFileContent(lines, startingLine, totalLines) {
+	let windowContent = "";
+	iterateOverFile({
+		lines,
+		startingLine,
+		totalLines,
+		callback({ content }) {
+			windowContent += content;
+		}
+	});
+	return windowContent;
+}
 
 //#endregion
 export { renderFileWithHighlighter };

package/dist/utils/renderFileWithHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderFileWithHighlighter.js","names":["hastConfig: CodeToHastOptions<DiffsThemeNames>"],"sources":["../../src/utils/renderFileWithHighlighter.ts"],"sourcesContent":["import { DEFAULT_THEMES } from '../constants';\nimport type {\n  CodeToHastOptions,\n  DiffsHighlighter,\n  DiffsThemeNames,\n  FileContents,\n  RenderFileOptions,\n  ThemedFileResult,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\n\nexport function renderFileWithHighlighter(\n  file: FileContents,\n  highlighter: DiffsHighlighter,\n  { theme = DEFAULT_THEMES, tokenizeMaxLineLength }: RenderFileOptions,\n  forcePlainText = false\n): ThemedFileResult {\n  const { state, transformers } = createTransformerWithState();\n  const lang = forcePlainText\n    ? 'text'\n    : (file.lang ?? getFiletypeFromFileName(file.name));\n  const baseThemeType = (() => {\n    if (typeof theme === 'string') {\n      return highlighter.getTheme(theme).type;\n    }\n    return undefined;\n  })();\n  const themeStyles = getHighlighterThemeStyles({\n    theme,\n    highlighter,\n  });\n  state.lineInfo = (shikiLineNumber: number) => ({\n    type: 'context',\n    lineIndex: shikiLineNumber - 1,\n    lineNumber: shikiLineNumber,\n  });\n  const hastConfig: CodeToHastOptions<DiffsThemeNames> = (() => {\n    if (typeof theme === 'string') {\n      return {\n        lang,\n        theme,\n        transformers,\n        defaultColor: false,\n        cssVariablePrefix: formatCSSVariablePrefix('token'),\n        tokenizeMaxLineLength,\n      };\n    }\n    return {\n      lang,\n      themes: theme,\n      transformers,\n      defaultColor: false,\n      cssVariablePrefix: formatCSSVariablePrefix('token'),\n      tokenizeMaxLineLength,\n    };\n  })();\n  return {\n    code: getLineNodes(\n      highlighter.codeToHast(cleanLastNewline(file.contents), hastConfig)\n    ),\n    themeStyles,\n    baseThemeType: baseThemeType,\n  };\n}\n"],"mappings":";;;;;;;;;AAgBA,SAAgB,0BACd,MACA,aACA,EAAE,QAAQ,gBAAgB,yBAC1B,iBAAiB,OACC;CAClB,MAAM,EAAE,OAAO,iBAAiB,4BAA4B;CAC5D,MAAM,OAAO,iBACT,SACC,KAAK,QAAQ,wBAAwB,KAAK,KAAK;CACpD,MAAM,uBAAuB;AAC3B,MAAI,OAAO,UAAU,SACnB,QAAO,YAAY,SAAS,MAAM,CAAC;KAGnC;CACJ,MAAM,cAAc,0BAA0B;EAC5C;EACA;EACD,CAAC;AACF,OAAM,YAAY,qBAA6B;EAC7C,MAAM;EACN,WAAW,kBAAkB;EAC7B,YAAY;EACb;CACD,MAAMA,oBAAwD;AAC5D,MAAI,OAAO,UAAU,SACnB,QAAO;GACL;GACA;GACA;GACA,cAAc;GACd,mBAAmB,wBAAwB,QAAQ;GACnD;GACD;AAEH,SAAO;GACL;GACA,QAAQ;GACR;GACA,cAAc;GACd,mBAAmB,wBAAwB,QAAQ;GACnD;GACD;KACC;AACJ,QAAO;EACL,MAAM,aACJ,YAAY,WAAW,iBAAiB,KAAK,SAAS,EAAE,WAAW,CACpE;EACD;EACe;EAChB"}
+{"version":3,"file":"renderFileWithHighlighter.js","names":["DEFAULT_PLAIN_TEXT_OPTIONS: ForceFilePlainTextOptions","hastConfig: CodeToHastOptions<DiffsThemeNames>","windowContent: string"],"sources":["../../src/utils/renderFileWithHighlighter.ts"],"sourcesContent":["import { DEFAULT_THEMES } from '../constants';\nimport type {\n  CodeToHastOptions,\n  DiffsHighlighter,\n  DiffsThemeNames,\n  FileContents,\n  ForceFilePlainTextOptions,\n  RenderFileOptions,\n  ThemedFileResult,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\nimport { iterateOverFile } from './iterateOverFile';\nimport { splitFileContents } from './splitFileContents';\n\nconst DEFAULT_PLAIN_TEXT_OPTIONS: ForceFilePlainTextOptions = {\n  forcePlainText: false,\n};\n\nexport function renderFileWithHighlighter(\n  file: FileContents,\n  highlighter: DiffsHighlighter,\n  { theme = DEFAULT_THEMES, tokenizeMaxLineLength }: RenderFileOptions,\n  {\n    forcePlainText,\n    startingLine,\n    totalLines,\n    lines,\n  }: ForceFilePlainTextOptions = DEFAULT_PLAIN_TEXT_OPTIONS\n): ThemedFileResult {\n  if (forcePlainText) {\n    startingLine ??= 0;\n    totalLines ??= Infinity;\n  } else {\n    // If we aren't forcing plain text, then we intentionally do not support\n    // ranges for highlighting as that could break the syntax highlighting, we\n    // we override any values that may have been passed in.  Maybe one day we\n    // warn about this?\n    startingLine = 0;\n    totalLines = Infinity;\n  }\n  const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;\n  const { state, transformers } = createTransformerWithState();\n  const lang = forcePlainText\n    ? 'text'\n    : (file.lang ?? getFiletypeFromFileName(file.name));\n  const baseThemeType = (() => {\n    if (typeof theme === 'string') {\n      return highlighter.getTheme(theme).type;\n    }\n    return undefined;\n  })();\n  const themeStyles = getHighlighterThemeStyles({\n    theme,\n    highlighter,\n  });\n  state.lineInfo = (shikiLineNumber: number) => ({\n    type: 'context',\n    lineIndex: shikiLineNumber - 1 + startingLine,\n    lineNumber: shikiLineNumber + startingLine,\n  });\n  const hastConfig: CodeToHastOptions<DiffsThemeNames> = (() => {\n    if (typeof theme === 'string') {\n      return {\n        lang,\n        theme,\n        transformers,\n        defaultColor: false,\n        cssVariablePrefix: formatCSSVariablePrefix('token'),\n        tokenizeMaxLineLength,\n      };\n    }\n    return {\n      lang,\n      themes: theme,\n      transformers,\n      defaultColor: false,\n      cssVariablePrefix: formatCSSVariablePrefix('token'),\n      tokenizeMaxLineLength,\n    };\n  })();\n  const highlightedLines = getLineNodes(\n    highlighter.codeToHast(\n      isWindowedHighlight\n        ? extractWindowedFileContent(\n            lines ?? splitFileContents(file.contents),\n            startingLine,\n            totalLines\n          )\n        : cleanLastNewline(file.contents),\n      hastConfig\n    )\n  );\n\n  // Create sparse array for windowed rendering\n  const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;\n  if (isWindowedHighlight) {\n    code.push(...highlightedLines);\n  }\n\n  return { code, themeStyles, baseThemeType };\n}\n\nfunction extractWindowedFileContent(\n  lines: string[],\n  startingLine: number,\n  totalLines: number\n): string {\n  let windowContent: string = '';\n  iterateOverFile({\n    lines,\n    startingLine,\n    totalLines,\n    callback({ content }) {\n      windowContent += content;\n    },\n  });\n  return windowContent;\n}\n"],"mappings":";;;;;;;;;;;AAmBA,MAAMA,6BAAwD,EAC5D,gBAAgB,OACjB;AAED,SAAgB,0BACd,MACA,aACA,EAAE,QAAQ,gBAAgB,yBAC1B,EACE,gBACA,cACA,YACA,UAC6B,4BACb;AAClB,KAAI,gBAAgB;AAClB,mBAAiB;AACjB,iBAAe;QACV;AAKL,iBAAe;AACf,eAAa;;CAEf,MAAM,sBAAsB,eAAe,KAAK,aAAa;CAC7D,MAAM,EAAE,OAAO,iBAAiB,4BAA4B;CAC5D,MAAM,OAAO,iBACT,SACC,KAAK,QAAQ,wBAAwB,KAAK,KAAK;CACpD,MAAM,uBAAuB;AAC3B,MAAI,OAAO,UAAU,SACnB,QAAO,YAAY,SAAS,MAAM,CAAC;KAGnC;CACJ,MAAM,cAAc,0BAA0B;EAC5C;EACA;EACD,CAAC;AACF,OAAM,YAAY,qBAA6B;EAC7C,MAAM;EACN,WAAW,kBAAkB,IAAI;EACjC,YAAY,kBAAkB;EAC/B;CACD,MAAMC,oBAAwD;AAC5D,MAAI,OAAO,UAAU,SACnB,QAAO;GACL;GACA;GACA;GACA,cAAc;GACd,mBAAmB,wBAAwB,QAAQ;GACnD;GACD;AAEH,SAAO;GACL;GACA,QAAQ;GACR;GACA,cAAc;GACd,mBAAmB,wBAAwB,QAAQ;GACnD;GACD;KACC;CACJ,MAAM,mBAAmB,aACvB,YAAY,WACV,sBACI,2BACE,SAAS,kBAAkB,KAAK,SAAS,EACzC,cACA,WACD,GACD,iBAAiB,KAAK,SAAS,EACnC,WACD,CACF;CAGD,MAAM,OAAO,sBAAsB,IAAI,MAAM,aAAa,GAAG;AAC7D,KAAI,oBACF,MAAK,KAAK,GAAG,iBAAiB;AAGhC,QAAO;EAAE;EAAM;EAAa;EAAe;;AAG7C,SAAS,2BACP,OACA,cACA,YACQ;CACR,IAAIC,gBAAwB;AAC5B,iBAAgB;EACd;EACA;EACA;EACA,SAAS,EAAE,WAAW;AACpB,oBAAiB;;EAEpB,CAAC;AACF,QAAO"}

package/dist/utils/resolveVirtualFileMetrics.d.ts

@@ -0,0 +1,7 @@
+import { HunkSeparators, VirtualFileMetrics } from "../types.js";
+
+//#region src/utils/resolveVirtualFileMetrics.d.ts
+declare function resolveVirtualFileMetrics(hunkSeparators: HunkSeparators, metricsOverride?: Partial<VirtualFileMetrics>): VirtualFileMetrics;
+//#endregion
+export { resolveVirtualFileMetrics };
+//# sourceMappingURL=resolveVirtualFileMetrics.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"resolveVirtualFileMetrics.d.ts","names":["HunkSeparators","VirtualFileMetrics","resolveVirtualFileMetrics","Partial"],"sources":["../../src/utils/resolveVirtualFileMetrics.d.ts"],"sourcesContent":["import type { HunkSeparators, VirtualFileMetrics } from '../types';\nexport declare function resolveVirtualFileMetrics(hunkSeparators: HunkSeparators, metricsOverride?: Partial<VirtualFileMetrics>): VirtualFileMetrics;\n//# sourceMappingURL=resolveVirtualFileMetrics.d.ts.map"],"mappings":";;;iBACwBE,yBAAAA,iBAA0CF,kCAAkCG,QAAQF,sBAAsBA"}

package/dist/utils/resolveVirtualFileMetrics.js

@@ -0,0 +1,24 @@
+import { DEFAULT_VIRTUAL_FILE_METRICS } from "../constants.js";
+
+//#region src/utils/resolveVirtualFileMetrics.ts
+function resolveVirtualFileMetrics(hunkSeparators, metricsOverride) {
+	const metrics = {
+		...DEFAULT_VIRTUAL_FILE_METRICS,
+		...metricsOverride
+	};
+	metrics.hunkSeparatorHeight = getHunkSeparatorHeight(hunkSeparators, metricsOverride?.hunkSeparatorHeight);
+	return metrics;
+}
+function getHunkSeparatorHeight(type, customHeight) {
+	if (customHeight != null) return customHeight;
+	switch (type) {
+		case "simple": return 4;
+		case "metadata":
+		case "line-info":
+		case "custom": return 32;
+	}
+}
+
+//#endregion
+export { resolveVirtualFileMetrics };
+//# sourceMappingURL=resolveVirtualFileMetrics.js.map

package/dist/utils/resolveVirtualFileMetrics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveVirtualFileMetrics.js","names":["metrics: VirtualFileMetrics"],"sources":["../../src/utils/resolveVirtualFileMetrics.ts"],"sourcesContent":["import { DEFAULT_VIRTUAL_FILE_METRICS } from '../constants';\nimport type { HunkSeparators, VirtualFileMetrics } from '../types';\n\nexport function resolveVirtualFileMetrics(\n  hunkSeparators: HunkSeparators,\n  metricsOverride?: Partial<VirtualFileMetrics>\n): VirtualFileMetrics {\n  const metrics: VirtualFileMetrics = {\n    ...DEFAULT_VIRTUAL_FILE_METRICS,\n    ...metricsOverride,\n  };\n  metrics.hunkSeparatorHeight = getHunkSeparatorHeight(\n    hunkSeparators,\n    metricsOverride?.hunkSeparatorHeight\n  );\n  return metrics;\n}\n\nfunction getHunkSeparatorHeight(\n  type: HunkSeparators,\n  customHeight: number | undefined\n): number {\n  if (customHeight != null) {\n    return customHeight;\n  }\n  switch (type) {\n    case 'simple':\n      return 4;\n    case 'metadata':\n    case 'line-info':\n    case 'custom':\n      return 32;\n  }\n}\n"],"mappings":";;;AAGA,SAAgB,0BACd,gBACA,iBACoB;CACpB,MAAMA,UAA8B;EAClC,GAAG;EACH,GAAG;EACJ;AACD,SAAQ,sBAAsB,uBAC5B,gBACA,iBAAiB,oBAClB;AACD,QAAO;;AAGT,SAAS,uBACP,MACA,cACQ;AACR,KAAI,gBAAgB,KAClB,QAAO;AAET,SAAQ,MAAR;EACE,KAAK,SACH,QAAO;EACT,KAAK;EACL,KAAK;EACL,KAAK,SACH,QAAO"}

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

@@ -1 +1 @@
-{"version":3,"file":"setLanguageOverride.d.ts","names":[],"sources":["../../src/utils/setLanguageOverride.ts"],"sourcesContent":[],"mappings":";;;iBAMgB,mBAAA,aACF,oBACN,qBACL;iBACa,mBAAA,aACF,wBACN,qBACL"}
+{"version":3,"file":"setLanguageOverride.d.ts","names":["FileContents","FileDiffMetadata","SupportedLanguages","setLanguageOverride"],"sources":["../../src/utils/setLanguageOverride.d.ts"],"sourcesContent":["import type { FileContents, FileDiffMetadata, SupportedLanguages } from '../types';\nexport declare function setLanguageOverride(fileOrDiff: FileContents, lang: SupportedLanguages): FileContents;\nexport declare function setLanguageOverride(fileOrDiff: FileDiffMetadata, lang: SupportedLanguages): FileDiffMetadata;\n//# sourceMappingURL=setLanguageOverride.d.ts.map"],"mappings":";;;iBACwBG,mBAAAA,aAAgCH,oBAAoBE,qBAAqBF;iBACzEG,mBAAAA,aAAgCF,wBAAwBC,qBAAqBD"}

package/dist/utils/setWrapperNodeProps.d.ts

@@ -2,6 +2,7 @@ import { PrePropertiesConfig } from "../types.js";
 
 //#region src/utils/setWrapperNodeProps.d.ts
 declare function setPreNodeProperties(pre: HTMLPreElement, {
+  type,
   diffIndicators,
   disableBackground,
   disableLineNumbers,

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

@@ -1 +1 @@
-{"version":3,"file":"setWrapperNodeProps.d.ts","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":[],"mappings":";;;iBAEgB,oBAAA,MACT;;;;;;;;;GAUF,sBACF"}
+{"version":3,"file":"setWrapperNodeProps.d.ts","names":["PrePropertiesConfig","setPreNodeProperties","HTMLPreElement","type","diffIndicators","disableBackground","disableLineNumbers","overflow","split","themeStyles","themeType","totalLines"],"sources":["../../src/utils/setWrapperNodeProps.d.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\nexport declare function setPreNodeProperties(pre: HTMLPreElement, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines }: PrePropertiesConfig): HTMLPreElement;\n//# sourceMappingURL=setWrapperNodeProps.d.ts.map"],"mappings":";;;iBACwBC,oBAAAA,MAA0BC;;;;;;;;;;GAAsIF,sBAAsBE"}

package/dist/utils/setWrapperNodeProps.js

@@ -1,23 +1,30 @@
 //#region src/utils/setWrapperNodeProps.ts
-function setPreNodeProperties(pre, { diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines }) {
-	if (themeType === "system") delete pre.dataset.themeType;
-	else pre.dataset.themeType = themeType;
+function setPreNodeProperties(pre, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines }) {
+	if (type === "diff") {
+		pre.setAttribute("data-diff", "");
+		pre.removeAttribute("data-file");
+	} else {
+		pre.setAttribute("data-file", "");
+		pre.removeAttribute("data-diff");
+	}
+	if (themeType === "system") pre.removeAttribute("data-theme-type");
+	else pre.setAttribute("data-theme-type", themeType);
 	switch (diffIndicators) {
 		case "bars":
 		case "classic":
-			pre.dataset.indicators = diffIndicators;
+			pre.setAttribute("data-indicators", diffIndicators);
 			break;
 		case "none":
-			delete pre.dataset.indicators;
+			pre.removeAttribute("data-indicators");
 			break;
 	}
-	if (disableLineNumbers) pre.dataset.disableLineNumbers = "";
-	else delete pre.dataset.disableLineNumbers;
-	if (disableBackground) delete pre.dataset.background;
-	else pre.dataset.background = "";
-	pre.dataset.type = split ? "split" : "file";
-	pre.dataset.overflow = overflow;
-	pre.dataset.diffs = "";
+	if (disableLineNumbers) pre.setAttribute("data-disable-line-numbers", "");
+	else pre.removeAttribute("data-disable-line-numbers");
+	if (disableBackground) pre.removeAttribute("data-background");
+	else pre.setAttribute("data-background", "");
+	if (type === "diff") pre.setAttribute("data-diff-type", split ? "split" : "single");
+	else pre.removeAttribute("data-diff-type");
+	pre.setAttribute("data-overflow", overflow);
 	pre.tabIndex = 0;
 	pre.style = themeStyles;
 	pre.style.setProperty("--diffs-min-number-column-width-default", `${`${totalLines}`.length}ch`);

package/dist/utils/setWrapperNodeProps.js.map

@@ -1 +1 @@
-{"version":3,"file":"setWrapperNodeProps.js","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\n\nexport function setPreNodeProperties(\n  pre: HTMLPreElement,\n  {\n    diffIndicators,\n    disableBackground,\n    disableLineNumbers,\n    overflow,\n    split,\n    themeStyles,\n    themeType,\n    totalLines,\n  }: PrePropertiesConfig\n): HTMLPreElement {\n  if (themeType === 'system') {\n    delete pre.dataset.themeType;\n  } else {\n    pre.dataset.themeType = themeType;\n  }\n  switch (diffIndicators) {\n    case 'bars':\n    case 'classic':\n      pre.dataset.indicators = diffIndicators;\n      break;\n    case 'none':\n      delete pre.dataset.indicators;\n      break;\n  }\n  if (disableLineNumbers) {\n    pre.dataset.disableLineNumbers = '';\n  } else {\n    delete pre.dataset.disableLineNumbers;\n  }\n  if (disableBackground) {\n    delete pre.dataset.background;\n  } else {\n    pre.dataset.background = '';\n  }\n  pre.dataset.type = split ? 'split' : 'file';\n  pre.dataset.overflow = overflow;\n  pre.dataset.diffs = '';\n  pre.tabIndex = 0;\n  // Set theme color custom properties as inline styles on pre element\n  pre.style = themeStyles;\n  // Set CSS custom property for line number column width\n  pre.style.setProperty(\n    '--diffs-min-number-column-width-default',\n    `${`${totalLines}`.length}ch`\n  );\n  return pre;\n}\n"],"mappings":";AAEA,SAAgB,qBACd,KACA,EACE,gBACA,mBACA,oBACA,UACA,OACA,aACA,WACA,cAEc;AAChB,KAAI,cAAc,SAChB,QAAO,IAAI,QAAQ;KAEnB,KAAI,QAAQ,YAAY;AAE1B,SAAQ,gBAAR;EACE,KAAK;EACL,KAAK;AACH,OAAI,QAAQ,aAAa;AACzB;EACF,KAAK;AACH,UAAO,IAAI,QAAQ;AACnB;;AAEJ,KAAI,mBACF,KAAI,QAAQ,qBAAqB;KAEjC,QAAO,IAAI,QAAQ;AAErB,KAAI,kBACF,QAAO,IAAI,QAAQ;KAEnB,KAAI,QAAQ,aAAa;AAE3B,KAAI,QAAQ,OAAO,QAAQ,UAAU;AACrC,KAAI,QAAQ,WAAW;AACvB,KAAI,QAAQ,QAAQ;AACpB,KAAI,WAAW;AAEf,KAAI,QAAQ;AAEZ,KAAI,MAAM,YACR,2CACA,GAAG,GAAG,aAAa,OAAO,IAC3B;AACD,QAAO"}
+{"version":3,"file":"setWrapperNodeProps.js","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\n\nexport function setPreNodeProperties(\n  pre: HTMLPreElement,\n  {\n    type,\n    diffIndicators,\n    disableBackground,\n    disableLineNumbers,\n    overflow,\n    split,\n    themeStyles,\n    themeType,\n    totalLines,\n  }: PrePropertiesConfig\n): HTMLPreElement {\n  if (type === 'diff') {\n    pre.setAttribute('data-diff', '');\n    pre.removeAttribute('data-file');\n  } else {\n    pre.setAttribute('data-file', '');\n    pre.removeAttribute('data-diff');\n  }\n  if (themeType === 'system') {\n    pre.removeAttribute('data-theme-type');\n  } else {\n    pre.setAttribute('data-theme-type', themeType);\n  }\n  switch (diffIndicators) {\n    case 'bars':\n    case 'classic':\n      pre.setAttribute('data-indicators', diffIndicators);\n      break;\n    case 'none':\n      pre.removeAttribute('data-indicators');\n      break;\n  }\n  if (disableLineNumbers) {\n    pre.setAttribute('data-disable-line-numbers', '');\n  } else {\n    pre.removeAttribute('data-disable-line-numbers');\n  }\n  if (disableBackground) {\n    pre.removeAttribute('data-background');\n  } else {\n    pre.setAttribute('data-background', '');\n  }\n  if (type === 'diff') {\n    pre.setAttribute('data-diff-type', split ? 'split' : 'single');\n  } else {\n    pre.removeAttribute('data-diff-type');\n  }\n  pre.setAttribute('data-overflow', overflow);\n  pre.tabIndex = 0;\n  // Set theme color custom properties as inline styles on pre element\n  pre.style = themeStyles;\n  // Set CSS custom property for line number column width\n  pre.style.setProperty(\n    '--diffs-min-number-column-width-default',\n    `${`${totalLines}`.length}ch`\n  );\n  return pre;\n}\n"],"mappings":";AAEA,SAAgB,qBACd,KACA,EACE,MACA,gBACA,mBACA,oBACA,UACA,OACA,aACA,WACA,cAEc;AAChB,KAAI,SAAS,QAAQ;AACnB,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;QAC3B;AACL,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;;AAElC,KAAI,cAAc,SAChB,KAAI,gBAAgB,kBAAkB;KAEtC,KAAI,aAAa,mBAAmB,UAAU;AAEhD,SAAQ,gBAAR;EACE,KAAK;EACL,KAAK;AACH,OAAI,aAAa,mBAAmB,eAAe;AACnD;EACF,KAAK;AACH,OAAI,gBAAgB,kBAAkB;AACtC;;AAEJ,KAAI,mBACF,KAAI,aAAa,6BAA6B,GAAG;KAEjD,KAAI,gBAAgB,4BAA4B;AAElD,KAAI,kBACF,KAAI,gBAAgB,kBAAkB;KAEtC,KAAI,aAAa,mBAAmB,GAAG;AAEzC,KAAI,SAAS,OACX,KAAI,aAAa,kBAAkB,QAAQ,UAAU,SAAS;KAE9D,KAAI,gBAAgB,iBAAiB;AAEvC,KAAI,aAAa,iBAAiB,SAAS;AAC3C,KAAI,WAAW;AAEf,KAAI,QAAQ;AAEZ,KAAI,MAAM,YACR,2CACA,GAAG,GAAG,aAAa,OAAO,IAC3B;AACD,QAAO"}