svelte-highlight 7.14.0 → 7.14.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/FileTabs.svelte CHANGED
@@ -13,7 +13,8 @@
13
13
 
14
14
  const dispatch = createEventDispatcher();
15
15
 
16
- const baseId = `svelte-highlight-file-tabs-${uid++}`;
16
+ const baseId = `svelte-highlight-file-tabs-${uid}`;
17
+ uid += 1;
17
18
 
18
19
  /** @type {HTMLDivElement} */
19
20
  let root;
package/Highlight.svelte CHANGED
@@ -1,28 +1,38 @@
1
1
  <script>
2
- import { createEventDispatcher } from "svelte";
3
- import { highlightLanguage } from "./core.js";
4
- import { createHighlighter } from "./highlighter.svelte.js";
5
- import LangTag from "./LangTag.svelte";
2
+ /** @type {import("./languages").LanguageType<string>} */
3
+ export let language;
4
+
5
+ /** @type {any} */
6
+ export let code;
7
+
8
+ /** @type {boolean} */
9
+ export let langtag = false;
6
10
 
7
- /** @type {{ language: import("./languages").LanguageType<string>; code: any; langtag?: boolean; [key: string]: any }} */
8
- let { language, code, langtag = false, ...restProps } = $props();
11
+ import hljs from "highlight.js/lib/core";
12
+ import { afterUpdate, createEventDispatcher } from "svelte";
13
+ import LangTag from "./LangTag.svelte";
9
14
 
10
15
  const dispatch = createEventDispatcher();
11
16
 
12
- const core = createHighlighter(
13
- () => highlightLanguage(language, code),
14
- (highlighted) => {
15
- if (highlighted) dispatch("highlight", { highlighted });
16
- },
17
- );
17
+ /** @type {string} */
18
+ let highlighted = "";
19
+
20
+ afterUpdate(() => {
21
+ if (highlighted) dispatch("highlight", { highlighted });
22
+ });
23
+
24
+ $: {
25
+ hljs.registerLanguage(language.name, language.register);
26
+ highlighted = hljs.highlight(code, { language: language.name }).value;
27
+ }
18
28
  </script>
19
29
 
20
- <slot highlighted={core.value} {langtag} languageName={language.name}>
30
+ <slot {highlighted} {langtag} languageName={language.name}>
21
31
  <LangTag
22
- {...restProps}
32
+ {...$$restProps}
23
33
  languageName={language.name}
24
34
  {langtag}
25
- highlighted={core.value}
35
+ {highlighted}
26
36
  {code}
27
37
  />
28
38
  </slot>
@@ -1,16 +1,17 @@
1
1
  <script>
2
- import hljs from "highlight.js";
3
- import { createEventDispatcher } from "svelte";
4
- import { createHighlighter } from "./highlighter.svelte.js";
5
2
  import LangTag from "./LangTag.svelte";
6
3
 
7
- /** @type {{ code: any; languageNames?: (import("./languages").LanguageName | (string & {}))[]; langtag?: boolean; [key: string]: any }} */
8
- let {
9
- code,
10
- languageNames = undefined,
11
- langtag = false,
12
- ...restProps
13
- } = $props();
4
+ /** @type {any} */
5
+ export let code;
6
+
7
+ /** @type {(import("./languages").LanguageName | (string & {}))[] | undefined} */
8
+ export let languageNames = undefined;
9
+
10
+ /** @type {boolean} */
11
+ export let langtag = false;
12
+
13
+ import hljs from "highlight.js";
14
+ import { afterUpdate, createEventDispatcher } from "svelte";
14
15
 
15
16
  /**
16
17
  * @typedef {{ highlighted: string; language: string; }} HighlightEventDetail
@@ -18,21 +19,25 @@
18
19
  */
19
20
  const dispatch = createEventDispatcher();
20
21
 
21
- const core = createHighlighter(
22
- () => hljs.highlightAuto(code, languageNames),
23
- ({ value, language }) => {
24
- if (value)
25
- dispatch("highlight", { highlighted: value, language: language ?? "" });
26
- },
27
- );
22
+ /** @type {string} */
23
+ let highlighted = "";
24
+
25
+ /** @type {string} */
26
+ let language = "";
28
27
 
29
- let highlighted = $derived(core.value.value);
30
- let language = $derived(core.value.language ?? "");
28
+ afterUpdate(() => {
29
+ if (highlighted) dispatch("highlight", { highlighted, language });
30
+ });
31
+
32
+ $: ({ value: highlighted, language = "" } = hljs.highlightAuto(
33
+ code,
34
+ languageNames,
35
+ ));
31
36
  </script>
