@pierre/diffs 1.4.0 → 1.4.1

package/dist/highlighter/shared_highlighter.d.ts

@@ -1,4 +1,4 @@
-import { DiffsHighlighter, DiffsThemeNames, HighlighterTypes, SupportedLanguages } from "../types.js";
+import { DiffsHighlighter, DiffsThemeNames, HighlighterTypes, SupportedLanguages, ThemesType } from "../types.js";
 
 //#region src/highlighter/shared_highlighter.d.ts
 type CachedOrLoadingHighlighterType = Promise<DiffsHighlighter> | DiffsHighlighter | undefined;
@@ -13,7 +13,11 @@ declare function getSharedHighlighter({
   preferredHighlighter
 }: HighlighterOptions): Promise<DiffsHighlighter>;
 declare function isHighlighterLoaded(h?: CachedOrLoadingHighlighterType): h is DiffsHighlighter;
-declare function getHighlighterIfLoaded(): DiffsHighlighter | undefined;
+interface GetHighlighterIfLoadedProps {
+  theme: DiffsThemeNames | ThemesType;
+  lang: SupportedLanguages;
+}
+declare function getHighlighterIfLoaded(withSettings?: GetHighlighterIfLoadedProps): DiffsHighlighter | undefined;
 declare function isHighlighterLoading(h?: CachedOrLoadingHighlighterType): h is Promise<DiffsHighlighter>;
 declare function isHighlighterNull(h?: CachedOrLoadingHighlighterType): h is undefined;
 declare function preloadHighlighter(options: HighlighterOptions): Promise<void>;

package/dist/highlighter/shared_highlighter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared_highlighter.d.ts","names":[],"sources":["../../src/highlighter/shared_highlighter.ts"],"mappings":";;;KAwBK,8BAAA,GACD,OAAA,CAAQ,gBAAA,IACR,gBAAA;AAAA,UAKM,kBAAA;EACR,MAAA,EAAQ,eAAA;EACR,KAAA,EAAO,kBAAA;EACP,oBAAA,GAAuB,gBAAA;AAAA;AAAA,iBAGH,oBAAA;EACpB,MAAA;EACA,KAAA;EACA;AAAA,GACC,kBAAA,GAAqB,OAAA,CAAQ,gBAAA;AAAA,iBAmDhB,mBAAA,CACd,CAAA,GAAG,8BAAA,GACF,CAAA,IAAK,gBAAgB;AAAA,iBAIR,sBAAA,IAA0B,gBAAgB;AAAA,iBAO1C,oBAAA,CACd,CAAA,GAAG,8BAAA,GACF,CAAA,IAAK,OAAA,CAAQ,gBAAA;AAAA,iBAIA,iBAAA,CACd,CAAA,GAAG,8BAA4C,GAC9C,CAAA;AAAA,iBAImB,kBAAA,CACpB,OAAA,EAAS,kBAAA,GACR,OAAO;AAAA,iBAIY,kBAAA,IAAsB,OAAO"}
+{"version":3,"file":"shared_highlighter.d.ts","names":[],"sources":["../../src/highlighter/shared_highlighter.ts"],"mappings":";;;KA2BK,8BAAA,GACD,OAAA,CAAQ,gBAAA,IACR,gBAAA;AAAA,UAKM,kBAAA;EACR,MAAA,EAAQ,eAAA;EACR,KAAA,EAAO,kBAAA;EACP,oBAAA,GAAuB,gBAAA;AAAA;AAAA,iBAGH,oBAAA;EACpB,MAAA;EACA,KAAA;EACA;AAAA,GACC,kBAAA,GAAqB,OAAA,CAAQ,gBAAA;AAAA,iBAmDhB,mBAAA,CACd,CAAA,GAAG,8BAAA,GACF,CAAA,IAAK,gBAAgB;AAAA,UAId,2BAAA;EACR,KAAA,EAAO,eAAA,GAAkB,UAAA;EACzB,IAAA,EAAM,kBAAA;AAAA;AAAA,iBAGQ,sBAAA,CACd,YAAA,GAAe,2BAAA,GACd,gBAAgB;AAAA,iBAcH,oBAAA,CACd,CAAA,GAAG,8BAAA,GACF,CAAA,IAAK,OAAA,CAAQ,gBAAA;AAAA,iBAIA,iBAAA,CACd,CAAA,GAAG,8BAA4C,GAC9C,CAAA;AAAA,iBAImB,kBAAA,CACpB,OAAA,EAAS,kBAAA,GACR,OAAO;AAAA,iBAIY,kBAAA,IAAsB,OAAO"}

package/dist/highlighter/shared_highlighter.js

@@ -1,6 +1,8 @@
+import { areLanguagesAttached } from "./languages/areLanguagesAttached.js";
 import { attachResolvedLanguages } from "./languages/attachResolvedLanguages.js";
 import { cleanUpResolvedLanguages } from "./languages/cleanUpResolvedLanguages.js";
 import { getResolvedOrResolveLanguage } from "./languages/getResolvedOrResolveLanguage.js";
