update

Author: Hugos68

packages/twoslash-svelte/src/index.ts

@@ -4,7 +4,7 @@ import { createRequire } from 'node:module'
 import { decode } from '@jridgewell/sourcemap-codec'
 import { SourceMap } from '@volar/language-core'
 import { svelte2tsx } from 'svelte2tsx'
-import { createTwoslasher as _createTwoSlasher, defaultCompilerOptions, defaultHandbookOptions, findFlagNotations, findQueryMarkers } from 'twoslash'
+import { createTwoslasher as createTwoSlasherBase, defaultCompilerOptions, defaultHandbookOptions, findFlagNotations, findQueryMarkers } from 'twoslash'
 import { createPositionConverter, removeCodeRanges, resolveNodePositions } from 'twoslash-protocol'
 import ts from 'typescript'
 
@@ -15,24 +15,18 @@ export interface CreateTwoslashSvelteOptions extends CreateTwoslashOptions {
    * @default false
    */
   debugShowGeneratedCode?: boolean
-  /**
-   * Use the version 4 definitions for Svelte.
-   *
-   * @default false
-   */
-  useVersion4TypeDefinitions?: boolean
 }
 
 /**
  * Create a twoslasher instance that add additional support for Svelte
  */
 export function createTwoslasher(createOptions: CreateTwoslashSvelteOptions = {}): TwoslashInstance {
   const require = createRequire(import.meta.url)
-  const _twoslasher = _createTwoSlasher(createOptions)
+  const twoslasherBase = createTwoSlasherBase(createOptions)
 
   function twoslasher(code: string, extension?: string, options: TwoslashExecuteOptions = {}) {
     if (extension !== 'svelte') {
-      return _twoslasher(code, extension, options)
+      return twoslasherBase(code, extension, options)
     }
 
     const compilerOptions: ts.CompilerOptions = {
@@ -93,21 +87,17 @@ export function createTwoslasher(createOptions: CreateTwoslashSvelteOptions = {}
       }
       return offsets[offsets.length - 1]?.[0]
     }
-    const svelte2tsxPackageJsonPath = require.resolve('svelte2tsx/package.json')
-
-    const references = createOptions.useVersion4TypeDefinitions
-      ? [
-          `/// <reference path="${new URL('svelte-shims-v4.d.ts', svelte2tsxPackageJsonPath).pathname}" />`,
-          `/// <reference path="${new URL('svelte-jsx-v4.d.ts', svelte2tsxPackageJsonPath).pathname}" />`,
-        ]
-      : [
-          `/// <reference path="${new URL('svelte-shims.d.ts', svelte2tsxPackageJsonPath).pathname}" />`,
-          `/// <reference path="${new URL('svelte-jsx.d.ts', svelte2tsxPackageJsonPath).pathname}" />`,
-        ].join('\n')
 
-    const result = _twoslasher(`${references}\n${compiled.code}`, 'tsx', {
+    const result = twoslasherBase(compiled.code, 'tsx', {
       ...options,
-      compilerOptions,
+      compilerOptions: {
+        ...compilerOptions,
+        types: [
+          ...(compilerOptions.types ?? []),
+          require.resolve(`svelte2tsx/svelte-jsx-v4.d.ts`),
+          require.resolve(`svelte2tsx/svelte-shims-v4.d.ts`),
+        ],
+      },
       handbookOptions: {
         ...handbookOptions,
         keepNotations: true,
@@ -193,7 +183,7 @@ export function createTwoslasher(createOptions: CreateTwoslashSvelteOptions = {}
     return result
   }
 
-  twoslasher.getCacheMap = _twoslasher.getCacheMap
+  twoslasher.getCacheMap = twoslasherBase.getCacheMap
 
   return twoslasher
 }