@volar/language-core 2.3.0-alpha.7 → 2.3.0-alpha.9

package/index.js

@@ -34,6 +34,11 @@ function createLanguage(plugins, scriptRegistry, sync) {
             },
             get(id) {
                 sync(id);
+                const result = scriptRegistry.get(id);
+                // The sync function provider may not always call the set function due to caching, so it is necessary to explicitly check isAssociationDirty.
+                if (result?.isAssociationDirty) {
+                    this.set(id, result.snapshot, result.languageId);
+                }
                 return scriptRegistry.get(id);
             },
             set(id, snapshot, languageId, _plugins = plugins) {
@@ -49,13 +54,22 @@ function createLanguage(plugins, scriptRegistry, sync) {
                     console.warn(`languageId not found for ${id}`);
                     return;
                 }
+                let associatedOnly = false;
+                for (const plugin of plugins) {
+                    if (plugin.isAssociatedFileOnly?.(id, languageId)) {
+                        associatedOnly = true;
+                        break;
+                    }
+                }
                 if (scriptRegistry.has(id)) {
                     const sourceScript = scriptRegistry.get(id);
-                    if (sourceScript.languageId !== languageId) {
-                        // languageId changed
+                    if (sourceScript.languageId !== languageId || sourceScript.associatedOnly !== associatedOnly) {
                         this.delete(id);
                         return this.set(id, snapshot, languageId);
                     }
+                    else if (associatedOnly) {
+                        sourceScript.snapshot = snapshot;
+                    }
                     else if (sourceScript.isAssociationDirty || sourceScript.snapshot !== snapshot) {
                         // snapshot updated
                         sourceScript.snapshot = snapshot;
@@ -94,8 +108,12 @@ function createLanguage(plugins, scriptRegistry, sync) {
                         snapshot,
                         associatedIds: new Set(),
                         targetIds: new Set(),
+                        associatedOnly
                     };
                     scriptRegistry.set(id, sourceScript);
+                    if (associatedOnly) {
+                        return sourceScript;
+                    }
                     for (const languagePlugin of _plugins) {
                         const virtualCode = languagePlugin.createVirtualCode?.(id, languageId, snapshot, prepareCreateVirtualCode(sourceScript));
                         if (virtualCode) {
@@ -124,30 +142,32 @@ function createLanguage(plugins, scriptRegistry, sync) {
             },
         },
         maps: {
-            get(virtualCode) {
-                for (const map of this.forEach(virtualCode)) {
-                    return map[2];
-                }
-                throw `no map found for ${virtualCode.id}`;
-            },
-            *forEach(virtualCode) {
+            get(virtualCode, sourceScript, mappings) {
                 let mapCache = virtualCodeToSourceMap.get(virtualCode.snapshot);
                 if (!mapCache) {
                     virtualCodeToSourceMap.set(virtualCode.snapshot, mapCache = new WeakMap());
                 }
-                const sourceScript = virtualCodeToSourceScriptMap.get(virtualCode);
                 if (!mapCache.has(sourceScript.snapshot)) {
-                    mapCache.set(sourceScript.snapshot, new source_map_1.SourceMap(virtualCode.mappings));
+                    mapCache.set(sourceScript.snapshot, new source_map_1.SourceMap(mappings ?? virtualCode.mappings));
                 }
-                yield [sourceScript.id, sourceScript.snapshot, mapCache.get(sourceScript.snapshot)];
+                return mapCache.get(sourceScript.snapshot);
+            },
+            *forEach(virtualCode) {
+                const sourceScript = virtualCodeToSourceScriptMap.get(virtualCode);
+                yield [
+                    sourceScript.id,
+                    sourceScript.snapshot,
+                    this.get(virtualCode, sourceScript),
+                ];
                 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)];
+                            yield [
+                                relatedSourceScript.id,
+                                relatedSourceScript.snapshot,
+                                this.get(virtualCode, relatedSourceScript, relatedMappings),
+                            ];
                         }
                     }
                 }

package/lib/types.d.ts

@@ -10,7 +10,7 @@ export interface Language<T = unknown> {
         fromVirtualCode(virtualCode: VirtualCode): SourceScript<T>;
     };
     maps: {
-        get(virtualCode: VirtualCode): SourceMap<CodeInformation>;
+        get(virtualCode: VirtualCode, sourceScript: SourceScript<T>, mappings?: Mapping<CodeInformation>[]): SourceMap<CodeInformation>;
         forEach(virtualCode: VirtualCode): Generator<[id: T, snapshot: ts.IScriptSnapshot, map: SourceMap<CodeInformation>]>;
     };
     linkedCodeMaps: {
@@ -34,6 +34,7 @@ export interface SourceScript<T = unknown> {
     snapshot: ts.IScriptSnapshot;
     targetIds: Set<T>;
     associatedIds: Set<T>;
+    associatedOnly: boolean;
     isAssociationDirty?: boolean;
     generated?: {
         root: VirtualCode;
@@ -103,6 +104,13 @@ export interface LanguagePlugin<T = unknown, K extends VirtualCode = VirtualCode
      * Cleanup a virtual code.
      */
     disposeVirtualCode?(scriptId: T, virtualCode: K): void;
+    /**
+     * Some file types should not be parsed or processed as TypeScript files,
+     * as they are used only as sources for generated files.
+     *
+     * This functionality is required only in TS plugin mode.
+     */
+    isAssociatedFileOnly?(scriptId: T, languageId: string): boolean;
     typescript?: TypeScriptGenericOptions<K> & TypeScriptNonTSPluginOptions<K>;
 }
 export interface CodegenContext<T = unknown> {

package/package.json

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