@shikijs/twoslash 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/core.d.mts

@@ -218,6 +218,10 @@ declare function defaultHoverInfoProcessor(type: string): string;
  */
 declare function rendererClassic(): TwoslashRenderer;
 
+declare class ShikiTwoslashError extends Error {
+    constructor(message: string);
+}
+
 /**
  * This file is the core of the @shikijs/twoslash package,
  * Decoupled from twoslash's implementation and allowing to introduce custom implementation or cache system.
@@ -227,4 +231,4 @@ declare function defaultTwoslashOptions(): TwoslashExecuteOptions;
 type TwoslashFunction = (code: string, lang?: string, options?: TwoslashExecuteOptions) => TwoslashReturn;
 declare function createTransformerFactory(defaultTwoslasher: TwoslashFunction, defaultRenderer?: TwoslashRenderer): (options?: TransformerTwoslashOptions) => ShikiTransformer;
 
-export { type CompletionItem, type HastExtension, type RendererRichOptions, type TransformerTwoslashOptions, type TwoslashRenderer, createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich };
+export { type CompletionItem, type HastExtension, type RendererRichOptions, ShikiTwoslashError, type TransformerTwoslashOptions, type TwoslashRenderer, createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich };

package/dist/core.d.ts

@@ -218,6 +218,10 @@ declare function defaultHoverInfoProcessor(type: string): string;
  */
 declare function rendererClassic(): TwoslashRenderer;
 
+declare class ShikiTwoslashError extends Error {
+    constructor(message: string);
+}
+
 /**
  * This file is the core of the @shikijs/twoslash package,
  * Decoupled from twoslash's implementation and allowing to introduce custom implementation or cache system.
@@ -227,4 +231,4 @@ declare function defaultTwoslashOptions(): TwoslashExecuteOptions;
 type TwoslashFunction = (code: string, lang?: string, options?: TwoslashExecuteOptions) => TwoslashReturn;
 declare function createTransformerFactory(defaultTwoslasher: TwoslashFunction, defaultRenderer?: TwoslashRenderer): (options?: TransformerTwoslashOptions) => ShikiTransformer;
 
-export { type CompletionItem, type HastExtension, type RendererRichOptions, type TransformerTwoslashOptions, type TwoslashRenderer, createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich };
+export { type CompletionItem, type HastExtension, type RendererRichOptions, ShikiTwoslashError, type TransformerTwoslashOptions, type TwoslashRenderer, createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich };

package/dist/core.mjs

@@ -1,4 +1,11 @@
-import { splitToken } from '@shikijs/core';
+import { splitTokens } from '@shikijs/core';
+
+class ShikiTwoslashError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ShikiTwoslashError";
+  }
+}
 
 const module = {
 	type: "element",
@@ -549,7 +556,7 @@ function rendererRich(options = {}) {
     },
     nodeCompletion(query, node) {
       if (node.type !== "text")
-        throw new Error(`[@shikijs/twoslash] nodeCompletion only works on text nodes, got ${node.type}`);
+        throw new ShikiTwoslashError(`Renderer hook nodeCompletion only works on text nodes, got ${node.type}`);
       const items = query.completions.map((i) => ({
         type: "element",
         tagName: "li",
@@ -920,7 +927,7 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
       throws = true
     } = options;
     if (!renderer)
-      throw new Error("[@shikijs/twoslash] Missing renderer");
+      throw new ShikiTwoslashError("Missing renderer");
     const filter = options.filter || ((lang, _, options2) => langs.includes(lang) && (!explicitTrigger || /\btwoslash\b/.test(options2.meta?.__raw || "")));
     return {
       preprocess(code) {
@@ -928,7 +935,6 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
         if (lang in langAlias)
           lang = langAlias[this.options.lang];
         if (filter(lang, code, this.options)) {
-          this.options.mergeWhitespaces = "never";
           const twoslash = twoslasher(code, lang, twoslashOptions);
           this.meta.twoslash = twoslash;
           this.options.lang = twoslash.meta.extension || lang;
@@ -938,17 +944,12 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
       tokens(tokens) {
         if (!this.meta.twoslash)
           return;
-        const breakpoints = Array.from(new Set(this.meta.twoslash.nodes.flatMap(
-          (i) => ["hover", "error", "query", "highlight", "completion"].includes(i.type) ? [i.start, i.start + i.length] : []
-        ))).sort();
-        return tokens.map((line) => {
-          return line.flatMap((token) => {
-            const breakpointsInToken = breakpoints.filter((i) => token.offset < i && i < token.offset + token.content.length).map((i) => i - token.offset).sort((a, b) => a - b);
-            if (!breakpointsInToken.length)
-              return token;
-            return splitToken(token, breakpointsInToken);
-          });
-        });
+        return splitTokens(
+          tokens,
+          this.meta.twoslash.nodes.flatMap(
+            (i) => ["hover", "error", "query", "highlight", "completion"].includes(i.type) ? [i.start, i.start + i.length] : []
+          )
+        );
       },
       pre(pre) {
         if (this.meta.twoslash)
@@ -969,7 +970,7 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
             index = codeEl.children.indexOf(lineEl);
             if (index === -1) {
               if (throws)
-                throw new Error(`[@shikijs/twoslash] Cannot find line ${line} in code element`);
+                throw new ShikiTwoslashError(`Cannot find line ${line} in code element`);
               return;
             }
           }
@@ -1082,7 +1083,7 @@ function createTransformerFactory(defaultTwoslasher, defaultRenderer) {
             }
             default: {
               if (throws)
-                throw new Error(`[@shikijs/twoslash] Unknown node type: ${node.type}`);
+                throw new ShikiTwoslashError(`Unknown node type: ${node.type}`);
             }
           }
         }
@@ -1098,4 +1099,4 @@ function getTokenString(token) {
   return token.children?.map(getTokenString).join("") || "";
 }
 
-export { createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich };
+export { ShikiTwoslashError, createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich };

package/dist/index.d.mts

@@ -1,7 +1,7 @@
-import * as _shikijs_core_dist_chunk_types_mjs from '@shikijs/core/dist/chunk-types.mjs';
+import * as _shikijs_core_dist_chunk_tokens_mjs from '@shikijs/core/dist/chunk-tokens.mjs';
 import { CreateTwoslashOptions } from 'twoslash';
 import { TransformerTwoslashOptions, RendererRichOptions } from './core.mjs';
-export { CompletionItem, HastExtension, TwoslashRenderer, createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich } from './core.mjs';
+export { CompletionItem, HastExtension, ShikiTwoslashError, TwoslashRenderer, createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich } from './core.mjs';
 import '@shikijs/core';
 import 'hast';
 
@@ -16,6 +16,6 @@ interface TransformerTwoslashIndexOptions extends TransformerTwoslashOptions, Pi
 /**
  * Factory function to create a Shiki transformer for twoslash integrations.
  */
