Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(highlightjs): run overlapping syncMimeTypes calls in order
Elian Dorand9c6cfa27708
diff --git a/packages/highlightjs/src/index.spec.ts b/packages/highlightjs/src/index.spec.tsindex d2ec2be74c..913fec0f38 100644--- a/packages/highlightjs/src/index.spec.ts+++ b/packages/highlightjs/src/index.spec.ts@@ -69,6 +69,16 @@ describe("ensureMimeTypes", () => {expect(getLanguage("text-x-python")).toBeDefined();});+ it("syncMimeTypes applies overlapping calls in order", async () => {+ const { syncMimeTypes, getLanguage } = await freshModule();++ const enabling = syncMimeTypes([ mime("text/x-python") ]);+ const disabling = syncMimeTypes([ mime("text/x-python", false) ]);+ await Promise.all([ enabling, disabling ]);++ expect(getLanguage("text-x-python")).toBeUndefined();+ });+it("remembers a mime type with no highlight.js definition as unsupported", async () => {const { ensureMimeTypes, highlight } = await freshModule();const warn = vi.spyOn(console, "warn").mockImplementation(() => undefined);diff --git a/packages/highlightjs/src/index.ts b/packages/highlightjs/src/index.tsindex 8ffa63e02d..b6deb60767 100644--- a/packages/highlightjs/src/index.ts+++ b/packages/highlightjs/src/index.ts@@ -10,6 +10,7 @@ export { default as Themes, type Theme, type ThemeVariant, getThemeVariant } froconst registeredMimeTypes = new Set<string>();const unsupportedMimeTypes = new Set<string>();let highlightingThemeEl: HTMLStyleElement | null = null;+let lastSync: Promise<void> = Promise.resolve();export async function ensureMimeTypes(mimeTypes: MimeType[]) {for (const mimeType of mimeTypes) {@@ -36,9 +37,17 @@ export async function ensureMimeTypes(mimeTypes: MimeType[]) {/*** Makes the registered languages match `mimeTypes`: registers the enabled ones, like- * {@link ensureMimeTypes}, and unregisters the disabled ones that are registered.+ * {@link ensureMimeTypes}, and unregisters the disabled ones that are registered. Calls run one+ * after another, so a language import still pending from an earlier call cannot register a+ * language that a later call disabled.*/-export async function syncMimeTypes(mimeTypes: MimeType[]) {+export function syncMimeTypes(mimeTypes: MimeType[]): Promise<void> {+ const sync = lastSync.then(() => applyMimeTypes(mimeTypes));+ lastSync = sync.catch(() => undefined);+ return sync;+}++async function applyMimeTypes(mimeTypes: MimeType[]) {for (const mimeType of mimeTypes) {const mime = normalizeMimeTypeForCKEditor(mimeType.mime);if (!mimeType.enabled && registeredMimeTypes.has(mime)) {