npm - @volar/monaco - Versions diffs - 2.4.0-alpha.3 → 2.4.0-alpha.5 - Mend

@volar/monaco 2.4.0-alpha.3 → 2.4.0-alpha.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/ata.d.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-import type { LanguageServiceEnvironment } from '@volar/language-service';
+import type { FileSystem } from '@volar/language-service';
 import type { URI } from 'vscode-uri';
-export declare function activateAutomaticTypeAcquisition(env: LanguageServiceEnvironment, uriConverter: {
-    asFileName(uri: URI): string;
-}, onFetch?: (path: string, content: string) => void): void;
+export declare function createJsDelivrNpmFileSystem(getCdnPath?: (uri: URI) => string | undefined, getPackageVersion?: (pkgName: string) => string | undefined, onFetch?: (path: string, content: string) => void): FileSystem;

package/lib/ata.js CHANGED Viewed

@@ -1,179 +1,158 @@
-export function activateAutomaticTypeAcquisition(env, uriConverter, onFetch) {
-    const textCache = new Map();
-    const jsonCache = new Map();
-    const npmFs = createJsDelivrNpmFileSystem();
-    const _fs = env.fs;
-    env.fs = {
+const textCache = new Map();
+const jsonCache = new Map();
+export function createJsDelivrNpmFileSystem(getCdnPath = (uri) => {
+    if (uri.path === '/node_modules') {
+        return '';
+    }
+    else if (uri.path.startsWith('/node_modules/')) {
+        return uri.path.slice('/node_modules'.length);
+    }
+}, getPackageVersion, onFetch) {
+    const fetchResults = new Map();
+    const flatResults = new Map();
+    return {
         async stat(uri) {
-            return await npmFs.stat(uri) ?? await _fs?.stat(uri);
-        },
-        async readDirectory(uri) {
-            return [
-                ...await npmFs.readDirectory(uri),
-                ...await _fs?.readDirectory(uri) ?? [],
-            ];
-        },
-        async readFile(uri) {
-            return await npmFs.readFile(uri) ?? await _fs?.readFile(uri);
-        },
-    };
-    function createJsDelivrNpmFileSystem() {
-        const fetchResults = new Map();
-        const flatResults = new Map();
-        return {
-            async stat(uri) {
-                const fileName = uriConverter.asFileName(uri);
-                if (fileName === '/node_modules') {
-                    return {
-                        type: 2,
-                        size: -1,
-                        ctime: -1,
-                        mtime: -1,
-                    };
-                }
-                if (fileName.startsWith('/node_modules/')) {
-                    const path = fileName.substring('/node_modules/'.length);
-                    return await _stat(path);
-                }
-            },
-            async readFile(uri) {
-                const fileName = uriConverter.asFileName(uri);
-                if (fileName.startsWith('/node_modules/')) {
-                    const path = fileName.substring('/node_modules/'.length);
-                    return await _readFile(path);
-                }
-            },
-            readDirectory(uri) {
-                const fileName = uriConverter.asFileName(uri);
-                if (fileName.startsWith('/node_modules/')) {
-                    const path = fileName.substring('/node_modules/'.length);
-                    return _readDirectory(path);
-                }
-                return [];
-            },
-        };
-        async function _stat(path) {
-            const pkgName = getPackageName(path);
-            if (!pkgName || !await isValidPackageName(pkgName)) {
+            const path = getCdnPath(uri);
+            if (path === undefined) {
                 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 + '/'))) {
+            if (path === '') {
                 return {
                     type: 2,
+                    size: -1,
                     ctime: -1,
                     mtime: -1,
-                    size: -1,
                 };
             }
-        }
-        async function _readDirectory(path) {
-            const pkgName = getPackageName(path);
-            if (!pkgName || !await isValidPackageName(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]),
-            ];
-        }
-        async function _readFile(path) {
-            const pkgName = getPackageName(path);
-            if (!pkgName || !await isValidPackageName(pkgName)) {
+            return await _stat(path);
+        },
+        async readFile(uri) {
+            const path = getCdnPath(uri);
+            if (path === undefined) {
                 return;
             }
-            if (!fetchResults.has(path)) {
-                fetchResults.set(path, (async () => {
-                    if ((await _stat(path))?.type !== 1) {
-                        return;
-                    }
-                    const text = await fetchText(`https://cdn.jsdelivr.net/npm/${path}`);
-                    if (text !== undefined) {
-                        onFetch?.(path, text);
-                    }
-                    return text;
-                })());
-            }
-            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);
+            return await _readFile(path);
+        },
+        readDirectory(uri) {
+            const path = getCdnPath(uri);
+            if (path === undefined) {
+                return [];
             }
-            // resolve tag version
-            if (version === 'latest') {
-                const data = await fetchJson(`https://data.jsdelivr.com/v1/package/resolve/npm/${pkgName}@latest`);
-                if (!data?.version) {
-                    return [];
+            return _readDirectory(path);
+        },
+    };
+    async function _stat(path) {
+        const resolved = resolvePackageName(path);
+        if (!resolved || !await isValidPackageName(resolved[1])) {
+            return;
+        }
+        if (!flatResults.has(resolved[0])) {
+            flatResults.set(resolved[0], flat(resolved[1], resolved[2]));
+        }
+        const flatResult = await flatResults.get(resolved[0]);
+        const filePath = path.slice(resolved[0].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,
+            };
+        }
+    }
+    async function _readDirectory(path) {
+        const resolved = resolvePackageName(path);
+        if (!resolved || !await isValidPackageName(resolved[1])) {
+            return [];
+        }
+        if (!flatResults.has(resolved[0])) {
+            flatResults.set(resolved[0], flat(resolved[1], resolved[2]));
+        }
+        const flatResult = await flatResults.get(resolved[0]);
+        const dirPath = path.slice(resolved[0].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]),
+        ];
+    }
+    async function _readFile(path) {
+        const resolved = resolvePackageName(path);
+        if (!resolved || !await isValidPackageName(resolved[1])) {
+            return;
+        }
+        if (!fetchResults.has(path)) {
+            fetchResults.set(path, (async () => {
+                if ((await _stat(path))?.type !== 1) {
+                    return;
                 }
-                version = data.version;
-            }
-            const flat = await fetchJson(`https://data.jsdelivr.com/v1/package/npm/${pkgName}@${version}/flat`);
-            if (!flat) {
+                const text = await fetchText(`https://cdn.jsdelivr.net/npm/${path}`);
+                if (text !== undefined) {
+                    onFetch?.(path, text);
+                }
+                return text;
+            })());
+        }
+        return await fetchResults.get(path);
+    }
+    async function flat(pkgName, version) {
+        version ??= 'latest';
+        // resolve latest tag
+        if (version === 'latest') {
+            const data = await fetchJson(`https://data.jsdelivr.com/v1/package/resolve/npm/${pkgName}@${version}`);
+            if (!data?.version) {
                 return [];
             }
-            return flat.files;
+            version = data.version;
         }
-        async function isValidPackageName(pkgName) {
-            // @aaa/bbb@latest -> @aaa/bbb
-            if (pkgName.substring(1).includes('@')) {
-                pkgName = pkgName.substring(0, pkgName.lastIndexOf('@'));
-            }
-            // ignore @aaa/node_modules
-            if (pkgName.endsWith('/node_modules')) {
-                return false;
-            }
-            // hard code for known invalid package
-            if (pkgName.startsWith('@typescript/') || pkgName.startsWith('@types/typescript__')) {
-                return false;
-            }
-            // 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 flat = await fetchJson(`https://data.jsdelivr.com/v1/package/npm/${pkgName}@${version}/flat`);
+        if (!flat) {
+            return [];
+        }
+        return flat.files;
+    }
+    async function isValidPackageName(pkgName) {
+        // ignore @aaa/node_modules
+        if (pkgName.endsWith('/node_modules')) {
+            return false;
+        }
+        // hard code for known invalid package
+        if (pkgName.startsWith('@typescript/') || pkgName.startsWith('@types/typescript__')) {
+            return false;
+        }
+        // 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(`${originalPkgName}/package.json`);
+            if (packageJson) {
+                const packageJsonObj = JSON.parse(packageJson);
+                if (packageJsonObj.types || packageJsonObj.typings) {
+                    return false;
                 }
-                const packageJson = await _readFile(`${originalPkgName}/package.json`);
-                if (packageJson) {
-                    const packageJsonObj = JSON.parse(packageJson);
-                    if (packageJsonObj.types || packageJsonObj.typings) {
-                        return false;
-                    }
-                    const indexDts = await _stat(`${originalPkgName}/index.d.ts`);
-                    if (indexDts?.type === 1) {
-                        return false;
-                    }
+                const indexDts = await _stat(`${originalPkgName}/index.d.ts`);
+                if (indexDts?.type === 1) {
+                    return false;
                 }
             }
-            return true;
         }
+        return true;
     }
     /**
      * @example
@@ -181,48 +160,57 @@ export function activateAutomaticTypeAcquisition(env, uriConverter, onFetch) {
      * "@a/b/c" -> "@a/b"
      * "@a/b@1.2.3/c" -> "@a/b@1.2.3"
      */
-    function getPackageName(path) {
+    function resolvePackageName(path) {
         const parts = path.split('/');
-        let pkgName = parts[0];
-        if (pkgName.startsWith('@')) {
+        let modName = parts[0];
+        if (modName.startsWith('@')) {
             if (!parts[1]) {
-                return undefined;
+                return;
             }
-            pkgName += '/' + parts[1];
+            modName += '/' + parts[1];
         }
-        return pkgName;
-    }
-    async function fetchText(url) {
-        if (!textCache.has(url)) {
-            textCache.set(url, (async () => {
-                try {
-                    const res = await fetch(url);
-                    if (res.status === 200) {
-                        return await res.text();
-                    }
-                }
-                catch {
-                    // ignore
-                }
-            })());
+        let pkgName = modName;
+        let version;
+        if (modName.lastIndexOf('@') >= 1) {
+            pkgName = modName.substring(0, modName.lastIndexOf('@'));
+            version = modName.substring(modName.lastIndexOf('@') + 1);
         }
-        return await textCache.get(url);
+        if (!version && getPackageVersion) {
+            getPackageVersion?.(pkgName);
+        }
+        return [modName, pkgName, version];
     }
-    async function fetchJson(url) {
-        if (!jsonCache.has(url)) {
-            jsonCache.set(url, (async () => {
-                try {
-                    const res = await fetch(url);
-                    if (res.status === 200) {
-                        return await res.json();
-                    }
+}
+async function fetchText(url) {
+    if (!textCache.has(url)) {
+        textCache.set(url, (async () => {
+            try {
+                const res = await fetch(url);
+                if (res.status === 200) {
+                    return await res.text();
                 }
-                catch {
-                    // ignore
+            }
+            catch {
+                // ignore
+            }
+        })());
+    }
+    return await textCache.get(url);
+}
+async function fetchJson(url) {
+    if (!jsonCache.has(url)) {
+        jsonCache.set(url, (async () => {
+            try {
+                const res = await fetch(url);
+                if (res.status === 200) {
+                    return await res.json();
                 }
-            })());
-        }
-        return await jsonCache.get(url);
+            }
+            catch {
+                // ignore
+            }
+        })());
     }
+    return await jsonCache.get(url);
 }
 //# sourceMappingURL=ata.js.map

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "2.4.0-alpha.3",
+	"version": "2.4.0-alpha.5",
 	"license": "MIT",
 	"type": "module",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "2.4.0-alpha.3",
-		"@volar/typescript": "2.4.0-alpha.3",
+		"@volar/language-service": "2.4.0-alpha.5",
+		"@volar/typescript": "2.4.0-alpha.5",
 		"monaco-languageserver-types": "^0.3.4",
 		"monaco-types": "^0.1.0",
 		"vscode-uri": "^3.0.8"
@@ -22,5 +22,5 @@
 	"devDependencies": {
 		"monaco-editor-core": "latest"
 	},
-	"gitHead": "cb556d64b389cf2ab637f0cb97fee35f3579cfad"
+	"gitHead": "bef4f4bf123264f3b0ce3da11adf1e0da387ce6d"
 }

package/worker.d.ts CHANGED Viewed

@@ -30,47 +30,47 @@ export declare function createSimpleWorkerService<T = {}>({ env, workerContext,
     getSignatureHelpTriggerCharacters: () => string[];
     getSignatureHelpRetriggerCharacters: () => string[];
     executeCommand(command: string, args: any[], token?: import("@volar/language-service").CancellationToken): any;
-    getDocumentFormattingEdits: (_uri: URI | import("@volar/language-service").UriComponents, options: import("@volar/language-service").FormattingOptions, range: import("@volar/language-service").Range | undefined, onTypeParams: {
+    getDocumentFormattingEdits: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, options: import("@volar/language-service").FormattingOptions, range: import("@volar/language-service").Range | undefined, onTypeParams: {
         ch: string;
         position: import("@volar/language-service").Position;
     } | undefined, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").TextEdit[] | undefined>;
-    getFoldingRanges: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").FoldingRange[] | undefined>;
-    getSelectionRanges: (_uri: URI | import("@volar/language-service").UriComponents, positions: import("@volar/language-service").Position[], token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").SelectionRange[] | undefined>;
-    getLinkedEditingRanges: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LinkedEditingRanges | undefined>;
-    getDocumentSymbols: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
-    getDocumentColors: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
-    getColorPresentations: (_uri: URI | import("@volar/language-service").UriComponents, color: import("@volar/language-service").Color, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").ColorPresentation[] | undefined>;
-    getDiagnostics: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken, response?: (result: import("@volar/language-service").Diagnostic[]) => void) => Promise<import("@volar/language-service").Diagnostic[]>;
+    getFoldingRanges: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").FoldingRange[] | undefined>;
+    getSelectionRanges: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, positions: import("@volar/language-service").Position[], token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").SelectionRange[] | undefined>;
+    getLinkedEditingRanges: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LinkedEditingRanges | undefined>;
+    getDocumentSymbols: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
+    getDocumentColors: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
+    getColorPresentations: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, color: import("@volar/language-service").Color, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").ColorPresentation[] | undefined>;
+    getDiagnostics: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken, response?: (result: import("@volar/language-service").Diagnostic[]) => void) => Promise<import("@volar/language-service").Diagnostic[]>;
     getWorkspaceDiagnostics: (token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceDocumentDiagnosticReport[]>;
-    getReferences: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Location[] | undefined>;
+    getReferences: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Location[] | undefined>;
     getFileReferences: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => import("@volar/language-service/lib/types.js").NullableProviderResult<import("@volar/language-service").Location[]>;
-    getDefinition: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    getTypeDefinition: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    getImplementations: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getDefinition: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getTypeDefinition: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getImplementations: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
     getRenameRange: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Range | {
         range: import("@volar/language-service").Range;
         placeholder: string;
     } | {
         message: string;
     } | undefined>;
-    getRenameEdits: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, newName: string, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
+    getRenameEdits: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, newName: string, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
     getFileRenameEdits: (_oldUri: URI | import("@volar/language-service/lib/types.js").UriComponents, _newUri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
-    getSemanticTokens: (_uri: URI | import("@volar/language-service").UriComponents, range: import("@volar/language-service").Range | undefined, legend: import("@volar/language-service").SemanticTokensLegend, token?: import("@volar/language-service").CancellationToken, _reportProgress?: (tokens: import("@volar/language-service").SemanticTokens) => void) => Promise<import("@volar/language-service").SemanticTokens | undefined>;
-    getHover: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Hover | undefined>;
-    getCompletionItems: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, completionContext?: import("@volar/language-service").CompletionContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CompletionList>;
-    getCodeActions: (_uri: URI | import("@volar/language-service").UriComponents, range: import("@volar/language-service").Range, codeActionContext: import("@volar/language-service").CodeActionContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeAction[] | undefined>;
-    getSignatureHelp: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, signatureHelpContext?: import("@volar/language-service").SignatureHelpContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").SignatureHelp | undefined>;
-    getCodeLenses: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeLens[]>;
-    getDocumentHighlights: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentHighlight[] | undefined>;
-    getDocumentLinks: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentLink[]>;
+    getSemanticTokens: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, range: import("@volar/language-service").Range | undefined, legend: import("@volar/language-service").SemanticTokensLegend, token?: import("@volar/language-service").CancellationToken, _reportProgress?: (tokens: import("@volar/language-service").SemanticTokens) => void) => Promise<import("@volar/language-service").SemanticTokens | undefined>;
+    getHover: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Hover | undefined>;
+    getCompletionItems: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, completionContext?: import("@volar/language-service").CompletionContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CompletionList>;
+    getCodeActions: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, range: import("@volar/language-service").Range, codeActionContext: import("@volar/language-service").CodeActionContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeAction[] | undefined>;
+    getSignatureHelp: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, signatureHelpContext?: import("@volar/language-service").SignatureHelpContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").SignatureHelp | undefined>;
+    getCodeLenses: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeLens[]>;
+    getDocumentHighlights: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentHighlight[] | undefined>;
+    getDocumentLinks: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentLink[]>;
     getWorkspaceSymbols: (query: string, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceSymbol[]>;
-    getAutoInsertSnippet: (_uri: URI | import("@volar/language-service").UriComponents, selection: import("@volar/language-service").Position, change: {
+    getAutoInsertSnippet: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, selection: import("@volar/language-service").Position, change: {
         rangeOffset: number;
         rangeLength: number;
         text: string;
     }, token?: import("@volar/language-service").CancellationToken) => Promise<string | undefined>;
     getDocumentDropEdits: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, dataTransfer: Map<string, import("@volar/language-service").DataTransferItem>, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentDropEdit | undefined>;
-    getInlayHints: (_uri: URI | import("@volar/language-service").UriComponents, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").InlayHint[] | undefined>;
+    getInlayHints: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").InlayHint[] | undefined>;
     resolveCodeAction: (item: import("@volar/language-service").CodeAction, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeAction>;
     resolveCompletionItem: (item: import("@volar/language-service").CompletionItem, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CompletionItem>;
     resolveCodeLens: (item: import("@volar/language-service").CodeLens, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeLens>;
@@ -110,47 +110,47 @@ export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts,
     getSignatureHelpTriggerCharacters: () => string[];
     getSignatureHelpRetriggerCharacters: () => string[];
     executeCommand(command: string, args: any[], token?: import("@volar/language-service").CancellationToken): any;
-    getDocumentFormattingEdits: (_uri: URI | import("@volar/language-service").UriComponents, options: import("@volar/language-service").FormattingOptions, range: import("@volar/language-service").Range | undefined, onTypeParams: {
+    getDocumentFormattingEdits: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, options: import("@volar/language-service").FormattingOptions, range: import("@volar/language-service").Range | undefined, onTypeParams: {
         ch: string;
         position: import("@volar/language-service").Position;
     } | undefined, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").TextEdit[] | undefined>;
-    getFoldingRanges: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").FoldingRange[] | undefined>;
-    getSelectionRanges: (_uri: URI | import("@volar/language-service").UriComponents, positions: import("@volar/language-service").Position[], token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").SelectionRange[] | undefined>;
-    getLinkedEditingRanges: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LinkedEditingRanges | undefined>;
-    getDocumentSymbols: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
-    getDocumentColors: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
-    getColorPresentations: (_uri: URI | import("@volar/language-service").UriComponents, color: import("@volar/language-service").Color, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").ColorPresentation[] | undefined>;
-    getDiagnostics: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken, response?: (result: import("@volar/language-service").Diagnostic[]) => void) => Promise<import("@volar/language-service").Diagnostic[]>;
+    getFoldingRanges: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").FoldingRange[] | undefined>;
+    getSelectionRanges: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, positions: import("@volar/language-service").Position[], token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").SelectionRange[] | undefined>;
+    getLinkedEditingRanges: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LinkedEditingRanges | undefined>;
+    getDocumentSymbols: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
+    getDocumentColors: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
+    getColorPresentations: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, color: import("@volar/language-service").Color, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").ColorPresentation[] | undefined>;
+    getDiagnostics: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken, response?: (result: import("@volar/language-service").Diagnostic[]) => void) => Promise<import("@volar/language-service").Diagnostic[]>;
     getWorkspaceDiagnostics: (token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceDocumentDiagnosticReport[]>;
-    getReferences: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Location[] | undefined>;
+    getReferences: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Location[] | undefined>;
     getFileReferences: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => import("@volar/language-service/lib/types.js").NullableProviderResult<import("@volar/language-service").Location[]>;
-    getDefinition: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    getTypeDefinition: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    getImplementations: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getDefinition: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getTypeDefinition: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getImplementations: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
     getRenameRange: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Range | {
         range: import("@volar/language-service").Range;
         placeholder: string;
     } | {
         message: string;
     } | undefined>;
-    getRenameEdits: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, newName: string, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
+    getRenameEdits: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, newName: string, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
     getFileRenameEdits: (_oldUri: URI | import("@volar/language-service/lib/types.js").UriComponents, _newUri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
-    getSemanticTokens: (_uri: URI | import("@volar/language-service").UriComponents, range: import("@volar/language-service").Range | undefined, legend: import("@volar/language-service").SemanticTokensLegend, token?: import("@volar/language-service").CancellationToken, _reportProgress?: (tokens: import("@volar/language-service").SemanticTokens) => void) => Promise<import("@volar/language-service").SemanticTokens | undefined>;
-    getHover: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Hover | undefined>;
-    getCompletionItems: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, completionContext?: import("@volar/language-service").CompletionContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CompletionList>;
-    getCodeActions: (_uri: URI | import("@volar/language-service").UriComponents, range: import("@volar/language-service").Range, codeActionContext: import("@volar/language-service").CodeActionContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeAction[] | undefined>;
-    getSignatureHelp: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, signatureHelpContext?: import("@volar/language-service").SignatureHelpContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").SignatureHelp | undefined>;
-    getCodeLenses: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeLens[]>;
-    getDocumentHighlights: (_uri: URI | import("@volar/language-service").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentHighlight[] | undefined>;
-    getDocumentLinks: (_uri: URI | import("@volar/language-service").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentLink[]>;
+    getSemanticTokens: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, range: import("@volar/language-service").Range | undefined, legend: import("@volar/language-service").SemanticTokensLegend, token?: import("@volar/language-service").CancellationToken, _reportProgress?: (tokens: import("@volar/language-service").SemanticTokens) => void) => Promise<import("@volar/language-service").SemanticTokens | undefined>;
+    getHover: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").Hover | undefined>;
+    getCompletionItems: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, completionContext?: import("@volar/language-service").CompletionContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CompletionList>;
+    getCodeActions: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, range: import("@volar/language-service").Range, codeActionContext: import("@volar/language-service").CodeActionContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeAction[] | undefined>;
+    getSignatureHelp: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, signatureHelpContext?: import("@volar/language-service").SignatureHelpContext, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").SignatureHelp | undefined>;
+    getCodeLenses: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeLens[]>;
+    getDocumentHighlights: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentHighlight[] | undefined>;
+    getDocumentLinks: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentLink[]>;
     getWorkspaceSymbols: (query: string, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceSymbol[]>;
-    getAutoInsertSnippet: (_uri: URI | import("@volar/language-service").UriComponents, selection: import("@volar/language-service").Position, change: {
+    getAutoInsertSnippet: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, selection: import("@volar/language-service").Position, change: {
         rangeOffset: number;
         rangeLength: number;
         text: string;
     }, token?: import("@volar/language-service").CancellationToken) => Promise<string | undefined>;
     getDocumentDropEdits: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, position: import("@volar/language-service").Position, dataTransfer: Map<string, import("@volar/language-service").DataTransferItem>, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").DocumentDropEdit | undefined>;
-    getInlayHints: (_uri: URI | import("@volar/language-service").UriComponents, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").InlayHint[] | undefined>;
+    getInlayHints: (_uri: URI | import("@volar/language-service/lib/types.js").UriComponents, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").InlayHint[] | undefined>;
     resolveCodeAction: (item: import("@volar/language-service").CodeAction, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeAction>;
     resolveCompletionItem: (item: import("@volar/language-service").CompletionItem, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CompletionItem>;
     resolveCodeLens: (item: import("@volar/language-service").CodeLens, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").CodeLens>;