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

package/index.d.ts

@@ -1,8 +1,9 @@
-export * from '@volar/source-map';
+export { Mapping } from '@volar/source-map';
 export * from './lib/editorFeatures';
 export * from './lib/linkedCodeMap';
 export * from './lib/types';
 export * from './lib/utils';
-import type { Language, LanguagePlugin, SourceScript, VirtualCode } from './lib/types';
+import type { Language, LanguagePlugin, MapperFactory, SourceScript, VirtualCode } from './lib/types';
+export declare const defaultMapperFactory: MapperFactory;
 export declare function createLanguage<T>(plugins: LanguagePlugin<T>[], scriptRegistry: Map<T, SourceScript<T>>, sync: (id: T) => void): Language<T>;
 export declare function forEachEmbeddedCode(virtualCode: VirtualCode): Generator<VirtualCode>;

package/index.js

@@ -14,19 +14,23 @@ 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.createLanguage = void 0;
-__exportStar(require("@volar/source-map"), exports);
+exports.defaultMapperFactory = void 0;
+exports.createLanguage = createLanguage;
+exports.forEachEmbeddedCode = forEachEmbeddedCode;
 __exportStar(require("./lib/editorFeatures"), exports);
 __exportStar(require("./lib/linkedCodeMap"), exports);
 __exportStar(require("./lib/types"), exports);
 __exportStar(require("./lib/utils"), exports);
 const source_map_1 = require("@volar/source-map");
 const linkedCodeMap_1 = require("./lib/linkedCodeMap");
