@volar/typescript 2.3.0-alpha.0 → 2.3.0-alpha.2

package/env.d.ts

@@ -0,0 +1,15 @@
+declare module '@volar/langauge-core' {
+	interface Language<T> {
+		typescript?: {
+			configFileName: string | undefined;
+			sys: ts.System & {
+				version?: number;
+				sync?(): Promise<number>;
+			};
+			languageServiceHost: ts.LanguageServiceHost;
+			getExtraServiceScript(fileName: string): [SourceScript<T>, TypeScriptExtraServiceScript] | undefined;
+			asScriptId(fileName: string): T;
+			asFileName(scriptId: T): string;
+		};
+	}
+}

package/lib/protocol/createProject.d.ts

@@ -1,9 +1,9 @@
-import { Language, TypeScriptExtraServiceScript } from '@volar/language-core';
+import { Language, SourceScript, TypeScriptExtraServiceScript } from '@volar/language-core';
 import type * as ts from 'typescript';
 import type { createSys } from './createSys';
 export interface TypeScriptProjectHost extends Pick<ts.LanguageServiceHost, 'getLocalizedDiagnosticMessages' | 'getCurrentDirectory' | 'getCompilationSettings' | 'getProjectReferences' | 'getScriptFileNames' | 'getProjectVersion' | 'getScriptSnapshot'> {
 }
 export declare function createLanguageServiceHost<T>(ts: typeof import('typescript'), sys: ReturnType<typeof createSys> | ts.System, language: Language<T>, asScrpitId: (fileName: string) => T, projectHost: TypeScriptProjectHost): {
     languageServiceHost: ts.LanguageServiceHost;
-    getExtraServiceScript: (fileName: string) => TypeScriptExtraServiceScript | undefined;
+    getExtraServiceScript: (fileName: string) => [SourceScript<T>, TypeScriptExtraServiceScript] | undefined;
 };

package/lib/protocol/createProject.js

@@ -80,7 +80,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
         getScriptKind(fileName) {
             sync();
             if (extraScriptRegistry.has(fileName)) {
-                return extraScriptRegistry.get(fileName).scriptKind;
+                return extraScriptRegistry.get(fileName)[1].scriptKind;
             }
             const sourceScript = language.scripts.get(asScrpitId(fileName));
             if (sourceScript?.generated) {
@@ -170,7 +170,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
                 for (const extraServiceScript of sourceScript.generated.languagePlugin.typescript?.getExtraServiceScripts?.(fileName, sourceScript.generated.root) ?? []) {
                     newTsVirtualFileSnapshots.add(extraServiceScript.code.snapshot);
                     tsFileNamesSet.add(extraServiceScript.fileName);
-                    extraScriptRegistry.set(extraServiceScript.fileName, extraServiceScript);
+                    extraScriptRegistry.set(extraServiceScript.fileName, [sourceScript, extraServiceScript]);
                 }
                 for (const code of (0, language_core_1.forEachEmbeddedCode)(sourceScript.generated.root)) {
                     newOtherVirtualFileSnapshots.add(code.snapshot);
@@ -197,7 +197,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
     function getScriptSnapshot(fileName) {
         sync();
         if (extraScriptRegistry.has(fileName)) {
-            return extraScriptRegistry.get(fileName).code.snapshot;
+            return extraScriptRegistry.get(fileName)[1].code.snapshot;
         }
         const sourceScript = language.scripts.get(asScrpitId(fileName));
         if (sourceScript?.generated) {
@@ -217,7 +217,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
         }
         const version = scriptVersions.get(fileName);
         if (extraScriptRegistry.has(fileName)) {
-            const snapshot = extraScriptRegistry.get(fileName).code.snapshot;
+            const snapshot = extraScriptRegistry.get(fileName)[1].code.snapshot;
             if (!version.map.has(snapshot)) {
                 version.map.set(snapshot, version.lastVersion++);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.3.0-alpha.0",
+	"version": "2.3.0-alpha.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.3.0-alpha.0",
+		"@volar/language-core": "2.3.0-alpha.2",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.3.0-alpha.0"
+		"@volar/language-service": "2.3.0-alpha.2"
 	},
-	"gitHead": "f17c19f712651acde33cc2171a112e64db0b460e"
+	"gitHead": "25e56612551d56037f4064c599532b4c7c185118"
 }