@volar/typescript 1.9.2 → 1.10.1

package/out/languageServiceHost.d.ts

@@ -1,5 +1,6 @@
 import type { LanguageContext } from '@volar/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
+import { ServiceEnvironment } from '@volar/language-service';
 export declare function createLanguageServiceHost(ctx: LanguageContext, ts: typeof import('typescript/lib/tsserverlibrary'), sys: ts.System & {
     version?: number;
-}): ts.LanguageServiceHost;
+}, env: ServiceEnvironment | undefined): ts.LanguageServiceHost;

package/out/languageServiceHost.js

@@ -4,7 +4,7 @@ exports.createLanguageServiceHost = void 0;
 const path_1 = require("path");
 const utilities_1 = require("./typescript/utilities");
 const fileVersions = new Map();
-function createLanguageServiceHost(ctx, ts, sys) {
+function createLanguageServiceHost(ctx, ts, sys, env) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
     let tsFileNames = [];
@@ -15,8 +15,6 @@ function createLanguageServiceHost(ctx, ts, sys) {
         getCancellationToken: ctx.host.getCancellationToken ? () => ctx.host.getCancellationToken() : undefined,
         getLocalizedDiagnosticMessages: ctx.host.getLocalizedDiagnosticMessages ? () => ctx.host.getLocalizedDiagnosticMessages() : undefined,
         getProjectReferences: ctx.host.getProjectReferences ? () => ctx.host.getProjectReferences() : undefined,
-        resolveModuleNames: ctx.host.resolveModuleNames ? (...args) => ctx.host.resolveModuleNames(...args) : undefined,
-        resolveModuleNameLiterals: ctx.host.resolveModuleNameLiterals ? (...args) => ctx.host.resolveModuleNameLiterals(...args) : undefined,
         getDefaultLibFileName: (options) => {
             try {
                 return ts.getDefaultLibFilePath(options);
@@ -68,6 +66,35 @@ function createLanguageServiceHost(ctx, ts, sys) {
         },
     };
     const fsFileSnapshots = new Map();
+    if (ctx.host.resolveModuleName) {
+        // TODO: can this share between monorepo packages?
+        const moduleCache = ts.createModuleResolutionCache(_tsHost.getCurrentDirectory(), _tsHost.useCaseSensitiveFileNames ? s => s : s => s.toLowerCase(), _tsHost.getCompilationSettings());
+        const watching = !!env?.onDidChangeWatchedFiles?.(() => {
+            moduleCache.clear();
+        });
+        let lastProjectVersion = ctx.host.getProjectVersion();
+        _tsHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, sourceFile) => {
+            if (!watching && lastProjectVersion !== ctx.host.getProjectVersion()) {
+                lastProjectVersion = ctx.host.getProjectVersion();
+                moduleCache.clear();
+            }
+            return moduleLiterals.map((moduleLiteral) => {
+                let moduleName = moduleLiteral.text;
+                moduleName = ctx.host.resolveModuleName(moduleName, sourceFile.impliedNodeFormat);
+                return ts.resolveModuleName(moduleName, containingFile, options, _tsHost, moduleCache, redirectedReference, sourceFile.impliedNodeFormat);
+            });
+        };
+        _tsHost.resolveModuleNames = (moduleNames, containingFile, _reusedNames, redirectedReference, options, sourceFile) => {
+            if (!watching && lastProjectVersion !== ctx.host.getProjectVersion()) {
+                lastProjectVersion = ctx.host.getProjectVersion();
+                moduleCache.clear();
+            }
+            return moduleNames.map((moduleName) => {
+                moduleName = ctx.host.resolveModuleName(moduleName, sourceFile?.impliedNodeFormat);
+                return ts.resolveModuleName(moduleName, containingFile, options, _tsHost, moduleCache, redirectedReference, sourceFile?.impliedNodeFormat).resolvedModule;
+            });
+        };
+    }
     let oldTsVirtualFileSnapshots = new Set();
     let oldOtherVirtualFileSnapshots = new Set();
     return new Proxy(_tsHost, {
@@ -212,6 +239,27 @@ function createLanguageServiceHost(ctx, ts, sys) {
             || tsFileNames.some(fileName => fileName.toLowerCase().startsWith(dirName.toLowerCase()));
     }
     function fileExists(fileName) {
+        // fill external virtual files
+        const ext = fileName.substring(fileName.lastIndexOf('.'));
+        if (ext === '.js'
+            || ext === '.ts'
+            || ext === '.jsx'
+            || ext === '.tsx') {
+            /**
+             * If try to access a external .vue file that outside of the project,
+             * the file will not process by language service host,
+             * so virtual file will not be created.
+             *
+             * We try to create virtual file here.
+             */
+            const sourceFileName = fileName.substring(0, fileName.lastIndexOf('.'));
+            if (!ctx.virtualFiles.hasSource(sourceFileName)) {
+                const scriptSnapshot = getScriptSnapshot(sourceFileName);
+                if (scriptSnapshot) {
+                    ctx.virtualFiles.updateSource(sourceFileName, scriptSnapshot, ctx.host.getLanguageId?.(sourceFileName));
+                }
+            }
+        }
         // virtual files
         if (ctx.virtualFiles.hasVirtualFile(fileName)) {
             return true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.9.2",
+	"version": "1.10.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.9.2"
+		"@volar/language-core": "1.10.1"
 	},
 	"devDependencies": {
-		"@volar/language-service": "1.9.2"
+		"@volar/language-service": "1.10.1"
 	},
-	"gitHead": "c838ba22be287308e3fcf27f65af672749816df4"
+	"gitHead": "65775648936d786847511f3d8bdd8a3d1dca2e4e"
 }