@volar/language-core 2.3.0-alpha.4 → 2.3.0-alpha.6

package/index.d.ts

@@ -3,9 +3,6 @@ export * from './lib/editorFeatures';
 export * from './lib/linkedCodeMap';
 export * from './lib/types';
 export * from './lib/utils';
-import { SourceMap } from '@volar/source-map';
-import type * as ts from 'typescript';
-import type { CodeInformation, Language, LanguagePlugin, SourceScript, VirtualCode } from './lib/types';
+import type { Language, LanguagePlugin, SourceScript, VirtualCode } from './lib/types';
 export declare function createLanguage<T>(plugins: LanguagePlugin<T>[], scriptRegistry: Map<T, SourceScript<T>>, sync: (id: T) => void): Language<T>;
-export declare function updateVirtualCodeMapOfMap<T>(virtualCode: VirtualCode, mapOfMap: Map<T, [ts.IScriptSnapshot, SourceMap<CodeInformation>]>, getSourceSnapshot: (source: string | undefined) => [T, ts.IScriptSnapshot] | undefined): void;
-export declare function forEachEmbeddedCode(virtualCode: VirtualCode): Generator<VirtualCode>;
+export declare function forEachEmbeddedCode<T>(virtualCode: VirtualCode<T>): Generator<VirtualCode<T>>;

package/index.js

@@ -14,7 +14,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 });
-exports.forEachEmbeddedCode = exports.updateVirtualCodeMapOfMap = exports.createLanguage = void 0;
+exports.forEachEmbeddedCode = exports.createLanguage = void 0;
 __exportStar(require("@volar/source-map"), exports);
 __exportStar(require("./lib/editorFeatures"), exports);
 __exportStar(require("./lib/linkedCodeMap"), exports);
