@volar/typescript 1.11.1 → 2.0.0-alpha.0

package/lib/typescript/types.d.ts

@@ -4,13 +4,13 @@ export type Path = string & {
 export declare const enum CharacterCodes {
     nullCharacter = 0,
     maxAsciiCharacter = 127,
-    lineFeed = 10,
-    carriageReturn = 13,
+    lineFeed = 10,// \n
+    carriageReturn = 13,// \r
     lineSeparator = 8232,
     paragraphSeparator = 8233,
     nextLine = 133,
-    space = 32,
-    nonBreakingSpace = 160,
+    space = 32,// " "
+    nonBreakingSpace = 160,//
     enQuad = 8192,
     emQuad = 8193,
     enSpace = 8194,
@@ -91,40 +91,39 @@ export declare const enum CharacterCodes {
     X = 88,
     Y = 89,
     Z = 90,
-    ampersand = 38,
-    asterisk = 42,
-    at = 64,
-    backslash = 92,
-    backtick = 96,
-    bar = 124,
-    caret = 94,
-    closeBrace = 125,
-    closeBracket = 93,
-    closeParen = 41,
-    colon = 58,
-    comma = 44,
-    dot = 46,
-    doubleQuote = 34,
-    equals = 61,
-    exclamation = 33,
-    greaterThan = 62,
-    hash = 35,
-    lessThan = 60,
-    minus = 45,
-    openBrace = 123,
-    openBracket = 91,
-    openParen = 40,
-    percent = 37,
-    plus = 43,
-    question = 63,
-    semicolon = 59,
-    singleQuote = 39,
-    slash = 47,
-    tilde = 126,
-    backspace = 8,
-    formFeed = 12,
+    ampersand = 38,// &
+    asterisk = 42,// *
+    at = 64,// @
+    backslash = 92,// \
+    backtick = 96,// `
+    bar = 124,// |
+    caret = 94,// ^
+    closeBrace = 125,// }
+    closeBracket = 93,// ]
+    closeParen = 41,// )
+    colon = 58,// :
+    comma = 44,// ,
+    dot = 46,// .
+    doubleQuote = 34,// "
+    equals = 61,// =
+    exclamation = 33,// !
+    greaterThan = 62,// >
+    hash = 35,// #
+    lessThan = 60,// <
+    minus = 45,// -
+    openBrace = 123,// {
+    openBracket = 91,// [
+    openParen = 40,// (
+    percent = 37,// %
+    plus = 43,// +
+    question = 63,// ?
+    semicolon = 59,// ;
+    singleQuote = 39,// '
+    slash = 47,// /
+    tilde = 126,// ~
+    backspace = 8,// \b
+    formFeed = 12,// \f
     byteOrderMark = 65279,
-    tab = 9,
+    tab = 9,// \t
     verticalTab = 11
 }
-//# sourceMappingURL=types.d.ts.map

package/lib/typescript/utilities.d.ts

@@ -5,4 +5,3 @@ 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/lib/typescript/utilities.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchFiles = void 0;
 const core_1 = require("./core");
 const path_1 = require("./path");
+require("./types");
 // KLUDGE: Don't assume one 'node_modules' links to another. More likely a single directory inside the node_modules is the symlink.
 // ALso, don't assume that an `@foo` directory is linked. More likely the contents of that are linked.
 // Reserved characters, forces escaping of any non-word (or digit), non-whitespace character.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.11.1",
+	"version": "2.0.0-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,12 +12,12 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.11.1",
+		"@volar/language-core": "2.0.0-alpha.0",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "1.11.1"
+		"@volar/language-service": "2.0.0-alpha.0"
 	},
-	"gitHead": "188f49ee79bd2ea8e8fc32b80003c85f79868f9d"
+	"gitHead": "6a6be45a3b7983148d90541e7c68ef84c9155a7a"
 }

package/lib/getProgram.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 getProgram(ts: typeof import('typescript/lib/tsserverlibrary'), core: embedded.LanguageContext, ls: ts.LanguageService, sys: ts.System): ts.Program;
-//# sourceMappingURL=getProgram.d.ts.map

package/lib/languageService.d.ts

@@ -1,4 +0,0 @@
-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/lib/languageService.js

