@vue/language-core 1.9.0-alpha.3 → 2.0.1

package/{out → lib}/virtualFile/computedFiles.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computedFiles = void 0;
-const source_map_1 = require("@volar/source-map");
-const muggle = require("muggle-string");
-const embeddedFile_1 = require("./embeddedFile");
+const language_core_1 = require("@volar/language-core");
 const computeds_1 = require("computeds");
+const embeddedFile_1 = require("./embeddedFile");
 function computedFiles(plugins, fileName, sfc, codegenStack) {
     const nameToBlock = (0, computeds_1.computed)(() => {
         const blocks = {};
@@ -25,10 +24,10 @@ function computedFiles(plugins, fileName, sfc, codegenStack) {
         }
         return blocks;
     });
-    const pluginsResult = plugins.map(plugin => compiledPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codegenStack));
+    const pluginsResult = plugins.map(plugin => computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codegenStack));
     const flatResult = (0, computeds_1.computed)(() => pluginsResult.map(r => r()).flat());
     const structuredResult = (0, computeds_1.computed)(() => {
-        const embeddedFiles = [];
+        const embeddedCodes = [];
         let remain = [...flatResult()];
         while (remain.length) {
             const beforeLength = remain.length;
@@ -38,50 +37,57 @@ function computedFiles(plugins, fileName, sfc, codegenStack) {
             }
         }
         for (const { file, snapshot, mappings, codegenStacks } of remain) {
-            embeddedFiles.push({
-                ...file,
+            embeddedCodes.push({
+                id: file.id,
+                languageId: (0, language_core_1.resolveCommonLanguageId)(`/dummy.${file.lang}`),
+                linkedCodeMappings: file.linkedCodeMappings,
                 snapshot,
                 mappings,
                 codegenStacks,
-                embeddedFiles: [],
+                embeddedCodes: [],
             });
-            console.error('Unable to resolve embedded: ' + file.parentFileName + ' -> ' + file.fileName);
+            console.error('Unable to resolve embedded: ' + file.parentCodeId + ' -> ' + file.id);
         }
-        return embeddedFiles;
+        return embeddedCodes;
         function consumeRemain() {
             for (let i = remain.length - 1; i >= 0; i--) {
                 const { file, snapshot, mappings, codegenStacks } = remain[i];
-                if (!file.parentFileName) {
-                    embeddedFiles.push({
-                        ...file,
+                if (!file.parentCodeId) {
+                    embeddedCodes.push({
+                        id: file.id,
+                        languageId: (0, language_core_1.resolveCommonLanguageId)(`/dummy.${file.lang}`),
+                        linkedCodeMappings: file.linkedCodeMappings,
                         snapshot,
                         mappings,
                         codegenStacks,
-                        embeddedFiles: [],
+                        embeddedCodes: [],
                     });
                     remain.splice(i, 1);
                 }
                 else {
-                    const parent = findParentStructure(file.parentFileName, embeddedFiles);
+                    const parent = findParentStructure(file.parentCodeId, embeddedCodes);
                     if (parent) {
-                        parent.embeddedFiles.push({
-                            ...file,
+                        parent.embeddedCodes ??= [];
+                        parent.embeddedCodes.push({
+                            id: file.id,
+                            languageId: (0, language_core_1.resolveCommonLanguageId)(`/dummy.${file.lang}`),
+                            linkedCodeMappings: file.linkedCodeMappings,
                             snapshot,
                             mappings,
                             codegenStacks,
-                            embeddedFiles: [],
+                            embeddedCodes: [],
                         });
                         remain.splice(i, 1);
                     }
                 }
             }
         }
-        function findParentStructure(fileName, current) {
+        function findParentStructure(id, current) {
             for (const child of current) {
-                if (child.fileName === fileName) {
+                if (child.id === id) {
                     return child;
                 }
-                let parent = findParentStructure(fileName, child.embeddedFiles);
+                let parent = findParentStructure(id, child.embeddedCodes ?? []);
                 if (parent) {
                     return parent;
                 }
@@ -91,36 +97,36 @@ function computedFiles(plugins, fileName, sfc, codegenStack) {
     return structuredResult;
 }
 exports.computedFiles = computedFiles;
-function compiledPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codegenStack) {
+function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codegenStack) {
     const embeddedFiles = {};
     const files = (0, computeds_1.computed)(() => {
         try {
-            if (!plugin.getEmbeddedFileNames) {
+            if (!plugin.getEmbeddedCodes) {
                 return Object.values(embeddedFiles);
             }
-            const embeddedFileNames = plugin.getEmbeddedFileNames(fileName, sfc);
-            for (const oldFileName of Object.keys(embeddedFiles)) {
-                if (!embeddedFileNames.includes(oldFileName)) {
-                    delete embeddedFiles[oldFileName];
+            const fileInfos = plugin.getEmbeddedCodes(fileName, sfc);
+            for (const oldId of Object.keys(embeddedFiles)) {
+                if (!fileInfos.some(file => file.id === oldId)) {
+                    delete embeddedFiles[oldId];
                 }
             }
-            for (const embeddedFileName of embeddedFileNames) {
-                if (!embeddedFiles[embeddedFileName]) {
-                    embeddedFiles[embeddedFileName] = (0, computeds_1.computed)(() => {
-                        const [content, stacks] = codegenStack ? muggle.track([]) : [[], []];
-                        const file = new embeddedFile_1.VueEmbeddedFile(embeddedFileName, content, stacks);
+            for (const fileInfo of fileInfos) {
+                if (!embeddedFiles[fileInfo.id]) {
+                    embeddedFiles[fileInfo.id] = (0, computeds_1.computed)(() => {
+                        const [content, stacks] = codegenStack ? (0, language_core_1.track)([]) : [[], []];
+                        const file = new embeddedFile_1.VueEmbeddedCode(fileInfo.id, fileInfo.lang, content, stacks);
                         for (const plugin of plugins) {
-                            if (!plugin.resolveEmbeddedFile) {
+                            if (!plugin.resolveEmbeddedCode) {
                                 continue;
                             }
                             try {
-                                plugin.resolveEmbeddedFile(fileName, sfc, file);
+                                plugin.resolveEmbeddedCode(fileName, sfc, file);
                             }
                             catch (e) {
                                 console.error(e);
                             }
                         }
-                        const newText = (0, source_map_1.toString)(file.content);
+                        const newText = (0, language_core_1.toString)(file.content);
                         const changeRanges = new Map();
                         const snapshot = {
                             getText: (start, end) => newText.slice(start, end),
@@ -153,27 +159,34 @@ function compiledPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codege
     return (0, computeds_1.computed)(() => {
         return files().map(_file => {
             const { file, snapshot } = _file();
-            const mappings = (0, source_map_1.buildMappings)(file.content);
+            const mappings = (0, language_core_1.buildMappings)(file.content);
+            let lastValidMapping;
             for (const mapping of mappings) {
                 if (mapping.source !== undefined) {
                     const block = nameToBlock()[mapping.source];
                     if (block) {
-                        mapping.sourceRange = [
-                            mapping.sourceRange[0] + block.startTagEnd,
-                            mapping.sourceRange[1] + block.startTagEnd,
-                        ];
+                        mapping.sourceOffsets = mapping.sourceOffsets.map(offset => offset + block.startTagEnd);
                     }
                     else {
                         // ignore
                     }
                     mapping.source = undefined;
                 }
+                if (mapping.data.__combineLastMappping) {
+                    lastValidMapping.sourceOffsets.push(...mapping.sourceOffsets);
+                    lastValidMapping.generatedOffsets.push(...mapping.generatedOffsets);
+                    lastValidMapping.lengths.push(...mapping.lengths);
+                    continue;
+                }
+                else {
+                    lastValidMapping = mapping;
+                }
             }
             return {
                 file,
                 snapshot,
-                mappings,
-                codegenStacks: (0, source_map_1.buildStacks)(file.content, file.contentStacks),
+                mappings: mappings.filter(mapping => !mapping.data.__combineLastMappping),
+                codegenStacks: (0, language_core_1.buildStacks)(file.content, file.contentStacks),
             };
         });
     });

package/lib/virtualFile/computedMappings.d.ts

@@ -0,0 +1,4 @@
+import { Mapping } from '@volar/language-core';
+import type * as ts from 'typescript';
+import type { Sfc, VueCodeInformation } from '../types';
+export declare function computedMappings(snapshot: () => ts.IScriptSnapshot, sfc: Sfc): () => Mapping<VueCodeInformation>[];

package/{out → lib}/virtualFile/computedMappings.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computedMappings = void 0;
 const language_core_1 = require("@volar/language-core");
-const muggle = require("muggle-string");
 const computeds_1 = require("computeds");
+const utils_1 = require("../generators/utils");
 function computedMappings(snapshot, sfc) {
     return (0, computeds_1.computed)(() => {
-        const str = [[snapshot().getText(0, snapshot().getLength()), undefined, 0, language_core_1.FileRangeCapabilities.full]];
+        const str = [[snapshot().getText(0, snapshot().getLength()), undefined, 0, (0, utils_1.enableAllFeatures)({})]];
         for (const block of [
             sfc.script,
             sfc.scriptSetup,
@@ -15,21 +15,18 @@ function computedMappings(snapshot, sfc) {
             ...sfc.customBlocks,
         ]) {
             if (block) {
-                muggle.replaceSourceRange(str, undefined, block.startTagEnd, block.endTagStart, [
-                    block.content,
-                    undefined,
-                    block.startTagEnd,
-                    {},
-                ]);
+                (0, language_core_1.replaceSourceRange)(str, undefined, block.startTagEnd, block.endTagStart, '\n\n');
             }
         }
-        return str.map((m) => {
+        return str
+            .filter(s => typeof s !== 'string')
+            .map((m) => {
             const text = m[0];
             const start = m[2];
-            const end = start + text.length;
             return {
-                sourceRange: [start, end],
-                generatedRange: [start, end],
+                sourceOffsets: [start],
+                generatedOffsets: [start],
+                lengths: [text.length],
                 data: m[3],
             };
         });

package/lib/virtualFile/computedSfc.d.ts

@@ -0,0 +1,4 @@
+import type { SFCParseResult } from '@vue/compiler-sfc';
+import type * as ts from 'typescript';
+import type { Sfc, VueLanguagePlugin } from '../types';
+export declare function computedSfc(ts: typeof import('typescript'), plugins: ReturnType<VueLanguagePlugin>[], fileName: string, snapshot: () => ts.IScriptSnapshot, parsed: () => SFCParseResult | undefined): Sfc;

package/{out → lib}/virtualFile/computedSfc.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computedSfc = void 0;
+const computeds_1 = require("computeds");
 const parseCssClassNames_1 = require("../utils/parseCssClassNames");
 const parseCssVars_1 = require("../utils/parseCssVars");
-const computeds_1 = require("computeds");
 function computedSfc(ts, plugins, fileName, snapshot, parsed) {
     const untrackedSnapshot = () => {
         (0, computeds_1.pauseTracking)();
@@ -25,7 +25,7 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             const _src = src();
             return _src ? untrackedSnapshot().getText(0, base.startTagEnd).lastIndexOf(_src) - base.startTagEnd : -1;
         });
-        const ast = (0, computeds_1.computed)(() => ts.createSourceFile(fileName + '.' + base.lang, base.content, ts.ScriptTarget.Latest));
+        const ast = (0, computeds_1.computed)(() => ts.createSourceFile(fileName + '.' + base.lang, base.content, 99));
         return mergeObject(base, {
             get src() { return src(); },
             get srcOffset() { return srcOffset(); },
@@ -41,7 +41,7 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             const _generic = generic();
             return _generic !== undefined ? untrackedSnapshot().getText(0, base.startTagEnd).lastIndexOf(_generic) - base.startTagEnd : -1;
         });
-        const ast = (0, computeds_1.computed)(() => ts.createSourceFile(fileName + '.' + base.lang, base.content, ts.ScriptTarget.Latest));
+        const ast = (0, computeds_1.computed)(() => ts.createSourceFile(fileName + '.' + base.lang, base.content, 99));
         return mergeObject(base, {
             get generic() { return generic(); },
             get genericOffset() { return genericOffset(); },

package/{out → lib}/virtualFile/computedVueSfc.d.ts

@@ -1,5 +1,4 @@
 import type { SFCParseResult } from '@vue/compiler-sfc';
-import type * as ts from 'typescript/lib/tsserverlibrary';
-import { VueLanguagePlugin } from '../types';
+import type * as ts from 'typescript';
+import type { VueLanguagePlugin } from '../types';
 export declare function computedVueSfc(plugins: ReturnType<VueLanguagePlugin>[], fileName: string, snapshot: () => ts.IScriptSnapshot): () => SFCParseResult | undefined;
-//# sourceMappingURL=computedVueSfc.d.ts.map

package/lib/virtualFile/embeddedFile.d.ts

@@ -0,0 +1,12 @@
+import type { Mapping, StackNode } from '@volar/language-core';
+import type { Code } from '../types';
+export declare class VueEmbeddedCode {
+    id: string;
+    lang: string;
+    content: Code[];
+    contentStacks: StackNode[];
+    parentCodeId?: string;
+    linkedCodeMappings: Mapping[];
+    embeddedCodes: VueEmbeddedCode[];
+    constructor(id: string, lang: string, content: Code[], contentStacks: StackNode[]);
+}

package/lib/virtualFile/embeddedFile.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VueEmbeddedCode = void 0;
+class VueEmbeddedCode {
+    constructor(id, lang, content, contentStacks) {
+        this.id = id;
+        this.lang = lang;
+        this.content = content;
+        this.contentStacks = contentStacks;
+        this.linkedCodeMappings = [];
+        this.embeddedCodes = [];
+    }
+}
+exports.VueEmbeddedCode = VueEmbeddedCode;
+//# sourceMappingURL=embeddedFile.js.map

package/lib/virtualFile/vueFile.d.ts

@@ -0,0 +1,25 @@
+import type { Stack, VirtualCode } from '@volar/language-core';
+import { Signal } from 'computeds';
+import type * as ts from 'typescript';
+import type { VueCompilerOptions, VueLanguagePlugin } from '../types';
+export declare class VueGeneratedCode implements VirtualCode {
+    fileName: string;
+    languageId: string;
+    initSnapshot: ts.IScriptSnapshot;
+    vueCompilerOptions: VueCompilerOptions;
+    plugins: ReturnType<VueLanguagePlugin>[];
+    ts: typeof import('typescript');
+    codegenStack: boolean;
+    id: string;
+    _snapshot: Signal<ts.IScriptSnapshot>;
+    getVueSfc: () => import("@vue/compiler-sfc").SFCParseResult | undefined;
+    sfc: import("../types").Sfc;
+    getMappings: () => import("@volar/language-core").Mapping<import("../types").VueCodeInformation>[];
+    getEmbeddedCodes: () => VirtualCode[];
+    codegenStacks: Stack[];
+    get embeddedCodes(): VirtualCode[];
+    get snapshot(): ts.IScriptSnapshot;
+    get mappings(): import("@volar/language-core").Mapping<import("../types").VueCodeInformation>[];
+    constructor(fileName: string, languageId: string, initSnapshot: ts.IScriptSnapshot, vueCompilerOptions: VueCompilerOptions, plugins: ReturnType<VueLanguagePlugin>[], ts: typeof import('typescript'), codegenStack: boolean);
+    update(newSnapshot: ts.IScriptSnapshot): void;
+}

package/{out → lib}/virtualFile/vueFile.js

@@ -1,25 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VueFile = void 0;
-const language_core_1 = require("@volar/language-core");
+exports.VueGeneratedCode = void 0;
+const computeds_1 = require("computeds");
 const computedFiles_1 = require("./computedFiles");
 const computedMappings_1 = require("./computedMappings");
 const computedSfc_1 = require("./computedSfc");
 const computedVueSfc_1 = require("./computedVueSfc");
-const computeds_1 = require("computeds");
-const jsxReg = /^\.(js|ts)x?$/;
-class VueFile {
-    get embeddedFiles() {
-        return this.getEmbeddedFiles();
-    }
-    get mainScriptName() {
-        let res = '';
-        (0, language_core_1.forEachEmbeddedFile)(this, file => {
-            if (file.kind === language_core_1.FileKind.TypeScriptHostFile && file.fileName.replace(this.fileName, '').match(jsxReg)) {
-                res = file.fileName;
-            }
-        });
-        return res;
+class VueGeneratedCode {
+    get embeddedCodes() {
+        return this.getEmbeddedCodes();
     }
     get snapshot() {
         return this._snapshot();
@@ -27,21 +16,22 @@ class VueFile {
     get mappings() {
         return this.getMappings();
     }
-    constructor(fileName, initSnapshot, vueCompilerOptions, plugins, ts, codegenStack) {
+    constructor(fileName, languageId, initSnapshot, vueCompilerOptions, plugins, ts, codegenStack) {
         this.fileName = fileName;
+        this.languageId = languageId;
         this.initSnapshot = initSnapshot;
         this.vueCompilerOptions = vueCompilerOptions;
         this.plugins = plugins;
         this.ts = ts;
         this.codegenStack = codegenStack;
+        // sources
+        this.id = 'main';
         // computeds
         this.getVueSfc = (0, computedVueSfc_1.computedVueSfc)(this.plugins, this.fileName, () => this._snapshot());
         this.sfc = (0, computedSfc_1.computedSfc)(this.ts, this.plugins, this.fileName, () => this._snapshot(), this.getVueSfc);
         this.getMappings = (0, computedMappings_1.computedMappings)(() => this._snapshot(), this.sfc);
-        this.getEmbeddedFiles = (0, computedFiles_1.computedFiles)(this.plugins, this.fileName, this.sfc, this.codegenStack);
+        this.getEmbeddedCodes = (0, computedFiles_1.computedFiles)(this.plugins, this.fileName, this.sfc, this.codegenStack);
         // others
-        this.capabilities = language_core_1.FileCapabilities.full;
-        this.kind = language_core_1.FileKind.TextFile;
         this.codegenStacks = [];
         this._snapshot = (0, computeds_1.signal)(initSnapshot);
     }
@@ -49,5 +39,5 @@ class VueFile {
         this._snapshot.set(newSnapshot);
     }
 }
-exports.VueFile = VueFile;
+exports.VueGeneratedCode = VueGeneratedCode;
 //# sourceMappingURL=vueFile.js.map

package/package.json

@@ -1,11 +1,10 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.9.0-alpha.3",
-	"main": "out/index.js",
+	"version": "2.0.1",
 	"license": "MIT",
 	"files": [
-		"out/**/*.js",
-		"out/**/*.d.ts"
+		"**/*.js",
+		"**/*.d.ts"
 	],
 	"repository": {
 		"type": "git",
@@ -13,13 +12,11 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~1.11.0",
-		"@volar/source-map": "~1.11.0",
-		"@vue/compiler-dom": "^3.3.0",
-		"@vue/shared": "^3.3.0",
+		"@volar/language-core": "~2.1.0",
+		"@vue/compiler-dom": "^3.4.0",
+		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
 		"minimatch": "^9.0.3",
-		"muggle-string": "^0.3.1",
 		"path-browserify": "^1.0.1",
 		"vue-template-compiler": "^2.7.14"
 	},
@@ -27,7 +24,7 @@
 		"@types/minimatch": "^5.1.2",
 		"@types/node": "latest",
 		"@types/path-browserify": "^1.0.1",
-		"@vue/compiler-sfc": "^3.3.0"
+		"@vue/compiler-sfc": "^3.4.0"
 	},
 	"peerDependencies": {
 		"typescript": "*"
@@ -37,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "cf6564bc8c649151c2e72a93d0aa482d4a59a773"
+	"gitHead": "adedfd0983c910370d080e955702cca7d2275420"
 }

package/out/generators/script.d.ts

@@ -1,15 +0,0 @@
-import { FileRangeCapabilities, MirrorBehaviorCapabilities } from '@volar/language-core';
-import * as SourceMaps from '@volar/source-map';
-import type * as ts from 'typescript/lib/tsserverlibrary';
-import type * as templateGen from '../generators/template';
-import type { ScriptRanges } from '../parsers/scriptRanges';
-import type { ScriptSetupRanges } from '../parsers/scriptSetupRanges';
-import type { VueCompilerOptions } from '../types';
-import { Sfc } from '../types';
-export declare function generate(ts: typeof import('typescript/lib/tsserverlibrary'), fileName: string, script: Sfc['script'], scriptSetup: Sfc['scriptSetup'], styles: Sfc['styles'], // TODO: computed it
-lang: string, scriptRanges: ScriptRanges | undefined, scriptSetupRanges: ScriptSetupRanges | undefined, htmlGen: ReturnType<typeof templateGen['generate']> | undefined, compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions, codegenStack: boolean): {
-    codes: SourceMaps.Segment<FileRangeCapabilities>[];
-    codeStacks: SourceMaps.StackNode[];
-    mirrorBehaviorMappings: SourceMaps.Mapping<[MirrorBehaviorCapabilities, MirrorBehaviorCapabilities]>[];
-};
-//# sourceMappingURL=script.d.ts.map