32
37
 
33
38
  <slot {highlighted} {langtag} languageName={language}>
34
39
  <LangTag
35
- {...restProps}
40
+ {...$$restProps}
36
41
  languageName={language}
37
42
  {langtag}
38
43
  {highlighted}
@@ -1,29 +1,37 @@
1
1
  <script>
2
- import { createEventDispatcher } from "svelte";
3
- import { highlightLanguage } from "./core.js";
4
- import { createHighlighter } from "./highlighter.svelte.js";
5
2
  import LangTag from "./LangTag.svelte";
6
- import svelte from "./languages/svelte";
7
3
 
8
- /** @type {{ code: any; langtag?: boolean; [key: string]: any }} */
9
- let { code, langtag = false, ...restProps } = $props();
4
+ /** @type {any} */
5
+ export let code;
6
+
7
+ /** @type {boolean} */
8
+ export let langtag = false;
9
+
10
+ import hljs from "highlight.js/lib/core";
11
+ import { afterUpdate, createEventDispatcher } from "svelte";
12
+ import svelte from "./languages/svelte";
10
13
 
11
14
  const dispatch = createEventDispatcher();
12
15
 
13
- const core = createHighlighter(
14
- () => highlightLanguage(svelte, code),
15
- (highlighted) => {
16
- if (highlighted) dispatch("highlight", { highlighted });
17
- },
18
- );
16
+ /** @type {string} */
17
+ let highlighted = "";
18
+
19
+ afterUpdate(() => {
20
+ if (highlighted) dispatch("highlight", { highlighted });
21
+ });
22
+
23
+ $: {
24
+ hljs.registerLanguage(svelte.name, svelte.register);
25
+ highlighted = hljs.highlight(code, { language: svelte.name }).value;
26
+ }
19
27
  </script>
20
28
 
21
- <slot highlighted={core.value} {langtag} languageName="svelte">
29
+ <slot {highlighted} {langtag} languageName="svelte">
22
30
  <LangTag
23
- {...restProps}
31
+ {...$$restProps}
24
32
  languageName="svelte"
25
33
  {langtag}
26
- highlighted={core.value}
34
+ {highlighted}
27
35
  {code}
28
36
  />
29
37
  </slot>
@@ -1,4 +1,6 @@
1
1
  <script>
2
+ import { splitLines } from "./split-lines.js";
3
+
2
4
  /** @type {string} */
3
5
  export let highlighted;
4
6
 
@@ -24,9 +26,9 @@
24
26
  const MIN_DIGITS = 2;
25
27
  const HIGHLIGHTED_BACKGROUND = "rgba(254, 241, 96, 0.2)";
26
28
 
27
- $: lines = highlighted.split("\n");
29
+ $: lines = splitLines(highlighted);
28
30
  $: focusMode = highlightedLines.length > 0;
29
- $: len_digits = lines.length.toString().length;
31
+ $: len_digits = (startingLineNumber + lines.length - 1).toString().length;
30
32
  $: len = len_digits - MIN_DIGITS < 1 ? MIN_DIGITS : len_digits;
31
33
  $: width = len * DIGIT_WIDTH;
32
34
  </script>
package/action.js CHANGED
@@ -1,4 +1,4 @@
1
- import { highlightLanguage } from "./core.js";
1
+ import hljs from "highlight.js/lib/core";
2
2
 
3
3
  /**
4
4
  * Highlight an element in place with highlight.js.
@@ -9,8 +9,11 @@ import { highlightLanguage } from "./core.js";
9
9
  export function highlight(node, parameters) {
10
10
  /** @param {{ language: import("./languages").LanguageType<string>; code?: string }} params */
11
11
  function apply({ language, code }) {
12
+ if (!hljs.getLanguage(language.name)) {
13
+ hljs.registerLanguage(language.name, language.register);
14
+ }
12
15
  const source = code ?? node.textContent ?? "";
13
- node.innerHTML = highlightLanguage(language, source);
16
+ node.innerHTML = hljs.highlight(source, { language: language.name }).value;
14
17
  node.classList.add("hljs");
15
18
  }
16
19
 
package/index.d.ts CHANGED
@@ -14,4 +14,10 @@ export { default as HighlightSvelte } from "./HighlightSvelte.svelte";
14
14
  export { default as LineNumbers } from "./LineNumbers.svelte";
