@volar/typescript 1.10.1 → 1.10.3

package/out/documentRegistry.d.ts

@@ -1,2 +1,3 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
 export declare function getDocumentRegistry(ts: typeof import('typescript/lib/tsserverlibrary'), useCaseSensitiveFileNames: boolean, currentDirectory: string): ts.DocumentRegistry;
+//# sourceMappingURL=documentRegistry.d.ts.map

package/out/getProgram.d.ts

@@ -1,3 +1,4 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import type * as embedded from '@volar/language-core';
 export declare function getProgram(ts: typeof import('typescript/lib/tsserverlibrary'), core: embedded.LanguageContext, ls: ts.LanguageService, sys: ts.System): ts.Program;
+//# sourceMappingURL=getProgram.d.ts.map

package/out/index.d.ts

@@ -4,3 +4,4 @@ export * from './languageServiceHost';
 export * from './sys';
 export * from './getProgram';
 export * from './serverPlugin';
+//# sourceMappingURL=index.d.ts.map

package/out/languageService.d.ts

@@ -1,3 +1,4 @@
 import { VirtualFiles } from '@volar/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 export declare function decorateLanguageService(virtualFiles: VirtualFiles, languageService: ts.LanguageService, isTsPlugin: boolean): void;
+//# sourceMappingURL=languageService.d.ts.map

package/out/languageServiceHost.d.ts

@@ -4,3 +4,4 @@ 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;
+//# sourceMappingURL=languageServiceHost.d.ts.map

package/out/languageServiceHost.js

@@ -8,6 +8,7 @@ function createLanguageServiceHost(ctx, ts, sys, env) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
     let tsFileNames = [];
+    let tsDirectories = new Set();
     const _tsHost = {
         ...sys,
         getCurrentDirectory: () => ctx.host.workspacePath,
@@ -144,6 +145,11 @@ function createLanguageServiceHost(ctx, ts, sys, env) {
             }
         }
         tsFileNames = [...tsFileNamesSet];
+        // Update tsDirectories for `directoryExists()`
+        tsDirectories.clear();
+        for (const fileName of tsFileNames) {
+            tsDirectories.add(path_1.posix.dirname(normalizePath(fileName)));
+        }
     }
     function readDirectory(dirName, extensions, excludes, includes, depth) {
         let matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, sys?.useCaseSensitiveFileNames ?? false, ctx.host.workspacePath, depth, (dirPath) => {
@@ -235,8 +241,7 @@ function createLanguageServiceHost(ctx, ts, sys, env) {
         return sys.getModifiedTime?.(fileName)?.valueOf().toString() ?? '';
     }
     function directoryExists(dirName) {
-        return sys.directoryExists(dirName)
-            || tsFileNames.some(fileName => fileName.toLowerCase().startsWith(dirName.toLowerCase()));
+        return tsDirectories.has(normalizePath(dirName)) || sys.directoryExists(dirName);
     }
     function fileExists(fileName) {
         // fill external virtual files
@@ -288,4 +293,7 @@ function forEachEmbeddedFile(file, cb) {
         forEachEmbeddedFile(embeddedFile, cb);
     }
 }
+function normalizePath(fileName) {
+    return fileName.replace(/\\/g, '/').toLowerCase();
+}
 //# sourceMappingURL=languageServiceHost.js.map

package/out/serverPlugin.d.ts

@@ -2,3 +2,4 @@ import { VirtualFiles } from '@volar/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 export declare function decorateLanguageServiceHost(virtualFiles: VirtualFiles, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript/lib/tsserverlibrary'), exts: string[]): void;
 export declare function getExternalFiles(ts: typeof import('typescript/lib/tsserverlibrary'), project: ts.server.Project, exts: string[]): string[];
+//# sourceMappingURL=serverPlugin.d.ts.map

package/out/sys.d.ts

