react-codemirror-runmode 2.1.0 → 2.2.1

package/.claude/settings.local.json

@@ -0,0 +1,3 @@
+{
+  "enableAllProjectMcpServers": false
+}

package/dist/highlight.d.ts

@@ -1,5 +1,6 @@
 import { Parser } from '@lezer/common';
 import { Language, LanguageDescription } from '@codemirror/language';
 import { Highlighter } from '@lezer/highlight';
-export declare function getCodeParser(languageName: string, fallbackLanguage?: Language, languages?: LanguageDescription[]): Promise<Parser | null>;
+export declare function getMarkdownParser(input: string, languages?: LanguageDescription[]): Promise<Parser>;
+export declare function getCodeParser(input: string, languageName: string, fallbackLanguage?: Language, languages?: LanguageDescription[]): Promise<Parser | null>;
 export declare function highlightCode<Output>(languageName: string, input: string, highlighter: Highlighter, fallbackLanguage: Language | undefined, languages: LanguageDescription[] | undefined, callback: (text: string, style: string | null, from: number, to: number) => Output): Promise<Output[]>;

package/dist/highlight.js

@@ -1,8 +1,47 @@
 import { LanguageDescription } from '@codemirror/language';
 import { highlightTree } from '@lezer/highlight';
 import { languages as builtinLanguages } from '@codemirror/language-data';