@@ -1,303 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateLanguageService = void 0;
-const language_core_1 = require("@volar/language-core");
-function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
-    const _organizeImports = languageService.organizeImports.bind(languageService);
-    const _getDefinitionAtPosition = languageService.getDefinitionAtPosition.bind(languageService);
-    const _getDefinitionAndBoundSpan = languageService.getDefinitionAndBoundSpan.bind(languageService);
-    const _getTypeDefinitionAtPosition = languageService.getTypeDefinitionAtPosition.bind(languageService);
-    const _getImplementationAtPosition = languageService.getImplementationAtPosition.bind(languageService);
-    const _getFileReferences = languageService.getFileReferences.bind(languageService);
-    const _findRenameLocations = languageService.findRenameLocations.bind(languageService);
-    const _getReferencesAtPosition = languageService.getReferencesAtPosition.bind(languageService);
-    const _findReferences = languageService.findReferences.bind(languageService);
-    languageService.organizeImports = organizeImports;
-    languageService.getDefinitionAtPosition = getDefinitionAtPosition;
-    languageService.getDefinitionAndBoundSpan = getDefinitionAndBoundSpan;
-    languageService.getTypeDefinitionAtPosition = getTypeDefinitionAtPosition;
-    languageService.getImplementationAtPosition = getImplementationAtPosition;
-    languageService.findRenameLocations = findRenameLocations;
-    languageService.getReferencesAtPosition = getReferencesAtPosition;
-    languageService.getFileReferences = getFileReferences;
-    languageService.findReferences = findReferences;
-    // apis
-    function organizeImports(args, formatOptions, preferences) {
-        let edits = [];
-        const file = virtualFiles.getSource(args.fileName)?.root;
-        if (file) {
-            (0, language_core_1.forEachEmbeddedFile)(file, embeddedFile => {
-                if (embeddedFile.kind === language_core_1.FileKind.TypeScriptHostFile && embeddedFile.capabilities.codeAction) {
-                    edits = edits.concat(_organizeImports({
-                        ...args,
-                        fileName: embeddedFile.fileName,
-                    }, formatOptions, preferences));
-                }
-            });
-        }
-        else {
-            return _organizeImports(args, formatOptions, preferences);
-        }
-        return edits.map(transformFileTextChanges).filter(notEmpty);
-    }
-    function getReferencesAtPosition(fileName, position) {
-        return findLocations(fileName, position, 'references');
-    }
-    function getFileReferences(fileName) {
-        return findLocations(fileName, -1, 'fileReferences');
-    }
-    function getDefinitionAtPosition(fileName, position) {
-        return findLocations(fileName, position, 'definition');
-    }
-    function getTypeDefinitionAtPosition(fileName, position) {
-        return findLocations(fileName, position, 'typeDefinition');
-    }
-    function getImplementationAtPosition(fileName, position) {
-        return findLocations(fileName, position, 'implementation');
-    }
-    function findRenameLocations(fileName, position, findInStrings, findInComments, preferences) {
-        return findLocations(fileName, position, 'rename', findInStrings, findInComments, preferences);
-    }
-    function findLocations(fileName, position, mode, findInStrings = false, findInComments = false, preferences) {
-        const loopChecker = new Set();
-        let symbols = [];
-        withMirrors(fileName, position);
-        return symbols.map(s => transformDocumentSpanLike(s, mode === 'definition')).filter(notEmpty);
-        function withMirrors(fileName, position) {
-            if (loopChecker.has(fileName + ':' + position))
-                return;
-            loopChecker.add(fileName + ':' + position);
-            const _symbols = mode === 'definition' ? _getDefinitionAtPosition(fileName, position)
-                : mode === 'typeDefinition' ? _getTypeDefinitionAtPosition(fileName, position)
-                    : mode === 'references' ? _getReferencesAtPosition(fileName, position)
-                        : mode === 'fileReferences' ? _getFileReferences(fileName)
-                            : mode === 'implementation' ? _getImplementationAtPosition(fileName, position)
-                                : mode === 'rename' && preferences ? _findRenameLocations(fileName, position, findInStrings, findInComments, preferences)
-                                    : undefined;
-            if (!_symbols)
-                return;
-            symbols = symbols.concat(_symbols);
-            for (const ref of _symbols) {
-                loopChecker.add(ref.fileName + ':' + ref.textSpan.start);
-                const [virtualFile] = getVirtualFile(ref.fileName);
-                if (!virtualFile)
-                    continue;
-                const mirrorMap = virtualFiles.getMirrorMap(virtualFile);
-                if (!mirrorMap)
-                    continue;
-                for (const [mirrorOffset, data] of mirrorMap.findMirrorOffsets(ref.textSpan.start)) {
-                    if ((mode === 'definition' || mode === 'typeDefinition' || mode === 'implementation') && !data.definition)
-                        continue;
-                    if ((mode === 'references') && !data.references)
-                        continue;
-                    if ((mode === 'rename') && !data.rename)
-                        continue;
-                    if (loopChecker.has(ref.fileName + ':' + mirrorOffset))
-                        continue;
-                    withMirrors(ref.fileName, mirrorOffset);
-                }
-            }
-        }
-    }
-    function getDefinitionAndBoundSpan(fileName, position) {
-        const loopChecker = new Set();
-        let textSpan;
-        let symbols = [];
-        withMirrors(fileName, position);
-        if (!textSpan)
-            return;
-        return {
-            textSpan: textSpan,
-            definitions: symbols?.map(s => transformDocumentSpanLike(s, true)).filter(notEmpty),
-        };
-        function withMirrors(fileName, position) {
-            if (loopChecker.has(fileName + ':' + position))
-                return;
-            loopChecker.add(fileName + ':' + position);
-            const _symbols = _getDefinitionAndBoundSpan(fileName, position);
-            if (!_symbols)
-                return;
-            if (!textSpan) {
-                textSpan = _symbols.textSpan;
-            }
-            if (!_symbols.definitions)
-                return;
-            symbols = symbols.concat(_symbols.definitions);
-            for (const ref of _symbols.definitions) {
-                loopChecker.add(ref.fileName + ':' + ref.textSpan.start);
-                const [virtualFile] = getVirtualFile(ref.fileName);
-                if (!virtualFile)
-                    continue;
-                const mirrorMap = virtualFiles.getMirrorMap(virtualFile);
-                if (!mirrorMap)
-                    continue;
-                for (const [mirrorOffset, data] of mirrorMap.findMirrorOffsets(ref.textSpan.start)) {
-                    if (!data.definition)
-                        continue;
-                    if (loopChecker.has(ref.fileName + ':' + mirrorOffset))
-                        continue;
-                    withMirrors(ref.fileName, mirrorOffset);
-                }
-            }
-        }
-    }
-    function findReferences(fileName, position) {
-        const loopChecker = new Set();
-        let symbols = [];
-        withMirrors(fileName, position);
-        return symbols.map(s => transformReferencedSymbol(s)).filter(notEmpty);
-        function withMirrors(fileName, position) {
-            if (loopChecker.has(fileName + ':' + position))
-                return;
-            loopChecker.add(fileName + ':' + position);
-            const _symbols = _findReferences(fileName, position);
-            if (!_symbols)
-                return;
-            symbols = symbols.concat(_symbols);
-            for (const symbol of _symbols) {
-                for (const ref of symbol.references) {
-                    loopChecker.add(ref.fileName + ':' + ref.textSpan.start);
-                    const [virtualFile] = getVirtualFile(ref.fileName);
-                    if (!virtualFile)
-                        continue;
-                    const mirrorMap = virtualFiles.getMirrorMap(virtualFile);
-                    if (!mirrorMap)
-                        continue;
-                    for (const [mirrorOffset, data] of mirrorMap.findMirrorOffsets(ref.textSpan.start)) {
-                        if (!data.references)
-                            continue;
-                        if (loopChecker.has(ref.fileName + ':' + mirrorOffset))
-                            continue;
-                        withMirrors(ref.fileName, mirrorOffset);
-                    }
-                }
-            }
-        }
-    }
-    // transforms
-    function transformFileTextChanges(changes) {
-        const [_, source] = getVirtualFile(changes.fileName);
-        if (source) {
-            return {
-                ...changes,
-                fileName: source.fileName,
-                textChanges: changes.textChanges.map(c => {
-                    const span = transformSpan(changes.fileName, c.span);
-                    if (span) {
-                        return {
-                            ...c,
-                            span: span.textSpan,
-                        };
-                    }
-                }).filter(notEmpty),
-            };
-        }
-        else {
-            return changes;
-        }
-    }
-    function transformReferencedSymbol(symbol) {
-        const definition = transformDocumentSpanLike(symbol.definition, false);
-        const references = symbol.references.map(r => transformDocumentSpanLike(r, false)).filter(notEmpty);
-        if (definition) {
-            return {
-                definition,
-                references,
-            };
-        }
-        else if (references.length) { // TODO: remove patching
-            return {
-                definition: {
-                    ...symbol.definition,
-                    fileName: references[0].fileName,
-                    textSpan: references[0].textSpan,
-                },
-                references,
-            };
-        }
-    }
-    function transformDocumentSpanLike(documentSpan, isDefinition) {
-        let textSpan = transformSpan(documentSpan.fileName, documentSpan.textSpan);
-        if (isDefinition && !textSpan) {
-            const [virtualFile, source] = getVirtualFile(documentSpan.fileName);
-            if (virtualFile && source) {
-                textSpan = {
-                    fileName: source.fileName,
-                    textSpan: { start: 0, length: 0 },
-                };
-            }
-        }
-        if (!textSpan)
-            return;
-        const contextSpan = transformSpan(documentSpan.fileName, documentSpan.contextSpan);
-        const originalTextSpan = transformSpan(documentSpan.originalFileName, documentSpan.originalTextSpan);
-        const originalContextSpan = transformSpan(documentSpan.originalFileName, documentSpan.originalContextSpan);
-        return {
-            ...documentSpan,
-            fileName: textSpan.fileName,
-            textSpan: textSpan.textSpan,
-            contextSpan: contextSpan?.textSpan,
-            originalFileName: originalTextSpan?.fileName,
-            originalTextSpan: originalTextSpan?.textSpan,
-            originalContextSpan: originalContextSpan?.textSpan,
-        };
-    }
-    function transformSpan(fileName, textSpan) {
-        if (!fileName)
-            return;
-        if (!textSpan)
-            return;
-        const [virtualFile, source] = getVirtualFile(fileName);
-        if (virtualFile && source) {
-            if (isTsPlugin) {
-                textSpan = {
-                    start: textSpan.start - source.snapshot.getLength(),
-                    length: textSpan.length,
-                };
-            }
-            for (const [_, [sourceSnapshot, map]] of virtualFiles.getMaps(virtualFile)) {
-                if (source.snapshot !== sourceSnapshot)
-                    continue;
-                const sourceLoc = map.toSourceOffset(textSpan.start);
-                if (sourceLoc) {
-                    return {
-                        fileName: source.fileName,
-                        textSpan: {
-                            start: sourceLoc[0],
-                            length: textSpan.length,
-                        },
-                    };
-                }
-            }
-        }
-        else {
-            return {
-                fileName,
-                textSpan,
-            };
-        }
-    }
-    function getVirtualFile(fileName) {
-        if (isTsPlugin) {
-            let result;
-            const source = virtualFiles.getSource(fileName);
-            if (source) {
-                (0, language_core_1.forEachEmbeddedFile)(source.root, file => {
-                    const ext = file.fileName.replace(fileName, '');
-                    if (file.kind === language_core_1.FileKind.TypeScriptHostFile && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
-                        result = file;
-                    }
-                });
-            }
-            return [result, source];
-        }
-        else {
-            return virtualFiles.getVirtualFile(fileName);
-        }
-    }
-}
-exports.decorateLanguageService = decorateLanguageService;
-function notEmpty(value) {
-    return value !== null && value !== undefined;
-}
-//# sourceMappingURL=languageService.js.map

package/lib/languageServiceHost.d.ts

@@ -1,6 +0,0 @@
-import type { LanguageContext } from '@volar/language-core';
-import type * as ts from 'typescript/lib/tsserverlibrary';
-export declare function createLanguageServiceHost(ctx: LanguageContext, ts: typeof import('typescript/lib/tsserverlibrary'), sys: ts.System & {
-    version?: number;
-}): ts.LanguageServiceHost;
-//# sourceMappingURL=languageServiceHost.d.ts.map