@volar/typescript 2.4.0-alpha.1 → 2.4.0-alpha.2

package/lib/protocol/createProject.d.ts

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

package/lib/protocol/createProject.js

@@ -4,7 +4,7 @@ exports.createLanguageServiceHost = createLanguageServiceHost;
 const language_core_1 = require("@volar/language-core");
 const path = require("path-browserify");
 const resolveModuleName_1 = require("../resolveModuleName");
-function createLanguageServiceHost(ts, sys, language, asUri, projectHost) {
+function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
     const scriptVersions = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
     let lastProjectVersion;
     let tsProjectVersion = 0;
@@ -82,7 +82,7 @@ function createLanguageServiceHost(ts, sys, language, asUri, projectHost) {
             if (extraScriptRegistry.has(fileName)) {
                 return extraScriptRegistry.get(fileName).scriptKind;
             }
-            const sourceScript = language.scripts.get(asUri(fileName));
+            const sourceScript = language.scripts.get(asScriptId(fileName));
             if (sourceScript?.generated) {
                 const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
                 if (serviceScript) {
@@ -119,7 +119,7 @@ function createLanguageServiceHost(ts, sys, language, asUri, projectHost) {
     if (language.plugins.some(plugin => plugin.typescript?.extraFileExtensions.length)) {
         // TODO: can this share between monorepo packages?
         const moduleCache = ts.createModuleResolutionCache(languageServiceHost.getCurrentDirectory(), languageServiceHost.useCaseSensitiveFileNames?.() ? s => s : s => s.toLowerCase(), languageServiceHost.getCompilationSettings());
-        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, language.plugins, fileName => language.scripts.get(asUri(fileName)));
+        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, language.plugins, fileName => language.scripts.get(asScriptId(fileName)));
         let lastSysVersion = 'version' in sys ? sys.version : undefined;
         languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, sourceFile) => {
             if ('version' in sys && lastSysVersion !== sys.version) {
@@ -160,7 +160,7 @@ function createLanguageServiceHost(ts, sys, language, asUri, projectHost) {
         const newOtherVirtualFileSnapshots = new Set();
         const tsFileNamesSet = new Set();
         for (const fileName of projectHost.getScriptFileNames()) {
-            const sourceScript = language.scripts.get(asUri(fileName));
+            const sourceScript = language.scripts.get(asScriptId(fileName));
             if (sourceScript?.generated) {
                 const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
                 if (serviceScript) {
@@ -199,7 +199,7 @@ function createLanguageServiceHost(ts, sys, language, asUri, projectHost) {
         if (extraScriptRegistry.has(fileName)) {
             return extraScriptRegistry.get(fileName).code.snapshot;
         }
-        const sourceScript = language.scripts.get(asUri(fileName));
+        const sourceScript = language.scripts.get(asScriptId(fileName));
         if (sourceScript?.generated) {
             const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
             if (serviceScript) {
@@ -223,7 +223,7 @@ function createLanguageServiceHost(ts, sys, language, asUri, projectHost) {
             }
             return version.map.get(snapshot).toString();
         }
-        const sourceScript = language.scripts.get(asUri(fileName));
+        const sourceScript = language.scripts.get(asScriptId(fileName));
         if (sourceScript?.generated) {
             const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
             if (serviceScript) {
@@ -235,7 +235,7 @@ function createLanguageServiceHost(ts, sys, language, asUri, projectHost) {
         }
         const isOpenedFile = !!projectHost.getScriptSnapshot(fileName);
         if (isOpenedFile) {
-            const sourceScript = language.scripts.get(asUri(fileName));
+            const sourceScript = language.scripts.get(asScriptId(fileName));
             if (sourceScript && !sourceScript.generated) {
                 if (!version.map.has(sourceScript.snapshot)) {
                     version.map.set(sourceScript.snapshot, version.lastVersion++);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.4.0-alpha.1",
+	"version": "2.4.0-alpha.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.0-alpha.1",
+		"@volar/language-core": "2.4.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.4.0-alpha.1"
+		"@volar/language-service": "2.4.0-alpha.2"
 	},
-	"gitHead": "c096c457fea026fcd432b82224026f747fab571b"
+	"gitHead": "62914047f925b79391fee6e4f697705b77641baf"
 }