@@ -4,3 +4,4 @@ export declare function createSys(ts: typeof import('typescript/lib/tsserverlibr
     version: number;
     sync(): Promise<number>;
 } & Disposable;
+//# sourceMappingURL=sys.d.ts.map

package/out/sys.js

@@ -9,8 +9,8 @@ function createSys(ts, env) {
     const rootPath = env.uriToFileName(env.workspaceUri.toString());
     const sys = ts.sys;
     const root = {
-        dirs: {},
-        files: {},
+        dirs: new Map(),
+        files: new Map(),
         requestedRead: false,
     };
     const promises = new Set();
@@ -20,10 +20,10 @@ function createSys(ts, env) {
             const dirName = path_1.posix.dirname(fileName);
             const baseName = path_1.posix.basename(fileName);
             const dir = getDir(dirName);
-            if (dir.files[baseName]) { // is requested file
+            if (dir.files.has(baseName)) { // is requested file
                 version++;
                 if (change.type === 1 || change.type === 2) {
-                    dir.files[baseName] = {
+                    dir.files.set(baseName, {
                         stat: {
                             type: 1,
                             ctime: Date.now(),
@@ -31,15 +31,15 @@ function createSys(ts, env) {
                             size: -1,
                         },
                         requestedStat: false,
-                    };
+                    });
                 }
                 else if (change.type === 3) {
-                    dir.files[baseName] = {
+                    dir.files.set(baseName, {
                         stat: undefined,
                         text: undefined,
                         requestedStat: true,
                         requestedText: true,
-                    };
+                    });
                 }
             }
         }
@@ -99,7 +99,7 @@ function createSys(ts, env) {
         const dir = getDir(dirPath);
         const name = path_1.posix.basename(fileName);
         readFileWorker(fileName, encoding, dir);
-        return dir.files[name]?.text;
+        return dir.files.get(name)?.text;
     }
     function directoryExists(dirName) {
         dirName = resolvePath(dirName);
@@ -168,7 +168,10 @@ function createSys(ts, env) {
         const dirPath = path_1.posix.dirname(fileName);
         const baseName = path_1.posix.basename(fileName);
         const dir = getDir(dirPath);
-        const file = dir.files[baseName] ??= {};
+        let file = dir.files.get(baseName);
+        if (!file) {
+            dir.files.set(baseName, file = {});
+        }
         return file;
     }
     // for import path completion
@@ -176,7 +179,7 @@ function createSys(ts, env) {
         dirName = resolvePath(dirName);
         readDirectoryWorker(dirName);
         const dir = getDir(dirName);
-        return [...Object.entries(dir.dirs)].filter(([_, dir]) => dir.exists).map(([name]) => name);
+        return [...dir.dirs.entries()].filter(([_, dir]) => dir.exists).map(([name]) => name);
     }
     function readDirectory(dirName, extensions, excludes, includes, depth) {
         dirName = resolvePath(dirName);
@@ -185,16 +188,18 @@ function createSys(ts, env) {
             readDirectoryWorker(dirPath);
             const dir = getDir(dirPath);
             return {
-                files: [...Object.entries(dir.files)].filter(([_, file]) => file.stat?.type === 1).map(([name]) => name),
-                directories: [...Object.entries(dir.dirs)].filter(([_, dir]) => dir.exists).map(([name]) => name),
+                files: [...dir.files.entries()].filter(([_, file]) => file.stat?.type === 1).map(([name]) => name),
+                directories: [...dir.dirs.entries()].filter(([_, dir]) => dir.exists).map(([name]) => name),
             };
         }, sys?.realpath ? (path => sys.realpath(path)) : (path => path));
         return [...new Set(matches)];
     }
     function readFileWorker(fileName, encoding, dir) {
         const name = path_1.posix.basename(fileName);
-        dir.files[name] ??= {};
-        const file = dir.files[name];
+        let file = dir.files.get(name);
+        if (!file) {
+            dir.files.set(name, file = {});
+        }
         if (file.requestedText) {
             return;
         }
@@ -254,9 +259,11 @@ function createSys(ts, env) {
                     stat.then((stat) => {
                         promises.delete(promise);
                         if (stat?.type === 1) {
-                            dir.files[name] ??= {};
-                            const file = dir.files[name];
-                            if (stat.type !== file.stat?.type || stat.mtime !== file.stat.mtime) {
+                            let file = dir.files.get(name);
+                            if (!file) {
+                                dir.files.set(name, file = {});
+                            }
+                            if (stat.type !== file.stat?.type || stat.mtime !== file.stat?.mtime) {
                                 version++;
                             }
                             file.stat = stat;
@@ -276,9 +283,12 @@ function createSys(ts, env) {
                 }
             }
             if (fileType === 1) {
-                dir.files[name] ??= {};
-                if (!dir.files[name].stat) {
-                    dir.files[name].stat = {
+                let file = dir.files.get(name);
+                if (!file) {
+                    dir.files.set(name, file = {});
+                }
+                if (!file.stat) {
+                    file.stat = {
                         type: 1,
                         mtime: 0,
                         ctime: 0,
@@ -316,13 +326,12 @@ function createSys(ts, env) {
         return currentDir;
     }
     function getDirFromDir(dir, name) {
-        let target = dir.dirs[name];
+        let target = dir.dirs.get(name);
         if (!target) {
-            target = {
-                dirs: {},
-                files: {},
-            };
-            dir.dirs[name] = target;
+            dir.dirs.set(name, target = {
+                dirs: new Map(),
+                files: new Map(),
+            });
         }
         return target;
     }

package/out/typescript/core.d.ts

@@ -81,3 +81,4 @@ type GetCanonicalFileName = (fileName: string) => string;
 export declare function createGetCanonicalFileName(useCaseSensitiveFileNames: boolean): GetCanonicalFileName;
 export declare function startsWith(str: string, prefix: string): boolean;
 export {};
+//# sourceMappingURL=core.d.ts.map

package/out/typescript/corePublic.d.ts

@@ -89,3 +89,4 @@ export declare const enum Comparison {
 }
 export declare const Map: MapConstructor;
 export declare const Set: SetConstructor;
+//# sourceMappingURL=corePublic.d.ts.map

package/out/typescript/path.d.ts

@@ -110,3 +110,4 @@ export declare function removeTrailingDirectorySeparator(path: string): string;
  */
 export declare function containsPath(parent: string, child: string, ignoreCase?: boolean): boolean;
 export declare function containsPath(parent: string, child: string, currentDirectory: string, ignoreCase?: boolean): boolean;
+//# sourceMappingURL=path.d.ts.map

package/out/typescript/types.d.ts

@@ -127,3 +127,4 @@ export declare const enum CharacterCodes {
     tab = 9,
     verticalTab = 11
 }
+//# sourceMappingURL=types.d.ts.map

package/out/typescript/utilities.d.ts

@@ -5,3 +5,4 @@ interface FileSystemEntries {
 /** @param path directory of the tsconfig.json */
 export declare function matchFiles(path: string, extensions: readonly string[] | undefined, excludes: readonly string[] | undefined, includes: readonly string[] | undefined, useCaseSensitiveFileNames: boolean, currentDirectory: string, depth: number | undefined, getFileSystemEntries: (path: string) => FileSystemEntries, realpath: (path: string) => string): string[];
 export {};
+//# sourceMappingURL=utilities.d.ts.map

package/package.json

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

package/out/dtsHost.d.ts

@@ -1,8 +0,0 @@
-import { FileSystem, ServiceEnvironment } from '@volar/language-service';
-export declare const jsDelivrUriBase = "https://cdn.jsdelivr.net/npm";
-export declare function decorateServiceEnvironment(env: ServiceEnvironment, jsDelivrUriResolver: ReturnType<typeof createJsDelivrUriResolver>, jsDelivrFs: FileSystem): void;
-export declare function createJsDelivrUriResolver(versions?: Record<string, string>, fileNameBase?: string): {
-    uriToFileName: (uri: string) => string | undefined;
-    fileNameToUri: (fileName: string) => string | undefined;
-};
-export declare function createJsDelivrFs(): FileSystem;

package/out/dtsHost.js

@@ -1,276 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createJsDelivrFs = exports.createJsDelivrUriResolver = exports.decorateServiceEnvironment = exports.jsDelivrUriBase = void 0;
-exports.jsDelivrUriBase = 'https://cdn.jsdelivr.net/npm';
-function decorateServiceEnvironment(env, jsDelivrUriResolver, jsDelivrFs) {
-    const fileNameToUri = env.fileNameToUri;
-    const uriToFileName = env.uriToFileName;
-    const fs = env.fs;
-    env.fileNameToUri = fileName => {
-        return jsDelivrUriResolver.fileNameToUri(fileName) ?? fileNameToUri(fileName);
-    };
-    env.uriToFileName = fileName => {
-        return jsDelivrUriResolver.uriToFileName(fileName) ?? uriToFileName(fileName);
-    };
-    env.fs = {
-        stat(uri) {
-            if (jsDelivrUriResolver.uriToFileName(uri)) {
-                return jsDelivrFs.stat(uri);
-            }
-            return fs?.stat(uri);
-        },
-        readDirectory(uri) {
-            if (jsDelivrUriResolver.uriToFileName(uri)) {
-                return jsDelivrFs.readDirectory(uri);
-            }
-            return fs?.readDirectory(uri) ?? [];
-        },
-        readFile(uri) {
-            if (jsDelivrUriResolver.uriToFileName(uri)) {
-                return jsDelivrFs.readFile(uri);
-            }
-            return fs?.readFile(uri);
-        },
-    };
-}
-exports.decorateServiceEnvironment = decorateServiceEnvironment;
-function createJsDelivrUriResolver(versions = {}, fileNameBase = '/node_modules') {
-    return {
-        uriToFileName,
-        fileNameToUri,
-    };
-    function uriToFileName(uri) {
-        if (uri === exports.jsDelivrUriBase) {
-            return fileNameBase;
-        }
-        if (uri.startsWith(exports.jsDelivrUriBase + '/')) {
-            const path = uri.substring(exports.jsDelivrUriBase.length);
-            const pkgName = getPackageName(path);
-            if (pkgName?.substring(1).includes('@')) {
-                const trimedVersion = pkgName.substring(0, pkgName.lastIndexOf('@'));
-                return `${fileNameBase}${path.replace(pkgName, trimedVersion)}`;
-            }
-            return `${fileNameBase}${path}`;
-        }
-    }
-    function fileNameToUri(fileName) {
-        if (fileName === fileNameBase) {
-            return exports.jsDelivrUriBase;
-        }
-        if (fileName.startsWith(fileNameBase + '/')) {
-            const path = fileName.substring(fileNameBase.length);
-            const pkgName = getPackageName(path);
-            if (pkgName) {
-                const version = versions[pkgName] ?? 'latest';
-                return `${exports.jsDelivrUriBase}/${pkgName}@${version}${path.substring(1 + pkgName.length)}`;
-            }
-            return `${exports.jsDelivrUriBase}${path}`;
-        }
-    }
-}
-exports.createJsDelivrUriResolver = createJsDelivrUriResolver;
-function createJsDelivrFs() {
-    const fetchResults = new Map();
-    const flatResults = new Map();
-    return {
-        stat,
-        readDirectory,
-        readFile,
-    };
-    function stat(uri) {
-        if (uri === exports.jsDelivrUriBase) {
-            return {
-                type: 2,
-                size: -1,
-                ctime: -1,
-                mtime: -1,
-            };
-        }
-        if (uri.startsWith(exports.jsDelivrUriBase + '/')) {
-            const path = uri.substring(exports.jsDelivrUriBase.length);
-            const pkgName = getPackageName(path);
-            if (!pkgName || !isValidPackageNameSync(pkgName)) {
-                return;
-            }
-            return (async () => {
-                if (!await isValidPackageNameAsync(pkgName)) {
-                    return;
-                }
-                if (!flatResults.has(pkgName)) {
-                    flatResults.set(pkgName, flat(pkgName));
-                }
-                const flatResult = await flatResults.get(pkgName);
-                const filePath = path.slice(`/${pkgName}`.length);
-                const file = flatResult.find(file => file.name === filePath);
-                if (file) {
-                    return {
-                        type: 1,
-                        ctime: new Date(file.time).valueOf(),
-                        mtime: new Date(file.time).valueOf(),
-                        size: file.size,
-                    };
-                }
-                else if (flatResult.some(file => file.name.startsWith(filePath + '/'))) {
-                    return {
-                        type: 2,
-                        ctime: -1,
-                        mtime: -1,
-                        size: -1,
-                    };
-                }
-            })();
-        }
-    }
-    function readDirectory(uri) {
-        if (uri.startsWith(exports.jsDelivrUriBase + '/')) {
-            const path = uri.substring(exports.jsDelivrUriBase.length);
-            const pkgName = getPackageName(path);
-            if (!pkgName || !isValidPackageNameSync(pkgName)) {
-                return [];
-            }
-            return (async () => {
-                if (!await isValidPackageNameAsync(pkgName)) {
-                    return [];
-                }
-                if (!flatResults.has(pkgName)) {
-                    flatResults.set(pkgName, flat(pkgName));
-                }
-                const flatResult = await flatResults.get(pkgName);
-                const dirPath = path.slice(`/${pkgName}`.length);
-                const files = flatResult
-                    .filter(f => f.name.substring(0, f.name.lastIndexOf('/')) === dirPath)
-                    .map(f => f.name.slice(dirPath.length + 1));
-                const dirs = flatResult
-                    .filter(f => f.name.startsWith(dirPath + '/') && f.name.substring(dirPath.length + 1).split('/').length >= 2)
-                    .map(f => f.name.slice(dirPath.length + 1).split('/')[0]);
-                return [
-                    ...files.map(f => [f, 1]),
-                    ...[...new Set(dirs)].map(f => [f, 2]),
-                ];
-            })();
-        }
-        return [];
-    }
-    function readFile(uri) {
-        if (uri.startsWith(exports.jsDelivrUriBase + '/')) {
-            const path = uri.substring(exports.jsDelivrUriBase.length);
-            const pkgName = getPackageName(path);
-            if (!pkgName || !isValidPackageNameSync(pkgName)) {
-                return;
-            }
-            return (async () => {
-                if (!await isValidPackageNameAsync(pkgName)) {
-                    return;
-                }
-                if (!fetchResults.has(path)) {
-                    fetchResults.set(path, (async () => {
-                        if ((await stat(uri))?.type !== 1) {
-                            return;
-                        }
-                        return await fetchText(uri);
-                    })());
-                }
-                return await fetchResults.get(path);
-            })();
-        }
-    }
-    async function flat(pkgNameWithVersion) {
-        let pkgName = pkgNameWithVersion;
-        let version = 'latest';
-        if (pkgNameWithVersion.substring(1).includes('@')) {
-            pkgName = pkgNameWithVersion.substring(0, pkgNameWithVersion.lastIndexOf('@'));
-            version = pkgNameWithVersion.substring(pkgNameWithVersion.lastIndexOf('@') + 1);
-        }
-        // resolve tag version
-        if (version === 'latest') {
-            const data = await fetchJson(`https://data.jsdelivr.com/v1/package/resolve/npm/${pkgName}@latest`);
-            if (!data?.version) {
-                return [];
-            }
-            version = data.version;
-        }
-        const flat = await fetchJson(`https://data.jsdelivr.com/v1/package/npm/${pkgName}@${version}/flat`);
-        if (!flat) {
-            return [];
-        }
-        return flat.files;
-    }
-    function isValidPackageNameSync(pkgName) {
-        if (pkgName.substring(1).includes('@')) {
-            pkgName = pkgName.substring(0, pkgName.lastIndexOf('@'));
-        }
-        if (pkgName.indexOf('.') >= 0 || pkgName.endsWith('/node_modules')) {
-            return false;
-        }
-        // hard code for known invalid package
-        if (pkgName.startsWith('@typescript/') || pkgName.startsWith('@types/typescript__')) {
-            return false;
-        }
-        return true;
-    }
-    async function isValidPackageNameAsync(pkgName) {
-        if (pkgName.substring(1).includes('@')) {
-            pkgName = pkgName.substring(0, pkgName.lastIndexOf('@'));
-        }
-        // don't check @types if original package already having types
-        if (pkgName.startsWith('@types/')) {
-            let originalPkgName = pkgName.slice('@types/'.length);
-            if (originalPkgName.indexOf('__') >= 0) {
-                originalPkgName = '@' + originalPkgName.replace('__', '/');
-            }
-            const packageJson = await readFile(`${exports.jsDelivrUriBase}/${originalPkgName}/package.json`);
-            if (packageJson) {
-                const packageJsonObj = JSON.parse(packageJson);
-                if (packageJsonObj.types || packageJsonObj.typings) {
-                    return false;
-                }
-                const indexDts = await stat(`${exports.jsDelivrUriBase}/${originalPkgName}/index.d.ts`);
-                if (indexDts?.type === 1) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-}
-exports.createJsDelivrFs = createJsDelivrFs;
-async function fetchText(url) {
-    try {
-        const res = await fetch(url);
-        if (res.status === 200) {
-            return await res.text();
-        }
-    }
-    catch {
-        // ignore
-    }
-}
-async function fetchJson(url) {
-    try {
-        const res = await fetch(url);
-        if (res.status === 200) {
-            return await res.json();
-        }
-    }
-    catch {
-        // ignore
-    }
-}
-/**
- * @example
- * "/a/b/c" -> "a"
- * "/@a/b/c" -> "@a/b"
- * "/@a/b@1.2.3/c" -> "@a/b@1.2.3"
- */
-function getPackageName(path) {
-    const parts = path.split('/');
-    let pkgName = parts[1];
-    if (pkgName.startsWith('@')) {
-        if (parts.length < 3 || !parts[2]) {
-            return undefined;
-        }
-        pkgName += '/' + parts[2];
-    }
-    return pkgName;
-}
-//# sourceMappingURL=dtsHost.js.map