pref: reuse EncodedTokenMetadata from @shikijs/vscode-textmate

packages/core/src/highlight/code-to-tokens-base.ts

@@ -1,13 +1,12 @@
 /* ---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *-------------------------------------------------------- */
-import { INITIAL } from '@shikijs/vscode-textmate'
+import { EncodedTokenMetadata, INITIAL } from '@shikijs/vscode-textmate'
 import type { IGrammar, IRawThemeSetting, StateStack } from '@shikijs/vscode-textmate'
 import type { CodeToTokensBaseOptions, FontStyle, ShikiInternal, ThemeRegistrationResolved, ThemedToken, ThemedTokenScopeExplanation, TokenizeWithThemeOptions } from '../types'
 import { applyColorReplacements, isNoneTheme, isPlainLang, resolveColorReplacements, splitLines } from '../utils'
 import { ShikiError } from '../error'
 import { GrammarState, getGrammarStack } from '../textmate/grammar-state'
-import { StackElementMetadata } from '../textmate/stack-element-metadata'
 import { tokenizeAnsiWithTheme } from './code-to-tokens-ansi'
 
 /**
@@ -166,10 +165,10 @@ function _tokenizeWithTheme(
 
       const metadata = result.tokens[2 * j + 1]
       const color = applyColorReplacements(
-        colorMap[StackElementMetadata.getForeground(metadata)],
+        colorMap[EncodedTokenMetadata.getForeground(metadata)],
         colorReplacements,
       )
-      const fontStyle: FontStyle = StackElementMetadata.getFontStyle(metadata)
+      const fontStyle: FontStyle = EncodedTokenMetadata.getFontStyle(metadata)
 
       const token: ThemedToken = {
         content: line.substring(startIndex, nextStartIndex),

packages/core/src/index.ts

@@ -12,7 +12,6 @@ export { createWasmOnigEngine, loadWasm } from './engines/wasm'
 export { createJavaScriptRegexEngine } from './engines/javascript'
 
 // TextMate Utilities
-export { StackElementMetadata } from './textmate/stack-element-metadata'
 export { normalizeTheme } from './textmate/normalize-theme'
 
 // Low-level Highlighting
@@ -27,3 +26,11 @@ export { codeToTokensWithThemes } from './highlight/code-to-tokens-themes'
 export * from './utils'
 export { transformerDecorations } from './transformer-decorations'
 export { ShikiError } from './error'
+
+// Deprecated
+export {
+  /**
+   * @deprecated Use `EncodedTokenMetadata` from `@shikijs/vscode-textmate` instead.
+   */
+  EncodedTokenMetadata as StackElementMetadata,
+} from '@shikijs/vscode-textmate'

packages/monaco/src/index.ts

@@ -1,8 +1,7 @@
 import type monacoNs from 'monaco-editor-core'
 import type { ShikiInternal, ThemeRegistrationResolved } from '@shikijs/core'
 import type { StateStack } from '@shikijs/vscode-textmate'
-import { INITIAL } from '@shikijs/vscode-textmate'
-import { StackElementMetadata } from '@shikijs/core'
+import { EncodedTokenMetadata, INITIAL } from '@shikijs/vscode-textmate'
 
 export interface MonacoTheme extends monacoNs.editor.IStandaloneThemeData {}
 
@@ -132,7 +131,7 @@ export function shikiToMonaco(
           for (let j = 0; j < tokensLength; j++) {
             const startIndex = result.tokens[2 * j]
             const metadata = result.tokens[2 * j + 1]
-            const color = normalizeColor(colorMap[StackElementMetadata.getForeground(metadata)] || '')
+            const color = normalizeColor(colorMap[EncodedTokenMetadata.getForeground(metadata)] || '')
             // Because Monaco only support one scope per token,
             // we workaround this to use color to trace back the scope
             const scope = findScopeByColor(color) || ''

pnpm-workspace.yaml

@@ -19,7 +19,7 @@ catalog:
   '@rollup/plugin-node-resolve': ^15.2.3
   '@rollup/plugin-replace': ^5.0.7
   '@rollup/plugin-terser': ^0.4.4
-  '@shikijs/vscode-textmate': ^9.1.1
+  '@shikijs/vscode-textmate': ^9.2.0
   '@types/fs-extra': ^11.0.4
   '@types/hast': ^3.0.4
   '@types/markdown-it': ^14.1.2