@pierre/diffs 1.2.5 → 1.3.0-beta.1

package/dist/utils/createTransformerWithState.js.map

@@ -1 +1 @@
-{"version":3,"file":"createTransformerWithState.js","names":["state: SharedRenderState","transformers: ShikiTransformer[]","children: ElementContent[]","tokenStyleNormalizer: ShikiTransformer","style: Record<string, string>"],"sources":["../../src/utils/createTransformerWithState.ts"],"sourcesContent":["import {\n  type ShikiTransformerStyleToClass,\n  transformerStyleToClass,\n} from '@shikijs/transformers';\nimport type { ElementContent } from 'hast';\nimport type { ThemedToken } from 'shiki';\n\nimport type { SharedRenderState, ShikiTransformer } from '../types';\nimport { findCodeElement } from './hast_utils';\nimport { processLine } from './processLine';\nimport { wrapTokenFragments } from './wrapTokenFragments';\n\ninterface CreateTransformerWithStateReturn {\n  state: SharedRenderState;\n  transformers: ShikiTransformer[];\n  toClass: ShikiTransformerStyleToClass;\n}\n\ntype TokenWithLineChar = ThemedToken & {\n  __lineChar?: number;\n};\n\nexport function createTransformerWithState(\n  useTokenTransformer = false,\n  useCSSClasses = false\n): CreateTransformerWithStateReturn {\n  const state: SharedRenderState = { lineInfo: [] };\n  const transformers: ShikiTransformer[] = [\n    {\n      line(node) {\n        // Remove the default class\n        delete node.properties.class;\n        return node;\n      },\n      pre(pre) {\n        const code = findCodeElement(pre);\n        const children: ElementContent[] = [];\n        if (code != null) {\n          let index = 1;\n          for (const node of code.children) {\n            if (node.type !== 'element') continue;\n            if (useTokenTransformer) {\n              wrapTokenFragments(node);\n            }\n            children.push(processLine(node, index, state));\n            index++;\n          }\n          code.children = children;\n        }\n        return pre;\n      },\n      ...(useTokenTransformer\n        ? {\n            tokens(lines) {\n              for (const line of lines) {\n                let col = 0;\n                for (const token of line) {\n                  const tokenWithOriginalRange = token as TokenWithLineChar;\n                  tokenWithOriginalRange.__lineChar ??= col;\n                  col += token.content.length;\n                }\n              }\n            },\n            preprocess(_code, options) {\n              options.mergeWhitespaces = 'never';\n            },\n            span(hast, _line, _char, _lineElement, token) {\n              if (token?.offset != null && token.content != null) {\n                const tokenWithOriginalRange = token as TokenWithLineChar;\n                const tokenChar = tokenWithOriginalRange.__lineChar;\n                if (tokenChar != null) {\n                  hast.properties['data-char'] = tokenChar;\n                }\n                return hast;\n              }\n              return hast;\n            },\n          }\n        : null),\n    },\n  ];\n  if (useCSSClasses) {\n    transformers.push(tokenStyleNormalizer, toClass);\n  }\n  return { state, transformers, toClass };\n}\n\nconst toClass = transformerStyleToClass({ classPrefix: 'hl-' });\n\n// Create a transformer that converts token color/fontStyle to htmlStyle\n// This needs to run BEFORE transformerStyleToClass\nconst tokenStyleNormalizer: ShikiTransformer = {\n  name: 'token-style-normalizer',\n  tokens(lines) {\n    for (const line of lines) {\n      for (const token of line) {\n        // Skip if htmlStyle is already set\n        if (token.htmlStyle != null) continue;\n\n        const style: Record<string, string> = {};\n\n        if (token.color != null) {\n          style.color = token.color;\n        }\n        if (token.bgColor != null) {\n          style['background-color'] = token.bgColor;\n        }\n        if (token.fontStyle != null && token.fontStyle !== 0) {\n          // FontStyle is a bitmask: 1 = italic, 2 = bold, 4 = underline\n          if ((token.fontStyle & 1) !== 0) {\n            style['font-style'] = 'italic';\n          }\n          if ((token.fontStyle & 2) !== 0) {\n            style['font-weight'] = 'bold';\n          }\n          if ((token.fontStyle & 4) !== 0) {\n            style['text-decoration'] = 'underline';\n          }\n        }\n\n        // Only set htmlStyle if we have any styles\n        if (Object.keys(style).length > 0) {\n          token.htmlStyle = style;\n        }\n      }\n    }\n  },\n};\n"],"mappings":";;;;;;AAsBA,SAAgB,2BACd,sBAAsB,OACtB,gBAAgB,OACkB;CAClC,MAAMA,QAA2B,EAAE,UAAU,EAAE,EAAE;CACjD,MAAMC,eAAmC,CACvC;EACE,KAAK,MAAM;AAET,UAAO,KAAK,WAAW;AACvB,UAAO;;EAET,IAAI,KAAK;GACP,MAAM,OAAO,gBAAgB,IAAI;GACjC,MAAMC,WAA6B,EAAE;AACrC,OAAI,QAAQ,MAAM;IAChB,IAAI,QAAQ;AACZ,SAAK,MAAM,QAAQ,KAAK,UAAU;AAChC,SAAI,KAAK,SAAS,UAAW;AAC7B,SAAI,oBACF,oBAAmB,KAAK;AAE1B,cAAS,KAAK,YAAY,MAAM,OAAO,MAAM,CAAC;AAC9C;;AAEF,SAAK,WAAW;;AAElB,UAAO;;EAET,GAAI,sBACA;GACE,OAAO,OAAO;AACZ,SAAK,MAAM,QAAQ,OAAO;KACxB,IAAI,MAAM;AACV,UAAK,MAAM,SAAS,MAAM;MACxB,MAAM,yBAAyB;AAC/B,6BAAuB,eAAe;AACtC,aAAO,MAAM,QAAQ;;;;GAI3B,WAAW,OAAO,SAAS;AACzB,YAAQ,mBAAmB;;GAE7B,KAAK,MAAM,OAAO,OAAO,cAAc,OAAO;AAC5C,QAAI,OAAO,UAAU,QAAQ,MAAM,WAAW,MAAM;KAElD,MAAM,YADyB,MACU;AACzC,SAAI,aAAa,KACf,MAAK,WAAW,eAAe;AAEjC,YAAO;;AAET,WAAO;;GAEV,GACD;EACL,CACF;AACD,KAAI,cACF,cAAa,KAAK,sBAAsB,QAAQ;AAElD,QAAO;EAAE;EAAO;EAAc;EAAS;;AAGzC,MAAM,UAAU,wBAAwB,EAAE,aAAa,OAAO,CAAC;AAI/D,MAAMC,uBAAyC;CAC7C,MAAM;CACN,OAAO,OAAO;AACZ,OAAK,MAAM,QAAQ,MACjB,MAAK,MAAM,SAAS,MAAM;AAExB,OAAI,MAAM,aAAa,KAAM;GAE7B,MAAMC,QAAgC,EAAE;AAExC,OAAI,MAAM,SAAS,KACjB,OAAM,QAAQ,MAAM;AAEtB,OAAI,MAAM,WAAW,KACnB,OAAM,sBAAsB,MAAM;AAEpC,OAAI,MAAM,aAAa,QAAQ,MAAM,cAAc,GAAG;AAEpD,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,gBAAgB;AAExB,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,iBAAiB;AAEzB,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,qBAAqB;;AAK/B,OAAI,OAAO,KAAK,MAAM,CAAC,SAAS,EAC9B,OAAM,YAAY;;;CAK3B"}
+{"version":3,"file":"createTransformerWithState.js","names":["state: SharedRenderState","transformers: ShikiTransformer[]","children: ElementContent[]","tokenStyleNormalizer: ShikiTransformer","style: Record<string, string>"],"sources":["../../src/utils/createTransformerWithState.ts"],"sourcesContent":["import {\n  type ShikiTransformerStyleToClass,\n  transformerStyleToClass,\n} from '@shikijs/transformers';\nimport type { ElementContent } from 'hast';\nimport type { ThemedToken } from 'shiki';\n\nimport type { SharedRenderState, ShikiTransformer } from '../types';\nimport { findCodeElement } from './hast_utils';\nimport { processLine } from './processLine';\nimport { wrapTokenFragments } from './wrapTokenFragments';\n\ninterface CreateTransformerWithStateReturn {\n  state: SharedRenderState;\n  transformers: ShikiTransformer[];\n  toClass: ShikiTransformerStyleToClass;\n}\n\ntype TokenWithLineChar = ThemedToken & {\n  __lineChar?: number;\n};\n\nexport function createTransformerWithState(\n  useTokenTransformer = false,\n  useCSSClasses = false\n): CreateTransformerWithStateReturn {\n  const state: SharedRenderState = { lineInfo: [] };\n  const transformers: ShikiTransformer[] = [\n    {\n      line(node) {\n        // Remove the default class\n        delete node.properties.class;\n        return node;\n      },\n      pre(pre) {\n        const code = findCodeElement(pre);\n        const children: ElementContent[] = [];\n        if (code != null) {\n          let index = 1;\n          for (const node of code.children) {\n            if (node.type !== 'element') continue;\n            if (useTokenTransformer) {\n              wrapTokenFragments(node);\n            }\n            children.push(processLine(node, index, state));\n            index++;\n          }\n          code.children = children;\n        }\n        return pre;\n      },\n      ...(useTokenTransformer\n        ? {\n            tokens(lines) {\n              for (const line of lines) {\n                let col = 0;\n                for (const token of line) {\n                  const tokenWithOriginalRange = token as TokenWithLineChar;\n                  tokenWithOriginalRange.__lineChar ??= col;\n                  col += token.content.length;\n                }\n              }\n            },\n            preprocess(_code, options) {\n              options.mergeWhitespaces = 'never';\n            },\n            span(hast, _line, _char, _lineElement, token) {\n              if (token?.offset != null && token.content != null) {\n                const tokenWithOriginalRange = token as TokenWithLineChar;\n                const tokenChar = tokenWithOriginalRange.__lineChar;\n                if (tokenChar != null) {\n                  hast.properties['data-char'] = tokenChar;\n                }\n                return hast;\n              }\n              return hast;\n            },\n          }\n        : null),\n    },\n  ];\n  if (useCSSClasses) {\n    transformers.push(tokenStyleNormalizer, toClass);\n  }\n  if (useTokenTransformer) {\n    // shiki renders empty lines as \" \" that breaks the editor selection.\n    // We replace them with <br> tags.\n    transformers.push({\n      line: (node) => {\n        if (node.type === 'element' && node.children.length === 0) {\n          node.children.push({\n            type: 'element',\n            tagName: 'br',\n            properties: {},\n            children: [],\n          });\n        }\n        return node;\n      },\n    });\n  }\n  return { state, transformers, toClass };\n}\n\nconst toClass = transformerStyleToClass({ classPrefix: 'hl-' });\n\n// Create a transformer that converts token color/fontStyle to htmlStyle\n// This needs to run BEFORE transformerStyleToClass\nconst tokenStyleNormalizer: ShikiTransformer = {\n  name: 'token-style-normalizer',\n  tokens(lines) {\n    for (const line of lines) {\n      for (const token of line) {\n        // Skip if htmlStyle is already set\n        if (token.htmlStyle != null) continue;\n\n        const style: Record<string, string> = {};\n\n        if (token.color != null) {\n          style.color = token.color;\n        }\n        if (token.bgColor != null) {\n          style['background-color'] = token.bgColor;\n        }\n        if (token.fontStyle != null && token.fontStyle !== 0) {\n          // FontStyle is a bitmask: 1 = italic, 2 = bold, 4 = underline\n          if ((token.fontStyle & 1) !== 0) {\n            style['font-style'] = 'italic';\n          }\n          if ((token.fontStyle & 2) !== 0) {\n            style['font-weight'] = 'bold';\n          }\n          if ((token.fontStyle & 4) !== 0) {\n            style['text-decoration'] = 'underline';\n          }\n        }\n\n        // Only set htmlStyle if we have any styles\n        if (Object.keys(style).length > 0) {\n          token.htmlStyle = style;\n        }\n      }\n    }\n  },\n};\n"],"mappings":";;;;;;AAsBA,SAAgB,2BACd,sBAAsB,OACtB,gBAAgB,OACkB;CAClC,MAAMA,QAA2B,EAAE,UAAU,EAAE,EAAE;CACjD,MAAMC,eAAmC,CACvC;EACE,KAAK,MAAM;AAET,UAAO,KAAK,WAAW;AACvB,UAAO;;EAET,IAAI,KAAK;GACP,MAAM,OAAO,gBAAgB,IAAI;GACjC,MAAMC,WAA6B,EAAE;AACrC,OAAI,QAAQ,MAAM;IAChB,IAAI,QAAQ;AACZ,SAAK,MAAM,QAAQ,KAAK,UAAU;AAChC,SAAI,KAAK,SAAS,UAAW;AAC7B,SAAI,oBACF,oBAAmB,KAAK;AAE1B,cAAS,KAAK,YAAY,MAAM,OAAO,MAAM,CAAC;AAC9C;;AAEF,SAAK,WAAW;;AAElB,UAAO;;EAET,GAAI,sBACA;GACE,OAAO,OAAO;AACZ,SAAK,MAAM,QAAQ,OAAO;KACxB,IAAI,MAAM;AACV,UAAK,MAAM,SAAS,MAAM;MACxB,MAAM,yBAAyB;AAC/B,6BAAuB,eAAe;AACtC,aAAO,MAAM,QAAQ;;;;GAI3B,WAAW,OAAO,SAAS;AACzB,YAAQ,mBAAmB;;GAE7B,KAAK,MAAM,OAAO,OAAO,cAAc,OAAO;AAC5C,QAAI,OAAO,UAAU,QAAQ,MAAM,WAAW,MAAM;KAElD,MAAM,YADyB,MACU;AACzC,SAAI,aAAa,KACf,MAAK,WAAW,eAAe;AAEjC,YAAO;;AAET,WAAO;;GAEV,GACD;EACL,CACF;AACD,KAAI,cACF,cAAa,KAAK,sBAAsB,QAAQ;AAElD,KAAI,oBAGF,cAAa,KAAK,EAChB,OAAO,SAAS;AACd,MAAI,KAAK,SAAS,aAAa,KAAK,SAAS,WAAW,EACtD,MAAK,SAAS,KAAK;GACjB,MAAM;GACN,SAAS;GACT,YAAY,EAAE;GACd,UAAU,EAAE;GACb,CAAC;AAEJ,SAAO;IAEV,CAAC;AAEJ,QAAO;EAAE;EAAO;EAAc;EAAS;;AAGzC,MAAM,UAAU,wBAAwB,EAAE,aAAa,OAAO,CAAC;AAI/D,MAAMC,uBAAyC;CAC7C,MAAM;CACN,OAAO,OAAO;AACZ,OAAK,MAAM,QAAQ,MACjB,MAAK,MAAM,SAAS,MAAM;AAExB,OAAI,MAAM,aAAa,KAAM;GAE7B,MAAMC,QAAgC,EAAE;AAExC,OAAI,MAAM,SAAS,KACjB,OAAM,QAAQ,MAAM;AAEtB,OAAI,MAAM,WAAW,KACnB,OAAM,sBAAsB,MAAM;AAEpC,OAAI,MAAM,aAAa,QAAQ,MAAM,cAAc,GAAG;AAEpD,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,gBAAgB;AAExB,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,iBAAiB;AAEzB,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,qBAAqB;;AAK/B,OAAI,OAAO,KAAK,MAAM,CAAC,SAAS,EAC9B,OAAM,YAAY;;;CAK3B"}

