@volar/language-core 1.4.0 → 1.5.0-alpha.0

package/out/languageContext.d.ts

@@ -1,9 +1,9 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import { LanguageModule, LanguageServiceHost } from './types';
+import { Language, LanguageServiceHost } from './types';
 export type LanguageContext = ReturnType<typeof createLanguageContext>;
-export declare function createLanguageContext(host: LanguageServiceHost, modules: {
+export declare function createLanguageContext(modules: {
     typescript?: typeof import('typescript/lib/tsserverlibrary');
-}, languageModules: LanguageModule[]): {
+}, host: LanguageServiceHost, languages: Language[]): {
     typescript: {
         languageServiceHost: ts.LanguageServiceHost;
     };

package/out/languageContext.js

@@ -4,23 +4,15 @@ exports.createLanguageContext = void 0;
 const path_1 = require("path");
 const virtualFiles_1 = require("./virtualFiles");
 const types_1 = require("./types");
-function createLanguageContext(host, modules, languageModules) {
-    for (const languageModule of languageModules.reverse()) {
-        if (languageModule.proxyLanguageServiceHost) {
-            const proxyApis = languageModule.proxyLanguageServiceHost(host);
-            host = new Proxy(host, {
-                get(target, key) {
-                    if (key in proxyApis) {
-                        return proxyApis[key];
-                    }
-                    return target[key];
-                },
-            });
+function createLanguageContext(modules, host, languages) {
+    for (const language of languages.reverse()) {
+        if (language.resolveHost) {
+            host = language.resolveHost(host);
         }
     }
     let lastProjectVersion;
     let tsProjectVersion = 0;
-    const virtualFiles = (0, virtualFiles_1.createVirtualFiles)(languageModules);
+    const virtualFiles = (0, virtualFiles_1.createVirtualFiles)(languages);
     const ts = modules.typescript;
     const scriptSnapshots = new Map();
     const sourceTsFileVersions = new Map();

package/out/types.d.ts

@@ -52,11 +52,11 @@ export interface VirtualFile {
     mirrorBehaviorMappings?: Mapping<[MirrorBehaviorCapabilities, MirrorBehaviorCapabilities]>[];
     embeddedFiles: VirtualFile[];
 }
-export interface LanguageModule<T extends VirtualFile = VirtualFile> {
-    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 Language<T extends VirtualFile = VirtualFile> {
+    resolveHost?(host: LanguageServiceHost): LanguageServiceHost;
+    createVirtualFile(fileName: string, snapshot: ts.IScriptSnapshot, languageId: string | undefined): T | undefined;
+    updateVirtualFile(virtualFile: T, snapshot: ts.IScriptSnapshot): void;
+    deleteVirtualFile?(virtualFile: T): void;
 }
 export interface LanguageServiceHost extends ts.LanguageServiceHost {
     getScriptLanguageId?(fileName: string): string | undefined;

package/out/types.js

@@ -37,5 +37,4 @@ var FileKind;
     FileKind[FileKind["TextFile"] = 0] = "TextFile";
     FileKind[FileKind["TypeScriptHostFile"] = 1] = "TypeScriptHostFile";
 })(FileKind = exports.FileKind || (exports.FileKind = {}));
-;
 //# sourceMappingURL=types.js.map

package/out/virtualFiles.d.ts

@@ -1,15 +1,15 @@
 import { SourceMap } from '@volar/source-map';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import { MirrorMap } from './sourceMaps';
-import type { FileRangeCapabilities, LanguageModule, VirtualFile } from './types';
+import type { FileRangeCapabilities, Language, VirtualFile } from './types';
 export type VirtualFiles = ReturnType<typeof createVirtualFiles>;
 export interface Source {
     fileName: string;
     snapshot: ts.IScriptSnapshot;
     root: VirtualFile;
-    languageModule: LanguageModule;
+    language: Language;
 }
-export declare function createVirtualFiles(languageModules: LanguageModule[]): {
+export declare function createVirtualFiles(languages: Language[]): {
     allSources(): Source[];
     updateSource(fileName: string, snapshot: ts.IScriptSnapshot, languageId: string | undefined): VirtualFile | undefined;
     deleteSource(fileName: string): void;

package/out/virtualFiles.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.forEachEmbeddedFile = exports.createVirtualFiles = void 0;
 const source_map_1 = require("@volar/source-map");
 const sourceMaps_1 = require("./sourceMaps");
-function createVirtualFiles(languageModules) {
+function createVirtualFiles(languages) {
     const sourceFiles = new Map();
     const virtualFiles = new Map();
     const virtualFileToSourceMapsMap = new WeakMap();
@@ -18,14 +18,14 @@ function createVirtualFiles(languageModules) {
             const value = sourceFiles.get(key);
             if (value) {
                 value.snapshot = snapshot;
-                value.languageModule.updateFile(value.root, snapshot);
+                value.language.updateVirtualFile(value.root, snapshot);
                 sourceFilesDirty = true;
                 return value.root; // updated
             }
-            for (const languageModule of languageModules) {
-                const virtualFile = languageModule.createFile(fileName, snapshot, languageId);
+            for (const language of languages) {
+                const virtualFile = language.createVirtualFile(fileName, snapshot, languageId);
                 if (virtualFile) {
-                    sourceFiles.set(key, { fileName, snapshot, root: virtualFile, languageModule });
+                    sourceFiles.set(key, { fileName, snapshot, root: virtualFile, language });
                     sourceFilesDirty = true;
                     return virtualFile; // created
                 }
@@ -35,7 +35,7 @@ function createVirtualFiles(languageModules) {
             const key = normalizePath(fileName);
             const value = sourceFiles.get(key);
             if (value) {
-                value.languageModule.deleteFile?.(value.root);
+                value.language.deleteVirtualFile?.(value.root);
                 sourceFiles.delete(key); // deleted
                 sourceFilesDirty = true;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "1.4.0",
+	"version": "1.5.0-alpha.0",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/source-map": "1.4.0"
+		"@volar/source-map": "1.5.0-alpha.0"
 	},
-	"gitHead": "9bf14ef0d08c53f9ae32cf538d9748fa91cc4ab7"
+	"gitHead": "a4e1b3766ccb5affe1613cad7630513b9073d275"
 }