15
15
  export type { LanguageName, LanguageType } from "./languages";
16
16
  export { loadLanguage } from "./load-language";
17
+ export {
18
+ dualStyle,
19
+ scopeClassFor,
20
+ scopeSelectors,
21
+ scopeStyle,
22
+ } from "./scoped";
17
23
  export { default as Typewriter } from "./Typewriter.svelte";
package/index.js CHANGED
@@ -11,4 +11,10 @@ export { default as HighlightStyle } from "./HighlightStyle.svelte";
11
11
  export { default as HighlightSvelte } from "./HighlightSvelte.svelte";
12
12
  export { default as LineNumbers } from "./LineNumbers.svelte";
13
13
  export { loadLanguage } from "./load-language.js";
14
+ export {
15
+ dualStyle,
16
+ scopeClassFor,
17
+ scopeSelectors,
18
+ scopeStyle,
19
+ } from "./scoped.js";
14
20
  export { default as Typewriter } from "./Typewriter.svelte";
@@ -16,6 +16,12 @@ function defineAstro(hljs) {
16
16
  excludeBegin: true,
17
17
  excludeEnd: true,
18
18
  relevance: 100,
19
+ /** @type {import("highlight.js").ModeCallback} */
20
+ "on:begin": (match, response) => {
21
+ if (match.index !== 0) {
22
+ response.ignoreMatch();
23
+ }
24
+ },
19
25
  },
20
26
  {
21
27
  begin: /^---\s*$/m,
package/languages/hcl.js CHANGED
@@ -35,13 +35,13 @@ function defineHcl(hljs) {
35
35
  contains: [hljs.BACKSLASH_ESCAPE, INTERPOLATION],
36
36
  };
37
37
 
38
- const HEREDOC = {
38
+ const HEREDOC = hljs.END_SAME_AS_BEGIN({
39
39
  className: "string",
40
- begin: /<<-?\s*(["']?)(\w+)\1/,
41
- end: /^\s*\w+\s*$/,
40
+ begin: /<<-?\s*(\w+)\s*\n/,
41
+ end: /^\s*(\w+)\s*$/,
42
42
  contains: [INTERPOLATION],
43
43
  relevance: 10,
44
- };
44
+ });
45
45
 
46
46
  return {
47
47
  name: "HCL",
package/languages/hlsl.js CHANGED
@@ -52,8 +52,12 @@ function defineHlsl(hljs) {
52
52
  };
53
53
 
54
54
  const ATTRIBUTE = {
55
- className: "meta",
56
- begin: /(?<![\w\]])\[[a-zA-Z_]\w*(?:\([^)]*\))\]/,
55
+ // A leading word character or `]` means this is array indexing (e.g.
56
+ // `arr[i]`, `buf[0][process(x)]`) rather than an HLSL attribute, so the
57
+ // guard character is matched in its own group and left unscoped
58
+ // instead of excluded with a negative lookbehind.
59
+ begin: [/(?:^|[^\w\]])/, /\[[a-zA-Z_]\w*(?:\([^)]*\))\]/],
60
+ beginScope: { 2: "meta" },
57
61
  relevance: 0,
58
62
  };
59
63
 
