volar-service-typescript 0.0.6 → 0.0.8

package/out/index.js

@@ -82,7 +82,7 @@ exports.default = (options) => (contextOrNull, modules) => {
         return {};
     }
     const ts = modules.typescript;
-    const sys = (0, typescript_1.createSys)(context, ts, context.env, options?.dtsHost);
+    const sys = (0, typescript_1.createSys)(ts, context.env, options?.dtsHost);
     const languageServiceHost = (0, typescript_1.createLanguageServiceHost)(context, ts, sys);
     const created = tsFaster.createLanguageService(ts, sys, languageServiceHost, proxiedHost => ts.createLanguageService(proxiedHost, (0, typescript_1.getDocumentRegistry)(ts, sys.useCaseSensitiveFileNames, context.host.getCurrentDirectory())));
     const { languageService } = created;

package/out/protocol.const.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventName = exports.DisplayPartKind = exports.KindModifiers = exports.DiagnosticCategory = exports.Kind = void 0;
 class Kind {
 }
+exports.Kind = Kind;
 Kind.alias = 'alias';
 Kind.callSignature = 'call';
 Kind.class = 'class';
@@ -37,15 +38,15 @@ Kind.warning = 'warning';
 Kind.string = 'string';
 Kind.parameter = 'parameter';
 Kind.typeParameter = 'type parameter';
-exports.Kind = Kind;
 class DiagnosticCategory {
 }
+exports.DiagnosticCategory = DiagnosticCategory;
 DiagnosticCategory.error = 'error';
 DiagnosticCategory.warning = 'warning';
 DiagnosticCategory.suggestion = 'suggestion';
-exports.DiagnosticCategory = DiagnosticCategory;
 class KindModifiers {
 }
+exports.KindModifiers = KindModifiers;
 KindModifiers.optional = 'optional';
 KindModifiers.deprecated = 'deprecated';
 KindModifiers.color = 'color';
@@ -63,16 +64,15 @@ KindModifiers.fileExtensionKindModifiers = [
     KindModifiers.jsxFile,
     KindModifiers.jsonFile,
 ];
-exports.KindModifiers = KindModifiers;
 class DisplayPartKind {
 }
+exports.DisplayPartKind = DisplayPartKind;
 DisplayPartKind.functionName = 'functionName';
 DisplayPartKind.methodName = 'methodName';
 DisplayPartKind.parameterName = 'parameterName';
 DisplayPartKind.propertyName = 'propertyName';
 DisplayPartKind.punctuation = 'punctuation';
 DisplayPartKind.text = 'text';
-exports.DisplayPartKind = DisplayPartKind;
 var EventName;
 (function (EventName) {
     EventName["syntaxDiag"] = "syntaxDiag";
@@ -88,5 +88,5 @@ var EventName;
     EventName["surveyReady"] = "surveyReady";
     EventName["projectLoadingStart"] = "projectLoadingStart";
     EventName["projectLoadingFinish"] = "projectLoadingFinish";
-})(EventName = exports.EventName || (exports.EventName = {}));
+})(EventName || (exports.EventName = EventName = {}));
 //# sourceMappingURL=protocol.const.js.map

package/out/utils/typeConverters.js

@@ -59,5 +59,5 @@ var SymbolKind;
         }
     }
     SymbolKind.fromProtocolScriptElementKind = fromProtocolScriptElementKind;
-})(SymbolKind = exports.SymbolKind || (exports.SymbolKind = {}));
+})(SymbolKind || (exports.SymbolKind = SymbolKind = {}));
 //# sourceMappingURL=typeConverters.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.6",
+	"version": "0.0.8",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -14,7 +14,7 @@
 	},
 	"devDependencies": {
 		"@types/semver": "^7.3.13",
-		"@volar/typescript": "1.7.1"
+		"@volar/typescript": "1.7.7"
 	},
 	"dependencies": {
 		"semver": "^7.3.8",
@@ -24,7 +24,13 @@
 		"vscode-uri": "^3.0.7"
 	},
 	"peerDependencies": {
+		"@volar/language-service": "*",
 		"@volar/typescript": "*"
 	},
-	"gitHead": "a4ee5d50ec7d4c37c7b24e019ee0ee2d701bb8bb"
+	"peerDependenciesMeta": {
+		"@volar/language-service": {
+			"optional": true
+		}
+	},
+	"gitHead": "b3a5b5642bd39d0542a113cd06743f968b053458"
 }

package/out/languageServiceHost.d.ts

@@ -1,3 +0,0 @@
-import type { ServiceContext } from '@volar/language-service';
-import type * as ts from 'typescript/lib/tsserverlibrary';
-export declare function createLanguageServiceHost(context: ServiceContext, ts: typeof import('typescript/lib/tsserverlibrary')): ts.LanguageServiceHost;

