@volar/language-core 1.0.0-beta.1 → 1.0.0-beta.3

package/out/documentRegistry.d.ts

@@ -1,6 +1,6 @@
-import type { EmbeddedFile, EmbeddedLanguageModule, DocumentCapabilities, PositionCapabilities, SourceFile } from './types';
-import { Teleport } from './sourceMaps';
 import { Mapping, SourceMapBase } from '@volar/source-map';
+import { Teleport } from './sourceMaps';
+import type { EmbeddedFile, EmbeddedLanguageModule, SourceFile } from './types';
 export declare function forEachEmbeddeds(input: EmbeddedFile[], cb: (embedded: EmbeddedFile) => void): void;
 export type DocumentRegistry = ReturnType<typeof createDocumentRegistry>;
 export declare function createDocumentRegistry(): {
@@ -15,25 +15,16 @@ export declare function createDocumentRegistry(): {
         vueFile: SourceFile;
         embedded: EmbeddedFile;
     }, void, unknown>;
-    fromEmbeddedLocation: (fileName: string, start: number, end?: number, filter?: ((data: PositionCapabilities) => boolean) | undefined, sourceMapFilter?: ((sourceMap: DocumentCapabilities) => boolean) | undefined) => Generator<{
+    fromEmbeddedLocation: (fileName: string, offset: number) => Generator<{
         fileName: string;
-        range: {
-            start: number;
-            end: number;
-        };
-        mapped: {
-            vueFile: SourceFile;
-            embedded: EmbeddedFile;
-        };
-        data: any;
+        offset: number;
+        mapping: Mapping<any>;
+        sourceMap: SourceMapBase<any>;
     } | {
         fileName: string;
-        range: {
-            start: number;
-            end: number;
-        };
-        mapped?: undefined;
-        data?: undefined;
+        offset: number;
+        mapping?: undefined;
+        sourceMap?: undefined;
     }, void, unknown>;
     fromEmbeddedFile: (file: EmbeddedFile) => SourceFile | undefined;
     fromEmbeddedFileName: (fileName: string) => {
@@ -41,6 +32,5 @@ export declare function createDocumentRegistry(): {
         embedded: EmbeddedFile;
     } | undefined;
     getSourceMap: (file: SourceFile, mappings: Mapping<any>[]) => SourceMapBase<any>;
-    getTeleportSourceMap: (file: SourceFile, mappings: Mapping<any>[]) => Teleport;
     onSourceFileUpdated(file: SourceFile): void;
 };

package/out/documentRegistry.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDocumentRegistry = exports.forEachEmbeddeds = void 0;
+const source_map_1 = require("@volar/source-map");
 const reactivity_1 = require("@vue/reactivity");
 const sourceMaps_1 = require("./sourceMaps");
-const source_map_1 = require("@volar/source-map");
 function forEachEmbeddeds(input, cb) {
     for (const child of input) {
         if (child) {
@@ -61,33 +61,26 @@ function createDocumentRegistry() {
                 yield sourceMap[1];
             }
         },
-        fromEmbeddedLocation: function* (fileName, start, end, filter, sourceMapFilter) {
+        fromEmbeddedLocation: function* (fileName, offset) {
             if (fileName.endsWith('/__VLS_types.ts')) { // TODO: monkey fix
                 return;
             }
-            if (end === undefined)
-                end = start;
             const mapped = sourceMapsByFileName.value.get(normalizePath(fileName));
             if (mapped) {
-                if (sourceMapFilter && !sourceMapFilter(mapped.embedded.capabilities))
-                    return;
                 const sourceMap = getSourceMap(mapped.vueFile, mapped.embedded.mappings);
-                for (const vueRange of sourceMap.getSourceRanges(start, end, filter)) {
+                for (const vueRange of sourceMap.toSourceOffsets(offset)) {
                     yield {
                         fileName: mapped.vueFile.fileName,
-                        range: vueRange[0],
-                        mapped: mapped,
-                        data: vueRange[1],
+                        offset: vueRange[0],
+                        mapping: vueRange[1],
+                        sourceMap,
                     };
                 }
             }
             else {
                 yield {
                     fileName,
-                    range: {
-                        start,
-                        end,
-                    },
+                    offset,
                 };
             }
         },
@@ -98,7 +91,6 @@ function createDocumentRegistry() {
             return sourceMapsByFileName.value.get(normalizePath(fileName));
         },
         getSourceMap,
-        getTeleportSourceMap: getTeleport,
         // TODO: unuse this
         onSourceFileUpdated(file) {
             _sourceMaps.delete(file);

package/out/languageContext.d.ts

@@ -15,25 +15,16 @@ export declare function createEmbeddedLanguageServiceHost(host: LanguageServiceH
             vueFile: SourceFile;
             embedded: import("./types").EmbeddedFile;
         }, void, unknown>;
-        fromEmbeddedLocation: (fileName: string, start: number, end?: number | undefined, filter?: ((data: import("./types").PositionCapabilities) => boolean) | undefined, sourceMapFilter?: ((sourceMap: import("./types").DocumentCapabilities) => boolean) | undefined) => Generator<{
+        fromEmbeddedLocation: (fileName: string, offset: number) => Generator<{
             fileName: string;
-            range: {
-                start: number;
-                end: number;
-            };
-            mapped: {
-                vueFile: SourceFile;
-                embedded: import("./types").EmbeddedFile;
-            };
-            data: any;
+            offset: number;
+            mapping: import("@volar/source-map").Mapping<any>;
+            sourceMap: import("@volar/source-map").SourceMapBase<any>;
         } | {
             fileName: string;
-            range: {
-                start: number;
-                end: number;
-            };
-            mapped?: undefined;
-            data?: undefined;
+            offset: number;
+            mapping?: undefined;
+            sourceMap?: undefined;
         }, void, unknown>;
         fromEmbeddedFile: (file: import("./types").EmbeddedFile) => SourceFile | undefined;
         fromEmbeddedFileName: (fileName: string) => {
@@ -41,7 +32,6 @@ export declare function createEmbeddedLanguageServiceHost(host: LanguageServiceH
             embedded: import("./types").EmbeddedFile;
         } | undefined;
         getSourceMap: (file: SourceFile, mappings: import("@volar/source-map").Mapping<any>[]) => import("@volar/source-map").SourceMapBase<any>;
-        getTeleportSourceMap: (file: SourceFile, mappings: import("@volar/source-map").Mapping<any>[]) => import("./sourceMaps").Teleport;
         onSourceFileUpdated(file: SourceFile): void;
     };
 };

package/out/languageContext.js

@@ -175,7 +175,7 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
             const newScripts = {};
             if (!tsFileUpdated) {
                 (0, documentRegistry_1.forEachEmbeddeds)(sourceFile.embeddeds, embedded => {
-                    if (embedded.isTsHostFile) {
+                    if (embedded.kind) {
                         oldScripts[embedded.fileName] = embedded.text;
                     }
                 });
@@ -184,7 +184,7 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
             documentRegistry.onSourceFileUpdated(sourceFile);
             if (!tsFileUpdated) {
                 (0, documentRegistry_1.forEachEmbeddeds)(sourceFile.embeddeds, embedded => {
-                    if (embedded.isTsHostFile) {
+                    if (embedded.kind) {
                         newScripts[embedded.fileName] = embedded.text;
                     }
                 });
@@ -202,7 +202,7 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
     function getScriptFileNames() {
         const tsFileNames = new Set();
         for (const mapped of documentRegistry.getAllEmbeddeds()) {
-            if (mapped.embedded.isTsHostFile) {
+            if (mapped.embedded.kind) {
                 tsFileNames.add(mapped.embedded.fileName); // virtual .ts
             }
         }

package/out/sourceMaps.d.ts

@@ -1,10 +1,5 @@
 import * as SourceMaps from '@volar/source-map';
-import { PositionCapabilities, TeleportMappingData, TeleportCapabilities } from './types';
-export declare class EmbeddedFileSourceMap extends SourceMaps.SourceMapBase<PositionCapabilities> {
-}
+import { TeleportCapabilities, TeleportMappingData } from './types';
 export declare class Teleport extends SourceMaps.SourceMapBase<TeleportMappingData> {
-    findTeleports(start: number, end?: number, filter?: (data: TeleportCapabilities) => boolean): Generator<readonly [{
-        start: number;
-        end: number;
-    }, TeleportCapabilities], void, unknown>;
+    findTeleports(start: number, filter?: (data: TeleportCapabilities) => boolean): Generator<number, void, unknown>;
 }

package/out/sourceMaps.js

@@ -1,16 +1,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Teleport = exports.EmbeddedFileSourceMap = void 0;
+exports.Teleport = void 0;
 const SourceMaps = require("@volar/source-map");
-class EmbeddedFileSourceMap extends SourceMaps.SourceMapBase {
-}
-exports.EmbeddedFileSourceMap = EmbeddedFileSourceMap;
 class Teleport extends SourceMaps.SourceMapBase {
-    *findTeleports(start, end, filter) {
-        for (const [teleRange, data] of this.getMappedRanges(start, end, filter ? data => filter(data.toGenedCapabilities) : undefined)) {
-            yield [teleRange, data.toGenedCapabilities];
+    *findTeleports(start, filter) {
+        for (const mapped of this.toGeneratedOffsets(start)) {
+            if (!filter || filter(mapped[1].data.toSourceCapabilities)) {
+                yield mapped[0];
+            }
         }
-        for (const [teleRange, data] of this.getSourceRanges(start, end, filter ? data => filter(data.toGenedCapabilities) : undefined)) {
-            yield [teleRange, data.toGenedCapabilities];
+        for (const mapped of this.toSourceOffsets(start)) {
+            if (!filter || filter(mapped[1].data.toGenedCapabilities)) {
+                yield mapped[0];
+            }
         }
     }
 }

package/out/types.d.ts

@@ -1,22 +1,22 @@
 import { Mapping } from '@volar/source-map';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 export interface DocumentCapabilities {
-    diagnostics?: boolean;
-    foldingRanges?: boolean;
-    formatting?: boolean | {
+    diagnostic?: boolean;
+    foldingRange?: boolean;
+    documentFormatting?: boolean | {
         initialIndentBracket?: [string, string];
     };
     documentSymbol?: boolean;
-    codeActions?: boolean;
-    inlayHints?: boolean;
+    codeAction?: boolean;
+    inlayHint?: boolean;
 }
 export interface PositionCapabilities {
     hover?: boolean;
     references?: boolean;
-    definitions?: boolean;
+    definition?: boolean;
     rename?: boolean | {
         normalize?(newName: string): string;
-        apply?(oldName: string, newName: string): string;
+        apply?(newName: string): string;
     };
     completion?: boolean | {
         additional: boolean;
@@ -28,7 +28,7 @@ export interface PositionCapabilities {
 }
 export interface TeleportCapabilities {
     references?: boolean;
-    definitions?: boolean;
+    definition?: boolean;
     rename?: boolean;
 }
 export interface TeleportMappingData {
@@ -44,10 +44,14 @@ export interface SourceFile {
     text: string;
     embeddeds: EmbeddedFile[];
 }
+export declare enum EmbeddedFileKind {
+    TextFile = 0,
+    TypeScriptHostFile = 1
+}
 export interface EmbeddedFile {
     fileName: string;
     text: string;
-    isTsHostFile: boolean;
+    kind: EmbeddedFileKind;
     capabilities: DocumentCapabilities;
     mappings: Mapping<PositionCapabilities>[];
     teleportMappings?: Mapping<TeleportMappingData>[];

package/out/types.js

@@ -1,2 +1,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmbeddedFileKind = void 0;
+var EmbeddedFileKind;
+(function (EmbeddedFileKind) {
+    EmbeddedFileKind[EmbeddedFileKind["TextFile"] = 0] = "TextFile";
+    EmbeddedFileKind[EmbeddedFileKind["TypeScriptHostFile"] = 1] = "TypeScriptHostFile";
+})(EmbeddedFileKind = exports.EmbeddedFileKind || (exports.EmbeddedFileKind = {}));
 //# sourceMappingURL=types.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "1.0.0-beta.1",
+	"version": "1.0.0-beta.3",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,9 +13,9 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/code-gen": "1.0.0-beta.1",
-		"@volar/source-map": "1.0.0-beta.1",
-		"@vue/reactivity": "^3.2.38"
+		"@volar/source-map": "1.0.0-beta.3",
+		"@vue/reactivity": "^3.2.38",
+		"muggle-string": "^0.1.0"
 	},
-	"gitHead": "3421929c584e8fafd772b2386c12ffe9b48355f2"
+	"gitHead": "b7242f995970b4eedfcf068619497eb845e9ac73"
 }