package/languages/jq.js CHANGED
@@ -83,8 +83,8 @@ function defineJq(hljs) {
83
83
 
84
84
  const FUNCTION_DEF = {
85
85
  // def name(params):
86
- className: "title.function",
87
- begin: /(?<=def\s)[a-zA-Z_]\w*/,
86
+ begin: [/def\s+/, /[a-zA-Z_]\w*/],
87
+ beginScope: { 2: "title.function" },
88
88
  relevance: 0,
89
89
  };
90
90
 
package/languages/just.js CHANGED
@@ -22,7 +22,7 @@ function defineJust(hljs) {
22
22
  end: /\]/,
23
23
  contains: [
24
24
  {
25
- className: "meta-keyword",
25
+ className: "keyword",
26
26
  begin: /[a-zA-Z][\w-]*/,
27
27
  },
28
28
  STRING,
package/languages/kql.js CHANGED
@@ -94,6 +94,7 @@ function defineKql(hljs) {
94
94
  aliases: ["kql", "kusto"],
95
95
  case_insensitive: false,
96
96
  keywords: {
97
+ $pattern: "[\\w.]+",
97
98
  keyword: KQL_KEYWORDS,
98
99
  operator: KQL_OPERATORS,
99
100
  built_in: KQL_FUNCTIONS,
@@ -90,8 +90,9 @@ function defineReScript(hljs) {
90
90
  // `</` unambiguously starts a JSX closing tag. A bare `<` immediately
91
91
  // preceded by a word character (e.g. `array<int>`, `option<string>`,
92
92
  // `text<div>`) is generic-type application syntax instead, so that case
93
- // is excluded with a negative lookbehind.
94
- begin: /<\/(?=[A-Za-z])|(?<![\w])<(?=[A-Za-z])/,
93
+ // is excluded with `\B`, which only holds when the preceding character
94
+ // has the same word-ness as `<` (i.e. is not a word character).
95
+ begin: /<\/(?=[A-Za-z])|\B<(?=[A-Za-z])/,
95
96
  end: /\/?>/,
96
97
  relevance: 0,
97
98
  contains: [
@@ -13,7 +13,7 @@ const SOLIDITY_LITERALS =
13
13
 
14
14
  const SOLIDITY_BUILT_INS =
15
15
  "msg block tx abi require assert keccak256 sha256 ripemd160 ecrecover " +
16
- "addmod mulgmod gasleft blockhash now";
16
+ "addmod mulmod gasleft blockhash now";
17
17
 
18
18
  const SOLIDITY_TYPE = {
19
19
  className: "type",
@@ -2,28 +2,29 @@ import typescriptRegister from "highlight.js/lib/languages/typescript";
2
2
  import html from "./html.js";
3
3
 
4
4
  const RUNE_NAMES = "state|derived|effect|props|bindable|inspect|host";
5
- const RUNE_SUFFIXES = "raw|snapshot|by|eager";
5
+ const RUNE_SUFFIXES =
6
+ "raw|snapshot|by|eager|pre|tracking|pending|root|id|trace";
6
7
  const SVELTE_DIRECTIVES =
7
8
  "on|bind|use|transition|in|out|animate|class|style|let";
8
9
  const TS_LANG = "(?:ts|typescript)";
9
10
  const SCRIPT_TS_BEGIN = new RegExp(
10
11
  String.raw`<script(?=[^>]*\slang=["']${TS_LANG}["'])[^>]*>`,
11
- "gm",
12
+ "m",
12
13
  );
13
14
  const SCRIPT_JS_MODULE_BEGIN = new RegExp(
14
15
  String.raw`<script(?=[^>]*(?:\scontext=["']module["']|\smodule\b))(?![^>]*\slang=["']${TS_LANG}["'])[^>]*>`,
15
- "gm",
16
+ "m",
16
17
  );
17
18
  const SCRIPT_JS_BEGIN = new RegExp(
18
19
  String.raw`<script(?![^>]*\slang=["']${TS_LANG}["'])[^>]*>`,
19
- "gm",
20
+ "m",
20
21
  );
21
22
 
22
23
  /** @param {import("highlight.js").HLJSApi} hljs */
23
24
  function defineSvelte(hljs) {
24
25
  const runePattern = {
25
26
  begin: new RegExp(
26
- String.raw`\$(?:${RUNE_NAMES})(?:\.(?:${RUNE_SUFFIXES}))?(?=\s|\(|,|;|\)|\}|$)`,
27
+ String.raw`\$(?:${RUNE_NAMES})(?:\.(?:${RUNE_SUFFIXES}))?(?=\s|\(|,|;|\)|\}|<|$)`,
27
28
  ),
28
29
  className: "keyword",
29
30
  relevance: 10,
package/languages/zig.js CHANGED
@@ -4,12 +4,12 @@ const ZIG_KEYWORDS =
4
4
  "error test and or orelse unreachable async await suspend resume " +
5
5
  "nosuspend export extern packed align allowzero volatile linksection " +
6
6
  "threadlocal usingnamespace asm anytype noalias callconv opaque " +
7
- "anyframe fn";
7
+ "anyframe";
8
8
 
9
9
  const ZIG_LITERALS = "true false null undefined";
10
10
 
11
11
  const ZIG_TYPES =
12
- "bool void type anyerror anytype noreturn comptime_int comptime_float " +
12
+ "bool void type anyerror anytype anyopaque noreturn comptime_int comptime_float " +
13
13
  "isize usize c_char c_short c_ushort c_int c_uint c_long c_ulong " +
14
14
  "c_longlong c_ulonglong c_longdouble f16 f32 f64 f80 f128";
15
15
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "svelte-highlight",
3
- "version": "7.14.0",
3
+ "version": "7.14.1",
4
4
  "license": "MIT",
5
5
  "description": "Svelte component library for highlighting code using highlight.js",
6
6
  "author": "Eric Liu (https://github.com/metonym)",
@@ -65,12 +65,24 @@
65
65
  "types": "./languages/*.d.ts",
66
66
  "import": "./languages/*.js"
67
67
  },
68
+ "./ansi": {
69
+ "types": "./ansi.d.ts",
70
+ "default": "./ansi.js"
71
+ },
72
+ "./load-language": {
73
+ "types": "./load-language.d.ts",
74
+ "default": "./load-language.js"
75
+ },
76
+ "./scoped": {
77
+ "types": "./scoped.d.ts",
78
+ "default": "./scoped.js"
79
+ },
68
80
  "./package.json": "./package.json"
69
81
  },
70
82
  "svelte": "./index.js",
71
83
  "types": "./index.d.ts",
72
84
  "sideEffects": [
73
- "src/styles/*.css",
74
- "src/langtag.css"
85
+ "styles/*.css",
86
+ "langtag.css"
75
87
  ]
76
88
  }
@@ -0,0 +1,6 @@
1
+ /**
2
+ * Splits highlight.js output HTML into lines, closing any `<span>` elements
3
+ * left open at a line break and reopening the same stack (in order) on the
4
+ * next line.
5
+ */
6
+ export declare function splitLines(html: string): string[];
package/split-lines.js ADDED
@@ -0,0 +1,50 @@
1
+ /**
2
+ * Splits highlight.js output HTML into lines without corrupting `<span>`
3
+ * elements that wrap a line break (block comments, template literals).
4
+ * Open spans are closed at the end of a line and the same stack is
5
+ * reopened, in order, at the start of the next line -- the strategy
6
+ * Prism and Shiki use for line-level transforms.
7
+ * @param {string} html
8
+ * @returns {string[]}
9
+ */
10
+ export function splitLines(html) {
11
+ const lines = [];
12
+ /** @type {string[]} */
13
+ const stack = [];
14
+ let current = "";
15
+ let i = 0;
16
+
17
+ while (i < html.length) {
18
+ const char = html[i];
19
+
20
+ if (char === "<") {
21
+ const tagEnd = html.indexOf(">", i);
22
+ const tag = html.slice(i, tagEnd + 1);
23
+
24
+ if (tag.startsWith("</span")) {
25
+ stack.pop();
26
+ } else if (tag.startsWith("<span")) {
27
+ stack.push(tag);
28
+ }
29
+
30
+ current += tag;
31
+ i = tagEnd + 1;
32
+ continue;
33
+ }
34
+
35
+ if (char === "\n") {
36
+ current += "</span>".repeat(stack.length);
37
+ lines.push(current);
38
+ current = stack.join("");
39
+ i++;
40
+ continue;
41
+ }
42
+
43
+ current += char;
44
+ i++;
45
+ }
46
+
47
+ lines.push(current);
48
+
49
+ return lines;
50
+ }
package/core.js DELETED
@@ -1,22 +0,0 @@
1
- import hljs from "highlight.js/lib/core";
2
-
3
- /**
4
- * Register a highlight.js language if it hasn't been registered yet.
5
- * @param {import("./languages").LanguageType<string>} language
6
- */
7
- export function registerLanguage(language) {
8
- if (!hljs.getLanguage(language.name)) {
9
- hljs.registerLanguage(language.name, language.register);
10
- }
11
- }
12
-
13
- /**
14
- * Register (if needed) and highlight `code` with the given language.
15
- * @param {import("./languages").LanguageType<string>} language
16
- * @param {any} code
17
- * @returns {string}
18
- */
19
- export function highlightLanguage(language, code) {
20
- registerLanguage(language);
21
- return hljs.highlight(code, { language: language.name }).value;
22
- }
@@ -1,22 +0,0 @@
1
- /**
2
- * Shared reactive core behind `Highlight`, `HighlightAuto`, and
3
- * `HighlightSvelte`: derives a result from `compute` whenever its
4
- * dependencies change, and notifies `onHighlight` when that result changes.
5
- *
6
- * @template T
7
- * @param {() => T} compute
8
- * @param {(result: T) => void} [onHighlight]
9
- */
10
- export function createHighlighter(compute, onHighlight) {
11
- const result = $derived.by(compute);
12
-
13
- $effect(() => {
14
- onHighlight?.(result);
15
- });
16
-
17
- return {
18
- get value() {
19
- return result;
20
- },
21
- };
22
- }