@volar/language-core 1.0.22 → 1.1.0-1.2.0-alpha.1.0

package/out/index.d.ts

@@ -1,4 +1,4 @@
-export * from './documentRegistry';
+export * from './virtualFiles';
 export * from './languageContext';
 export * from './sourceMaps';
 export * from './types';

package/out/index.js

@@ -13,7 +13,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./documentRegistry"), exports);
+__exportStar(require("./virtualFiles"), exports);
 __exportStar(require("./languageContext"), exports);
 __exportStar(require("./sourceMaps"), exports);
 __exportStar(require("./types"), exports);

package/out/languageContext.d.ts

@@ -6,13 +6,14 @@ export declare function createLanguageContext(host: LanguageServiceHost, languag
         languageServiceHost: ts.LanguageServiceHost;
     };
     virtualFiles: {
-        all: Map<string, [string, ts.IScriptSnapshot, import("./types").VirtualFile, LanguageModule<import("./types").VirtualFile>]>;
-        update(fileName: string, snapshot: ts.IScriptSnapshot): import("./types").VirtualFile | undefined;
-        delete(fileName: string): void;
-        get(fileName: string): readonly [ts.IScriptSnapshot, import("./types").VirtualFile] | undefined;
-        hasSourceFile: (fileName: string) => boolean;
+        allSources(): import("./virtualFiles").Source[];
+        updateSource(fileName: string, snapshot: ts.IScriptSnapshot, languageId: string | undefined): import("./types").VirtualFile | undefined;
+        deleteSource(fileName: string): void;
+        getSource(fileName: string): import("./virtualFiles").Source | undefined;
+        hasSource: (fileName: string) => boolean;
         getMirrorMap: (file: import("./types").VirtualFile) => import("./sourceMaps").MirrorMap | undefined;
         getMaps: (virtualFile: import("./types").VirtualFile) => [string, import("@volar/source-map").SourceMap<import("./types").FileRangeCapabilities>][];
-        getSourceByVirtualFileName(fileName: string): readonly [string, ts.IScriptSnapshot, import("./types").VirtualFile] | undefined;
+        hasVirtualFile(fileName: string): boolean;
+        getVirtualFile(fileName: string): readonly [import("./types").VirtualFile, import("./virtualFiles").Source] | readonly [undefined, undefined];
     };
 };

package/out/languageContext.js

@@ -1,9 +1,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLanguageContext = void 0;
 const path_1 = require("path");
