@pierre/diffs 1.1.4 → 1.1.6

package/dist/utils/setWrapperNodeProps.d.ts

@@ -8,8 +8,6 @@ declare function setPreNodeProperties(pre: HTMLPreElement, {
   disableLineNumbers,
   overflow,
   split,
-  themeStyles,
-  themeType,
   totalLines,
   customProperties
 }: PrePropertiesConfig): HTMLPreElement;

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

@@ -1 +1 @@
-{"version":3,"file":"setWrapperNodeProps.d.ts","names":["PrePropertiesConfig","setPreNodeProperties","HTMLPreElement","type","diffIndicators","disableBackground","disableLineNumbers","overflow","split","themeStyles","themeType","totalLines","customProperties"],"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, customProperties }: PrePropertiesConfig): HTMLPreElement;\n//# sourceMappingURL=setWrapperNodeProps.d.ts.map"],"mappings":";;;iBACwBC,oBAAAA,MAA0BC;;;;;;;;;;;GAAwJF,sBAAsBE"}
+{"version":3,"file":"setWrapperNodeProps.d.ts","names":["PrePropertiesConfig","setPreNodeProperties","HTMLPreElement","type","diffIndicators","disableBackground","disableLineNumbers","overflow","split","totalLines","customProperties"],"sources":["../../src/utils/setWrapperNodeProps.d.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\nexport declare function setPreNodeProperties(pre: HTMLPreElement, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, totalLines, customProperties }: PrePropertiesConfig): HTMLPreElement;\n//# sourceMappingURL=setWrapperNodeProps.d.ts.map"],"mappings":";;;iBACwBC,oBAAAA,MAA0BC;;;;;;;;;GAAgIF,sBAAsBE"}

package/dist/utils/setWrapperNodeProps.js

@@ -1,5 +1,5 @@
 //#region src/utils/setWrapperNodeProps.ts
-function setPreNodeProperties(pre, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines, customProperties }) {
+function setPreNodeProperties(pre, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, totalLines, customProperties }) {
 	if (customProperties != null) for (const key in customProperties) {
 		const value = customProperties[key];
 		if (value != null) pre.setAttribute(key, `${value}`);
@@ -11,8 +11,6 @@ function setPreNodeProperties(pre, { type, diffIndicators, disableBackground, di
 		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":
@@ -30,7 +28,6 @@ function setPreNodeProperties(pre, { type, diffIndicators, disableBackground, di
 	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`);
 	return pre;
 }

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    type,\n    diffIndicators,\n    disableBackground,\n    disableLineNumbers,\n    overflow,\n    split,\n    themeStyles,\n    themeType,\n    totalLines,\n    customProperties,\n  }: PrePropertiesConfig\n): HTMLPreElement {\n  // NOTE: We always apply custom properties first so the important properties\n  // cannot be overridden.\n  if (customProperties != null) {\n    for (const key in customProperties) {\n      const value = customProperties[key];\n      if (value != null) {\n        pre.setAttribute(key, `${value}`);\n      }\n    }\n  }\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,YACA,oBAEc;AAGhB,KAAI,oBAAoB,KACtB,MAAK,MAAM,OAAO,kBAAkB;EAClC,MAAM,QAAQ,iBAAiB;AAC/B,MAAI,SAAS,KACX,KAAI,aAAa,KAAK,GAAG,QAAQ;;AAIvC,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"}
+{"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    totalLines,\n    customProperties,\n  }: PrePropertiesConfig\n): HTMLPreElement {\n  // NOTE: We always apply custom properties first so the important properties\n  // cannot be overridden.\n  if (customProperties != null) {\n    for (const key in customProperties) {\n      const value = customProperties[key];\n      if (value != null) {\n        pre.setAttribute(key, `${value}`);\n      }\n    }\n  }\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  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 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,YACA,oBAEc;AAGhB,KAAI,oBAAoB,KACtB,MAAK,MAAM,OAAO,kBAAkB;EAClC,MAAM,QAAQ,iBAAiB;AAC/B,MAAI,SAAS,KACX,KAAI,aAAa,KAAK,GAAG,QAAQ;;AAIvC,KAAI,SAAS,QAAQ;AACnB,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;QAC3B;AACL,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;;AAElC,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,MAAM,YACR,2CACA,GAAG,GAAG,aAAa,OAAO,IAC3B;AACD,QAAO"}

package/dist/worker/worker-portable.js

@@ -12150,10 +12150,12 @@ const MERGE_CONFLICT_SEPARATOR_MARKER_REGEX = /^={7,}$/;
 const MERGE_CONFLICT_END_MARKER_REGEX = /^>{7,}(?:\s.*)?$/;
 const HEADER_PREFIX_SLOT_ID = "header-prefix";
 const HEADER_METADATA_SLOT_ID = "header-metadata";
+const CUSTOM_HEADER_SLOT_ID = "header-custom";
 const DEFAULT_THEMES = {
 	dark: "pierre-dark",
 	light: "pierre-light"
 };
+const THEME_CSS_ATTRIBUTE = "data-theme-css";
 const UNSAFE_CSS_ATTRIBUTE = "data-unsafe-css";
 const CORE_CSS_ATTRIBUTE = "data-core-css";
 const DEFAULT_COLLAPSED_CONTEXT_THRESHOLD = 1;
@@ -15442,13 +15444,7 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
 		totalLines = Infinity;
 	}
 	const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
-	const baseThemeType = (() => {
-		const theme = options.theme ?? DEFAULT_THEMES;
-		if (typeof theme === "string") {
-			return highlighter$1.getTheme(theme).type;
-		}
-		return undefined;
-	})();
+	const baseThemeType = typeof options.theme === "string" ? highlighter$1.getTheme(options.theme).type : undefined;
 	const themeStyles = getHighlighterThemeStyles({
 		theme: options.theme,
 		highlighter: highlighter$1
@@ -15794,12 +15790,7 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 	const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
 	const { state, transformers } = createTransformerWithState();
 	const lang = forcePlainText ? "text" : file.lang ?? getFiletypeFromFileName(file.name);
-	const baseThemeType = (() => {
-		if (typeof theme === "string") {
-			return highlighter$1.getTheme(theme).type;
-		}
-		return undefined;
-	})();
+	const baseThemeType = typeof theme === "string" ? highlighter$1.getTheme(theme).type : undefined;
 	const themeStyles = getHighlighterThemeStyles({
 		theme,
 		highlighter: highlighter$1