package/dist/utils/renderDiffWithHighlighter.js

@@ -1,11 +1,11 @@
 import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_THEMES } from "../constants.js";
 import { getFiletypeFromFileName } from "./getFiletypeFromFileName.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 { iterateOverDiff } from "./iterateOverDiff.js";
+import { cleanLastNewline } from "./cleanLastNewline.js";
 import { createDiffSpanDecoration, pushOrJoinSpan } from "./parseDiffDecorations.js";
 import { diffChars, diffWordsWithSpace } from "diff";
 

package/dist/utils/renderFileWithHighlighter.js

@@ -1,12 +1,10 @@
 import { DEFAULT_THEMES } from "../constants.js";
-import { iterateOverFile } from "./iterateOverFile.js";
+import { linesFromFileContents } from "./computeFileOffsets.js";
 import { getFiletypeFromFileName } from "./getFiletypeFromFileName.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
 const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
@@ -49,7 +47,7 @@ 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 highlightedLines = getLineNodes(highlighter.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents, hastConfig));
 	const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
 	if (isWindowedHighlight) code.push(...highlightedLines);
 	return {
@@ -59,16 +57,9 @@ function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES,
 	};
 }
 function extractWindowedFileContent(lines, startingLine, totalLines) {
-	let windowContent = "";
-	iterateOverFile({
-		lines,
-		startingLine,
-		totalLines,
-		callback({ content }) {
-			windowContent += content;
-		}
-	});
-	return windowContent;
+	if (lines.length === 0) return "";
+	const endLine = Math.min(startingLine + totalLines, lines.length);
+	return lines.slice(startingLine, endLine).join("");
 }
 
 //#endregion

