@volar/typescript 1.10.5 → 1.10.7

package/out/languageServiceHost.d.ts

@@ -1,7 +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;
-}, env: ServiceEnvironment | undefined): ts.LanguageServiceHost;
+}): ts.LanguageServiceHost;
 //# sourceMappingURL=languageServiceHost.d.ts.map

package/out/languageServiceHost.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLanguageServiceHost = void 0;
-const path_1 = require("path");
+const path = require("path-browserify");
 const utilities_1 = require("./typescript/utilities");
 const fileVersions = new Map();
-function createLanguageServiceHost(ctx, ts, sys, env) {
+function createLanguageServiceHost(ctx, ts, sys) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
     let tsFileNames = [];
@@ -50,7 +50,7 @@ function createLanguageServiceHost(ctx, ts, sys, env) {
             if (ts) {
                 if (ctx.virtualFiles.hasSource(fileName))
                     return ts.ScriptKind.Deferred;
-                switch (path_1.posix.extname(fileName)) {
+                switch (path.extname(fileName)) {
                     case '.js': return ts.ScriptKind.JS;
                     case '.cjs': return ts.ScriptKind.JS;
                     case '.mjs': return ts.ScriptKind.JS;
@@ -70,12 +70,9 @@ function createLanguageServiceHost(ctx, ts, sys, env) {
     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 lastSysVersion = sys.version;
         _tsHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, sourceFile) => {
-            if (!watching && lastSysVersion !== sys.version) {
+            if (lastSysVersion !== sys.version) {
                 lastSysVersion = sys.version;
                 moduleCache.clear();
             }
@@ -86,7 +83,7 @@ function createLanguageServiceHost(ctx, ts, sys, env) {
             });
         };
         _tsHost.resolveModuleNames = (moduleNames, containingFile, _reusedNames, redirectedReference, options, sourceFile) => {
-            if (!watching && lastSysVersion !== sys.version) {
+            if (lastSysVersion !== sys.version) {
                 lastSysVersion = sys.version;
                 moduleCache.clear();
             }
@@ -148,7 +145,7 @@ function createLanguageServiceHost(ctx, ts, sys, env) {
         // Update tsDirectories for `directoryExists()`
         tsDirectories.clear();
         for (const fileName of tsFileNames) {
-            tsDirectories.add(path_1.posix.dirname(normalizePath(fileName)));
+            tsDirectories.add(path.dirname(normalizePath(fileName)));
         }
     }
     function readDirectory(dirName, extensions, excludes, includes, depth) {

package/out/sys.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSys = void 0;
-const path_1 = require("path");
+const path = require("path-browserify");
 const utilities_1 = require("./typescript/utilities");
 let currentCwd = '';
 function createSys(ts, env) {
@@ -17,8 +17,8 @@ function createSys(ts, env) {
     const fileWatcher = env.onDidChangeWatchedFiles?.(({ changes }) => {
         for (const change of changes) {
             const fileName = env.uriToFileName(change.uri);
-            const dirName = path_1.posix.dirname(fileName);
-            const baseName = path_1.posix.basename(fileName);
+            const dirName = path.dirname(fileName);
+            const baseName = path.basename(fileName);
             const dir = getDir(dirName);
             if (dir.files.has(baseName)) { // is requested file
                 version++;
@@ -84,6 +84,7 @@ function createSys(ts, env) {
                 if (sys.directoryExists(rootPath)) {
                     // https://github.com/vuejs/language-tools/issues/2480
                     try {
+                        // @ts-expect-error
                         process.chdir(rootPath);
                     }
                     catch { }
@@ -91,13 +92,13 @@ function createSys(ts, env) {
             }
             return sys.resolvePath(fsPath).replace(/\\/g, '/');
         }
-        return path_1.posix.resolve(fsPath).replace(/\\/g, '/');
+        return path.resolve(fsPath).replace(/\\/g, '/');
     }
     function readFile(fileName, encoding) {
         fileName = resolvePath(fileName);
-        const dirPath = path_1.posix.dirname(fileName);
+        const dirPath = path.dirname(fileName);
         const dir = getDir(dirPath);
-        const name = path_1.posix.basename(fileName);
+        const name = path.basename(fileName);
         readFileWorker(fileName, encoding, dir);
         return dir.files.get(name)?.text;
     }
@@ -165,8 +166,8 @@ function createSys(ts, env) {
     }
     function getFile(fileName) {
         fileName = resolvePath(fileName);
-        const dirPath = path_1.posix.dirname(fileName);
-        const baseName = path_1.posix.basename(fileName);
+        const dirPath = path.dirname(fileName);
+        const baseName = path.basename(fileName);
         const dir = getDir(dirPath);
         let file = dir.files.get(baseName);
         if (!file) {
@@ -195,7 +196,7 @@ function createSys(ts, env) {
         return [...new Set(matches)];
     }
     function readFileWorker(fileName, encoding, dir) {
-        const name = path_1.posix.basename(fileName);
+        const name = path.basename(fileName);
         let file = dir.files.get(name);
         if (!file) {
             dir.files.set(name, file = {});
@@ -310,13 +311,13 @@ function createSys(ts, env) {
     function getDir(dirName) {
         const dirNames = [];
         let currentDirPath = dirName;
-        let currentDirName = path_1.posix.basename(currentDirPath);
+        let currentDirName = path.basename(currentDirPath);
         let lastDirPath;
         while (lastDirPath !== currentDirPath) {
             lastDirPath = currentDirPath;
             dirNames.push(currentDirName);
-            currentDirPath = path_1.posix.dirname(currentDirPath);
-            currentDirName = path_1.posix.basename(currentDirPath);
+            currentDirPath = path.dirname(currentDirPath);
+            currentDirName = path.basename(currentDirPath);
         }
         let currentDir = root;
         for (let i = dirNames.length - 1; i >= 0; i--) {

package/out/typescript/corePublic.js

@@ -12,6 +12,7 @@ exports.version = `${exports.versionMajorMinor}.0-dev`;
 var NativeCollections;
 (function (NativeCollections) {
     const globals = typeof globalThis !== "undefined" ? globalThis :
+        // @ts-expect-error node global
         typeof global !== "undefined" ? global :
             typeof self !== "undefined" ? self :
                 undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.10.5",
+	"version": "1.10.7",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,12 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.10.5"
+		"@volar/language-core": "1.10.7",
+		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
-		"@volar/language-service": "1.10.5"
+		"@types/path-browserify": "^1.0.1",
+		"@volar/language-service": "1.10.7"
 	},
-	"gitHead": "f087b2cb990108e71ed66727588b3e19c421b4c2"
+	"gitHead": "6350232bcf1e2fdf34bf6bc6fc87f46facb03730"
 }

package/out/program.d.ts

@@ -1,4 +0,0 @@
-import type * as ts from 'typescript/lib/tsserverlibrary';
-import type * as embedded from '@volar/language-core';
-export declare function decorateProgram({ createSourceFile }: Pick<typeof import('typescript/lib/tsserverlibrary'), 'createSourceFile'>, options: ts.CreateProgramOptions, core: embedded.LanguageContext, program: ts.Program): void;
-//# sourceMappingURL=program.d.ts.map

package/out/program.js

@@ -1,131 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateProgram = void 0;
-function decorateProgram({ createSourceFile }, options, core, program) {
-    const _getRootFileNames = program.getRootFileNames.bind(program);
-    const _getSyntacticDiagnostics = program.getSyntacticDiagnostics.bind(program);
-    const _getSemanticDiagnostics = program.getSemanticDiagnostics.bind(program);
-    const _getGlobalDiagnostics = program.getGlobalDiagnostics.bind(program);
-    const _emit = program.emit.bind(program);
-    // @ts-expect-error
-    const _getBindAndCheckDiagnostics = program.getBindAndCheckDiagnostics.bind(program);
-    program.getRootFileNames = getRootFileNames;
-    program.getSyntacticDiagnostics = getSyntacticDiagnostics;
-    program.getSemanticDiagnostics = getSemanticDiagnostics;
-    program.getGlobalDiagnostics = getGlobalDiagnostics;
-    program.emit = emit;
-    // @ts-expect-error
-    program.getBindAndCheckDiagnostics = getBindAndCheckDiagnostics;
-    // TODO
-    function getRootFileNames() {
-        return _getRootFileNames().filter(fileName => options.host?.fileExists?.(fileName));
-    }
-    // for vue-tsc --noEmit --watch
-    function getBindAndCheckDiagnostics(sourceFile, cancellationToken) {
-        return getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, _getBindAndCheckDiagnostics);
-    }
-    // for vue-tsc --noEmit
-    function getSyntacticDiagnostics(sourceFile, cancellationToken) {
-        return getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, _getSyntacticDiagnostics);
-    }
-    function getSemanticDiagnostics(sourceFile, cancellationToken) {
-        return getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, _getSemanticDiagnostics);
-    }
-    function getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, api) {
-        if (sourceFile) {
-            const [virtualFile, source] = core.virtualFiles.getVirtualFile(sourceFile.fileName);
-            if (virtualFile && source) {
-                if (!virtualFile.capabilities.diagnostic)
-                    return [];
-                const errors = transformDiagnostics(api(sourceFile, cancellationToken) ?? []);
-                return errors;
-            }
-        }
-        return transformDiagnostics(api(sourceFile, cancellationToken) ?? []);
-    }
-    function getGlobalDiagnostics(cancellationToken) {
-        return transformDiagnostics(_getGlobalDiagnostics(cancellationToken) ?? []);
-    }
-    function emit(targetSourceFile, _writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
-        const scriptResult = _emit(targetSourceFile, options.host?.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
-        return {
-            emitSkipped: scriptResult.emitSkipped,
-            emittedFiles: scriptResult.emittedFiles,
-            diagnostics: transformDiagnostics(scriptResult.diagnostics),
-        };
-    }
-    // transform
-    function transformDiagnostics(diagnostics) {
-        const result = [];
-        for (const diagnostic of diagnostics) {
-            if (diagnostic.file !== undefined
-                && diagnostic.start !== undefined
-                && diagnostic.length !== undefined) {
-                const [virtualFile, source] = core.virtualFiles.getVirtualFile(diagnostic.file.fileName);
-                if (virtualFile && source) {
-                    if (options.host?.fileExists?.(source.fileName) === false)
-                        continue;
-                    for (const [_, [sourceSnapshot, map]] of core.virtualFiles.getMaps(virtualFile)) {
-                        if (sourceSnapshot !== source.snapshot)
-                            continue;
-                        for (const start of map.toSourceOffsets(diagnostic.start)) {
-                            const reportStart = typeof start[1].data.diagnostic === 'object' ? start[1].data.diagnostic.shouldReport() : !!start[1].data.diagnostic;
-                            if (!reportStart)
-                                continue;
-                            for (const end of map.toSourceOffsets(diagnostic.start + diagnostic.length, true)) {
-                                const reportEnd = typeof end[1].data.diagnostic === 'object' ? end[1].data.diagnostic.shouldReport() : !!end[1].data.diagnostic;
-                                if (!reportEnd)
-                                    continue;
-                                onMapping(diagnostic, source.fileName, start[0], end[0], source.snapshot.getText(0, source.snapshot.getLength()));
-                                break;
-                            }
-                            break;
-                        }
-                    }
-                }
-                else {
-                    if (options.host?.fileExists?.(diagnostic.file.fileName) === false)
-                        continue;
-                    onMapping(diagnostic, diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, diagnostic.file.text);
-                }
-            }
-            else if (diagnostic.file === undefined) {
-                result.push(diagnostic);
-            }
-        }
-        return result;
-        function onMapping(diagnostic, fileName, start, end, docText) {
-            let file = fileName === diagnostic.file?.fileName
-                ? diagnostic.file
-                : undefined;
-            if (!file) {
-                if (docText === undefined) {
-                    const snapshot = core.host.getScriptSnapshot(fileName);
-                    if (snapshot) {
-                        docText = snapshot.getText(0, snapshot.getLength());
-                    }
-                }
-                else {
-                    file = createSourceFile(fileName, docText, 99, undefined, 7);
-                    // fix https://github.com/vuejs/language-tools/issues/2622 for TS 5.0
-                    file.originalFileName = fileName;
-                    file.path = fileName.toLowerCase();
-                    file.resolvedPath = fileName.toLowerCase();
-                }
-            }
-            const newDiagnostic = {
-                ...diagnostic,
-                file,
-                start: start,
-                length: end - start,
-            };
-            const relatedInformation = diagnostic.relatedInformation;
-            if (relatedInformation) {
-                newDiagnostic.relatedInformation = transformDiagnostics(relatedInformation);
-            }
-            result.push(newDiagnostic);
-        }
-    }
-}
-exports.decorateProgram = decorateProgram;
-//# sourceMappingURL=program.js.map