fix: upgrade @vue/language-core (#51)

Co-authored-by: zhiyuanzmj <32807958+zhiyuanzmj@users.noreply.github.com>
twoslashes · Sep 5, 2024 · 8801060 · 8801060
1 parent 2e3d85f
commit 8801060
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 317 deletions.
diff --git a/packages/twoslash-vue/package.json b/packages/twoslash-vue/package.json
@@ -50,7 +50,7 @@
     "typescript": "*"
   },
   "dependencies": {
-    "@vue/language-core": "~2.0.29",
+    "@vue/language-core": "~2.1.6",
     "twoslash": "workspace:*",
     "twoslash-protocol": "workspace:*"
   }

diff --git a/packages/twoslash-vue/src/index.ts b/packages/twoslash-vue/src/index.ts
@@ -1,5 +1,5 @@
 import type { Language, VueCompilerOptions } from '@vue/language-core'
-import { FileMap, createLanguage, createVueLanguagePlugin, defaultMapperFactory, resolveVueCompilerOptions } from '@vue/language-core'
+import { FileMap, createLanguage, createVueLanguagePlugin, defaultMapperFactory, resolveVueCompilerOptions, setupGlobalTypes } from '@vue/language-core'
 import type { CompilerOptions } from 'typescript'
 import ts from 'typescript'
 import type {
@@ -65,7 +65,9 @@ export function createTwoslasher(createOptions: CreateTwoslashVueOptions = {}):
     return cache.get(key)!
 
     function getLanguage() {
-      const vueLanguagePlugin = createVueLanguagePlugin<string>(ts, id => id, () => '', () => true, defaultCompilerOptions, resolveVueCompilerOptions(vueCompilerOptions))
+      const resolvedVueOptions = resolveVueCompilerOptions(vueCompilerOptions)
+      resolvedVueOptions.__setupedGlobalTypes = setupGlobalTypes(ts.sys.getCurrentDirectory(), resolvedVueOptions, ts.sys)
+      const vueLanguagePlugin = createVueLanguagePlugin<string>(ts, defaultCompilerOptions, resolvedVueOptions, id => id)
       return createLanguage(
         [vueLanguagePlugin],
         new FileMap(ts.sys.useCaseSensitiveFileNames),
@@ -138,9 +140,8 @@ export function createTwoslasher(createOptions: CreateTwoslashVueOptions = {}):
 
     const lang = getVueLanguage(compilerOptions, vueCompilerOptions)
     const sourceScript = lang.scripts.set('index.vue', ts.ScriptSnapshot.fromString(strippedCode))!
-    const fileCompiled = get(sourceScript.generated!.embeddedCodes.values(), 1)!
+    const fileCompiled = get(sourceScript.generated!.embeddedCodes.values(), 2)!
     const compiled = fileCompiled.snapshot.getText(0, fileCompiled.snapshot.getLength())
-      .replace(/(?=export const __VLS_globalTypesStart)/, '// ---cut-after---\n')
 
     const map = defaultMapperFactory(fileCompiled.mappings)
 

diff --git a/packages/twoslash-vue/test/query.test.ts b/packages/twoslash-vue/test/query.test.ts
@@ -19,10 +19,10 @@ describe('basic', () => {
     expect(result.meta.positionQueries)
       .toMatchInlineSnapshot(`
         [
-          38,
-          235,
-          1676,
-          1892,
+          79,
+          276,
+          1561,
+          1729,
         ]
       `)
 

diff --git a/packages/twoslash-vue/test/results/completion.json b/packages/twoslash-vue/test/results/completion.json
diff --git a/packages/twoslash-vue/test/results/cut-around-vue.json b/packages/twoslash-vue/test/results/cut-around-vue.json