package/out/languageServiceHost.js

@@ -1,199 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLanguageServiceHost = void 0;
-const path_1 = require("path");
-function createLanguageServiceHost(context, ts) {
-    let lastProjectVersion;
-    let tsProjectVersion = 0;
-    const host = context.host;
-    const virtualFiles = context.core.virtualFiles;
-    const _tsHost = {
-        fileExists: host.fileExists
-            ? fileName => {
-                const ext = fileName.substring(fileName.lastIndexOf('.'));
-                if (ext === '.js'
-                    || ext === '.ts'
-                    || ext === '.jsx'
-                    || ext === '.tsx') {
-                    /**
-                     * If try to access a external .vue file that outside of the project,
-                     * the file will not process by language service host,
-                     * so virtual file will not be created.
-                     *
-                     * We try to create virtual file here.
-                     */
-                    const sourceFileName = fileName.substring(0, fileName.lastIndexOf('.'));
-                    if (!virtualFiles.hasSource(sourceFileName)) {
-                        const scriptSnapshot = host.getScriptSnapshot(sourceFileName);
-                        if (scriptSnapshot) {
-                            virtualFiles.updateSource(sourceFileName, scriptSnapshot, host.getScriptLanguageId?.(sourceFileName));
-                        }
-                    }
-                }
-                if (virtualFiles.hasVirtualFile(fileName)) {
-                    return true;
-                }
-                return !!host.fileExists?.(fileName);
-            }
-            : undefined,
-        getProjectVersion: () => {
-            return host.getTypeRootsVersion?.() + ':' + tsProjectVersion.toString();
-        },
-        getTypeRootsVersion: host.getTypeRootsVersion,
-        getScriptFileNames,
-        getScriptVersion,
-        getScriptSnapshot,
-        readDirectory: (_path, extensions, exclude, include, depth) => {
-            const result = host.readDirectory?.(_path, extensions, exclude, include, depth) ?? [];
-            for (const { fileName } of virtualFiles.allSources()) {
-                const vuePath2 = path_1.posix.join(_path, path_1.posix.basename(fileName));
-                if (path_1.posix.relative(_path.toLowerCase(), fileName.toLowerCase()).startsWith('..')) {
-                    continue;
-                }
-                if (!depth && fileName.toLowerCase() === vuePath2.toLowerCase()) {
-                    result.push(vuePath2);
-                }
-                else if (depth) {
-                    result.push(vuePath2); // TODO: depth num
-                }
-            }
-            return result;
-        },
-        getScriptKind(fileName) {
-            if (ts) {
-                if (virtualFiles.hasSource(fileName))
-                    return ts.ScriptKind.Deferred;
-                switch (path_1.posix.extname(fileName)) {
-                    case '.js': return ts.ScriptKind.JS;
-                    case '.jsx': return ts.ScriptKind.JSX;
-                    case '.ts': return ts.ScriptKind.TS;
-                    case '.tsx': return ts.ScriptKind.TSX;
-                    case '.json': return ts.ScriptKind.JSON;
-                    default: return ts.ScriptKind.Unknown;
-                }
-            }
-            return 0;
-        },
-    };
-    const scriptSnapshots = new Map();
-    const virtualFileVersions = new Map();
-    return new Proxy(_tsHost, {
-        get: (target, property) => {
-            update();
-            return target[property] || host[property];
-        },
-    });
-    function update() {
-        const newProjectVersion = host.getProjectVersion?.();
-        const shouldUpdate = newProjectVersion === undefined || newProjectVersion !== lastProjectVersion;
-        if (!shouldUpdate)
-            return;
-        lastProjectVersion = newProjectVersion;
-        const oldTsVirtualFileSnapshots = new Set();
-        const oldOtherVirtualFileSnapshots = new Set();
-        const newTsVirtualFileSnapshots = new Set();
-        const newOtherVirtualFileSnapshots = new Set();
-        for (const { root } of virtualFiles.allSources()) {
-            forEachEmbeddedFile(root, embedded => {
-                if (embedded.kind === 1) {
-                    oldTsVirtualFileSnapshots.add(embedded.snapshot);
-                }
-                else {
-                    oldOtherVirtualFileSnapshots.add(embedded.snapshot);
-                }
-            });
-        }
-        context.core.update();
-        for (const { root } of virtualFiles.allSources()) {
-            forEachEmbeddedFile(root, embedded => {
-                if (embedded.kind === 1) {
-                    newTsVirtualFileSnapshots.add(embedded.snapshot);
-                }
-                else {
-                    newOtherVirtualFileSnapshots.add(embedded.snapshot);
-                }
-            });
-        }
-        if (!setEquals(oldTsVirtualFileSnapshots, newTsVirtualFileSnapshots)) {
-            tsProjectVersion++;
-        }
-        else if (setEquals(oldOtherVirtualFileSnapshots, newOtherVirtualFileSnapshots)) {
-            // no any meta language files update, it mean project version was update by source files this time
-            tsProjectVersion++;
-        }
-    }
-    function getScriptFileNames() {
-        const tsFileNames = new Set();
-        for (const { root: rootVirtualFile } of virtualFiles.allSources()) {
-            forEachEmbeddedFile(rootVirtualFile, embedded => {
-                if (embedded.kind === 1) {
-                    tsFileNames.add(embedded.fileName); // virtual .ts
-                }
-            });
-        }
-        for (const fileName of host.getScriptFileNames()) {
-            if (!virtualFiles.hasSource(fileName)) {
-                tsFileNames.add(fileName); // .ts
-            }
-        }
-        return [...tsFileNames];
-    }
-    function getScriptSnapshot(fileName) {
-        const version = getScriptVersion(fileName);
-        const cache = scriptSnapshots.get(fileName.toLowerCase());
-        if (cache && cache[0] === version) {
-            return cache[1];
-        }
-        const [virtualFile] = virtualFiles.getVirtualFile(fileName);
-        if (virtualFile) {
-            const snapshot = virtualFile.snapshot;
-            scriptSnapshots.set(fileName.toLowerCase(), [version, snapshot]);
-            return snapshot;
-        }
-        let tsScript = host.getScriptSnapshot(fileName);
-        if (tsScript) {
-            scriptSnapshots.set(fileName.toLowerCase(), [version, tsScript]);
-            return tsScript;
-        }
-    }
-    function getScriptVersion(fileName) {
-        let [virtualFile, source] = virtualFiles.getVirtualFile(fileName);
-        if (virtualFile && source) {
-            let version = virtualFileVersions.get(virtualFile.fileName);
-            if (!version) {
-                version = {
-                    value: 0,
-                    virtualFileSnapshot: virtualFile.snapshot,
-                    sourceFileSnapshot: source.snapshot,
-                };
-                virtualFileVersions.set(virtualFile.fileName, version);
-            }
-            else if (version.virtualFileSnapshot !== virtualFile.snapshot
-                || (host.isTsc && version.sourceFileSnapshot !== source.snapshot) // fix https://github.com/johnsoncodehk/volar/issues/1082
-            ) {
-                version.value++;
-                version.virtualFileSnapshot = virtualFile.snapshot;
-                version.sourceFileSnapshot = source.snapshot;
-            }
-            return version.value.toString();
-        }
-        return host.getScriptVersion(fileName);
-    }
-}
-exports.createLanguageServiceHost = createLanguageServiceHost;
-function setEquals(a, b) {
-    if (a.size !== b.size)
-        return false;
-    for (const item of a) {
-        if (!b.has(item))
-            return false;
-    }
-    return true;
-}
-function forEachEmbeddedFile(file, cb) {
-    cb(file);
-    for (const embeddedFile of file.embeddedFiles) {
-        forEachEmbeddedFile(embeddedFile, cb);
-    }
-}
-//# sourceMappingURL=languageServiceHost.js.map

