@volar/language-core 1.0.24 → 1.1.0-alpha.1

package/out/languageContext.d.ts

@@ -7,7 +7,7 @@ export declare function createLanguageContext(host: LanguageServiceHost, languag
     };
     virtualFiles: {
         allSources(): import("./virtualFiles").Source[];
-        updateSource(fileName: string, snapshot: ts.IScriptSnapshot): import("./types").VirtualFile | undefined;
+        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;

package/out/languageContext.js

@@ -4,6 +4,7 @@ const path_1 = require("path");
 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);
@@ -20,7 +21,7 @@ function createLanguageContext(host, languageModules) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
     const virtualFiles = (0, virtualFiles_1.createVirtualFiles)(languageModules);
-    const ts = host.getTypeScriptModule();
+    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,7 +29,7 @@ function createLanguageContext(host, languageModules) {
     const _tsHost = {
         fileExists: host.fileExists
             ? fileName => {
-                var _a;
+                var _a, _b;
                 const ext = fileName.substring(fileName.lastIndexOf('.'));
                 if (ext === '.js'
                     || ext === '.ts'
@@ -45,14 +46,14 @@ function createLanguageContext(host, languageModules) {
                     if (!virtualFiles.hasSource(sourceFileName)) {
                         const scriptSnapshot = host.getScriptSnapshot(sourceFileName);
                         if (scriptSnapshot) {
-                            virtualFiles.updateSource(sourceFileName, scriptSnapshot);
+                            virtualFiles.updateSource(sourceFileName, scriptSnapshot, (_a = host.getScriptLanguageId) === null || _a === void 0 ? void 0 : _a.call(host, sourceFileName));
                         }
                     }
                 }
                 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: () => {
@@ -111,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;
@@ -135,7 +136,7 @@ function createLanguageContext(host, languageModules) {
             if (sourceFileVersions.get(fileName) !== newVersion) {
                 // update
                 sourceFileVersions.set(fileName, newVersion);
-                virtualFiles.updateSource(fileName, snapshot);
+                virtualFiles.updateSource(fileName, snapshot, (_b = host.getScriptLanguageId) === null || _b === void 0 ? void 0 : _b.call(host, fileName));
                 virtualFilesUpdatedNum++;
             }
         }
@@ -147,7 +148,7 @@ function createLanguageContext(host, languageModules) {
         for (const fileName of [...remainRootFiles]) {
             const snapshot = host.getScriptSnapshot(fileName);
             if (snapshot) {
-                const virtualFile = virtualFiles.updateSource(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);
                 }

package/out/types.d.ts

@@ -55,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/virtualFiles.d.ts

@@ -10,7 +10,7 @@ export interface Source {
 }
 export declare function createVirtualFiles(languageModules: LanguageModule[]): {
     allSources(): Source[];
-    updateSource(fileName: string, snapshot: ts.IScriptSnapshot): VirtualFile | undefined;
+    updateSource(fileName: string, snapshot: ts.IScriptSnapshot, languageId: string | undefined): VirtualFile | undefined;
     deleteSource(fileName: string): void;
     getSource(fileName: string): Source | undefined;
     hasSource: (fileName: string) => boolean;

package/out/virtualFiles.js

@@ -12,7 +12,7 @@ function createVirtualFiles(languageModules) {
         allSources() {
             return Array.from(sourceFiles.values());
         },
-        updateSource(fileName, snapshot) {
+        updateSource(fileName, snapshot, languageId) {
             const key = normalizePath(fileName);
             const value = sourceFiles.get(key);
             if (value) {
@@ -22,7 +22,7 @@ function createVirtualFiles(languageModules) {
                 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, root: virtualFile, languageModule });
                     sourceFilesDirty = true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "1.0.24",
+	"version": "1.1.0-alpha.1",
 	"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/framework.git",
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/source-map": "1.0.24",
+		"@volar/source-map": "1.1.0-alpha.1",
 		"muggle-string": "^0.1.0"
 	},
-	"gitHead": "46da609e8914e29642f4707dec31507ad51b03fc"
+	"gitHead": "85666d83fafb0be442c55defb64fb0128b73bc0b"
 }