+const defaultMapperFactory = mappings => new source_map_1.SourceMap(mappings);
+exports.defaultMapperFactory = defaultMapperFactory;
 function createLanguage(plugins, scriptRegistry, sync) {
     const virtualCodeToSourceScriptMap = new WeakMap();
     const virtualCodeToSourceMap = new WeakMap();
     const virtualCodeToLinkedCodeMap = new WeakMap();
-    return {
+    const language = {
+        mapperFactory: exports.defaultMapperFactory,
         plugins,
         scripts: {
             fromVirtualCode(virtualCode) {
@@ -142,31 +146,30 @@ function createLanguage(plugins, scriptRegistry, sync) {
             },
         },
         maps: {
-            get(virtualCode, sourceScript, mappings) {
+            get(virtualCode, sourceScript) {
                 let mapCache = virtualCodeToSourceMap.get(virtualCode.snapshot);
                 if (!mapCache) {
                     virtualCodeToSourceMap.set(virtualCode.snapshot, mapCache = new WeakMap());
                 }
                 if (!mapCache.has(sourceScript.snapshot)) {
-                    mapCache.set(sourceScript.snapshot, new source_map_1.SourceMap(mappings ?? virtualCode.mappings));
+                    const mappings = virtualCode.associatedScriptMappings?.get(sourceScript.id) ?? virtualCode.mappings;
+                    mapCache.set(sourceScript.snapshot, language.mapperFactory(mappings));
                 }
                 return mapCache.get(sourceScript.snapshot);
             },
             *forEach(virtualCode) {
                 const sourceScript = virtualCodeToSourceScriptMap.get(virtualCode);
                 yield [
-                    sourceScript.id,
-                    sourceScript.snapshot,
+                    sourceScript,
                     this.get(virtualCode, sourceScript),
                 ];
                 if (virtualCode.associatedScriptMappings) {
-                    for (const [relatedScriptId, relatedMappings] of virtualCode.associatedScriptMappings) {
+                    for (const [relatedScriptId] of virtualCode.associatedScriptMappings) {
                         const relatedSourceScript = scriptRegistry.get(relatedScriptId);
                         if (relatedSourceScript) {
                             yield [
-                                relatedSourceScript.id,
-                                relatedSourceScript.snapshot,
-                                this.get(virtualCode, relatedSourceScript, relatedMappings),
+                                relatedSourceScript,
+                                this.get(virtualCode, relatedSourceScript),
                             ];
                         }
                     }
@@ -189,6 +192,7 @@ function createLanguage(plugins, scriptRegistry, sync) {
             },
         },
     };
+    return language;
     function triggerTargetsDirty(sourceScript) {
         sourceScript.targetIds.forEach(id => {
             const sourceScript = scriptRegistry.get(id);
@@ -216,7 +220,6 @@ function createLanguage(plugins, scriptRegistry, sync) {
         };
     }
 }
-exports.createLanguage = createLanguage;
 function* forEachEmbeddedCode(virtualCode) {
     yield virtualCode;
     if (virtualCode.embeddedCodes) {
@@ -225,5 +228,4 @@ function* forEachEmbeddedCode(virtualCode) {
         }
     }
 }
-exports.forEachEmbeddedCode = forEachEmbeddedCode;
 //# sourceMappingURL=index.js.map

package/lib/editorFeatures.js

@@ -1,120 +1,119 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveRenameEditText = exports.resolveRenameNewName = exports.shouldReportDiagnostics = exports.isSignatureHelpEnabled = exports.isAutoInsertEnabled = exports.isCompletionEnabled = exports.isFormattingEnabled = exports.isCodeActionsEnabled = exports.isDiagnosticsEnabled = exports.isDocumentLinkEnabled = exports.isColorEnabled = exports.isLinkedEditingEnabled = exports.isSelectionRangesEnabled = exports.isFoldingRangesEnabled = exports.isSymbolsEnabled = exports.isHighlightEnabled = exports.isImplementationEnabled = exports.isReferencesEnabled = exports.isTypeDefinitionEnabled = exports.isDefinitionEnabled = exports.isRenameEnabled = exports.isCallHierarchyEnabled = exports.isSemanticTokensEnabled = exports.isCodeLensEnabled = exports.isInlayHintsEnabled = exports.isHoverEnabled = void 0;
+exports.isHoverEnabled = isHoverEnabled;
+exports.isInlayHintsEnabled = isInlayHintsEnabled;
+exports.isCodeLensEnabled = isCodeLensEnabled;
+exports.isSemanticTokensEnabled = isSemanticTokensEnabled;
+exports.isCallHierarchyEnabled = isCallHierarchyEnabled;
+exports.isRenameEnabled = isRenameEnabled;
+exports.isDefinitionEnabled = isDefinitionEnabled;
+exports.isTypeDefinitionEnabled = isTypeDefinitionEnabled;
+exports.isReferencesEnabled = isReferencesEnabled;
+exports.isImplementationEnabled = isImplementationEnabled;
+exports.isHighlightEnabled = isHighlightEnabled;
+exports.isSymbolsEnabled = isSymbolsEnabled;
+exports.isFoldingRangesEnabled = isFoldingRangesEnabled;
+exports.isSelectionRangesEnabled = isSelectionRangesEnabled;
+exports.isLinkedEditingEnabled = isLinkedEditingEnabled;
+exports.isColorEnabled = isColorEnabled;
+exports.isDocumentLinkEnabled = isDocumentLinkEnabled;
+exports.isDiagnosticsEnabled = isDiagnosticsEnabled;
+exports.isCodeActionsEnabled = isCodeActionsEnabled;
+exports.isFormattingEnabled = isFormattingEnabled;
+exports.isCompletionEnabled = isCompletionEnabled;
+exports.isAutoInsertEnabled = isAutoInsertEnabled;
+exports.isSignatureHelpEnabled = isSignatureHelpEnabled;
+exports.shouldReportDiagnostics = shouldReportDiagnostics;
+exports.resolveRenameNewName = resolveRenameNewName;
+exports.resolveRenameEditText = resolveRenameEditText;
 function isHoverEnabled(info) {
     return !!info.semantic;
 }
-exports.isHoverEnabled = isHoverEnabled;
 function isInlayHintsEnabled(info) {
     return !!info.semantic;
 }
-exports.isInlayHintsEnabled = isInlayHintsEnabled;
 function isCodeLensEnabled(info) {
     return !!info.semantic;
 }
-exports.isCodeLensEnabled = isCodeLensEnabled;
 function isSemanticTokensEnabled(info) {
     return typeof info.semantic === 'object'
         ? info.semantic.shouldHighlight?.() ?? true
         : !!info.semantic;
 }
-exports.isSemanticTokensEnabled = isSemanticTokensEnabled;
 function isCallHierarchyEnabled(info) {
     return !!info.navigation;
 }
-exports.isCallHierarchyEnabled = isCallHierarchyEnabled;
 function isRenameEnabled(info) {
     return typeof info.navigation === 'object'
         ? info.navigation.shouldRename?.() ?? true
         : !!info.navigation;
 }
-exports.isRenameEnabled = isRenameEnabled;
 function isDefinitionEnabled(info) {
     return !!info.navigation;
 }
-exports.isDefinitionEnabled = isDefinitionEnabled;
 function isTypeDefinitionEnabled(info) {
     return !!info.navigation;
 }
-exports.isTypeDefinitionEnabled = isTypeDefinitionEnabled;
 function isReferencesEnabled(info) {
     return !!info.navigation;
 }
-exports.isReferencesEnabled = isReferencesEnabled;
 function isImplementationEnabled(info) {
     return !!info.navigation;
 }
-exports.isImplementationEnabled = isImplementationEnabled;
 function isHighlightEnabled(info) {
     return !!info.navigation;
 }
-exports.isHighlightEnabled = isHighlightEnabled;
 function isSymbolsEnabled(info) {
     return !!info.structure;
 }
-exports.isSymbolsEnabled = isSymbolsEnabled;
 function isFoldingRangesEnabled(info) {
     return !!info.structure;
 }
-exports.isFoldingRangesEnabled = isFoldingRangesEnabled;
 function isSelectionRangesEnabled(info) {
     return !!info.structure;
 }
-exports.isSelectionRangesEnabled = isSelectionRangesEnabled;
 function isLinkedEditingEnabled(info) {
     return !!info.structure;
 }
-exports.isLinkedEditingEnabled = isLinkedEditingEnabled;
 function isColorEnabled(info) {
     return !!info.structure;
 }
-exports.isColorEnabled = isColorEnabled;
 function isDocumentLinkEnabled(info) {
     return !!info.structure;
 }
-exports.isDocumentLinkEnabled = isDocumentLinkEnabled;
 function isDiagnosticsEnabled(info) {
     return !!info.verification;
 }
-exports.isDiagnosticsEnabled = isDiagnosticsEnabled;
 function isCodeActionsEnabled(info) {
     return !!info.verification;
 }
-exports.isCodeActionsEnabled = isCodeActionsEnabled;
 function isFormattingEnabled(info) {
     return !!info.format;
 }
-exports.isFormattingEnabled = isFormattingEnabled;
 function isCompletionEnabled(info) {
     return !!info.completion;
 }
-exports.isCompletionEnabled = isCompletionEnabled;
 function isAutoInsertEnabled(info) {
     return !!info.completion;
 }
-exports.isAutoInsertEnabled = isAutoInsertEnabled;
 function isSignatureHelpEnabled(info) {
     return !!info.completion;
 }
-exports.isSignatureHelpEnabled = isSignatureHelpEnabled;
 // should...
 function shouldReportDiagnostics(info) {
     return typeof info.verification === 'object'
         ? info.verification.shouldReport?.() ?? true
         : !!info.verification;
 }
-exports.shouldReportDiagnostics = shouldReportDiagnostics;
 //  resolve...
 function resolveRenameNewName(newName, info) {
     return typeof info.navigation === 'object'
         ? info.navigation.resolveRenameNewName?.(newName) ?? newName
         : newName;
 }
-exports.resolveRenameNewName = resolveRenameNewName;
 function resolveRenameEditText(text, info) {
     return typeof info.navigation === 'object'
         ? info.navigation.resolveRenameEditText?.(text) ?? text
         : text;
 }
-exports.resolveRenameEditText = resolveRenameEditText;
 //# sourceMappingURL=editorFeatures.js.map

package/lib/linkedCodeMap.js

@@ -4,10 +4,10 @@ exports.LinkedCodeMap = void 0;
 const source_map_1 = require("@volar/source-map");
 class LinkedCodeMap extends source_map_1.SourceMap {
     *getLinkedOffsets(start) {
-        for (const mapped of this.getGeneratedOffsets(start)) {
+        for (const mapped of this.toGeneratedLocation(start)) {
             yield mapped[0];
         }
-        for (const mapped of this.getSourceOffsets(start)) {
+        for (const mapped of this.toSourceLocation(start)) {
             yield mapped[0];
         }
     }

package/lib/types.d.ts

@@ -1,7 +1,16 @@
-import type { Mapping, SourceMap } from '@volar/source-map';
+import type { Mapping } from '@volar/source-map';
 import type * as ts from 'typescript';
 import type { LinkedCodeMap } from './linkedCodeMap';
+export interface Mapper {
+    mappings: Mapping<CodeInformation>[];
+    toSourceRange(start: number, end: number, fallbackToAnyMatch: boolean, filter?: (data: CodeInformation) => boolean): Generator<readonly [number, number, Mapping<CodeInformation>, Mapping<CodeInformation>]>;
+    toGeneratedRange(start: number, end: number, fallbackToAnyMatch: boolean, filter?: (data: CodeInformation) => boolean): Generator<readonly [number, number, Mapping<CodeInformation>, Mapping<CodeInformation>]>;
+    toSourceLocation(generatedOffset: number, filter?: (data: CodeInformation) => boolean): Generator<readonly [number, Mapping<CodeInformation>]>;
+    toGeneratedLocation(sourceOffset: number, filter?: (data: CodeInformation) => boolean): Generator<readonly [number, Mapping<CodeInformation>]>;
+}
+export type MapperFactory = (mappings: Mapping<CodeInformation>[]) => Mapper;
 export interface Language<T = unknown> {
+    mapperFactory: MapperFactory;
     plugins: LanguagePlugin<T>[];
     scripts: {
         get(id: T): SourceScript<T> | undefined;
@@ -10,8 +19,8 @@ export interface Language<T = unknown> {
         fromVirtualCode(virtualCode: VirtualCode): SourceScript<T>;
     };
     maps: {
-        get(virtualCode: VirtualCode, sourceScript: SourceScript<T>, mappings?: Mapping<CodeInformation>[]): SourceMap<CodeInformation>;
-        forEach(virtualCode: VirtualCode): Generator<[id: T, snapshot: ts.IScriptSnapshot, map: SourceMap<CodeInformation>]>;
+        get(virtualCode: VirtualCode, sourceScript: SourceScript<T>): Mapper;
+        forEach(virtualCode: VirtualCode): Generator<[sourceScript: SourceScript<T>, map: Mapper]>;
     };
     linkedCodeMaps: {
         get(virtualCode: VirtualCode): LinkedCodeMap | undefined;

package/package.json

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