-declare function transformerTwoslash(options?: TransformerTwoslashIndexOptions): _shikijs_core_dist_chunk_types_mjs.W;
+declare function transformerTwoslash(options?: TransformerTwoslashIndexOptions): _shikijs_core_dist_chunk_tokens_mjs.y;
 
 export { RendererRichOptions, type TransformerTwoslashIndexOptions, TransformerTwoslashOptions, transformerTwoslash };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import * as _shikijs_core_dist_chunk_types_mjs from '@shikijs/core/dist/chunk-types.mjs';
+import * as _shikijs_core_dist_chunk_tokens_mjs from '@shikijs/core/dist/chunk-tokens.mjs';
 import { CreateTwoslashOptions } from 'twoslash';
 import { TransformerTwoslashOptions, RendererRichOptions } from './core.js';
-export { CompletionItem, HastExtension, TwoslashRenderer, createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich } from './core.js';
+export { CompletionItem, HastExtension, ShikiTwoslashError, TwoslashRenderer, createTransformerFactory, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic, rendererRich } from './core.js';
 import '@shikijs/core';
 import 'hast';
 
@@ -16,6 +16,6 @@ interface TransformerTwoslashIndexOptions extends TransformerTwoslashOptions, Pi
 /**
  * Factory function to create a Shiki transformer for twoslash integrations.
  */
-declare function transformerTwoslash(options?: TransformerTwoslashIndexOptions): _shikijs_core_dist_chunk_types_mjs.W;
+declare function transformerTwoslash(options?: TransformerTwoslashIndexOptions): _shikijs_core_dist_chunk_tokens_mjs.y;
 
 export { RendererRichOptions, type TransformerTwoslashIndexOptions, TransformerTwoslashOptions, transformerTwoslash };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { createTwoslasher } from 'twoslash';
 import { createTransformerFactory, rendererRich } from './core.mjs';
-export { defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic } from './core.mjs';
+export { ShikiTwoslashError, defaultCompletionIcons, defaultCustomTagIcons, defaultHoverInfoProcessor, defaultTwoslashOptions, rendererClassic } from './core.mjs';
 import '@shikijs/core';
 
 function transformerTwoslash(options = {}) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/twoslash",
   "type": "module",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "Shiki transformer for twoslash",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -50,7 +50,7 @@
   ],
   "dependencies": {
     "twoslash": "^0.1.0",
-    "@shikijs/core": "1.0.0-beta.2"
+    "@shikijs/core": "1.0.0-beta.4"
   },
   "devDependencies": {
     "@iconify-json/carbon": "^1.1.28",

package/style-rich.css

@@ -9,8 +9,8 @@
   --twoslash-popup-shadow: rgba(0, 0, 0.08) 0px 1px 4px;
   --twoslash-docs-color: #888;
   --twoslash-docs-font: sans-serif;
-  --twoslach-code-font: inherit;
-  --twoslach-code-font-size: 1em;
+  --twoslash-code-font: inherit;
+  --twoslash-code-font-size: 1em;
   --twoslash-matched-color: inherit;
   --twoslash-unmatched-color: #888;
   --twoslash-cursor-color: #8888;
@@ -95,8 +95,8 @@
 }
 
 .twoslash .twoslash-popup-code {
-  font-family: var(--twoslach-code-font);
-  font-size: var(--twoslach-code-font-size);
+  font-family: var(--twoslash-code-font);
+  font-size: var(--twoslash-code-font-size);
 }
 
 .twoslash .twoslash-popup-docs {
@@ -118,7 +118,7 @@
 }
 
 .twoslash .twoslash-popup-docs-tag-name {
-  font-family: var(--twoslach-code-font);
+  font-family: var(--twoslash-code-font);
 }
 
 /* ===== Error Line ===== */