@shikijs/twoslash 1.1.0 → 1.1.2

package/dist/core.d.mts

@@ -48,6 +48,17 @@ interface TransformerTwoslashOptions {
      * @default true
      */
     throws?: boolean;
+    /**
+     * Custom error handler for twoslash errors
+     * When specified, `throws` will be ignored
+     * Optionally return a string to replace the code
+     */
+    onTwoslashError?: (error: unknown, code: string, lang: string, options: CodeToHastOptions) => string | void;
+    /**
+     * Custom error handler for Shiki errors
+     * When specified, `throws` will be ignored
+     */
+    onShikiError?: (error: unknown, code: string, lang: string) => void;
 }
 interface TwoslashRenderer {
     lineError?: (this: ShikiTransformerContext, error: NodeError) => ElementContent[];

package/dist/core.d.ts

@@ -48,6 +48,17 @@ interface TransformerTwoslashOptions {
      * @default true
      */
     throws?: boolean;
+    /**
+     * Custom error handler for twoslash errors
+     * When specified, `throws` will be ignored
+     * Optionally return a string to replace the code
+     */
+    onTwoslashError?: (error: unknown, code: string, lang: string, options: CodeToHastOptions) => string | void;
+    /**
+     * Custom error handler for Shiki errors
+     * When specified, `throws` will be ignored
+     */
+    onShikiError?: (error: unknown, code: string, lang: string) => void;
 }
 interface TwoslashRenderer {
     lineError?: (this: ShikiTransformerContext, error: NodeError) => ElementContent[];

package/dist/core.mjs

@@ -990,6 +990,12 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
       renderer = defaultRenderer,
       throws = true
     } = options;
+    const onTwoslashError = options.onTwoslashError || (throws ? (error) => {
+      throw error;
+    } : () => false);
+    const onShikiError = options.onShikiError || (throws ? (error) => {
+      throw error;
+    } : () => false);
     const trigger = explicitTrigger instanceof RegExp ? explicitTrigger : /\btwoslash\b/;
     if (!renderer)
       throw new ShikiTwoslashError("Missing renderer");
@@ -1001,11 +1007,17 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
         if (lang in langAlias)
           lang = langAlias[this.options.lang];
         if (filter(lang, code, this.options)) {
-          const twoslash = twoslasher(code, lang, twoslashOptions);
-          map.set(this.meta, twoslash);
-          this.meta.twoslash = twoslash;
-          this.options.lang = twoslash.meta?.extension || lang;
-          return twoslash.code;
+          try {
+            const twoslash = twoslasher(code, lang, twoslashOptions);
+            map.set(this.meta, twoslash);
+            this.meta.twoslash = twoslash;
+            this.options.lang = twoslash.meta?.extension || lang;
+            return twoslash.code;
+          } catch (error) {
+            const result = onTwoslashError(error, code, lang, this.options);
+            if (typeof result === "string")
+              return code;
+          }
         }
       },
       tokens(tokens) {
@@ -1039,8 +1051,7 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
             const lineEl = this.lines[line];
             index = codeEl.children.indexOf(lineEl);
             if (index === -1) {
-              if (throws)
-                throw new ShikiTwoslashError(`Cannot find line ${line} in code element`);
+              onShikiError(new ShikiTwoslashError(`Cannot find line ${line} in code element`), this.source, this.options.lang);
               return;
             }
           }
@@ -1077,8 +1088,10 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
             continue;
           }
           const tokens = locateTextTokens(node.line, node.character, node.length);
-          if (!tokens.length)
-            throw new ShikiTwoslashError(`Cannot find tokens for node: ${JSON.stringify(node)}`);
+          if (!tokens.length && !(node.type === "error" && renderer.nodesError)) {
+            onShikiError(new ShikiTwoslashError(`Cannot find tokens for node: ${JSON.stringify(node)}`), this.source, this.options.lang);
+            continue;
+          }
           const wrapTokens = (fn) => {
             const line = this.lines[node.line];
             let charIndex = 0;
@@ -1164,8 +1177,7 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
               break;
             }
             default: {
-              if (throws)
-                throw new ShikiTwoslashError(`Unknown node type: ${node.type}`);
+              onShikiError(new ShikiTwoslashError(`Unknown node type: ${node?.type}`), this.source, this.options.lang);
             }
           }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/twoslash",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Shiki transformer for twoslash",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -49,11 +49,11 @@
     "dist"
   ],
   "dependencies": {
-    "twoslash": "^0.2.0",
-    "@shikijs/core": "1.1.0"
+    "twoslash": "^0.2.1",
+    "@shikijs/core": "1.1.2"
   },
   "devDependencies": {
-    "@iconify-json/carbon": "^1.1.29",
+    "@iconify-json/carbon": "^1.1.30",
     "@iconify-json/codicon": "^1.1.41",
     "@shikijs/twoslash": "^3.1.2",
     "hast-util-from-html": "^2.0.1",