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

package/dist/core.mjs

@@ -1,4 +1,4 @@
-import { splitToken } from '@shikijs/core';
+import { splitTokens } from '@shikijs/core';
 
 const module = {
 	type: "element",
@@ -928,7 +928,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 +937,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)

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-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';
@@ -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,4 +1,4 @@
-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';
@@ -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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/twoslash",
   "type": "module",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "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.3"
   },
   "devDependencies": {
     "@iconify-json/carbon": "^1.1.28",