-const documentRegistry_1 = require("./documentRegistry");
+const virtualFiles_1 = require("./virtualFiles");
 const types_1 = require("./types");
 function createLanguageContext(host, languageModules) {
+    var _a;
     for (const languageModule of languageModules.reverse()) {
         if (languageModule.proxyLanguageServiceHost) {
             const proxyApis = languageModule.proxyLanguageServiceHost(host);
@@ -19,8 +20,8 @@ function createLanguageContext(host, languageModules) {
     }
     let lastProjectVersion;
     let tsProjectVersion = 0;
-    const virtualFiles = (0, documentRegistry_1.createVirtualFiles)(languageModules);
-    const ts = host.getTypeScriptModule();
+    const virtualFiles = (0, virtualFiles_1.createVirtualFiles)(languageModules);
+    const ts = (_a = host.getTypeScriptModule) === null || _a === void 0 ? void 0 : _a.call(host);
     const scriptSnapshots = new Map();
     const sourceTsFileVersions = new Map();
     const sourceFileVersions = new Map();
@@ -28,22 +29,31 @@ function createLanguageContext(host, languageModules) {
     const _tsHost = {
         fileExists: host.fileExists
             ? fileName => {
-                var _a;
-                // .vue.js -> .vue
-                // .vue.ts -> .vue
-                // .vue.d.ts -> [ignored]
-                const vueFileName = fileName.substring(0, fileName.lastIndexOf('.'));
-                if (!virtualFiles.hasSourceFile(vueFileName)) {
-                    // create virtual files
-                    const scriptSnapshot = host.getScriptSnapshot(vueFileName);
-                    if (scriptSnapshot) {
-                        virtualFiles.update(vueFileName, scriptSnapshot);
+                var _a, _b;
+                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, (_a = host.getScriptLanguageId) === null || _a === void 0 ? void 0 : _a.call(host, sourceFileName));
+                        }
                     }
                 }
-                if (virtualFiles.getSourceByVirtualFileName(fileName)) {
+                if (virtualFiles.hasVirtualFile(fileName)) {
                     return true;
                 }
-                return !!((_a = host.fileExists) === null || _a === void 0 ? void 0 : _a.call(host, fileName));
+                return !!((_b = host.fileExists) === null || _b === void 0 ? void 0 : _b.call(host, fileName));
             }
             : undefined,
         getProjectVersion: () => {
@@ -55,7 +65,7 @@ function createLanguageContext(host, languageModules) {
         readDirectory: (_path, extensions, exclude, include, depth) => {
             var _a, _b;
             const result = (_b = (_a = host.readDirectory) === null || _a === void 0 ? void 0 : _a.call(host, _path, extensions, exclude, include, depth)) !== null && _b !== void 0 ? _b : [];
-            for (const [, [fileName]] of virtualFiles.all) {
+            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;
@@ -71,7 +81,7 @@ function createLanguageContext(host, languageModules) {
         },
         getScriptKind(fileName) {
             if (ts) {
-                if (virtualFiles.hasSourceFile(fileName))
+                if (virtualFiles.hasSource(fileName))
                     return ts.ScriptKind.Deferred;
                 switch (path_1.posix.extname(fileName)) {
                     case '.js': return ts.ScriptKind.JS;
@@ -102,7 +112,7 @@ function createLanguageContext(host, languageModules) {
         }),
     };
     function update() {
-        var _a;
+        var _a, _b, _c;
         const newProjectVersion = (_a = host.getProjectVersion) === null || _a === void 0 ? void 0 : _a.call(host);
         const shouldUpdate = newProjectVersion === undefined || newProjectVersion !== lastProjectVersion;
         lastProjectVersion = newProjectVersion;
@@ -112,12 +122,12 @@ function createLanguageContext(host, languageModules) {
         let virtualFilesUpdatedNum = 0;
         const remainRootFiles = new Set(host.getScriptFileNames());
         // .vue
-        for (const [_, [fileName]] of virtualFiles.all) {
+        for (const { fileName } of virtualFiles.allSources()) {
             remainRootFiles.delete(fileName);
             const snapshot = host.getScriptSnapshot(fileName);
             if (!snapshot) {
                 // delete
-                virtualFiles.delete(fileName);
+                virtualFiles.deleteSource(fileName);
                 shouldUpdateTsProject = true;
                 virtualFilesUpdatedNum++;
                 continue;
@@ -126,7 +136,7 @@ function createLanguageContext(host, languageModules) {
             if (sourceFileVersions.get(fileName) !== newVersion) {
                 // update
                 sourceFileVersions.set(fileName, newVersion);
-                virtualFiles.update(fileName, snapshot);
+                virtualFiles.updateSource(fileName, snapshot, (_b = host.getScriptLanguageId) === null || _b === void 0 ? void 0 : _b.call(host, fileName));
                 virtualFilesUpdatedNum++;
             }
         }
@@ -138,7 +148,7 @@ function createLanguageContext(host, languageModules) {
         for (const fileName of [...remainRootFiles]) {
             const snapshot = host.getScriptSnapshot(fileName);
             if (snapshot) {
-                const virtualFile = virtualFiles.update(fileName, snapshot);
+                const virtualFile = virtualFiles.updateSource(fileName, snapshot, (_c = host.getScriptLanguageId) === null || _c === void 0 ? void 0 : _c.call(host, fileName));
                 if (virtualFile) {
                     remainRootFiles.delete(fileName);
                 }
@@ -167,9 +177,9 @@ function createLanguageContext(host, languageModules) {
                 shouldUpdateTsProject = true;
             }
         }
-        for (const [_, [_1, _2, virtualFile]] of virtualFiles.all) {
+        for (const { root: rootVirtualFile } of virtualFiles.allSources()) {
             if (!shouldUpdateTsProject) {
-                (0, documentRegistry_1.forEachEmbeddedFile)(virtualFile, embedded => {
+                (0, virtualFiles_1.forEachEmbeddedFile)(rootVirtualFile, embedded => {
                     var _a;
                     if (embedded.kind === types_1.FileKind.TypeScriptHostFile) {
                         if (virtualFileVersions.has(embedded.fileName) && ((_a = virtualFileVersions.get(embedded.fileName)) === null || _a === void 0 ? void 0 : _a.virtualFileSnapshot) !== embedded.snapshot) {
@@ -185,38 +195,38 @@ function createLanguageContext(host, languageModules) {
     }
     function getScriptFileNames() {
         const tsFileNames = new Set();
-        for (const [_, [_1, _2, sourceFile]] of virtualFiles.all) {
-            (0, documentRegistry_1.forEachEmbeddedFile)(sourceFile, embedded => {
+        for (const { root: rootVirtualFile } of virtualFiles.allSources()) {
+            (0, virtualFiles_1.forEachEmbeddedFile)(rootVirtualFile, embedded => {
                 if (embedded.kind === types_1.FileKind.TypeScriptHostFile) {
                     tsFileNames.add(embedded.fileName); // virtual .ts
                 }
             });
         }
         for (const fileName of host.getScriptFileNames()) {
-            if (!virtualFiles.hasSourceFile(fileName)) {
+            if (!virtualFiles.hasSource(fileName)) {
                 tsFileNames.add(fileName); // .ts
             }
         }
         return [...tsFileNames];
     }
     function getScriptVersion(fileName) {
-        let source = virtualFiles.getSourceByVirtualFileName(fileName);
-        if (source) {
-            let version = virtualFileVersions.get(source[2].fileName);
+        let [virtualFile, source] = virtualFiles.getVirtualFile(fileName);
+        if (virtualFile && source) {
+            let version = virtualFileVersions.get(virtualFile.fileName);
             if (!version) {
                 version = {
                     value: 0,
-                    virtualFileSnapshot: source[2].snapshot,
-                    sourceFileSnapshot: source[1],
+                    virtualFileSnapshot: virtualFile.snapshot,
+                    sourceFileSnapshot: source.snapshot,
                 };
-                virtualFileVersions.set(source[2].fileName, version);
+                virtualFileVersions.set(virtualFile.fileName, version);
             }
-            else if (version.virtualFileSnapshot !== source[2].snapshot
-                || (host.isTsc && version.sourceFileSnapshot !== source[1]) // fix https://github.com/johnsoncodehk/volar/issues/1082
+            else if (version.virtualFileSnapshot !== virtualFile.snapshot
+                || (host.isTsc && version.sourceFileSnapshot !== source.snapshot) // fix https://github.com/johnsoncodehk/volar/issues/1082
             ) {
                 version.value++;
-                version.virtualFileSnapshot = source[2].snapshot;
-                version.sourceFileSnapshot = source[1];
+                version.virtualFileSnapshot = virtualFile.snapshot;
+                version.sourceFileSnapshot = source.snapshot;
             }
             return version.value.toString();
         }
@@ -228,9 +238,9 @@ function createLanguageContext(host, languageModules) {
         if (cache && cache[0] === version) {
             return cache[1];
         }
-        const source = virtualFiles.getSourceByVirtualFileName(fileName);
-        if (source) {
-            const snapshot = source[2].snapshot;
+        const [virtualFile] = virtualFiles.getVirtualFile(fileName);
+        if (virtualFile) {
+            const snapshot = virtualFile.snapshot;
             scriptSnapshots.set(fileName.toLowerCase(), [version, snapshot]);
             return snapshot;
         }

package/out/types.d.ts

@@ -32,6 +32,15 @@ export interface MirrorBehaviorCapabilities {
     definition?: boolean;
     rename?: boolean;
 }
+export declare namespace FileCapabilities {
+    const full: FileCapabilities;
+}
+export declare namespace FileRangeCapabilities {
+    const full: FileRangeCapabilities;
+}
+export declare namespace MirrorBehaviorCapabilities {
+    const full: MirrorBehaviorCapabilities;
+}
 export declare enum FileKind {
     TextFile = 0,
     TypeScriptHostFile = 1
@@ -46,12 +55,13 @@ export interface VirtualFile {
     embeddedFiles: VirtualFile[];
 }
 export interface LanguageModule<T extends VirtualFile = VirtualFile> {
-    createFile(fileName: string, snapshot: ts.IScriptSnapshot): T | undefined;
+    createFile(fileName: string, snapshot: ts.IScriptSnapshot, languageId: string | undefined): T | undefined;
     updateFile(virtualFile: T, snapshot: ts.IScriptSnapshot): void;
     deleteFile?(virtualFile: T): void;
     proxyLanguageServiceHost?(host: LanguageServiceHost): Partial<LanguageServiceHost>;
 }
 export interface LanguageServiceHost extends ts.LanguageServiceHost {
-    getTypeScriptModule(): typeof import('typescript/lib/tsserverlibrary') | undefined;
+    getTypeScriptModule?(): typeof import('typescript/lib/tsserverlibrary');
+    getScriptLanguageId?(fileName: string): string | undefined;
     isTsc?: boolean;
 }

package/out/types.js

@@ -1,5 +1,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileKind = void 0;
+exports.FileKind = exports.MirrorBehaviorCapabilities = exports.FileRangeCapabilities = exports.FileCapabilities = void 0;
+var FileCapabilities;
+(function (FileCapabilities) {
+    FileCapabilities.full = {
+        diagnostic: true,
+        foldingRange: true,
+        documentFormatting: true,
+        documentSymbol: true,
+        codeAction: true,
+        inlayHint: true,
+    };
+})(FileCapabilities = exports.FileCapabilities || (exports.FileCapabilities = {}));
+var FileRangeCapabilities;
+(function (FileRangeCapabilities) {
+    FileRangeCapabilities.full = {
+        hover: true,
+        references: true,
+        definition: true,
+        rename: true,
+        completion: true,
+        diagnostic: true,
+        semanticTokens: true,
+    };
+})(FileRangeCapabilities = exports.FileRangeCapabilities || (exports.FileRangeCapabilities = {}));
+var MirrorBehaviorCapabilities;
+(function (MirrorBehaviorCapabilities) {
+    MirrorBehaviorCapabilities.full = {
+        references: true,
+        definition: true,
+        rename: true,
+    };
+})(MirrorBehaviorCapabilities = exports.MirrorBehaviorCapabilities || (exports.MirrorBehaviorCapabilities = {}));
 var FileKind;
 (function (FileKind) {
     FileKind[FileKind["TextFile"] = 0] = "TextFile";

package/out/virtualFiles.d.ts

@@ -0,0 +1,22 @@
+import { SourceMap } from '@volar/source-map';
+import { MirrorMap } from './sourceMaps';
+import type { LanguageModule, FileRangeCapabilities, VirtualFile } from './types';
+export type VirtualFiles = ReturnType<typeof createVirtualFiles>;
+export interface Source {
+    fileName: string;
+    snapshot: ts.IScriptSnapshot;
+    root: VirtualFile;
+    languageModule: LanguageModule;
+}
+export declare function createVirtualFiles(languageModules: LanguageModule[]): {
+    allSources(): Source[];
+    updateSource(fileName: string, snapshot: ts.IScriptSnapshot, languageId: string | undefined): VirtualFile | undefined;
+    deleteSource(fileName: string): void;
+    getSource(fileName: string): Source | undefined;
+    hasSource: (fileName: string) => boolean;
+    getMirrorMap: (file: VirtualFile) => MirrorMap | undefined;
+    getMaps: (virtualFile: VirtualFile) => [string, SourceMap<FileRangeCapabilities>][];
+    hasVirtualFile(fileName: string): boolean;
+    getVirtualFile(fileName: string): readonly [VirtualFile, Source] | readonly [undefined, undefined];
+};
+export declare function forEachEmbeddedFile(file: VirtualFile, cb: (embedded: VirtualFile) => void): void;

package/out/{documentRegistry.js → virtualFiles.js}

@@ -9,59 +9,53 @@ function createVirtualFiles(languageModules) {
     const virtualFileToMirrorMap = new WeakMap();
     let sourceFilesDirty = true;
     return {
-        all: sourceFiles,
-        update(fileName, snapshot) {
+        allSources() {
+            return Array.from(sourceFiles.values());
+        },
+        updateSource(fileName, snapshot, languageId) {
             const key = normalizePath(fileName);
             const value = sourceFiles.get(key);
             if (value) {
-                const virtualFile = value[2];
-                value[1] = snapshot;
-                value[3].updateFile(virtualFile, snapshot);
+                value.snapshot = snapshot;
+                value.languageModule.updateFile(value.root, snapshot);
                 sourceFilesDirty = true;
-                return virtualFile; // updated
+                return value.root; // updated
             }
             for (const languageModule of languageModules) {
-                const virtualFile = languageModule.createFile(fileName, snapshot);
+                const virtualFile = languageModule.createFile(fileName, snapshot, languageId);
                 if (virtualFile) {
-                    sourceFiles.set(key, [fileName, snapshot, virtualFile, languageModule]);
+                    sourceFiles.set(key, { fileName, snapshot, root: virtualFile, languageModule });
                     sourceFilesDirty = true;
                     return virtualFile; // created
                 }
             }
         },
-        delete(fileName) {
+        deleteSource(fileName) {
             var _a, _b;
             const key = normalizePath(fileName);
             const value = sourceFiles.get(key);
             if (value) {
-                const virtualFile = value[2];
-                (_b = (_a = value[3]).deleteFile) === null || _b === void 0 ? void 0 : _b.call(_a, virtualFile);
+                (_b = (_a = value.languageModule).deleteFile) === null || _b === void 0 ? void 0 : _b.call(_a, value.root);
                 sourceFiles.delete(key); // deleted
                 sourceFilesDirty = true;
             }
         },
-        get(fileName) {
+        getSource(fileName) {
             const key = normalizePath(fileName);
-            const value = sourceFiles.get(key);
-            if (value) {
-                return [
-                    value[1],
-                    value[2],
-                ];
-            }
+            return sourceFiles.get(key);
         },
-        hasSourceFile: (fileName) => sourceFiles.has(normalizePath(fileName)),
+        hasSource: (fileName) => sourceFiles.has(normalizePath(fileName)),
         getMirrorMap: getMirrorMap,
         getMaps: getSourceMaps,
-        getSourceByVirtualFileName(fileName) {
-            const source = getVirtualFilesMap().get(normalizePath(fileName));
-            if (source) {
-                return [
-                    source[1][0],
-                    source[1][1],
-                    source[0],
-                ];
+        hasVirtualFile(fileName) {
+            return !!getVirtualFilesMap().get(normalizePath(fileName));
+        },
+        getVirtualFile(fileName) {
+            const sourceAndVirtual = getVirtualFilesMap().get(normalizePath(fileName));
+            if (sourceAndVirtual) {
+                return [sourceAndVirtual.virtualFile, sourceAndVirtual.source];
             }
+            return [undefined, undefined];
         },
     };
     function getVirtualFilesMap() {
@@ -69,8 +63,8 @@ function createVirtualFiles(languageModules) {
             sourceFilesDirty = false;
             virtualFiles.clear();
             for (const [_, row] of sourceFiles) {
-                forEachEmbeddedFile(row[2], file => {
-                    virtualFiles.set(normalizePath(file.fileName), [file, row]);
+                forEachEmbeddedFile(row.root, file => {
+                    virtualFiles.set(normalizePath(file.fileName), { virtualFile: file, source: row });
                 });
             }
         }
@@ -87,7 +81,7 @@ function createVirtualFiles(languageModules) {
             sources.add(map.source);
         }
         for (const source of sources) {
-            const sourceFileName = source !== null && source !== void 0 ? source : getVirtualFilesMap().get(normalizePath(virtualFile.fileName))[1][0];
+            const sourceFileName = source !== null && source !== void 0 ? source : getVirtualFilesMap().get(normalizePath(virtualFile.fileName)).source.fileName;
             if (!sourceMapsBySourceFileName.has(sourceFileName)) {
                 sourceMapsBySourceFileName.set(sourceFileName, [
                     sourceFileName,
@@ -115,4 +109,4 @@ exports.forEachEmbeddedFile = forEachEmbeddedFile;
 function normalizePath(fileName) {
     return fileName.replace(/\\/g, '/').toLowerCase();
 }
-//# sourceMappingURL=documentRegistry.js.map
+//# sourceMappingURL=virtualFiles.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "1.0.22",
+	"version": "1.1.0-1.2.0-alpha.1.0",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -9,12 +9,12 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/johnsoncodehk/volar.git",
+		"url": "https://github.com/volarjs/volar.js.git",
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/source-map": "1.0.22",
+		"@volar/source-map": "1.1.0-1.2.0-alpha.1.0",
 		"muggle-string": "^0.1.0"
 	},
-	"gitHead": "eed05323d6fe1d8eda712f63bb765ba57bdd40ae"
+	"gitHead": "ffc1267f2766722751551182ce1e717be661247a"
 }

package/out/documentRegistry.d.ts

@@ -1,22 +0,0 @@
-import { SourceMap } from '@volar/source-map';
-import { MirrorMap } from './sourceMaps';
-import type { LanguageModule, FileRangeCapabilities, VirtualFile } from './types';
-export type VirtualFiles = ReturnType<typeof createVirtualFiles>;
-type Source = [
-    string,
-    ts.IScriptSnapshot,
-    VirtualFile,
-    LanguageModule
-];
-export declare function createVirtualFiles(languageModules: LanguageModule[]): {
-    all: Map<string, Source>;
-    update(fileName: string, snapshot: ts.IScriptSnapshot): VirtualFile | undefined;
-    delete(fileName: string): void;
-    get(fileName: string): readonly [import("typescript/lib/tsserverlibrary").IScriptSnapshot, VirtualFile] | undefined;
-    hasSourceFile: (fileName: string) => boolean;
-    getMirrorMap: (file: VirtualFile) => MirrorMap | undefined;
-    getMaps: (virtualFile: VirtualFile) => [string, SourceMap<FileRangeCapabilities>][];
-    getSourceByVirtualFileName(fileName: string): readonly [string, import("typescript/lib/tsserverlibrary").IScriptSnapshot, VirtualFile] | undefined;
-};
-export declare function forEachEmbeddedFile(file: VirtualFile, cb: (embedded: VirtualFile) => void): void;
-export {};