-export async function getCodeParser(languageName, fallbackLanguage, languages = builtinLanguages) {
-    if (languageName) {
+import { markdown } from '@codemirror/lang-markdown';
+/**
+ * Extract language names from code blocks in markdown text
+ */
+function extractCodeBlockLanguages(text) {
+    const codeBlockRegex = /```(\w+)/g;
+    const languages = [];
+    let match;
+    while ((match = codeBlockRegex.exec(text)) !== null) {
+        languages.push(match[1]);
+    }
+    return languages;
+}
+/**
+ * Pre-load parsers for a list of language names
+ */
+async function preloadLanguageParsers(languageNames, languages) {
+    return (await Promise.all(languageNames.map(async (langName) => {
+        const found = LanguageDescription.matchLanguageName(languages, langName, true);
+        if (found instanceof LanguageDescription) {
+            if (!found.support)
+                await found.load();
+            if (found.support) {
+                return found;
+            }
+        }
+    }))).filter((desc) => !!desc);
+}
+export async function getMarkdownParser(input, languages = builtinLanguages) {
+    const codeBlockLanguages = extractCodeBlockLanguages(input);
+    const preloadedLanguages = await preloadLanguageParsers(codeBlockLanguages || [], languages);
+    const langSupport = markdown({
+        codeLanguages: preloadedLanguages
+    });
+    return langSupport.language.parser;
+}
+export async function getCodeParser(input, languageName, fallbackLanguage, languages = builtinLanguages) {
+    if (languageName === 'markdown' || languageName === 'md') {
+        return await getMarkdownParser(input, languages);
+    }
+    else {
         const found = LanguageDescription.matchLanguageName(languages, languageName, true);
         if (found instanceof LanguageDescription) {
             if (!found.support)
@@ -15,7 +54,7 @@ export async function getCodeParser(languageName, fallbackLanguage, languages =
     return fallbackLanguage ? fallbackLanguage.parser : null;
 }
 export async function highlightCode(languageName, input, highlighter, fallbackLanguage, languages, callback) {
-    const parser = await getCodeParser(languageName, fallbackLanguage, languages);
+    const parser = await getCodeParser(input, languageName, fallbackLanguage, languages);
     if (parser) {
         const tree = parser.parse(input);
         const output = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-codemirror-runmode",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "Syntax highlighting for react, utilizing CodeMirror's parser",
   "type": "module",
   "main": "dist/index.js",
@@ -14,6 +14,7 @@
     "build": "tsc --project tsconfig.build.json",
     "test": "vitest",
     "lint": "eslint .",
+    "typecheck": "tsc --noEmit",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "prepublishOnly": "npm-run-all lint format:check build && npm run test run"
@@ -31,30 +32,31 @@
     "url": "https://github.com/craftzdog/react-codemirror-runmode.git"
   },
   "dependencies": {
-    "@codemirror/language": "^6.11.0",
-    "@codemirror/language-data": "^6.5.1",
-    "@lezer/common": "^1.2.3",
-    "@lezer/highlight": "^1.2.1"
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/language-data": "^6.5.2",
+    "@lezer/common": "^1.4.0",
+    "@lezer/highlight": "^1.2.3"
   },
   "peerDependencies": {
     "react": ">= 18"
   },
   "devDependencies": {
-    "@codemirror/theme-one-dark": "^6.1.2",
-    "@testing-library/react": "^16.2.0",
-    "@types/node": "^22.13.10",
-    "@types/react": "^19.0.12",
-    "@vitejs/plugin-react": "^4.3.4",
-    "eslint": "^9.22.0",
-    "eslint-config-prettier": "^10.1.1",
-    "eslint-plugin-react": "^7.37.4",
-    "jsdom": "^26.0.0",
+    "@codemirror/theme-one-dark": "^6.1.3",
+    "@testing-library/react": "^16.3.0",
+    "@types/node": "^25.0.1",
+    "@types/react": "^19.2.7",
+    "@vitejs/plugin-react": "^5.1.2",
+    "eslint": "^9.39.1",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-react": "^7.37.5",
+    "jsdom": "^27.3.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.5.3",
-    "react": "^19.0.0",
-    "typescript": "^5.8.2",
-    "typescript-eslint": "^8.27.0",
-    "vite": "^6.2.2",
-    "vitest": "^3.0.9"
+    "prettier": "^3.7.4",
+    "react": "^19.2.3",
+    "react-dom": "^19.2.3",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.49.0",
+    "vite": "^7.2.7",
+    "vitest": "^4.0.15"
   }
 }

package/src/highlight.ts

@@ -2,13 +2,71 @@ import { Parser } from '@lezer/common'
 import { Language, LanguageDescription } from '@codemirror/language'
 import { Highlighter, highlightTree } from '@lezer/highlight'
 import { languages as builtinLanguages } from '@codemirror/language-data'
+import { markdown } from '@codemirror/lang-markdown'
+
+/**
+ * Extract language names from code blocks in markdown text
+ */
+function extractCodeBlockLanguages(text: string): string[] {
+  const codeBlockRegex = /```(\w+)/g
+  const languages: string[] = []
+  let match
+  while ((match = codeBlockRegex.exec(text)) !== null) {
+    languages.push(match[1])
+  }
+  return languages
+}
+
+/**
+ * Pre-load parsers for a list of language names
+ */
+async function preloadLanguageParsers(
+  languageNames: string[],
+  languages: LanguageDescription[]
+): Promise<LanguageDescription[]> {
+  return (
+    await Promise.all(
+      languageNames.map(async langName => {
+        const found = LanguageDescription.matchLanguageName(
+          languages,
+          langName,
+          true
+        )
+        if (found instanceof LanguageDescription) {
+          if (!found.support) await found.load()
+          if (found.support) {
+            return found
+          }
+        }
+      })
+    )
+  ).filter((desc): desc is LanguageDescription => !!desc)
+}
+
+export async function getMarkdownParser(
+  input: string,
+  languages: LanguageDescription[] = builtinLanguages
+): Promise<Parser> {
+  const codeBlockLanguages = extractCodeBlockLanguages(input)
+  const preloadedLanguages = await preloadLanguageParsers(
+    codeBlockLanguages || [],
+    languages
+  )
+  const langSupport = markdown({
+    codeLanguages: preloadedLanguages
+  })
+  return langSupport.language.parser
+}
 
 export async function getCodeParser(
+  input: string,
   languageName: string,
   fallbackLanguage?: Language,
   languages: LanguageDescription[] = builtinLanguages
 ): Promise<Parser | null> {
-  if (languageName) {
+  if (languageName === 'markdown' || languageName === 'md') {
+    return await getMarkdownParser(input, languages)
+  } else {
     const found = LanguageDescription.matchLanguageName(
       languages,
       languageName,
@@ -35,7 +93,12 @@ export async function highlightCode<Output>(
     to: number
   ) => Output
 ): Promise<Output[]> {
-  const parser = await getCodeParser(languageName, fallbackLanguage, languages)
+  const parser = await getCodeParser(
+    input,
+    languageName,
+    fallbackLanguage,
+    languages
+  )
   if (parser) {
     const tree = parser.parse(input)
     const output: Array<Output> = []

package/test/index.spec.tsx

@@ -10,15 +10,15 @@ const sleep = (msec: number) =>
 
 describe('getCodeParser', () => {
   it('loads a JavaScript parser', async () => {
-    const parser = await getCodeParser('js')
+    const parser = await getCodeParser('', 'js')
     expect(parser).toBeInstanceOf(Parser)
   })
   it('loads a Python parser', async () => {
-    const parser = await getCodeParser('python')
+    const parser = await getCodeParser('', 'python')
     expect(parser).toBeInstanceOf(Parser)
   })
   it('returns null for non-existing languages', async () => {
-    const parser = await getCodeParser('foobar123')
+    const parser = await getCodeParser('', 'foobar123')
     expect(parser).toBeNull()
   })
 })
@@ -67,6 +67,72 @@ describe('highlightCode', () => {
   })
 })
 
+describe('Highlight codeblocks', () => {
+  it('highlights codeblocks in markdown', async () => {
+    const mdCode = '```js\nconst x = 123\n```'
+    const highlighted = await highlightCode(
+      'markdown',
+      mdCode,
+      oneDarkHighlightStyle,
+      undefined,
+      undefined,
+      (text, style, from, to) => ({ text, style, from, to })
+    )
+    // Should have tokens for the markdown code block structure and the JS code inside
+    expect(highlighted.length).toBeGreaterThan(0)
+
+    // Find the code fence markers
+    const fenceStart = highlighted.find(t => t.text === '```')
+    expect(fenceStart).toBeDefined()
+
+    // Find the language info token
+    const langInfo = highlighted.find(t => t.text === 'js')
+    expect(langInfo).toBeDefined()
+
+    // Find the JS keyword 'const' inside the code block
+    const constToken = highlighted.find(t => t.text === 'const')
+    expect(constToken).toBeDefined()
+    expect(constToken?.style).not.toBeNull()
+
+    // Find the number '123'
+    const numberToken = highlighted.find(t => t.text === '123')
+    expect(numberToken).toBeDefined()
+    expect(numberToken?.style).not.toBeNull()
+  })
+
+  it('highlights typescript codeblocks in markdown', async () => {
+    const mdCode = '```typescript\nconst x: number = 123\n```'
+    const highlighted = await highlightCode(
+      'markdown',
+      mdCode,
+      oneDarkHighlightStyle,
+      undefined,
+      undefined,
+      (text, style, from, to) => ({ text, style, from, to })
+    )
+    expect(highlighted.length).toBeGreaterThan(0)
+
+    // Find the language info token
+    const langInfo = highlighted.find(t => t.text === 'typescript')
+    expect(langInfo).toBeDefined()
+
+    // Find the TS keyword 'const'
+    const constToken = highlighted.find(t => t.text === 'const')
+    expect(constToken).toBeDefined()
+    expect(constToken?.style).not.toBeNull()
+
+    // Find the type annotation 'number'
+    const typeToken = highlighted.find(t => t.text === 'number')
+    expect(typeToken).toBeDefined()
+    expect(typeToken?.style).not.toBeNull()
+
+    // Find the number '123'
+    const numberToken = highlighted.find(t => t.text === '123')
+    expect(numberToken).toBeDefined()
+    expect(numberToken?.style).not.toBeNull()
+  })
+})
+
 describe('React Highlighter', () => {
   it('renders highlighted code', async () => {
     const code = 'const x = 123'

package/tsconfig.json

@@ -3,17 +3,18 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
-    "lib": ["es2024", "dom"],
+    "lib": ["esnext", "dom"],
     "jsx": "react-jsx",
     "esModuleInterop": true,
     "strict": true,
     "isolatedModules": true,
     "sourceMap": false,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "noImplicitAny": false,
     "outDir": "dist",
     "declaration": true,
-    "declarationDir": "dist"
+    "declarationDir": "dist",
+    "skipLibCheck": true
   }
 }

package/vite.config.ts

@@ -1,4 +1,4 @@
-/// <reference types="vitest" />
+/// <reference types="vitest/config" />
 import { defineConfig } from 'vite'
 import react from '@vitejs/plugin-react'