package/dist/utils/renderFileWithHighlighter.js.map

@@ -1 +1 @@
-{"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  {\n    theme = DEFAULT_THEMES,\n    tokenizeMaxLineLength,\n    useTokenTransformer,\n  }: 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 } =\n    createTransformerWithState(useTokenTransformer);\n  const lang = forcePlainText\n    ? 'text'\n    : (file.lang ?? getFiletypeFromFileName(file.name));\n  const baseThemeType =\n    typeof theme === 'string' ? highlighter.getTheme(theme).type : undefined;\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,EACE,QAAQ,gBACR,uBACA,uBAEF,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,iBACb,2BAA2B,oBAAoB;CACjD,MAAM,OAAO,iBACT,SACC,KAAK,QAAQ,wBAAwB,KAAK,KAAK;CACpD,MAAM,gBACJ,OAAO,UAAU,WAAW,YAAY,SAAS,MAAM,CAAC,OAAO;CACjE,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"}
+{"version":3,"file":"renderFileWithHighlighter.js","names":["DEFAULT_PLAIN_TEXT_OPTIONS: ForceFilePlainTextOptions","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  ForceFilePlainTextOptions,\n  RenderFileOptions,\n  ThemedFileResult,\n} from '../types';\nimport { linesFromFileContents } from './computeFileOffsets';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\n\nconst DEFAULT_PLAIN_TEXT_OPTIONS: ForceFilePlainTextOptions = {\n  forcePlainText: false,\n};\n\nexport function renderFileWithHighlighter(\n  file: FileContents,\n  highlighter: DiffsHighlighter,\n  {\n    theme = DEFAULT_THEMES,\n    tokenizeMaxLineLength,\n    useTokenTransformer,\n  }: 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 } =\n    createTransformerWithState(useTokenTransformer);\n  const lang = forcePlainText\n    ? 'text'\n    : (file.lang ?? getFiletypeFromFileName(file.name));\n  const baseThemeType =\n    typeof theme === 'string' ? highlighter.getTheme(theme).type : undefined;\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 ?? linesFromFileContents(file.contents),\n            startingLine,\n            totalLines\n          )\n        : 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  if (lines.length === 0) {\n    return '';\n  }\n  const endLine = Math.min(startingLine + totalLines, lines.length);\n  return lines.slice(startingLine, endLine).join('');\n}\n"],"mappings":";;;;;;;;;AAiBA,MAAMA,6BAAwD,EAC5D,gBAAgB,OACjB;AAED,SAAgB,0BACd,MACA,aACA,EACE,QAAQ,gBACR,uBACA,uBAEF,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,iBACb,2BAA2B,oBAAoB;CACjD,MAAM,OAAO,iBACT,SACC,KAAK,QAAQ,wBAAwB,KAAK,KAAK;CACpD,MAAM,gBACJ,OAAO,UAAU,WAAW,YAAY,SAAS,MAAM,CAAC,OAAO;CACjE,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,sBAAsB,KAAK,SAAS,EAC7C,cACA,WACD,GACD,KAAK,UACT,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;AACR,KAAI,MAAM,WAAW,EACnB,QAAO;CAET,MAAM,UAAU,KAAK,IAAI,eAAe,YAAY,MAAM,OAAO;AACjE,QAAO,MAAM,MAAM,cAAc,QAAQ,CAAC,KAAK,GAAG"}

package/dist/worker/WorkerPoolManager.js

@@ -1,11 +1,11 @@
 import { DEFAULT_THEMES } from "../constants.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
+import { areFilesEqual } from "../utils/areFilesEqual.js";
 import { attachResolvedThemes } from "../highlighter/themes/attachResolvedThemes.js";
 import { getSharedHighlighter } from "../highlighter/shared_highlighter.js";
 import { getThemes } from "../utils/getThemes.js";
 import { hasResolvedThemes } from "../highlighter/themes/hasResolvedThemes.js";
 import { areFileRenderOptionsEqual } from "../utils/areFileRenderOptionsEqual.js";
-import { areFilesEqual } from "../utils/areFilesEqual.js";
 import { getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { isFilePlainText } from "../utils/isFilePlainText.js";
 import { renderFileWithHighlighter } from "../utils/renderFileWithHighlighter.js";