@volar/typescript 2.1.6 → 2.2.0-alpha.1

package/lib/quickstart/createLanguageServicePlugin.js

@@ -23,17 +23,17 @@ function createLanguageServicePlugin(loadLanguagePlugins) {
                         .flat();
                     projectExternalFileExtensions.set(info.project, extensions);
                     const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
-                    const files = (0, language_core_1.createFileRegistry)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
+                    const language = (0, language_core_1.createLanguage)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
                         const snapshot = getScriptSnapshot(fileName);
                         if (snapshot) {
-                            files.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                            language.scripts.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
                         }
                         else {
-                            files.delete(fileName);
+                            language.scripts.delete(fileName);
                         }
                     });
-                    (0, decorateLanguageService_1.decorateLanguageService)(files, info.languageService);
-                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(files, info.languageServiceHost, ts);
+                    (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
+                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(language, info.languageServiceHost, ts);
                 }
                 return info.languageService;
             },

package/lib/resolveModuleName.d.ts

@@ -1,3 +1,3 @@
-import type { LanguagePlugin, SourceFile } from '@volar/language-core';
+import type { LanguagePlugin, SourceScript } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function createResolveModuleName(ts: typeof import('typescript'), languageServiceHost: ts.LanguageServiceHost, languagePlugins: LanguagePlugin<any>[], getFile: (fileName: string) => SourceFile | undefined): (moduleName: string, containingFile: string, compilerOptions: ts.CompilerOptions, cache?: ts.ModuleResolutionCache, redirectedReference?: ts.ResolvedProjectReference, resolutionMode?: ts.ResolutionMode) => ts.ResolvedModuleWithFailedLookupLocations;
+export declare function createResolveModuleName(ts: typeof import('typescript'), languageServiceHost: ts.LanguageServiceHost, languagePlugins: LanguagePlugin<any>[], getSourceScript: (fileName: string) => SourceScript | undefined): (moduleName: string, containingFile: string, compilerOptions: ts.CompilerOptions, cache?: ts.ModuleResolutionCache, redirectedReference?: ts.ResolvedProjectReference, resolutionMode?: ts.ResolutionMode) => ts.ResolvedModuleWithFailedLookupLocations;

package/lib/resolveModuleName.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createResolveModuleName = void 0;
-function createResolveModuleName(ts, languageServiceHost, languagePlugins, getFile) {
+function createResolveModuleName(ts, languageServiceHost, languagePlugins, getSourceScript) {
     const toPatchResults = new Map();
     const moduleResolutionHost = {
         readFile: languageServiceHost.readFile.bind(languageServiceHost),
@@ -32,11 +32,11 @@ function createResolveModuleName(ts, languageServiceHost, languagePlugins, getFi
         const result = ts.resolveModuleName(moduleName, containingFile, compilerOptions, moduleResolutionHost, cache, redirectedReference, resolutionMode);
         if (result.resolvedModule && toPatchResults.has(result.resolvedModule.resolvedFileName)) {
             result.resolvedModule.resolvedFileName = toPatchResults.get(result.resolvedModule.resolvedFileName);
-            const sourceFile = getFile(result.resolvedModule.resolvedFileName);
-            if (sourceFile?.generated) {
-                const tsCode = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
-                if (tsCode) {
-                    result.resolvedModule.extension = tsCode.extension;
+            const sourceScript = getSourceScript(result.resolvedModule.resolvedFileName);
+            if (sourceScript?.generated) {
+                const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
+                if (serviceScript) {
+                    result.resolvedModule.extension = serviceScript.extension;
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.1.6",
+	"version": "2.2.0-alpha.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,13 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.1.6",
+		"@volar/language-core": "2.2.0-alpha.1",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.1.6"
+		"@volar/language-service": "2.2.0-alpha.1"
 	},
-	"gitHead": "7feafa54fd3540569d492c2ab582c10c0cdc84d2"
+	"gitHead": "e6dcb83ecadcfcc9e22083eea61e1ee817a9d483"
 }