@volar/language-core 2.0.4 → 2.1.0

package/lib/fileRegistry.d.ts

@@ -4,14 +4,14 @@ import { LinkedCodeMap } from './linkedCodeMap';
 import type { CodeInformation, LanguagePlugin, SourceFile, VirtualCode } from './types';
 export type FileRegistry = ReturnType<typeof createFileRegistry>;
 export declare function createFileRegistry(languagePlugins: LanguagePlugin[], caseSensitive: boolean, sync: (id: string) => void): {
-    languagePlugins: LanguagePlugin<VirtualCode<string>>[];
-    set(id: string, languageId: string, snapshot: ts.IScriptSnapshot): SourceFile;
+    languagePlugins: LanguagePlugin<VirtualCode>[];
+    set(id: string, languageId: string, snapshot: ts.IScriptSnapshot, plugins?: LanguagePlugin<VirtualCode>[]): SourceFile;
     delete(id: string): void;
     get(id: string): SourceFile | undefined;
     getByVirtualCode(virtualCode: VirtualCode): SourceFile;
     getLinkedCodeMap(virtualCode: VirtualCode): LinkedCodeMap | undefined;
     getMaps(virtualCode: VirtualCode): Map<string, [ts.IScriptSnapshot, SourceMap<CodeInformation>]>;
-    getVirtualCode(sourceFileId: string, virtualCodeId: string): readonly [VirtualCode<string>, SourceFile] | readonly [undefined, undefined];
+    getVirtualCode(sourceFileId: string, virtualCodeId: string): readonly [VirtualCode, SourceFile] | readonly [undefined, undefined];
 };
 export declare function updateVirtualCodeMaps(virtualCode: VirtualCode, getSourceSnapshot: (sourceUri: string | undefined) => [string, ts.IScriptSnapshot] | undefined, map?: Map<string, [ts.IScriptSnapshot, SourceMap<CodeInformation>]>): Map<string, [ts.IScriptSnapshot, SourceMap<CodeInformation>]>;
 export declare function forEachEmbeddedCode(code: VirtualCode): Generator<VirtualCode>;

package/lib/fileRegistry.js

@@ -11,7 +11,7 @@ function createFileRegistry(languagePlugins, caseSensitive, sync) {
     const virtualCodeToLinkedCodeMap = new WeakMap();
     return {
         languagePlugins,
-        set(id, languageId, snapshot) {
+        set(id, languageId, snapshot, plugins = languagePlugins) {
             const value = sourceFiles.get(id);
             if (value) {
                 if (value.languageId !== languageId) {
@@ -38,7 +38,7 @@ function createFileRegistry(languagePlugins, caseSensitive, sync) {
             // created
             const sourceFile = { id, languageId, snapshot };
             sourceFiles.set(id, sourceFile);
-            for (const languagePlugin of languagePlugins) {
+            for (const languagePlugin of plugins) {
                 const virtualCode = languagePlugin.createVirtualCode(id, languageId, snapshot, this);
                 if (virtualCode) {
                     sourceFile.generated = {
@@ -127,8 +127,10 @@ function updateVirtualCodeMaps(virtualCode, getSourceSnapshot, map = new Map())
 exports.updateVirtualCodeMaps = updateVirtualCodeMaps;
 function* forEachEmbeddedCode(code) {
     yield code;
-    for (const embeddedCode of code.embeddedCodes) {
-        yield* forEachEmbeddedCode(embeddedCode);
+    if (code.embeddedCodes) {
+        for (const embeddedCode of code.embeddedCodes) {
+            yield* forEachEmbeddedCode(embeddedCode);
+        }
     }
 }
 exports.forEachEmbeddedCode = forEachEmbeddedCode;

package/lib/types.d.ts

@@ -14,12 +14,12 @@ export interface SourceFile {
     };
 }
 export type CodeMapping = Mapping<CodeInformation>;
-export interface VirtualCode<T extends string = string> {
-    id: T;
+export interface VirtualCode {
+    id: string;
     languageId: string;
     snapshot: ts.IScriptSnapshot;
     mappings: CodeMapping[];
-    embeddedCodes: VirtualCode[];
+    embeddedCodes?: VirtualCode[];
     codegenStacks?: Stack[];
     linkedCodeMappings?: Mapping[];
 }
@@ -92,5 +92,5 @@ export interface LanguageContext {
     };
 }
 export interface TypeScriptProjectHost extends Pick<ts.LanguageServiceHost, 'getLocalizedDiagnosticMessages' | 'getCompilationSettings' | 'getProjectReferences' | 'getCurrentDirectory' | 'getScriptFileNames' | 'getProjectVersion' | 'getScriptSnapshot'> {
-    getLanguageId(fileName: string): string;
+    getLanguageId(fileId: string): string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "2.0.4",
+	"version": "2.1.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/source-map": "2.0.4"
+		"@volar/source-map": "2.1.0"
 	},
-	"gitHead": "b3dc544424c95f8b72e832fbaa0f85a34442389b"
+	"gitHead": "09e1792f0adafb02caf89a5a45a6fcaaf3177808"
 }