package/out/services/callHierarchy.d.ts

@@ -1,7 +0,0 @@
-import type * as vscode from '@volar/language-service';
-import { SharedContext } from '../types';
-export declare function register(ctx: SharedContext): {
-    doPrepare: (uri: string, position: vscode.Position) => vscode.CallHierarchyItem[];
-    getIncomingCalls: (item: vscode.CallHierarchyItem) => vscode.CallHierarchyIncomingCall[];
-    getOutgoingCalls: (item: vscode.CallHierarchyItem) => vscode.CallHierarchyOutgoingCall[];
-};

package/out/services/callHierarchy.js

@@ -1,125 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.register = void 0;
-const PConst = __importStar(require("../protocol.const"));
-const modifiers_1 = require("../utils/modifiers");
-const typeConverters = __importStar(require("../utils/typeConverters"));
-const path_1 = require("path");
-const shared_1 = require("../shared");
-function register(ctx) {
-    function doPrepare(uri, position) {
-        const document = ctx.getTextDocument(uri);
-        if (!document)
-            return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
-        const offset = document.offsetAt(position);
-        const calls = (0, shared_1.safeCall)(() => ctx.typescript.languageService.prepareCallHierarchy(fileName, offset));
-        if (!calls)
-            return [];
-        const items = Array.isArray(calls) ? calls : [calls];
-        return items.map(item => fromProtocolCallHierarchyItem(item));
-    }
-    function getIncomingCalls(item) {
-        const document = ctx.getTextDocument(item.uri);
-        if (!document)
-            return [];
-        const fileName = ctx.env.uriToFileName(item.uri);
-        const offset = document.offsetAt(item.selectionRange.start);
-        const calls = (0, shared_1.safeCall)(() => ctx.typescript.languageService.provideCallHierarchyIncomingCalls(fileName, offset));
-        if (!calls)
-            return [];
-        const items = Array.isArray(calls) ? calls : [calls];
-        return items.map(item => fromProtocolCallHierarchyIncomingCall(item));
-    }
-    function getOutgoingCalls(item) {
-        const document = ctx.getTextDocument(item.uri);
-        if (!document)
-            return [];
-        const fileName = ctx.env.uriToFileName(item.uri);
-        const offset = document.offsetAt(item.selectionRange.start);
-        const calls = (0, shared_1.safeCall)(() => ctx.typescript.languageService.provideCallHierarchyOutgoingCalls(fileName, offset));
-        if (!calls)
-            return [];
-        const items = Array.isArray(calls) ? calls : [calls];
-        return items.map(item => fromProtocolCallHierarchyOutgoingCall(item, document));
-    }
-    return {
-        doPrepare,
-        getIncomingCalls,
-        getOutgoingCalls,
-    };
-    function isSourceFileItem(item) {
-        return item.kind === PConst.Kind.script || item.kind === PConst.Kind.module && item.selectionSpan.start === 0;
-    }
-    function fromProtocolCallHierarchyItem(item) {
-        const rootPath = ctx.typescript.languageService.getProgram()?.getCompilerOptions().rootDir ?? '';
-        const document = ctx.getTextDocument(ctx.env.fileNameToUri(item.file)); // TODO
-        const useFileName = isSourceFileItem(item);
-        const name = useFileName ? path_1.posix.basename(item.file) : item.name;
-        const detail = useFileName ? path_1.posix.relative(rootPath, path_1.posix.dirname(item.file)) : item.containerName ?? '';
-        const result = {
-            kind: typeConverters.SymbolKind.fromProtocolScriptElementKind(item.kind),
-            name,
-            detail,
-            uri: ctx.env.fileNameToUri(item.file),
-            range: {
-                start: document.positionAt(item.span.start),
-                end: document.positionAt(item.span.start + item.span.length),
-            },
-            selectionRange: {
-                start: document.positionAt(item.selectionSpan.start),
-                end: document.positionAt(item.selectionSpan.start + item.selectionSpan.length),
-            },
-        };
-        const kindModifiers = item.kindModifiers ? (0, modifiers_1.parseKindModifier)(item.kindModifiers) : undefined;
-        if (kindModifiers?.has(PConst.KindModifiers.deprecated)) {
-            result.tags = [1];
-        }
-        return result;
-    }
-    function fromProtocolCallHierarchyIncomingCall(item) {
-        const document = ctx.getTextDocument(ctx.env.fileNameToUri(item.from.file));
-        return {
-            from: fromProtocolCallHierarchyItem(item.from),
-            fromRanges: item.fromSpans.map(fromSpan => ({
-                start: document.positionAt(fromSpan.start),
-                end: document.positionAt(fromSpan.start + fromSpan.length),
-            })),
-        };
-    }
-    function fromProtocolCallHierarchyOutgoingCall(item, document) {
-        return {
-            to: fromProtocolCallHierarchyItem(item.to),
-            fromRanges: item.fromSpans.map(fromSpan => ({
-                start: document.positionAt(fromSpan.start),
-                end: document.positionAt(fromSpan.start + fromSpan.length),
-            })),
-        };
-    }
-}
-exports.register = register;
-;
-//# sourceMappingURL=callHierarchy.js.map

package/out/services/codeAction.d.ts

@@ -1,26 +0,0 @@
-import type * as vscode from '@volar/language-service';
-import { SharedContext } from '../types';
-export interface FixAllData {
-    type: 'fixAll';
-    uri: string;
-    fileName: string;
-    fixIds: {}[];
-}
-export interface RefactorData {
-    type: 'refactor';
-    uri: string;
-    fileName: string;
-    refactorName: string;
-    actionName: string;
-    range: {
-        pos: number;
-        end: number;
-    };
-}
-export interface OrganizeImportsData {
-    type: 'organizeImports';
-    uri: string;
-    fileName: string;
-}
-export type Data = FixAllData | RefactorData | OrganizeImportsData;
-export declare function register(ctx: SharedContext): (uri: string, range: vscode.Range, context: vscode.CodeActionContext) => Promise<vscode.CodeAction[] | undefined>;