+import { areThemesAttached } from "./themes/areThemesAttached.js";
 import { themeResolver } from "./themes/themeResolver.js";
 import { attachResolvedThemes } from "./themes/attachResolvedThemes.js";
 import { cleanUpResolvedThemes } from "./themes/cleanUpResolvedThemes.js";
@@ -18,7 +20,7 @@ async function getSharedHighlighter({ themes, langs, preferredHighlighter = "shi
 	const instance = isHighlighterLoading(highlighter) ? await highlighter : highlighter;
 	highlighter = instance;
 	const languageLoaders = [];
-	for (const language of langs) {
+	for (const language of Array.from(new Set(langs))) {
 		if (language === "text" || language === "ansi") continue;
 		const maybeResolvedLanguage = getResolvedOrResolveLanguage(language);
 		if ("then" in maybeResolvedLanguage) languageLoaders.push(maybeResolvedLanguage);
@@ -40,8 +42,10 @@ async function getSharedHighlighter({ themes, langs, preferredHighlighter = "shi
 function isHighlighterLoaded(h = highlighter) {
 	return h != null && !("then" in h);
 }
-function getHighlighterIfLoaded() {
-	if (highlighter != null && !("then" in highlighter)) return highlighter;
+function getHighlighterIfLoaded(withSettings) {
+	if (highlighter == null || "then" in highlighter) return;
+	if (withSettings != null && (!areThemesAttached(withSettings.theme) || !areLanguagesAttached(withSettings.lang))) return;
+	return highlighter;
 }
 function isHighlighterLoading(h = highlighter) {
 	return h != null && "then" in h;

package/dist/highlighter/shared_highlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared_highlighter.js","names":[],"sources":["../../src/highlighter/shared_highlighter.ts"],"sourcesContent":["import type { ThemeLoader } from '@pierre/theming';\nimport { pierreThemes } from '@pierre/theming/themes';\nimport {\n  createHighlighter,\n  createJavaScriptRegexEngine,\n  createOnigurumaEngine,\n} from 'shiki';\n\nimport type {\n  DiffsHighlighter,\n  DiffsThemeNames,\n  HighlighterTypes,\n  SupportedLanguages,\n  ThemeRegistrationResolved,\n} from '../types';\nimport type { ResolvedLanguage } from '../worker/types';\nimport { attachResolvedLanguages } from './languages/attachResolvedLanguages';\nimport { cleanUpResolvedLanguages } from './languages/cleanUpResolvedLanguages';\nimport { getResolvedOrResolveLanguage } from './languages/getResolvedOrResolveLanguage';\nimport { attachResolvedThemes } from './themes/attachResolvedThemes';\nimport { cleanUpResolvedThemes } from './themes/cleanUpResolvedThemes';\nimport { getResolvedOrResolveTheme } from './themes/getResolvedOrResolveTheme';\nimport { themeResolver } from './themes/themeResolver';\n\ntype CachedOrLoadingHighlighterType =\n  | Promise<DiffsHighlighter>\n  | DiffsHighlighter\n  | undefined;\n\nlet highlighter: CachedOrLoadingHighlighterType;\n\ninterface HighlighterOptions {\n  themes: DiffsThemeNames[];\n  langs: SupportedLanguages[];\n  preferredHighlighter?: HighlighterTypes;\n}\n\nexport async function getSharedHighlighter({\n  themes,\n  langs,\n  preferredHighlighter = 'shiki-js',\n}: HighlighterOptions): Promise<DiffsHighlighter> {\n  highlighter ??= createHighlighter({\n    themes: [],\n    langs: ['text'],\n    engine:\n      preferredHighlighter === 'shiki-wasm'\n        ? createOnigurumaEngine(import('shiki/wasm'))\n        : createJavaScriptRegexEngine(),\n  }) as Promise<DiffsHighlighter>;\n\n  const instance = isHighlighterLoading(highlighter)\n    ? await highlighter\n    : highlighter;\n  highlighter = instance;\n\n  const languageLoaders: Promise<ResolvedLanguage>[] = [];\n  for (const language of langs) {\n    if (language === 'text' || language === 'ansi') continue;\n    const maybeResolvedLanguage = getResolvedOrResolveLanguage(language);\n    if ('then' in maybeResolvedLanguage) {\n      languageLoaders.push(maybeResolvedLanguage);\n    } else {\n      attachResolvedLanguages(maybeResolvedLanguage, instance);\n    }\n  }\n\n  const themeLoaders: Promise<ThemeRegistrationResolved>[] = [];\n  for (const themeName of themes) {\n    const maybeResolvedTheme = getResolvedOrResolveTheme(themeName);\n    if ('then' in maybeResolvedTheme) {\n      themeLoaders.push(maybeResolvedTheme);\n    } else {\n      attachResolvedThemes(maybeResolvedTheme, highlighter);\n    }\n  }\n\n  // If we need to load any languages or themes, lets do that now\n  if (languageLoaders.length > 0 || themeLoaders.length > 0) {\n    await Promise.all([\n      Promise.all(languageLoaders).then((languages) => {\n        attachResolvedLanguages(languages, instance);\n      }),\n      Promise.all(themeLoaders).then((themes) => {\n        attachResolvedThemes(themes, instance);\n      }),\n    ]);\n  }\n\n  return instance;\n}\n\nexport function isHighlighterLoaded(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is DiffsHighlighter {\n  return h != null && !('then' in h);\n}\n\nexport function getHighlighterIfLoaded(): DiffsHighlighter | undefined {\n  if (highlighter != null && !('then' in highlighter)) {\n    return highlighter;\n  }\n  return undefined;\n}\n\nexport function isHighlighterLoading(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is Promise<DiffsHighlighter> {\n  return h != null && 'then' in h;\n}\n\nexport function isHighlighterNull(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is undefined {\n  return h == null;\n}\n\nexport async function preloadHighlighter(\n  options: HighlighterOptions\n): Promise<void> {\n  return void (await getSharedHighlighter(options));\n}\n\nexport async function disposeHighlighter(): Promise<void> {\n  if (highlighter == null) return;\n  (await highlighter).dispose();\n  cleanUpResolvedLanguages();\n  cleanUpResolvedThemes();\n  highlighter = undefined;\n}\n\nfor (const descriptor of pierreThemes.getThemes()) {\n  themeResolver.registerThemeIfAbsent(\n    descriptor.name,\n    descriptor.load as ThemeLoader<ThemeRegistrationResolved>\n  );\n}\n"],"mappings":";;;;;;;;;;AA6BA,IAAI;AAQJ,eAAsB,qBAAqB,EACzC,QACA,OACA,uBAAuB,cACyB;CAChD,gBAAgB,kBAAkB;EAChC,QAAQ,CAAC;EACT,OAAO,CAAC,MAAM;EACd,QACE,yBAAyB,eACrB,sBAAsB,OAAO,aAAa,IAC1C,4BAA4B;CACpC,CAAC;CAED,MAAM,WAAW,qBAAqB,WAAW,IAC7C,MAAM,cACN;CACJ,cAAc;CAEd,MAAM,kBAA+C,CAAC;CACtD,KAAK,MAAM,YAAY,OAAO;EAC5B,IAAI,aAAa,UAAU,aAAa,QAAQ;EAChD,MAAM,wBAAwB,6BAA6B,QAAQ;EACnE,IAAI,UAAU,uBACZ,gBAAgB,KAAK,qBAAqB;OAE1C,wBAAwB,uBAAuB,QAAQ;CAE3D;CAEA,MAAM,eAAqD,CAAC;CAC5D,KAAK,MAAM,aAAa,QAAQ;EAC9B,MAAM,qBAAqB,0BAA0B,SAAS;EAC9D,IAAI,UAAU,oBACZ,aAAa,KAAK,kBAAkB;OAEpC,qBAAqB,oBAAoB,WAAW;CAExD;CAGA,IAAI,gBAAgB,SAAS,KAAK,aAAa,SAAS,GACtD,MAAM,QAAQ,IAAI,CAChB,QAAQ,IAAI,eAAe,CAAC,CAAC,MAAM,cAAc;EAC/C,wBAAwB,WAAW,QAAQ;CAC7C,CAAC,GACD,QAAQ,IAAI,YAAY,CAAC,CAAC,MAAM,WAAW;EACzC,qBAAqB,QAAQ,QAAQ;CACvC,CAAC,CACH,CAAC;CAGH,OAAO;AACT;AAEA,SAAgB,oBACd,IAAoC,aACb;CACvB,OAAO,KAAK,QAAQ,EAAE,UAAU;AAClC;AAEA,SAAgB,yBAAuD;CACrE,IAAI,eAAe,QAAQ,EAAE,UAAU,cACrC,OAAO;AAGX;AAEA,SAAgB,qBACd,IAAoC,aACJ;CAChC,OAAO,KAAK,QAAQ,UAAU;AAChC;AAEA,SAAgB,kBACd,IAAoC,aACpB;CAChB,OAAO,KAAK;AACd;AAEA,eAAsB,mBACpB,SACe;CACR,MAAY,qBAAqB,OAAO;AACjD;AAEA,eAAsB,qBAAoC;CACxD,IAAI,eAAe,MAAM;CACzB,CAAC,MAAM,YAAA,CAAa,QAAQ;CAC5B,yBAAyB;CACzB,sBAAsB;CACtB,cAAc,KAAA;AAChB;AAEA,KAAK,MAAM,cAAc,aAAa,UAAU,GAC9C,cAAc,sBACZ,WAAW,MACX,WAAW,IACb"}
+{"version":3,"file":"shared_highlighter.js","names":[],"sources":["../../src/highlighter/shared_highlighter.ts"],"sourcesContent":["import type { ThemeLoader } from '@pierre/theming';\nimport { pierreThemes } from '@pierre/theming/themes';\nimport {\n  createHighlighter,\n  createJavaScriptRegexEngine,\n  createOnigurumaEngine,\n} from 'shiki';\n\nimport type {\n  DiffsHighlighter,\n  DiffsThemeNames,\n  HighlighterTypes,\n  SupportedLanguages,\n  ThemeRegistrationResolved,\n  ThemesType,\n} from '../types';\nimport type { ResolvedLanguage } from '../worker/types';\nimport { areLanguagesAttached } from './languages/areLanguagesAttached';\nimport { attachResolvedLanguages } from './languages/attachResolvedLanguages';\nimport { cleanUpResolvedLanguages } from './languages/cleanUpResolvedLanguages';\nimport { getResolvedOrResolveLanguage } from './languages/getResolvedOrResolveLanguage';\nimport { areThemesAttached } from './themes/areThemesAttached';\nimport { attachResolvedThemes } from './themes/attachResolvedThemes';\nimport { cleanUpResolvedThemes } from './themes/cleanUpResolvedThemes';\nimport { getResolvedOrResolveTheme } from './themes/getResolvedOrResolveTheme';\nimport { themeResolver } from './themes/themeResolver';\n\ntype CachedOrLoadingHighlighterType =\n  | Promise<DiffsHighlighter>\n  | DiffsHighlighter\n  | undefined;\n\nlet highlighter: CachedOrLoadingHighlighterType;\n\ninterface HighlighterOptions {\n  themes: DiffsThemeNames[];\n  langs: SupportedLanguages[];\n  preferredHighlighter?: HighlighterTypes;\n}\n\nexport async function getSharedHighlighter({\n  themes,\n  langs,\n  preferredHighlighter = 'shiki-js',\n}: HighlighterOptions): Promise<DiffsHighlighter> {\n  highlighter ??= createHighlighter({\n    themes: [],\n    langs: ['text'],\n    engine:\n      preferredHighlighter === 'shiki-wasm'\n        ? createOnigurumaEngine(import('shiki/wasm'))\n        : createJavaScriptRegexEngine(),\n  }) as Promise<DiffsHighlighter>;\n\n  const instance = isHighlighterLoading(highlighter)\n    ? await highlighter\n    : highlighter;\n  highlighter = instance;\n\n  const languageLoaders: Promise<ResolvedLanguage>[] = [];\n  for (const language of Array.from(new Set(langs))) {\n    if (language === 'text' || language === 'ansi') continue;\n    const maybeResolvedLanguage = getResolvedOrResolveLanguage(language);\n    if ('then' in maybeResolvedLanguage) {\n      languageLoaders.push(maybeResolvedLanguage);\n    } else {\n      attachResolvedLanguages(maybeResolvedLanguage, instance);\n    }\n  }\n\n  const themeLoaders: Promise<ThemeRegistrationResolved>[] = [];\n  for (const themeName of themes) {\n    const maybeResolvedTheme = getResolvedOrResolveTheme(themeName);\n    if ('then' in maybeResolvedTheme) {\n      themeLoaders.push(maybeResolvedTheme);\n    } else {\n      attachResolvedThemes(maybeResolvedTheme, highlighter);\n    }\n  }\n\n  // If we need to load any languages or themes, lets do that now\n  if (languageLoaders.length > 0 || themeLoaders.length > 0) {\n    await Promise.all([\n      Promise.all(languageLoaders).then((languages) => {\n        attachResolvedLanguages(languages, instance);\n      }),\n      Promise.all(themeLoaders).then((themes) => {\n        attachResolvedThemes(themes, instance);\n      }),\n    ]);\n  }\n\n  return instance;\n}\n\nexport function isHighlighterLoaded(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is DiffsHighlighter {\n  return h != null && !('then' in h);\n}\n\ninterface GetHighlighterIfLoadedProps {\n  theme: DiffsThemeNames | ThemesType;\n  lang: SupportedLanguages;\n}\n\nexport function getHighlighterIfLoaded(\n  withSettings?: GetHighlighterIfLoadedProps\n): DiffsHighlighter | undefined {\n  if (highlighter == null || 'then' in highlighter) {\n    return undefined;\n  }\n  if (\n    withSettings != null &&\n    (!areThemesAttached(withSettings.theme) ||\n      !areLanguagesAttached(withSettings.lang))\n  ) {\n    return undefined;\n  }\n  return highlighter;\n}\n\nexport function isHighlighterLoading(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is Promise<DiffsHighlighter> {\n  return h != null && 'then' in h;\n}\n\nexport function isHighlighterNull(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is undefined {\n  return h == null;\n}\n\nexport async function preloadHighlighter(\n  options: HighlighterOptions\n): Promise<void> {\n  return void (await getSharedHighlighter(options));\n}\n\nexport async function disposeHighlighter(): Promise<void> {\n  if (highlighter == null) return;\n  (await highlighter).dispose();\n  cleanUpResolvedLanguages();\n  cleanUpResolvedThemes();\n  highlighter = undefined;\n}\n\nfor (const descriptor of pierreThemes.getThemes()) {\n  themeResolver.registerThemeIfAbsent(\n    descriptor.name,\n    descriptor.load as ThemeLoader<ThemeRegistrationResolved>\n  );\n}\n"],"mappings":";;;;;;;;;;;;AAgCA,IAAI;AAQJ,eAAsB,qBAAqB,EACzC,QACA,OACA,uBAAuB,cACyB;CAChD,gBAAgB,kBAAkB;EAChC,QAAQ,CAAC;EACT,OAAO,CAAC,MAAM;EACd,QACE,yBAAyB,eACrB,sBAAsB,OAAO,aAAa,IAC1C,4BAA4B;CACpC,CAAC;CAED,MAAM,WAAW,qBAAqB,WAAW,IAC7C,MAAM,cACN;CACJ,cAAc;CAEd,MAAM,kBAA+C,CAAC;CACtD,KAAK,MAAM,YAAY,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,GAAG;EACjD,IAAI,aAAa,UAAU,aAAa,QAAQ;EAChD,MAAM,wBAAwB,6BAA6B,QAAQ;EACnE,IAAI,UAAU,uBACZ,gBAAgB,KAAK,qBAAqB;OAE1C,wBAAwB,uBAAuB,QAAQ;CAE3D;CAEA,MAAM,eAAqD,CAAC;CAC5D,KAAK,MAAM,aAAa,QAAQ;EAC9B,MAAM,qBAAqB,0BAA0B,SAAS;EAC9D,IAAI,UAAU,oBACZ,aAAa,KAAK,kBAAkB;OAEpC,qBAAqB,oBAAoB,WAAW;CAExD;CAGA,IAAI,gBAAgB,SAAS,KAAK,aAAa,SAAS,GACtD,MAAM,QAAQ,IAAI,CAChB,QAAQ,IAAI,eAAe,CAAC,CAAC,MAAM,cAAc;EAC/C,wBAAwB,WAAW,QAAQ;CAC7C,CAAC,GACD,QAAQ,IAAI,YAAY,CAAC,CAAC,MAAM,WAAW;EACzC,qBAAqB,QAAQ,QAAQ;CACvC,CAAC,CACH,CAAC;CAGH,OAAO;AACT;AAEA,SAAgB,oBACd,IAAoC,aACb;CACvB,OAAO,KAAK,QAAQ,EAAE,UAAU;AAClC;AAOA,SAAgB,uBACd,cAC8B;CAC9B,IAAI,eAAe,QAAQ,UAAU,aACnC;CAEF,IACE,gBAAgB,SACf,CAAC,kBAAkB,aAAa,KAAK,KACpC,CAAC,qBAAqB,aAAa,IAAI,IAEzC;CAEF,OAAO;AACT;AAEA,SAAgB,qBACd,IAAoC,aACJ;CAChC,OAAO,KAAK,QAAQ,UAAU;AAChC;AAEA,SAAgB,kBACd,IAAoC,aACpB;CAChB,OAAO,KAAK;AACd;AAEA,eAAsB,mBACpB,SACe;CACR,MAAY,qBAAqB,OAAO;AACjD;AAEA,eAAsB,qBAAoC;CACxD,IAAI,eAAe,MAAM;CACzB,CAAC,MAAM,YAAA,CAAa,QAAQ;CAC5B,yBAAyB;CACzB,sBAAsB;CACtB,cAAc,KAAA;AAChB;AAEA,KAAK,MAAM,cAAc,aAAa,UAAU,GAC9C,cAAc,sBACZ,WAAW,MACX,WAAW,IACb"}

package/dist/highlighter/themes/areThemesAttached.js

@@ -1,5 +1,5 @@
-import { AttachedThemes } from "./constants.js";
 import { getThemes } from "../../utils/getThemes.js";
+import { AttachedThemes } from "./constants.js";
 //#region src/highlighter/themes/areThemesAttached.ts
 function areThemesAttached(themes) {
 	for (const theme of getThemes(themes)) if (!AttachedThemes.has(theme)) return false;

package/dist/index.js

@@ -1,15 +1,4 @@
 import { ALTERNATE_FILE_NAMES_GIT, CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
-import { clearRenderQueue, dequeueRender, queueRender } from "./managers/UniversalRenderingManager.js";
-import { areObjectsEqual } from "./utils/areObjectsEqual.js";
-import { areThemesEqual } from "./utils/areThemesEqual.js";
-import { areOptionsEqual } from "./utils/areOptionsEqual.js";
-import { areSelectionsEqual } from "./utils/areSelectionsEqual.js";
-import { createWindowFromScrollPosition } from "./utils/createWindowFromScrollPosition.js";
-import { prefersReducedMotion } from "./utils/prefersReducedMotion.js";
-import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement, createIconElement, createTextNodeElement, findCodeElement } from "./utils/hast_utils.js";
-import { createGutterUtilityElement } from "./utils/createGutterUtilityElement.js";
-import { InteractionManager, pluckInteractionOptions } from "./managers/InteractionManager.js";
-import { ResizeManager } from "./managers/ResizeManager.js";
 import { AttachedLanguages, RegisteredCustomLanguages, ResolvedLanguages, ResolvingLanguages } from "./highlighter/languages/constants.js";
 import { areLanguagesAttached } from "./highlighter/languages/areLanguagesAttached.js";
 import { attachResolvedLanguages } from "./highlighter/languages/attachResolvedLanguages.js";
@@ -17,14 +6,25 @@ import { cleanUpResolvedLanguages } from "./highlighter/languages/cleanUpResolve
 import { isWorkerContext } from "./utils/isWorkerContext.js";
 import { resolveLanguage } from "./highlighter/languages/resolveLanguage.js";
 import { getResolvedOrResolveLanguage } from "./highlighter/languages/getResolvedOrResolveLanguage.js";
+import { getThemes } from "./utils/getThemes.js";
 import { AttachedThemes } from "./highlighter/themes/constants.js";
+import { areThemesAttached } from "./highlighter/themes/areThemesAttached.js";
 import { attachResolvedThemes } from "./highlighter/themes/attachResolvedThemes.js";
 import { cleanUpResolvedThemes } from "./highlighter/themes/cleanUpResolvedThemes.js";
 import { resolveTheme } from "./highlighter/themes/resolveTheme.js";
 import { getResolvedOrResolveTheme } from "./highlighter/themes/getResolvedOrResolveTheme.js";
 import { disposeHighlighter, getHighlighterIfLoaded, getSharedHighlighter, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, preloadHighlighter } from "./highlighter/shared_highlighter.js";
-import { getThemes } from "./utils/getThemes.js";
-import { areThemesAttached } from "./highlighter/themes/areThemesAttached.js";
+import { clearRenderQueue, dequeueRender, queueRender } from "./managers/UniversalRenderingManager.js";
+import { areObjectsEqual } from "./utils/areObjectsEqual.js";
+import { areThemesEqual } from "./utils/areThemesEqual.js";
+import { areOptionsEqual } from "./utils/areOptionsEqual.js";
+import { areSelectionsEqual } from "./utils/areSelectionsEqual.js";
+import { createWindowFromScrollPosition } from "./utils/createWindowFromScrollPosition.js";
+import { prefersReducedMotion } from "./utils/prefersReducedMotion.js";
+import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement, createIconElement, createTextNodeElement, findCodeElement } from "./utils/hast_utils.js";
+import { createGutterUtilityElement } from "./utils/createGutterUtilityElement.js";
+import { InteractionManager, pluckInteractionOptions } from "./managers/InteractionManager.js";
+import { ResizeManager } from "./managers/ResizeManager.js";
 import { hasResolvedThemes } from "./highlighter/themes/hasResolvedThemes.js";
 import { areFileRenderOptionsEqual } from "./utils/areFileRenderOptionsEqual.js";
 import { areRenderRangesEqual } from "./utils/areRenderRangesEqual.js";

package/dist/renderers/DiffHunksRenderer.d.ts

@@ -99,7 +99,7 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
    * cache owner so the editor can reuse it without mutating shared data. An
    * empty additions document gets one row for the editor's caret.
    */
-  beginEditSession(diff?: FileDiffMetadata, externalDiff?: FileDiffMetadata): void;
+  beginEditSession(diff: FileDiffMetadata, externalDiff?: FileDiffMetadata): void;
   /** Leave edit-session mode. The exit recompute is the host's concern. */
   endEditSession(): void;
   /**

package/dist/renderers/DiffHunksRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;;UAoJiB,wBAAA,SAAiC,eAAe;EAC/D,gBAAA,GAAmB,oBAAA;AAAA;AAAA,UAGJ,oCAAA,SAA6C,IAAA,CAC5D,2BAAA;EAGA,gBAAA,EAAkB,oBAAA;AAAA;AAAA,UAGH,0BAAA;EACf,IAAA;EACA,QAAA,EAAU,SAAS;EACnB,iBAAA;EACA,iBAAA;AAAA;AAAA,UAGe,wBAAA;EACf,IAAA;EACA,IAAA;EACA,SAAA;AAAA;AAAA,UAGe,cAAA;EACf,cAAA,EAAgB,SAAA;EAChB,gBAAA,GAAmB,UAAA;EACnB,iBAAA,GAAoB,UAAA;AAAA;AAAA,UAUL,mBAAA;EACf,IAAA;EACA,SAAA;EACA,SAAA;EACA,gBAAA;EACA,cAAA;EACA,YAAA,GAAe,gBAAA;EACf,YAAA,GAAe,gBAAgB;AAAA;AAAA,UAGhB,WAAA;EACf,OAAA,EAAS,OAAA;EACT,MAAA,EAAQ,OAAW;AAAA;AAAA,UAGJ,gBAAA;EACf,QAAA,EAAU,WAAA;EACV,QAAA,EAAU,WAAW;AAAA;AAAA,UAGN,2BAAA;EACf,MAAA,GAAS,WAAA;EACT,KAAA,GAAQ,WAAW;AAAA;AAAA,UAGJ,yBAAA;EACf,MAAA,GAAS,gBAAA;EACT,KAAA,GAAQ,gBAAgB;AAAA;AAAA,UAGT,iBAAA;EACf,QAAA,EAAU,gBAAA;EACV,gBAAA,EAAkB,cAAA;EAClB,iBAAA,EAAmB,cAAA;EACnB,kBAAA,EAAoB,cAAA;EACpB,mBAAA,EAAqB,cAAA;EACrB,kBAAA,EAAoB,cAAA;EACpB,mBAAA,EAAqB,cAAA;EACrB,QAAA,EAAU,QAAA;EACV,GAAA;EACA,OAAA,EAAS,OAAA;EACT,aAAA,EAAe,OAAA;EACf,UAAA;EACA,WAAA;EACA,aAAA;EACA,QAAA;EACA,YAAA;EACA,WAAA;AAAA;AAAA,cAKW,iBAAA;EAgCF,OAAA,EAAS,wBAAA;EAAA,QACR,kBAAA;EAAA,QAGA,cAAA;EAAA,QACA,aAAA;EAAA,SApCD,IAAA;EAAA,QAED,WAAA;EAAA,QAIA,IAAA;EAAA,QAEA,aAAA;EAAA,QAEA,mBAAA;EAAA,QACA,mBAAA;EAAA,QAEA,YAAA;EAAA,QACA,WAAA;EAAA,QAGA,sBAAA;EAAA,QAGA,qBAAA;EAAA,QAQA,iBAAA;EAER,WAAA,CACS,OAAA,GAAS,wBAAA,EACR,kBAAA,IACN,UAAA,EAAY,kBAAA,CAAmB,WAAA,cAEzB,cAAA,gCACA,aAAA,GAAgB,iBAAA;EASnB,OAAA;EAOA,OAAA;EA7FY;AAAA;AAGrB;;;;;;;EA6GS,gBAAA,CACL,IAAA,GAAO,gBAAA,EACP,YAAA,GAAe,gBAAA;EA7GI;EAuLd,cAAA;EApLQ;;;EA4LR,iBAAA;EA3LP;;;;;AACmB;AAGrB;;;EAwMS,wBAAA,IAA4B,OAAA;EAAA,QAqC3B,oBAAA;EAAA,IA4BG,SAAA,IAAa,gBAAA;EAIjB,gBAAA;EAMA,UAAA,CAAW,OAAA,EAAS,wBAAA;EAIpB,YAAA,CAAa,OAAA,EAAS,OAAA,CAAQ,wBAAA;EAI9B,UAAA,CACL,KAAA,UACA,SAAA,EAAW,mBAAA,EACX,kBAAA;EA0BK,eAAA,CAAgB,SAAA,WAAoB,mBAAA;EAIpC,mBAAA,IAAuB,GAAA,SAAY,mBAAA;;EAKnC,mBAAA,CACL,aAAA,EAAe,GAAA,SAAY,mBAAA;EAKtB,kBAAA,CACL,eAAA,EAAiB,kBAAA,CAAmB,WAAA;EAhUnB;;;;;;EAyVZ,iBAAA,CACL,UAAA,EAAY,GAAA,SAAY,KAAA,CAAM,gBAAA,IAC9B,SAAA,oBACA,uBAAA;EAAA,QA+HM,mBAAA;EAUD,mBAAA,CACL,YAAA,EAAc,YAAA,cAA0B,WAAA;EAAA,QA8DlC,0BAAA;EAAA,QAeA,mCAAA;EAAA,QAaA,mBAAA;EAAA,UAOE,wBAAA;IACR;EAAA,GACC,0BAAA,GAA6B,cAAA;EAAA,UAStB,sBAAA;IACR,IAAA;IACA;EAAA,GACC,wBAAA,GAA2B,cAAA;EAAA,QAetB,uBAAA;EAAA,UAKU,6BAAA,IAChB,GAAA,EAAK,mBAAA,KACF,2BAAA;EAAA,UAGa,2BAAA,IAChB,GAAA,EAAK,mBAAA,KACF,yBAAA;EAAA,UAEK,sBAAA,IAA0B,oCAAA;EAiDvB,qBAAA,IAAyB,OAAA,CAAQ,gBAAA;EAYvC,OAAA,CAAQ,IAAA,EAAM,gBAAA;EAAA,QAmCb,sBAAA;EAQD,uBAAA,IAA2B,IAAA,CAChC,eAAA;EAAA,QAeM,gBAAA;EAtuBa;;;;;EAixBd,oBAAA,CAAqB,IAAA,EAAM,gBAAA,GAAmB,gBAAA;EAAA,QAwB7C,aAAA;EAiCD,UAAA,CACL,IAAA,GAAM,gBAAA,cACN,WAAA,GAAa,WAAA,GACZ,iBAAA;EAgJU,WAAA,CACX,IAAA,EAAM,gBAAA,EACN,WAAA,GAAa,WAAA,GACZ,OAAA,CAAQ,iBAAA;EAAA,UAMD,gBAAA,CACR,KAAA,WACA,UAAA,UACA,gBAAA,GAAmB,mBAAA,GAClB,OAAA;EAAA,QAeW,cAAA;EAAA,QAyBN,yBAAA;EA2CD,kBAAA,CACL,IAAA,EAAM,gBAAA,EACN,MAAA,EAAQ,gBAAA,EACR,OAAA,EAAS,iBAAA,EACT,WAAA;EAAA,QAQM,oBAAA;EAAA,QAqCA,4BAAA;EAAA,QAgBA,oBAAA;EAAA,QAuBA,yBAAA;EAaD,gBAAA,CAAiB,KAAA;EAAA,QAIhB,oBAAA;EAAA,QAIA,iBAAA;EAgjBD,aAAA,CACL,IAAA,yCACA,MAAA,EAAQ,iBAAA,GACP,cAAA;EAyBI,aAAA,CACL,MAAA,EAAQ,iBAAA,EACR,QAAA,GAAU,cAAA,KACT,OAAA;EAkDI,cAAA,CACL,MAAA,EAAQ,iBAAA,EACR,YAAA,GAAc,cAAA;EAKT,iBAAA,CACL,QAAA,EAAU,cAAA,IACV,UAAA;EAAA,QAqBM,wBAAA;EAAA,QAiEA,cAAA;EAAA,QA+DA,kBAAA;EAAA,QASA,YAAA;AAAA"}
+{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":"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"}

package/dist/renderers/DiffHunksRenderer.js

@@ -1,9 +1,9 @@
 import { DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH } from "../constants.js";
-import { getFileAnnotations, shouldRenderFileAnnotations } from "../utils/includesFileAnnotations.js";
-import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement } from "../utils/hast_utils.js";
 import { areLanguagesAttached } from "../highlighter/languages/areLanguagesAttached.js";
-import { getHighlighterIfLoaded, getSharedHighlighter } from "../highlighter/shared_highlighter.js";
 import { areThemesAttached } from "../highlighter/themes/areThemesAttached.js";
+import { getHighlighterIfLoaded, getSharedHighlighter } from "../highlighter/shared_highlighter.js";
+import { getFileAnnotations, shouldRenderFileAnnotations } from "../utils/includesFileAnnotations.js";
+import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement } from "../utils/hast_utils.js";
 import { applyLineTextWithNewline } from "../utils/applyLineTextWithNewline.js";
 import { areRenderRangesEqual } from "../utils/areRenderRangesEqual.js";
 import { createAnnotationElement } from "../utils/createAnnotationElement.js";
@@ -82,15 +82,13 @@ var DiffHunksRenderer = class {
 		const { editSessionActive: wasAlreadyActive, renderCache } = this;
 		this.editSessionActive = true;
 		if (!wasAlreadyActive) this.pendingHighlightResult = void 0;
-		if (diff != null) this.diff = diff;
-		const currentDiff = diff ?? this.diffCache;
-		if (currentDiff != null && !currentDiff.isPartial && currentDiff.additionLines.length === 0) {
-			Object.assign(currentDiff, recomputeEmptyDocumentDiff(currentDiff, this.options.parseDiffOptions));
-			this.markEditSessionPass(currentDiff);
+		this.diff = diff;
+		if (!diff.isPartial && diff.additionLines.length === 0) {
+			Object.assign(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
+			this.markEditSessionPass(diff);
 			this.clearRenderCache();
 			return;
 		}
-		if (diff == null) return;
 		if (renderCache == null) return;
 		if (wasAlreadyActive && renderCache.diff === diff) return;
 		const { options } = this.getRenderOptions(diff);
@@ -517,6 +515,7 @@ var DiffHunksRenderer = class {
 			if (!forcePlainText && hasContent && (!this.renderCache.highlighted || forceHighlight)) this.workerManager.highlightDiffAST(this, diff);
 		} else {
 			this.computedLang = diff.lang ?? getFiletypeFromFileName(diff.name);
+			this.highlighter ??= getHighlighterIfLoaded();
 			const hasThemes = this.highlighter != null && areThemesAttached(options.theme);
 			const hasLangs = this.highlighter != null && areLanguagesAttached(this.computedLang);
 			const canHighlight = !forcePlainText && hasLangs;