@lostgradient/cinder 0.17.0 → 0.19.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/CHANGELOG.md +28 -0
- package/components.json +3 -2
- package/dist/cli/index.js +2 -2
- package/dist/cli/types.d.ts +1 -0
- package/dist/components/approval-card/index.js +105 -37
- package/dist/components/code-block/index.js +103 -36
- package/dist/components/combobox/combobox.schema.js +14 -1
- package/dist/components/combobox/combobox.svelte.d.ts +12 -12
- package/dist/components/combobox/combobox.types.d.ts +11 -5
- package/dist/components/combobox/index.js +94 -16
- package/dist/components/event-stream-viewer/index.js +3 -2
- package/dist/components/faceted-filter-bar/faceted-filter-bar.css +1 -1
- package/dist/components/invocation-rule-builder/index.js +3602 -380
- package/dist/components/invocation-rule-builder/invocation-rule-builder.css +14 -0
- package/dist/components/json-editor/index.js +86 -18
- package/dist/components/json-editor/json-editor-enhancement.d.ts +7 -0
- package/dist/components/json-editor/json-editor-enhancement.js +201 -0
- package/dist/components/json-editor/json-editor.css +68 -0
- package/dist/components/json-editor/json-editor.schema.js +5 -1
- package/dist/components/json-editor/json-editor.types.d.ts +2 -0
- package/dist/components/run-step-timeline/index.js +3 -2
- package/dist/components/schedule-builder/index.js +11 -5
- package/dist/components/schema-form/index.js +11 -5
- package/dist/components/select/index.js +11 -5
- package/dist/components/select/select.schema.js +5 -1
- package/dist/components/select/select.types.d.ts +2 -0
- package/dist/components/stat-group/stat-group.css +1 -0
- package/dist/components/status-dot/index.js +3 -2
- package/dist/highlighters/shiki/default.d.ts +5 -0
- package/dist/highlighters/shiki/default.js +278 -0
- package/dist/highlighters/shiki/index.d.ts +9 -2
- package/dist/highlighters/shiki/index.js +72 -35
- package/dist/index.js +618 -360
- package/dist/server/components/approval-card/index.js +2 -2
- package/dist/server/components/combobox/index.js +5 -3
- package/dist/server/components/event-stream-viewer/index.js +2 -2
- package/dist/server/components/invocation-rule-builder/index.js +15 -2
- package/dist/server/components/json-editor/index.js +1 -1
- package/dist/server/components/json-editor/json-editor-enhancement.js +150 -0
- package/dist/server/components/run-step-timeline/index.js +2 -2
- package/dist/server/components/schedule-builder/index.js +2 -2
- package/dist/server/components/schema-form/index.js +2 -2
- package/dist/server/components/select/index.js +2 -2
- package/dist/server/components/status-dot/index.js +2 -2
- package/dist/server/highlighters/shiki/default.js +39 -0
- package/dist/server/highlighters/shiki/index.js +7 -131
- package/dist/server/index.js +14 -13
- package/dist/server/{index.server-npxtkwjp.js → index.server-0gg1njz4.js} +3 -2
- package/dist/server/{index.server-j87v28yy.js → index.server-0hjcds3y.js} +35 -18
- package/dist/server/{index.server-9vqfmhez.js → index.server-20km2ga0.js} +1 -1
- package/dist/server/{index.server-qxneqxf8.js → index.server-62593nnh.js} +1 -1
- package/dist/server/{index.server-m8ya4p7w.js → index.server-8grn4zd3.js} +74 -14
- package/dist/server/index.server-c9gtmre4.js +178 -0
- package/dist/server/{index.server-66nm5gd5.js → index.server-ghvvqkfc.js} +1 -1
- package/dist/server/{index.server-tez36va4.js → index.server-kvn6cj65.js} +1 -1
- package/dist/server/{index.server-9nac5z11.js → index.server-psqfjzpc.js} +1 -1
- package/dist/server/{index.server-93vt8ktj.js → index.server-v73af5rk.js} +18 -2
- package/dist/server/{index.server-qke3ekjt.js → index.server-ww54rv4y.js} +1 -1
- package/dist/server/index.server-x4a15jpm.js +9 -0
- package/dist/server/{index.server-ex3ea9z0.js → index.server-xsdzbgs2.js} +3 -2
- package/dist/server/{index.server-8ak2cftv.js → index.server-z754e36a.js} +1 -1
- package/dist/utilities/json-highlight.d.ts +2 -0
- package/package.json +19 -1
- package/src/components/code-block/code-block-default-highlighter.ts +2 -2
- package/src/components/combobox/combobox.schema.json +13 -0
- package/src/components/combobox/combobox.schema.ts +13 -0
- package/src/components/combobox/combobox.svelte +100 -14
- package/src/components/combobox/combobox.types.ts +11 -5
- package/src/components/faceted-filter-bar/faceted-filter-bar.css +1 -1
- package/src/components/invocation-rule-builder/invocation-rule-builder.css +14 -0
- package/src/components/invocation-rule-builder/invocation-rule-builder.examples.json +1 -1
- package/src/components/invocation-rule-builder/invocation-rule-builder.svelte +30 -16
- package/src/components/json-editor/json-editor-enhancement.ts +48 -0
- package/src/components/json-editor/json-editor.css +68 -0
- package/src/components/json-editor/json-editor.examples.json +2 -2
- package/src/components/json-editor/json-editor.schema.json +4 -0
- package/src/components/json-editor/json-editor.schema.ts +5 -0
- package/src/components/json-editor/json-editor.svelte +80 -20
- package/src/components/json-editor/json-editor.types.ts +2 -0
- package/src/components/select/select.schema.json +4 -0
- package/src/components/select/select.schema.ts +4 -0
- package/src/components/select/select.svelte +9 -2
- package/src/components/select/select.types.ts +2 -0
- package/src/components/stat-group/stat-group.css +1 -0
- package/src/components/status-dot/status-dot.svelte +6 -1
- package/src/highlighters/shiki/default.ts +46 -0
- package/src/highlighters/shiki/index.ts +101 -32
- package/src/utilities/json-highlight.ts +5 -0
|
@@ -140,6 +140,7 @@ var rest_excludes = new Set([
|
|
|
140
140
|
"value",
|
|
141
141
|
"options",
|
|
142
142
|
"label",
|
|
143
|
+
"hideLabel",
|
|
143
144
|
"description",
|
|
144
145
|
"error",
|
|
145
146
|
"required",
|
|
@@ -149,14 +150,14 @@ var rest_excludes = new Set([
|
|
|
149
150
|
"aria-invalid"
|
|
150
151
|
]);
|
|
151
152
|
var root = $.from_html(`<span class="cinder-_required-marker" aria-hidden="true">*</span>`);
|
|
152
|
-
var root_1 = $.from_html(`<label
|
|
153
|
+
var root_1 = $.from_html(`<label> <!></label>`);
|
|
153
154
|
var root_2 = $.from_html(`<select></select>`);
|
|
154
155
|
var root_3 = $.from_html(`<option> </option>`);
|
|
155
156
|
var root_4 = $.from_html(`<p class="cinder-select-field__description"> </p>`);
|
|
156
157
|
var root_5 = $.from_html(`<div><!> <span class="cinder-select-field__control"><!> <span class="cinder-select-field__chevron" aria-hidden="true"></span></span> <!> <p class="cinder-select-field__error" aria-live="polite"> </p></div>`);
|
|
157
158
|
function Select($$anchor, $$props) {
|
|
158
159
|
$.push($$props, true);
|
|
159
|
-
let value = $.prop($$props, "value", 15), rest = $.rest_props($$props, rest_excludes);
|
|
160
|
+
let value = $.prop($$props, "value", 15), hideLabel = $.prop($$props, "hideLabel", 3, false), rest = $.rest_props($$props, rest_excludes);
|
|
160
161
|
const context = getFormFieldContext();
|
|
161
162
|
const field = $.derived(() => resolveFieldControl({
|
|
162
163
|
id: $$props.id,
|
|
@@ -174,6 +175,8 @@ function Select($$anchor, $$props) {
|
|
|
174
175
|
$.user_effect(() => {
|
|
175
176
|
if ($$props.options.length === 0) {
|
|
176
177
|
devWarn("[cinder/Select] options is empty — pass at least one option, or ignore during async load.");
|
|
178
|
+
} else if (value() !== undefined && !$$props.options.some((option) => option.value === value())) {
|
|
179
|
+
devWarn("[cinder/Select] value does not match any option — pass a value from options or omit it.");
|
|
177
180
|
}
|
|
178
181
|
});
|
|
179
182
|
var div = root_5();
|
|
@@ -194,11 +197,14 @@ function Select($$anchor, $$props) {
|
|
|
194
197
|
});
|
|
195
198
|
}
|
|
196
199
|
$.reset(label_1);
|
|
197
|
-
$.template_effect(() => {
|
|
200
|
+
$.template_effect(($0) => {
|
|
198
201
|
$.set_attribute(label_1, "for", $$props.id);
|
|
202
|
+
$.set_class(label_1, 1, $0);
|
|
199
203
|
$.set_attribute(label_1, "data-disabled", $.get(field).disabled || undefined);
|
|
200
204
|
$.set_text(text, `${$$props.label ?? ""} `);
|
|
201
|
-
}
|
|
205
|
+
}, [
|
|
206
|
+
() => $.clsx(classNames("cinder-select-field__label", hideLabel() && "cinder-sr-only"))
|
|
207
|
+
]);
|
|
202
208
|
$.append($$anchor2, label_1);
|
|
203
209
|
};
|
|
204
210
|
$.if(node, ($$render) => {
|
|
@@ -301,4 +307,4 @@ export {
|
|
|
301
307
|
Select
|
|
302
308
|
};
|
|
303
309
|
|
|
304
|
-
//# debugId=
|
|
310
|
+
//# debugId=FA2173692C84D5FD64756E2164756E21
|
|
@@ -72,6 +72,10 @@ var schema = {
|
|
|
72
72
|
type: "string",
|
|
73
73
|
description: "Visible label rendered in a `<label>` associated via `for`."
|
|
74
74
|
},
|
|
75
|
+
hideLabel: {
|
|
76
|
+
type: "boolean",
|
|
77
|
+
description: "Visually hides the label while keeping it available to assistive technology."
|
|
78
|
+
},
|
|
75
79
|
description: {
|
|
76
80
|
type: "string",
|
|
77
81
|
description: "Helper text rendered below the control; wired via `aria-describedby`."
|
|
@@ -109,4 +113,4 @@ export {
|
|
|
109
113
|
select_schema_default as default
|
|
110
114
|
};
|
|
111
115
|
|
|
112
|
-
//# debugId=
|
|
116
|
+
//# debugId=CAC7A1DD4E39706F64756E2164756E21
|
|
@@ -13,6 +13,8 @@ export type SelectProps<T extends string = string> = HTMLSelectAttributes & {
|
|
|
13
13
|
options: readonly SelectOption<T>[];
|
|
14
14
|
/** Visible label rendered in a `<label>` associated via `for`. */
|
|
15
15
|
label?: string;
|
|
16
|
+
/** Visually hides the label while keeping it available to assistive technology. */
|
|
17
|
+
hideLabel?: boolean;
|
|
16
18
|
/** Helper text rendered below the control; wired via `aria-describedby`. */
|
|
17
19
|
description?: string;
|
|
18
20
|
/** Validation error message; sets `aria-invalid="true"` and is wired via `aria-describedby`. */
|
|
@@ -103,6 +103,7 @@ function Status_dot($$anchor, $$props) {
|
|
|
103
103
|
const resolvedAriaLabel = $.derived(() => $.get(normalizedAriaLabel) ?? $.get(normalizedLabel) ?? $.get(resolvedStatus));
|
|
104
104
|
const visibleLabelIsLiveDuplicate = $.derived(() => $.get(resolvedLive) && $.get(normalizedLabel) !== undefined && $.get(resolvedAriaLabel) !== $.get(normalizedLabel));
|
|
105
105
|
const needsHiddenLiveLabel = $.derived(() => $.get(resolvedLive) && (!$.get(hasVisibleLabel) || $.get(visibleLabelIsLiveDuplicate)));
|
|
106
|
+
const liveAriaLabel = $.derived(() => !$.get(hasVisibleLabel) && ($.get(normalizedLabel) !== undefined || $.get(normalizedAriaLabel) !== undefined) ? $.get(resolvedAriaLabel) : undefined);
|
|
106
107
|
var span = root_2();
|
|
107
108
|
$.attribute_effect(span, ($0) => ({
|
|
108
109
|
...rest,
|
|
@@ -113,7 +114,7 @@ function Status_dot($$anchor, $$props) {
|
|
|
113
114
|
role: $.get(resolvedLive) ? "status" : "img",
|
|
114
115
|
"aria-live": $.get(resolvedLive) ? "polite" : undefined,
|
|
115
116
|
"aria-atomic": $.get(resolvedLive) ? "true" : undefined,
|
|
116
|
-
"aria-label": $.get(resolvedLive) ?
|
|
117
|
+
"aria-label": $.get(resolvedLive) ? $.get(liveAriaLabel) : $.get(resolvedAriaLabel)
|
|
117
118
|
}), [() => classNames("cinder-status-dot", $$props.class)]);
|
|
118
119
|
var node = $.sibling($.child(span), 2);
|
|
119
120
|
{
|
|
@@ -158,4 +159,4 @@ export {
|
|
|
158
159
|
Status_dot as StatusDot
|
|
159
160
|
};
|
|
160
161
|
|
|
161
|
-
//# debugId=
|
|
162
|
+
//# debugId=761AF4BF36F8CDE664756E2164756E21
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { createRetryingLoaderCache, shikiHighlighter as createShikiHighlighter, type ShikiHighlighterOptions } from './index.ts';
|
|
2
|
+
export { createRetryingLoaderCache };
|
|
3
|
+
export type { ShikiHighlighterOptions };
|
|
4
|
+
/** The bundled adapter with the complete Shiki language and theme registries. */
|
|
5
|
+
export declare function shikiHighlighter(options?: ShikiHighlighterOptions, moduleLoader?: Parameters<typeof createShikiHighlighter>[1]): ReturnType<typeof createShikiHighlighter>;
|
|
@@ -0,0 +1,278 @@
|
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
function __accessProp(key) {
|
|
7
|
+
return this[key];
|
|
8
|
+
}
|
|
9
|
+
var __toESMCache_node;
|
|
10
|
+
var __toESMCache_esm;
|
|
11
|
+
var __toESM = (mod, isNodeMode, target) => {
|
|
12
|
+
var canCache = mod != null && typeof mod === "object";
|
|
13
|
+
if (canCache) {
|
|
14
|
+
var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
|
|
15
|
+
var cached = cache.get(mod);
|
|
16
|
+
if (cached)
|
|
17
|
+
return cached;
|
|
18
|
+
}
|
|
19
|
+
target = mod != null ? __create(__getProtoOf(mod)) : {};
|
|
20
|
+
const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
|
|
21
|
+
for (let key of __getOwnPropNames(mod))
|
|
22
|
+
if (!__hasOwnProp.call(to, key))
|
|
23
|
+
__defProp(to, key, {
|
|
24
|
+
get: __accessProp.bind(mod, key),
|
|
25
|
+
enumerable: true
|
|
26
|
+
});
|
|
27
|
+
if (canCache)
|
|
28
|
+
cache.set(mod, to);
|
|
29
|
+
return to;
|
|
30
|
+
};
|
|
31
|
+
var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
|
|
32
|
+
var __returnValue = (v) => v;
|
|
33
|
+
function __exportSetter(name, newValue) {
|
|
34
|
+
this[name] = __returnValue.bind(null, newValue);
|
|
35
|
+
}
|
|
36
|
+
var __export = (target, all) => {
|
|
37
|
+
for (var name in all)
|
|
38
|
+
__defProp(target, name, {
|
|
39
|
+
get: all[name],
|
|
40
|
+
enumerable: true,
|
|
41
|
+
configurable: true,
|
|
42
|
+
set: __exportSetter.bind(all, name)
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
|
|
46
|
+
var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
|
|
47
|
+
get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
|
|
48
|
+
}) : x)(function(x) {
|
|
49
|
+
if (typeof require !== "undefined")
|
|
50
|
+
return require.apply(this, arguments);
|
|
51
|
+
throw Error('Dynamic require of "' + x + '" is not supported');
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
// src/utilities/retrying-loader-cache.ts
|
|
55
|
+
function createRetryingLoaderCache(loader) {
|
|
56
|
+
let cached;
|
|
57
|
+
return () => {
|
|
58
|
+
if (cached === undefined) {
|
|
59
|
+
const pending = loader();
|
|
60
|
+
pending.catch(() => {
|
|
61
|
+
if (cached === pending) {
|
|
62
|
+
cached = undefined;
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
cached = pending;
|
|
66
|
+
}
|
|
67
|
+
return cached;
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
// src/highlighters/shiki/strip-root-pre-tab-index.ts
|
|
72
|
+
function stripRootPreTabIndex(html) {
|
|
73
|
+
const openingPre = /^<pre\b[^>]*>/i.exec(html);
|
|
74
|
+
if (openingPre === null)
|
|
75
|
+
return html;
|
|
76
|
+
return openingPre[0].replace(/\s+tabindex=(?:"[^"]*"|'[^']*'|[^\s>]+)/i, "") + html.slice(openingPre[0].length);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
// src/highlighters/shiki/index.ts
|
|
80
|
+
function escapeHtml(value) {
|
|
81
|
+
const safe = typeof value === "string" ? value : "";
|
|
82
|
+
return safe.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll('"', """).replaceAll("'", "'");
|
|
83
|
+
}
|
|
84
|
+
function plaintextBlock(code) {
|
|
85
|
+
return `<pre class="shiki shiki-plaintext"><code>${escapeHtml(code)}</code></pre>`;
|
|
86
|
+
}
|
|
87
|
+
async function ensureLanguageLoaded(shiki, lang) {
|
|
88
|
+
const load = shiki.bundledLanguages[lang];
|
|
89
|
+
if (!load)
|
|
90
|
+
throw new Error(`Language "${lang}" is not bundled with Shiki.`);
|
|
91
|
+
await shiki.highlighter.loadLanguage(load);
|
|
92
|
+
}
|
|
93
|
+
async function ensureThemesLoaded(shiki, theme) {
|
|
94
|
+
const names = typeof theme === "string" ? [theme] : [theme.light, theme.dark];
|
|
95
|
+
for (const name of names) {
|
|
96
|
+
const load = shiki.bundledThemes[name];
|
|
97
|
+
if (!load)
|
|
98
|
+
throw new Error(`Theme "${name}" is not bundled with Shiki.`);
|
|
99
|
+
await shiki.highlighter.loadTheme(load);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
async function loadGuessedEmbeddedLanguages(shiki, code, lang, resolvedLanguageAliases) {
|
|
103
|
+
for (const guessed of shiki.guessEmbeddedLanguages(code, lang)) {
|
|
104
|
+
try {
|
|
105
|
+
const languageKey = await resolveLanguageKey(shiki, guessed, resolvedLanguageAliases);
|
|
106
|
+
if (languageKey !== undefined)
|
|
107
|
+
await ensureLanguageLoaded(shiki, languageKey);
|
|
108
|
+
} catch {}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
async function resolveLanguageKey(shiki, normalizedLang, resolvedLanguageAliases) {
|
|
112
|
+
let languageKey = Object.hasOwn(shiki.bundledLanguages, normalizedLang) ? normalizedLang : resolvedLanguageAliases.get(normalizedLang);
|
|
113
|
+
if (languageKey === undefined && shiki.resolveLanguageAliases && !resolvedLanguageAliases.has(normalizedLang)) {
|
|
114
|
+
let loaderFailed = false;
|
|
115
|
+
for (const [candidate, loader] of Object.entries(shiki.bundledLanguages)) {
|
|
116
|
+
try {
|
|
117
|
+
const module = await loader();
|
|
118
|
+
const registrations = module.default;
|
|
119
|
+
if (registrations.some((registration) => registration.aliases?.includes(normalizedLang))) {
|
|
120
|
+
languageKey = candidate;
|
|
121
|
+
break;
|
|
122
|
+
}
|
|
123
|
+
} catch {
|
|
124
|
+
loaderFailed = true;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
if (!loaderFailed || languageKey !== undefined) {
|
|
128
|
+
resolvedLanguageAliases.set(normalizedLang, languageKey);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return languageKey !== undefined && Object.hasOwn(shiki.bundledLanguages, languageKey) ? languageKey : undefined;
|
|
132
|
+
}
|
|
133
|
+
async function createShikiModule(languageLoaders, themeLoaders, resolveLanguageAliases = true) {
|
|
134
|
+
const [{ createOnigurumaEngine }, coreModule] = await Promise.all([
|
|
135
|
+
import("@shikijs/engine-oniguruma"),
|
|
136
|
+
import("shiki/core")
|
|
137
|
+
]);
|
|
138
|
+
const highlighter = await coreModule.createHighlighterCore({
|
|
139
|
+
themes: [],
|
|
140
|
+
langs: [],
|
|
141
|
+
engine: createOnigurumaEngine(import("shiki/wasm"))
|
|
142
|
+
});
|
|
143
|
+
return {
|
|
144
|
+
highlighter,
|
|
145
|
+
bundledLanguages: languageLoaders ?? {},
|
|
146
|
+
bundledThemes: themeLoaders ?? {},
|
|
147
|
+
guessEmbeddedLanguages: coreModule.guessEmbeddedLanguages,
|
|
148
|
+
resolveLanguageAliases
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
function getSharedShikiModule(languageLoaders, themeLoaders) {
|
|
152
|
+
if (languageLoaders !== undefined || themeLoaders !== undefined) {
|
|
153
|
+
const languageKey = languageLoaders ?? EMPTY_LOADERS;
|
|
154
|
+
const themeKey = themeLoaders ?? EMPTY_LOADERS;
|
|
155
|
+
let themes = sharedCuratedModules.get(languageKey);
|
|
156
|
+
if (themes === undefined) {
|
|
157
|
+
themes = new WeakMap;
|
|
158
|
+
sharedCuratedModules.set(languageKey, themes);
|
|
159
|
+
}
|
|
160
|
+
let loader = themes.get(themeKey);
|
|
161
|
+
if (loader === undefined) {
|
|
162
|
+
loader = createRetryingLoaderCache(() => createShikiModule(languageLoaders, themeLoaders));
|
|
163
|
+
themes.set(themeKey, loader);
|
|
164
|
+
}
|
|
165
|
+
return loader();
|
|
166
|
+
}
|
|
167
|
+
sharedShikiModule ??= createRetryingLoaderCache(() => createShikiModule());
|
|
168
|
+
return sharedShikiModule();
|
|
169
|
+
}
|
|
170
|
+
function shikiHighlighter(options = {}, moduleLoader) {
|
|
171
|
+
const { theme = DEFAULT_THEME, langs, languageLoaders, themeLoaders } = options;
|
|
172
|
+
const warnedLanguages = new Set;
|
|
173
|
+
const resolvedLanguageAliases = new Map;
|
|
174
|
+
const loadShiki = createRetryingLoaderCache(moduleLoader ?? (async () => {
|
|
175
|
+
const shikiModule = await getSharedShikiModule(languageLoaders, themeLoaders);
|
|
176
|
+
if (langs !== undefined) {
|
|
177
|
+
try {
|
|
178
|
+
await ensureThemesLoaded(shikiModule, theme);
|
|
179
|
+
} catch {}
|
|
180
|
+
for (const lang of langs) {
|
|
181
|
+
try {
|
|
182
|
+
await ensureLanguageLoaded(shikiModule, lang);
|
|
183
|
+
} catch {}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
return shikiModule;
|
|
187
|
+
}));
|
|
188
|
+
return async function highlight(code, lang) {
|
|
189
|
+
const normalizedLang = typeof lang === "string" ? lang.trim().split(/\s+/, 1)[0] ?? "" : "";
|
|
190
|
+
if (normalizedLang === "") {
|
|
191
|
+
return plaintextBlock(code);
|
|
192
|
+
}
|
|
193
|
+
let shiki;
|
|
194
|
+
try {
|
|
195
|
+
shiki = await loadShiki();
|
|
196
|
+
} catch (error) {
|
|
197
|
+
console.warn("[cinder/highlighters/shiki] failed to load shiki:", error);
|
|
198
|
+
return plaintextBlock(code);
|
|
199
|
+
}
|
|
200
|
+
const languageKey = await resolveLanguageKey(shiki, normalizedLang, resolvedLanguageAliases);
|
|
201
|
+
if (languageKey === undefined || !Object.hasOwn(shiki.bundledLanguages, languageKey)) {
|
|
202
|
+
if (!warnedLanguages.has(normalizedLang)) {
|
|
203
|
+
warnedLanguages.add(normalizedLang);
|
|
204
|
+
console.warn(`[cinder/highlighters/shiki] language "${normalizedLang}" is not in Shiki's bundle; rendering as plaintext.`);
|
|
205
|
+
}
|
|
206
|
+
return plaintextBlock(code);
|
|
207
|
+
}
|
|
208
|
+
try {
|
|
209
|
+
await ensureLanguageLoaded(shiki, languageKey);
|
|
210
|
+
await ensureThemesLoaded(shiki, theme);
|
|
211
|
+
await loadGuessedEmbeddedLanguages(shiki, code, normalizedLang, resolvedLanguageAliases);
|
|
212
|
+
const html = shiki.highlighter.codeToHtml(code, {
|
|
213
|
+
lang: normalizedLang,
|
|
214
|
+
...buildThemeOption(theme)
|
|
215
|
+
});
|
|
216
|
+
return stripRootPreTabIndex(html);
|
|
217
|
+
} catch (error) {
|
|
218
|
+
if (!warnedLanguages.has(normalizedLang)) {
|
|
219
|
+
warnedLanguages.add(normalizedLang);
|
|
220
|
+
console.warn(`[cinder/highlighters/shiki] failed to highlight "${normalizedLang}":`, error);
|
|
221
|
+
}
|
|
222
|
+
return plaintextBlock(code);
|
|
223
|
+
}
|
|
224
|
+
};
|
|
225
|
+
}
|
|
226
|
+
function buildThemeOption(theme) {
|
|
227
|
+
if (typeof theme === "string")
|
|
228
|
+
return { theme };
|
|
229
|
+
return { themes: theme };
|
|
230
|
+
}
|
|
231
|
+
var DEFAULT_THEME, sharedShikiModule, sharedCuratedModules, EMPTY_LOADERS;
|
|
232
|
+
var init_shiki = __esm(() => {
|
|
233
|
+
DEFAULT_THEME = {
|
|
234
|
+
light: "github-light",
|
|
235
|
+
dark: "github-dark"
|
|
236
|
+
};
|
|
237
|
+
sharedCuratedModules = new WeakMap;
|
|
238
|
+
EMPTY_LOADERS = {};
|
|
239
|
+
});
|
|
240
|
+
|
|
241
|
+
// src/highlighters/shiki/default.ts
|
|
242
|
+
var exports_default = {};
|
|
243
|
+
__export(exports_default, {
|
|
244
|
+
shikiHighlighter: () => shikiHighlighter2,
|
|
245
|
+
createRetryingLoaderCache: () => createRetryingLoaderCache
|
|
246
|
+
});
|
|
247
|
+
function getDefaultModuleLoader() {
|
|
248
|
+
sharedDefaultModuleLoader ??= createRetryingLoaderCache(async () => {
|
|
249
|
+
const [{ bundledLanguages }, { bundledThemes }] = await Promise.all([
|
|
250
|
+
import("shiki/langs"),
|
|
251
|
+
import("shiki/themes")
|
|
252
|
+
]);
|
|
253
|
+
return createShikiModule(bundledLanguages, bundledThemes, false);
|
|
254
|
+
});
|
|
255
|
+
return sharedDefaultModuleLoader;
|
|
256
|
+
}
|
|
257
|
+
function shikiHighlighter2(options = {}, moduleLoader) {
|
|
258
|
+
const loadModule = moduleLoader ?? (options.languageLoaders === undefined && options.themeLoaders === undefined ? getDefaultModuleLoader() : async () => {
|
|
259
|
+
const [{ bundledLanguages }, { bundledThemes }] = await Promise.all([
|
|
260
|
+
import("shiki/langs"),
|
|
261
|
+
import("shiki/themes")
|
|
262
|
+
]);
|
|
263
|
+
return createShikiModule(options.languageLoaders ?? bundledLanguages, options.themeLoaders ?? bundledThemes, options.languageLoaders !== undefined);
|
|
264
|
+
});
|
|
265
|
+
return shikiHighlighter(options, loadModule);
|
|
266
|
+
}
|
|
267
|
+
var sharedDefaultModuleLoader;
|
|
268
|
+
var init_default = __esm(() => {
|
|
269
|
+
init_shiki();
|
|
270
|
+
});
|
|
271
|
+
init_default();
|
|
272
|
+
|
|
273
|
+
export {
|
|
274
|
+
shikiHighlighter2 as shikiHighlighter,
|
|
275
|
+
createRetryingLoaderCache
|
|
276
|
+
};
|
|
277
|
+
|
|
278
|
+
//# debugId=7F9C6E1AE78C770B64756E2164756E21
|
|
@@ -102,6 +102,10 @@ export type ShikiHighlighterOptions = {
|
|
|
102
102
|
* first-render flash for those languages).
|
|
103
103
|
*/
|
|
104
104
|
langs?: ReadonlyArray<string>;
|
|
105
|
+
/** Curated Shiki language loader map for the `/highlighters/shiki/curated` entrypoint. */
|
|
106
|
+
languageLoaders?: Readonly<Record<string, DynamicImportLanguageRegistration>>;
|
|
107
|
+
/** Curated Shiki theme loader map for the `/highlighters/shiki/curated` entrypoint. */
|
|
108
|
+
themeLoaders?: Readonly<Record<string, DynamicImportThemeRegistration>>;
|
|
105
109
|
};
|
|
106
110
|
/**
|
|
107
111
|
* Widened to a plain string index (rather than `typeof import('shiki/langs')
|
|
@@ -109,8 +113,8 @@ export type ShikiHighlighterOptions = {
|
|
|
109
113
|
* here are keyed by a `lang`/theme name string that is only known to be a
|
|
110
114
|
* member of that union after a runtime `Object.hasOwn` check.
|
|
111
115
|
*/
|
|
112
|
-
type BundledLanguages = Record<string, DynamicImportLanguageRegistration
|
|
113
|
-
type BundledThemes = Record<string, DynamicImportThemeRegistration
|
|
116
|
+
type BundledLanguages = Readonly<Record<string, DynamicImportLanguageRegistration>>;
|
|
117
|
+
type BundledThemes = Readonly<Record<string, DynamicImportThemeRegistration>>;
|
|
114
118
|
type ShikiModule = {
|
|
115
119
|
highlighter: HighlighterCore;
|
|
116
120
|
bundledLanguages: BundledLanguages;
|
|
@@ -124,8 +128,11 @@ type ShikiModule = {
|
|
|
124
128
|
* their own `shiki/core` import.
|
|
125
129
|
*/
|
|
126
130
|
guessEmbeddedLanguages: (code: string, lang: string) => string[];
|
|
131
|
+
/** Whether aliases should be discovered from curated grammar metadata. */
|
|
132
|
+
resolveLanguageAliases: boolean;
|
|
127
133
|
};
|
|
128
134
|
type ShikiModuleLoader = () => Promise<ShikiModule>;
|
|
135
|
+
export declare function createShikiModule(languageLoaders?: Readonly<Record<string, DynamicImportLanguageRegistration>>, themeLoaders?: Readonly<Record<string, DynamicImportThemeRegistration>>, resolveLanguageAliases?: boolean): Promise<ShikiModule>;
|
|
129
136
|
/**
|
|
130
137
|
* Create a Shiki-backed {@link Highlighter} suitable for
|
|
131
138
|
* `<CodeBlock highlighter={...} />`. See module-level JSDoc for the
|
|
@@ -77,11 +77,6 @@ function stripRootPreTabIndex(html) {
|
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
// src/highlighters/shiki/index.ts
|
|
80
|
-
var exports_shiki = {};
|
|
81
|
-
__export(exports_shiki, {
|
|
82
|
-
shikiHighlighter: () => shikiHighlighter,
|
|
83
|
-
createRetryingLoaderCache: () => createRetryingLoaderCache
|
|
84
|
-
});
|
|
85
80
|
function escapeHtml(value) {
|
|
86
81
|
const safe = typeof value === "string" ? value : "";
|
|
87
82
|
return safe.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll('"', """).replaceAll("'", "'");
|
|
@@ -104,42 +99,80 @@ async function ensureThemesLoaded(shiki, theme) {
|
|
|
104
99
|
await shiki.highlighter.loadTheme(load);
|
|
105
100
|
}
|
|
106
101
|
}
|
|
107
|
-
async function loadGuessedEmbeddedLanguages(shiki, code, lang) {
|
|
102
|
+
async function loadGuessedEmbeddedLanguages(shiki, code, lang, resolvedLanguageAliases) {
|
|
108
103
|
for (const guessed of shiki.guessEmbeddedLanguages(code, lang)) {
|
|
109
|
-
if (!Object.hasOwn(shiki.bundledLanguages, guessed))
|
|
110
|
-
continue;
|
|
111
104
|
try {
|
|
112
|
-
await
|
|
105
|
+
const languageKey = await resolveLanguageKey(shiki, guessed, resolvedLanguageAliases);
|
|
106
|
+
if (languageKey !== undefined)
|
|
107
|
+
await ensureLanguageLoaded(shiki, languageKey);
|
|
113
108
|
} catch {}
|
|
114
109
|
}
|
|
115
110
|
}
|
|
116
|
-
function
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
}
|
|
111
|
+
async function resolveLanguageKey(shiki, normalizedLang, resolvedLanguageAliases) {
|
|
112
|
+
let languageKey = Object.hasOwn(shiki.bundledLanguages, normalizedLang) ? normalizedLang : resolvedLanguageAliases.get(normalizedLang);
|
|
113
|
+
if (languageKey === undefined && shiki.resolveLanguageAliases && !resolvedLanguageAliases.has(normalizedLang)) {
|
|
114
|
+
let loaderFailed = false;
|
|
115
|
+
for (const [candidate, loader] of Object.entries(shiki.bundledLanguages)) {
|
|
116
|
+
try {
|
|
117
|
+
const module = await loader();
|
|
118
|
+
const registrations = module.default;
|
|
119
|
+
if (registrations.some((registration) => registration.aliases?.includes(normalizedLang))) {
|
|
120
|
+
languageKey = candidate;
|
|
121
|
+
break;
|
|
122
|
+
}
|
|
123
|
+
} catch {
|
|
124
|
+
loaderFailed = true;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
if (!loaderFailed || languageKey !== undefined) {
|
|
128
|
+
resolvedLanguageAliases.set(normalizedLang, languageKey);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return languageKey !== undefined && Object.hasOwn(shiki.bundledLanguages, languageKey) ? languageKey : undefined;
|
|
132
|
+
}
|
|
133
|
+
async function createShikiModule(languageLoaders, themeLoaders, resolveLanguageAliases = true) {
|
|
134
|
+
const [{ createOnigurumaEngine }, coreModule] = await Promise.all([
|
|
135
|
+
import("@shikijs/engine-oniguruma"),
|
|
136
|
+
import("shiki/core")
|
|
137
|
+
]);
|
|
138
|
+
const highlighter = await coreModule.createHighlighterCore({
|
|
139
|
+
themes: [],
|
|
140
|
+
langs: [],
|
|
141
|
+
engine: createOnigurumaEngine(import("shiki/wasm"))
|
|
135
142
|
});
|
|
143
|
+
return {
|
|
144
|
+
highlighter,
|
|
145
|
+
bundledLanguages: languageLoaders ?? {},
|
|
146
|
+
bundledThemes: themeLoaders ?? {},
|
|
147
|
+
guessEmbeddedLanguages: coreModule.guessEmbeddedLanguages,
|
|
148
|
+
resolveLanguageAliases
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
function getSharedShikiModule(languageLoaders, themeLoaders) {
|
|
152
|
+
if (languageLoaders !== undefined || themeLoaders !== undefined) {
|
|
153
|
+
const languageKey = languageLoaders ?? EMPTY_LOADERS;
|
|
154
|
+
const themeKey = themeLoaders ?? EMPTY_LOADERS;
|
|
155
|
+
let themes = sharedCuratedModules.get(languageKey);
|
|
156
|
+
if (themes === undefined) {
|
|
157
|
+
themes = new WeakMap;
|
|
158
|
+
sharedCuratedModules.set(languageKey, themes);
|
|
159
|
+
}
|
|
160
|
+
let loader = themes.get(themeKey);
|
|
161
|
+
if (loader === undefined) {
|
|
162
|
+
loader = createRetryingLoaderCache(() => createShikiModule(languageLoaders, themeLoaders));
|
|
163
|
+
themes.set(themeKey, loader);
|
|
164
|
+
}
|
|
165
|
+
return loader();
|
|
166
|
+
}
|
|
167
|
+
sharedShikiModule ??= createRetryingLoaderCache(() => createShikiModule());
|
|
136
168
|
return sharedShikiModule();
|
|
137
169
|
}
|
|
138
170
|
function shikiHighlighter(options = {}, moduleLoader) {
|
|
139
|
-
const { theme = DEFAULT_THEME, langs } = options;
|
|
171
|
+
const { theme = DEFAULT_THEME, langs, languageLoaders, themeLoaders } = options;
|
|
140
172
|
const warnedLanguages = new Set;
|
|
173
|
+
const resolvedLanguageAliases = new Map;
|
|
141
174
|
const loadShiki = createRetryingLoaderCache(moduleLoader ?? (async () => {
|
|
142
|
-
const shikiModule = await getSharedShikiModule();
|
|
175
|
+
const shikiModule = await getSharedShikiModule(languageLoaders, themeLoaders);
|
|
143
176
|
if (langs !== undefined) {
|
|
144
177
|
try {
|
|
145
178
|
await ensureThemesLoaded(shikiModule, theme);
|
|
@@ -164,7 +197,8 @@ function shikiHighlighter(options = {}, moduleLoader) {
|
|
|
164
197
|
console.warn("[cinder/highlighters/shiki] failed to load shiki:", error);
|
|
165
198
|
return plaintextBlock(code);
|
|
166
199
|
}
|
|
167
|
-
|
|
200
|
+
const languageKey = await resolveLanguageKey(shiki, normalizedLang, resolvedLanguageAliases);
|
|
201
|
+
if (languageKey === undefined || !Object.hasOwn(shiki.bundledLanguages, languageKey)) {
|
|
168
202
|
if (!warnedLanguages.has(normalizedLang)) {
|
|
169
203
|
warnedLanguages.add(normalizedLang);
|
|
170
204
|
console.warn(`[cinder/highlighters/shiki] language "${normalizedLang}" is not in Shiki's bundle; rendering as plaintext.`);
|
|
@@ -172,9 +206,9 @@ function shikiHighlighter(options = {}, moduleLoader) {
|
|
|
172
206
|
return plaintextBlock(code);
|
|
173
207
|
}
|
|
174
208
|
try {
|
|
175
|
-
await ensureLanguageLoaded(shiki,
|
|
209
|
+
await ensureLanguageLoaded(shiki, languageKey);
|
|
176
210
|
await ensureThemesLoaded(shiki, theme);
|
|
177
|
-
await loadGuessedEmbeddedLanguages(shiki, code, normalizedLang);
|
|
211
|
+
await loadGuessedEmbeddedLanguages(shiki, code, normalizedLang, resolvedLanguageAliases);
|
|
178
212
|
const html = shiki.highlighter.codeToHtml(code, {
|
|
179
213
|
lang: normalizedLang,
|
|
180
214
|
...buildThemeOption(theme)
|
|
@@ -194,18 +228,21 @@ function buildThemeOption(theme) {
|
|
|
194
228
|
return { theme };
|
|
195
229
|
return { themes: theme };
|
|
196
230
|
}
|
|
197
|
-
var DEFAULT_THEME, sharedShikiModule;
|
|
231
|
+
var DEFAULT_THEME, sharedShikiModule, sharedCuratedModules, EMPTY_LOADERS;
|
|
198
232
|
var init_shiki = __esm(() => {
|
|
199
233
|
DEFAULT_THEME = {
|
|
200
234
|
light: "github-light",
|
|
201
235
|
dark: "github-dark"
|
|
202
236
|
};
|
|
237
|
+
sharedCuratedModules = new WeakMap;
|
|
238
|
+
EMPTY_LOADERS = {};
|
|
203
239
|
});
|
|
204
240
|
init_shiki();
|
|
205
241
|
|
|
206
242
|
export {
|
|
207
243
|
shikiHighlighter,
|
|
244
|
+
createShikiModule,
|
|
208
245
|
createRetryingLoaderCache
|
|
209
246
|
};
|
|
210
247
|
|
|
211
|
-
//# debugId=
|
|
248
|
+
//# debugId=DA177881A47A3C3364756E2164756E21
|