@@ -23,12 +23,15 @@ __exportStar(require("./lib/utils"), exports);
 const source_map_1 = require("@volar/source-map");
 const linkedCodeMap_1 = require("./lib/linkedCodeMap");
 function createLanguage(plugins, scriptRegistry, sync) {
-    const virtualCodeToSourceFileMap = new WeakMap();
-    const virtualCodeToMaps = new WeakMap();
+    const virtualCodeToSourceScriptMap = new WeakMap();
+    const virtualCodeToSourceMap = new WeakMap();
     const virtualCodeToLinkedCodeMap = new WeakMap();
     return {
         plugins,
         scripts: {
+            fromVirtualCode(virtualCode) {
+                return virtualCodeToSourceScriptMap.get(virtualCode);
+            },
             get(id) {
                 sync(id);
                 return scriptRegistry.get(id);
@@ -53,16 +56,20 @@ function createLanguage(plugins, scriptRegistry, sync) {
                         this.delete(id);
                         return this.set(id, snapshot, languageId);
                     }
-                    else if (sourceScript.snapshot !== snapshot) {
+                    else if (sourceScript.isAssociationDirty || sourceScript.snapshot !== snapshot) {
                         // snapshot updated
                         sourceScript.snapshot = snapshot;
+                        const codegenCtx = prepareCreateVirtualCode(sourceScript);
                         if (sourceScript.generated) {
-                            const newVirtualCode = sourceScript.generated.languagePlugin.updateVirtualCode?.(id, sourceScript.generated.root, snapshot);
+                            const { updateVirtualCode, createVirtualCode } = sourceScript.generated.languagePlugin;
+                            const newVirtualCode = updateVirtualCode
+                                ? updateVirtualCode(id, sourceScript.generated.root, snapshot, codegenCtx)
+                                : createVirtualCode?.(id, languageId, snapshot, codegenCtx);
                             if (newVirtualCode) {
                                 sourceScript.generated.root = newVirtualCode;
                                 sourceScript.generated.embeddedCodes.clear();
                                 for (const code of forEachEmbeddedCode(sourceScript.generated.root)) {
-                                    virtualCodeToSourceFileMap.set(code, sourceScript);
+                                    virtualCodeToSourceScriptMap.set(code, sourceScript);
                                     sourceScript.generated.embeddedCodes.set(code.id, code);
                                 }
                                 return sourceScript;
@@ -72,6 +79,7 @@ function createLanguage(plugins, scriptRegistry, sync) {
                                 return;
                             }
                         }
+                        triggerTargetsDirty(sourceScript);
                     }
                     else {
                         // not changed
@@ -80,10 +88,16 @@ function createLanguage(plugins, scriptRegistry, sync) {
                 }
                 else {
                     // created
-                    const sourceScript = { id, languageId, snapshot };
+                    const sourceScript = {
+                        id: id,
+                        languageId,
+                        snapshot,
+                        associatedIds: new Set(),
+                        targetIds: new Set(),
+                    };
                     scriptRegistry.set(id, sourceScript);
                     for (const languagePlugin of _plugins) {
-                        const virtualCode = languagePlugin.createVirtualCode?.(id, languageId, snapshot);
+                        const virtualCode = languagePlugin.createVirtualCode?.(id, languageId, snapshot, prepareCreateVirtualCode(sourceScript));
                         if (virtualCode) {
                             sourceScript.generated = {
                                 root: virtualCode,
@@ -91,7 +105,7 @@ function createLanguage(plugins, scriptRegistry, sync) {
                                 embeddedCodes: new Map(),
                             };
                             for (const code of forEachEmbeddedCode(virtualCode)) {
-                                virtualCodeToSourceFileMap.set(code, sourceScript);
+                                virtualCodeToSourceScriptMap.set(code, sourceScript);
                                 sourceScript.generated.embeddedCodes.set(code.id, code);
                             }
                             break;
@@ -101,86 +115,88 @@ function createLanguage(plugins, scriptRegistry, sync) {
                 }
             },
             delete(id) {
-                const value = scriptRegistry.get(id);
-                if (value) {
-                    if (value.generated) {
-                        value.generated.languagePlugin.disposeVirtualCode?.(id, value.generated.root);
-                    }
+                const sourceScript = scriptRegistry.get(id);
+                if (sourceScript) {
+                    sourceScript.generated?.languagePlugin.disposeVirtualCode?.(id, sourceScript.generated.root);
                     scriptRegistry.delete(id);
+                    triggerTargetsDirty(sourceScript);
                 }
             },
         },
         maps: {
-            get(virtualCode, scriptId) {
-                if (!scriptId) {
-                    const sourceScript = virtualCodeToSourceFileMap.get(virtualCode);
-                    if (!sourceScript) {
-                        return;
-                    }
-                    scriptId = sourceScript.id;
-                }
-                for (const [id, [_snapshot, map]] of this.forEach(virtualCode)) {
-                    if (id === scriptId) {
-                        return map;
-                    }
+            get(virtualCode) {
+                for (const map of this.forEach(virtualCode)) {
+                    return map[2];
                 }
+                throw `no map found for ${virtualCode.id}`;
             },
-            forEach(virtualCode) {
-                let map = virtualCodeToMaps.get(virtualCode.snapshot);
-                if (!map) {
-                    map = new Map();
-                    virtualCodeToMaps.set(virtualCode.snapshot, map);
+            *forEach(virtualCode) {
+                let mapCache = virtualCodeToSourceMap.get(virtualCode.snapshot);
+                if (!mapCache) {
+                    virtualCodeToSourceMap.set(virtualCode.snapshot, mapCache = new WeakMap());
                 }
-                updateVirtualCodeMapOfMap(virtualCode, map, id => {
-                    if (id) {
-                        throw 'not implemented';
-                        // const sourceScript = sourceScripts.get(id)!;
-                        // return [id, sourceScript.snapshot];
-                    }
-                    else {
-                        const sourceScript = virtualCodeToSourceFileMap.get(virtualCode);
-                        return [sourceScript.id, sourceScript.snapshot];
+                const sourceScript = virtualCodeToSourceScriptMap.get(virtualCode);
+                if (!mapCache.has(sourceScript.snapshot)) {
+                    mapCache.set(sourceScript.snapshot, new source_map_1.SourceMap(virtualCode.mappings));
+                }
+                yield [sourceScript.id, sourceScript.snapshot, mapCache.get(sourceScript.snapshot)];
+                if (virtualCode.associatedScriptMappings) {
+                    for (const [relatedScriptId, relatedMappings] of virtualCode.associatedScriptMappings) {
+                        const relatedSourceScript = scriptRegistry.get(relatedScriptId);
+                        if (relatedSourceScript) {
+                            if (!mapCache.has(relatedSourceScript.snapshot)) {
+                                mapCache.set(relatedSourceScript.snapshot, new source_map_1.SourceMap(relatedMappings));
+                            }
+                            yield [relatedSourceScript.id, relatedSourceScript.snapshot, mapCache.get(relatedSourceScript.snapshot)];
+                        }
                     }
-                });
-                return map;
+                }
             },
         },
         linkedCodeMaps: {
             get(virtualCode) {
-                if (!virtualCodeToLinkedCodeMap.has(virtualCode.snapshot)) {
-                    virtualCodeToLinkedCodeMap.set(virtualCode.snapshot, virtualCode.linkedCodeMappings
-                        ? new linkedCodeMap_1.LinkedCodeMap(virtualCode.linkedCodeMappings)
-                        : undefined);
+                const sourceScript = virtualCodeToSourceScriptMap.get(virtualCode);
+                let mapCache = virtualCodeToLinkedCodeMap.get(virtualCode.snapshot);
+                if (mapCache?.[0] !== sourceScript.snapshot) {
+                    virtualCodeToLinkedCodeMap.set(virtualCode.snapshot, mapCache = [
+                        sourceScript.snapshot,
+                        virtualCode.linkedCodeMappings
+                            ? new linkedCodeMap_1.LinkedCodeMap(virtualCode.linkedCodeMappings)
+                            : undefined,
+                    ]);
                 }
-                return virtualCodeToLinkedCodeMap.get(virtualCode.snapshot);
+                return mapCache[1];
             },
         },
     };
-}
-exports.createLanguage = createLanguage;
-function updateVirtualCodeMapOfMap(virtualCode, mapOfMap, getSourceSnapshot) {
-    const sources = new Set();
-    if (!virtualCode.mappings.length) {
-        const source = getSourceSnapshot(undefined);
-        if (source) {
-            mapOfMap.set(source[0], [source[1], new source_map_1.SourceMap([])]);
-        }
+    function triggerTargetsDirty(sourceScript) {
+        sourceScript.targetIds.forEach(id => {
+            const sourceScript = scriptRegistry.get(id);
+            if (sourceScript) {
+                sourceScript.isAssociationDirty = true;
+            }
+        });
     }
-    for (const mapping of virtualCode.mappings) {
-        if (sources.has(mapping.source)) {
-            continue;
-        }
-        sources.add(mapping.source);
-        const source = getSourceSnapshot(mapping.source);
-        if (!source) {
-            continue;
-        }
-        if (!mapOfMap.has(source[0]) || mapOfMap.get(source[0])[0] !== source[1]) {
-            mapOfMap.set(source[0], [source[1], new source_map_1.SourceMap(virtualCode.mappings.filter(mapping2 => mapping2.source === mapping.source))]);
+    function prepareCreateVirtualCode(sourceScript) {
+        for (const id of sourceScript.associatedIds) {
+            scriptRegistry.get(id)?.targetIds.delete(sourceScript.id);
         }
+        sourceScript.associatedIds.clear();
+        sourceScript.isAssociationDirty = false;
+        return {
+            getAssociatedScript(id) {
+                sync(id);
+                const relatedSourceScript = scriptRegistry.get(id);
+                if (relatedSourceScript) {
+                    relatedSourceScript.targetIds.add(sourceScript.id);
+                    sourceScript.associatedIds.add(relatedSourceScript.id);
+                }
+                return relatedSourceScript;
+            },
+        };
     }
 }
-exports.updateVirtualCodeMapOfMap = updateVirtualCodeMapOfMap;
+exports.createLanguage = createLanguage;
 function* forEachEmbeddedCode(virtualCode) {
     yield virtualCode;
     if (virtualCode.embeddedCodes) {

package/lib/linkedCodeMap.d.ts

@@ -1,4 +1,4 @@
 import { SourceMap } from '@volar/source-map';
-export declare class LinkedCodeMap extends SourceMap {
+export declare class LinkedCodeMap extends SourceMap<any> {
     getLinkedOffsets(start: number): Generator<number, void, unknown>;
 }

package/lib/types.d.ts

@@ -1,19 +1,20 @@
 import type { Mapping, SourceMap } from '@volar/source-map';
 import type * as ts from 'typescript';
 import type { LinkedCodeMap } from './linkedCodeMap';
-export interface Language<T> {
+export interface Language<T = unknown> {
     plugins: LanguagePlugin<T>[];
     scripts: {
         get(id: T): SourceScript<T> | undefined;
         set(id: T, snapshot: ts.IScriptSnapshot, languageId?: string, plugins?: LanguagePlugin<T>[]): SourceScript<T> | undefined;
         delete(id: T): void;
+        fromVirtualCode(virtualCode: VirtualCode<T>): SourceScript<T>;
     };
     maps: {
-        get(virtualCode: VirtualCode, scriptId?: T): SourceMap<CodeInformation> | undefined;
-        forEach(virtualCode: VirtualCode): Map<T, [ts.IScriptSnapshot, SourceMap<CodeInformation>]>;
+        get(virtualCode: VirtualCode<T>): SourceMap<CodeInformation>;
+        forEach(virtualCode: VirtualCode<T>): Generator<[id: T, snapshot: ts.IScriptSnapshot, map: SourceMap<CodeInformation>]>;
     };
     linkedCodeMaps: {
-        get(virtualCode: VirtualCode): LinkedCodeMap | undefined;
+        get(virtualCode: VirtualCode<T>): LinkedCodeMap | undefined;
     };
     typescript?: {
         configFileName: string | undefined;
@@ -22,28 +23,32 @@ export interface Language<T> {
             sync?(): Promise<number>;
         };
         languageServiceHost: ts.LanguageServiceHost;
-        getExtraServiceScript(fileName: string): [SourceScript<T>, TypeScriptExtraServiceScript] | undefined;
+        getExtraServiceScript(fileName: string): TypeScriptExtraServiceScript<T> | undefined;
         asScriptId(fileName: string): T;
         asFileName(scriptId: T): string;
     };
 }
-export interface SourceScript<T> {
+export interface SourceScript<T = unknown> {
     id: T;
     languageId: string;
     snapshot: ts.IScriptSnapshot;
+    targetIds: Set<T>;
+    associatedIds: Set<T>;
+    isAssociationDirty?: boolean;
     generated?: {
-        root: VirtualCode;
+        root: VirtualCode<T>;
         languagePlugin: LanguagePlugin<T>;
-        embeddedCodes: Map<string, VirtualCode>;
+        embeddedCodes: Map<string, VirtualCode<T>>;
     };
 }
 export type CodeMapping = Mapping<CodeInformation>;
-export interface VirtualCode {
+export interface VirtualCode<T = unknown> {
     id: string;
     languageId: string;
     snapshot: ts.IScriptSnapshot;
     mappings: CodeMapping[];
-    embeddedCodes?: VirtualCode[];
+    associatedScriptMappings?: Map<T, CodeMapping[]>;
+    embeddedCodes?: VirtualCode<T>[];
     linkedCodeMappings?: Mapping[];
 }
 export interface CodeInformation {
@@ -71,39 +76,51 @@ export interface CodeInformation {
     /** virtual code is expected correctly reflect the format information of the source code */
     format?: boolean;
 }
-export interface TypeScriptServiceScript {
-    code: VirtualCode;
+export interface TypeScriptServiceScript<T = unknown> {
+    code: VirtualCode<T>;
     extension: '.ts' | '.js' | '.mts' | '.mjs' | '.cjs' | '.cts' | '.d.ts' | string;
     scriptKind: ts.ScriptKind;
+    /** See #188 */
+    preventLeadingOffset?: boolean;
 }
-export interface TypeScriptExtraServiceScript extends TypeScriptServiceScript {
+export interface TypeScriptExtraServiceScript<T = unknown> extends TypeScriptServiceScript<T> {
     fileName: string;
 }
-export interface LanguagePlugin<T, K extends VirtualCode = VirtualCode> {
+export interface LanguagePlugin<T = unknown, K extends VirtualCode<T> = VirtualCode<T>> {
+    /**
+     * For files that are not opened in the IDE, the language ID will not be synchronized to the language server, so a hook is needed to parse the language ID of files that are known extension but not opened in the IDE.
+     */
     getLanguageId(scriptId: T): string | undefined;
-    createVirtualCode?(scriptId: T, languageId: string, snapshot: ts.IScriptSnapshot): K | undefined;
-    updateVirtualCode?(scriptId: T, virtualCode: K, newSnapshot: ts.IScriptSnapshot): K | undefined;
+    /**
+     * Generate a virtual code.
+     */
+    createVirtualCode?(scriptId: T, languageId: string, snapshot: ts.IScriptSnapshot, ctx: CodegenContext<T>): K | undefined;
+    /**
+     * Incremental update a virtual code. If not provide, call createVirtualCode again.
+     */
+    updateVirtualCode?(scriptId: T, virtualCode: K, newSnapshot: ts.IScriptSnapshot, ctx: CodegenContext<T>): K | undefined;
+    /**
+     * Cleanup a virtual code.
+     */
     disposeVirtualCode?(scriptId: T, virtualCode: K): void;
-    typescript?: {
-        /**
-         * LSP + TS Plugin
-         */
-        extraFileExtensions: ts.FileExtensionInfo[];
-        /**
-         * LSP + TS Plugin
-         */
-        resolveHiddenExtensions?: boolean;
-        /**
-         * LSP + TS Plugin
-         */
-        getServiceScript(rootVirtualCode: K): TypeScriptServiceScript | undefined;
-        /**
-         * LSP only
-         */
-        getExtraServiceScripts?(fileName: string, rootVirtualCode: K): TypeScriptExtraServiceScript[];
-        /**
-         * LSP only
-         */
-        resolveLanguageServiceHost?(host: ts.LanguageServiceHost): ts.LanguageServiceHost;
-    };
+    typescript?: TypeScriptGenericOptions<T, K> & TypeScriptNonTSPluginOptions<T, K>;
+}
+export interface CodegenContext<T = unknown> {
+    getAssociatedScript(scriptId: T): SourceScript<T> | undefined;
+}
+/**
+ * The following options available to all situations.
+ */
+interface TypeScriptGenericOptions<T, K> {
+    extraFileExtensions: ts.FileExtensionInfo[];
+    resolveHiddenExtensions?: boolean;
+    getServiceScript(root: K): TypeScriptServiceScript<T> | undefined;
+}
+/**
+ * The following options will not be available in TS plugin.
+ */
+interface TypeScriptNonTSPluginOptions<T, K> {
+    getExtraServiceScripts?(fileName: string, rootVirtualCode: K): TypeScriptExtraServiceScript<T>[];
+    resolveLanguageServiceHost?(host: ts.LanguageServiceHost): ts.LanguageServiceHost;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "2.3.0-alpha.4",
+	"version": "2.3.0-alpha.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/source-map": "2.3.0-alpha.4"
+		"@volar/source-map": "2.3.0-alpha.6"
 	},
-	"gitHead": "8ab3ce02b06a410e9321eea3e9f23d36f97fedda"
+	"gitHead": "f3103e86be8d80cb36f66be4c054ef9a255c29b1"
 }