feat: call preprocess hook in codeToHast

Author: antfu

packages/shikiji-core/src/renderer-hast.ts

@@ -19,9 +19,14 @@ export function codeToHast(
   options: CodeToHastOptions,
   transformerContext: ShikijiTransformerContextCommon = {
     meta: {},
+    options,
     codeToHast: (_code, _options) => codeToHast(internal, _code, _options),
   },
 ) {
+  let input = code
+  for (const transformer of options.transformers || [])
+    input = transformer.preprocess?.call(transformerContext, input, options) || input
+
   let bg: string
   let fg: string
   let tokens: ThemedToken[][]
@@ -44,7 +49,7 @@ export function codeToHast(
 
     const themeTokens = codeToTokensWithThemes(
       internal,
-      code,
+      input,
       options,
     )
 
@@ -65,7 +70,7 @@ export function codeToHast(
   else if ('theme' in options) {
     tokens = codeToThemedTokens(
       internal,
-      code,
+      input,
       {
         ...options,
         includeExplanation: false,

packages/shikiji-core/src/renderer-html.ts

@@ -12,14 +12,11 @@ export function codeToHtml(
 ): string {
   const context: ShikijiTransformerContextCommon = {
     meta: {},
+    options,
     codeToHast: (_code, _options) => codeToHast(internal, _code, _options),
   }
 
-  let intput = code
-  for (const transformer of options.transformers || [])
-    intput = transformer.preprocess?.call(context, intput, options) || intput
-
-  let result = hastToHtml(codeToHast(internal, intput, options, context))
+  let result = hastToHtml(codeToHast(internal, code, options, context))
 
   for (const transformer of options.transformers || [])
     result = transformer.postprocess?.call(context, result, options) || result

packages/shikiji-core/src/types.ts

@@ -410,12 +410,12 @@ export interface ShikijiTransformerContextMeta {}
 
 export interface ShikijiTransformerContextCommon {
   meta: ShikijiTransformerContextMeta
+  options: CodeToHastOptions
   codeToHast: (code: string, options: CodeToHastOptions) => Root
 }
 
 export interface ShikijiTransformerContext extends ShikijiTransformerContextCommon {
   readonly tokens: ThemedToken[][]
-  readonly options: CodeToHastOptions
   readonly root: Root
   readonly pre: Element
   readonly code: Element
@@ -453,15 +453,14 @@ export interface ShikijiTransformer {
 
   /**
    * Transform the raw input code before passing to the highlighter.
-   * This hook will only be called with `codeToHtml`.
+   * This hook will only be called with `codeToHtml` or `codeToHast`.
    */
   preprocess?(this: ShikijiTransformerContextCommon, code: string, options: CodeToHastOptions): string | void
-
   /**
    * Transform the generated HTML string before returning.
    * This hook will only be called with `codeToHtml`.
    */
-  postprocess?(this: ShikijiTransformerContextCommon, code: string, options: CodeToHastOptions): string | void
+  postprocess?(this: ShikijiTransformerContextCommon, html: string, options: CodeToHastOptions): string | void
 }
 
 export interface HtmlRendererOptionsCommon extends TransformerOptions {