fix(precompiled): fix traverse algorithm, close #917

packages/langs-precompiled/tests/__snapshots__/precompile-run.test.ts.snap

@@ -0,0 +1,3 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`run 1`] = `"<pre class="shiki vitesse-dark" style="background-color:#121212;color:#dbd7caee" tabindex="0"><code><span class="line"><span style="color:#666666">&#x3C;</span><span style="color:#4D9375">div</span><span style="color:#666666">></span><span style="color:#DBD7CAEE">hello</span><span style="color:#666666">&#x3C;/</span><span style="color:#4D9375">div</span><span style="color:#666666">></span></span></code></pre>"`;

packages/langs-precompiled/tests/precompile-run.test.ts

@@ -0,0 +1,20 @@
+import { createJavaScriptRawEngine } from '@shikijs/engine-javascript'
+import { createHighlighterCore } from 'shiki'
+import { expect, it } from 'vitest'
+// eslint-disable-next-line antfu/no-import-dist
+import vitesseDark from '../../themes/dist/vitesse-dark.mjs'
+// eslint-disable-next-line antfu/no-import-dist
+import html from '../dist/html.mjs'
+
+const isNode20andUp = process.version.replace(/^v/, '').split('.').map(Number)[0] >= 20
+
+it.runIf(isNode20andUp)('run', async () => {
+  const shiki = await createHighlighterCore({
+    themes: [vitesseDark],
+    langs: [html],
+    engine: createJavaScriptRawEngine(),
+  })
+
+  const code = shiki.codeToHtml('<div>hello</div>', { lang: 'html', theme: 'vitesse-dark' })
+  expect(code).toMatchSnapshot()
+})

packages/langs-precompiled/scripts/precompile.test.ts → packages/langs-precompiled/tests/precompile-serialize.test.ts

@@ -1,8 +1,8 @@
 import { EmulatedRegExp } from 'oniguruma-to-es'
 import { format } from 'prettier'
 import { expect, it } from 'vitest'
-import { toJsLiteral } from './langs'
-import { precompileGrammar } from './precompile'
+import { toJsLiteral } from '../scripts/langs'
+import { precompileGrammar } from '../scripts/precompile'
 
 const isNode20andUp = process.version.replace(/^v/, '').split('.').map(Number)[0] >= 20
 

scripts/utils.ts

@@ -7,6 +7,7 @@ export function traverseGrammarPatterns(a: any, callback: (pattern: string) => a
   }
   if (!a || typeof a !== 'object')
     return
+
   if (a.foldingStartMarker) {
     const pattern = callback(a.foldingStartMarker)
     if (pattern != null)
@@ -54,6 +55,9 @@ export function traverseGrammarPatterns(a: any, callback: (pattern: string) => a
   if (a.endCaptures) {
     traverseGrammarPatterns(Object.values(a.endCaptures), callback)
   }
+  if (a.injections) {
+    traverseGrammarPatterns(Object.values(a.injections), callback)
+  }
   Object.values(a.repository || {}).forEach((j: any) => {
     traverseGrammarPatterns(j, callback)
   })