@astrojs/ts-plugin 1.3.1 → 1.5.0

package/dist/astro2tsx.d.ts

@@ -1,6 +1,6 @@
-import { VirtualFile } from '@volar/language-core';
-export declare function astro2tsx(input: string, fileName: string, ts: typeof import('typescript/lib/tsserverlibrary.js')): {
-    virtualFile: VirtualFile;
+import type { VirtualCode } from '@volar/language-core';
+export declare function astro2tsx(input: string, fileName: string, ts: typeof import('typescript')): {
+    virtualFile: VirtualCode<string>;
     diagnostics: import("@astrojs/compiler").DiagnosticMessage[] | {
         code: 1000;
         location: {

package/dist/astro2tsx.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.astro2tsx = void 0;
 const sync_1 = require("@astrojs/compiler/sync");
 const sourcemap_codec_1 = require("@jridgewell/sourcemap-codec");
-const language_core_1 = require("@volar/language-core");
 const node_path_1 = __importDefault(require("node:path"));
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 function safeConvertToTSX(content, options) {
@@ -34,6 +33,16 @@ function safeConvertToTSX(content, options) {
                     text: `The Astro compiler encountered an unknown error while parsing this file. Please create an issue with your code and the error shown in the server's logs: https://github.com/withastro/language-tools/issues`,
                 },
             ],
+            metaRanges: {
+                frontmatter: {
+                    start: 0,
+                    end: 0,
+                },
+                body: {
+                    start: 0,
+                    end: 0,
+                },
+            },
         };
     }
 }
@@ -74,16 +83,23 @@ function getVirtualFileTSX(input, tsx, fileName, ts) {
                 if (length > 0) {
                     const lastMapping = mappings.length ? mappings[mappings.length - 1] : undefined;
                     if (lastMapping &&
-                        lastMapping.generatedRange[1] === current.genOffset &&
-                        lastMapping.sourceRange[1] === current.sourceOffset) {
-                        lastMapping.generatedRange[1] = current.genOffset + length;
-                        lastMapping.sourceRange[1] = current.sourceOffset + length;
+                        lastMapping.generatedOffsets[0] + lastMapping.lengths[0] === current.genOffset &&
+                        lastMapping.sourceOffsets[0] + lastMapping.lengths[0] === current.sourceOffset) {
+                        lastMapping.lengths[0] += length;
                     }
                     else {
                         mappings.push({
-                            sourceRange: [current.sourceOffset, current.sourceOffset + length],
-                            generatedRange: [current.genOffset, current.genOffset + length],
-                            data: language_core_1.FileRangeCapabilities.full,
+                            sourceOffsets: [current.sourceOffset],
+                            generatedOffsets: [current.genOffset],
+                            lengths: [length],
+                            data: {
+                                verification: true,
+                                completion: true,
+                                semantic: true,
+                                navigation: true,
+                                structure: true,
+                                format: false,
+                            },
                         });
                     }
                 }
@@ -98,33 +114,16 @@ function getVirtualFileTSX(input, tsx, fileName, ts) {
             }
         }
     }
-    const ast = ts.createSourceFile('/a.tsx', tsx.code, ts.ScriptTarget.ESNext);
-    if (ast.statements[0]) {
-        mappings.push({
-            sourceRange: [0, input.length],
-            generatedRange: [ast.statements[0].getStart(ast), tsx.code.length],
-            data: {},
-        });
-    }
     return {
-        fileName: fileName + '.tsx',
-        kind: language_core_1.FileKind.TypeScriptHostFile,
-        capabilities: {
-            codeAction: true,
-            documentFormatting: false,
-            diagnostic: true,
-            documentSymbol: true,
-            inlayHint: true,
-            foldingRange: true,
-        },
-        codegenStacks: [],
+        id: 'tsx',
+        languageId: 'typescriptreact',
         snapshot: {
             getText: (start, end) => tsx.code.substring(start, end),
             getLength: () => tsx.code.length,
             getChangeRange: () => undefined,
         },
         mappings: mappings,
-        embeddedFiles: [],
+        embeddedCodes: [],
     };
 }
 function patchTSX(code, fileName) {

package/dist/index.d.ts

@@ -1,3 +1,2 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-declare const init: ts.server.PluginModuleFactory;
-export = init;
+declare const _default: ts.server.PluginModuleFactory;
+export = _default;

package/dist/index.js

@@ -1,82 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-const language_core_1 = require("@volar/language-core");
-const typescript_1 = require("@volar/typescript");
-const semver = __importStar(require("semver"));
+const createLanguageServicePlugin_js_1 = require("@volar/typescript/lib/quickstart/createLanguageServicePlugin.js");
 const language_js_1 = require("./language.js");
-const externalFiles = new WeakMap();
-const init = (modules) => {
-    const { typescript: ts } = modules;
-    const pluginModule = {
-        create(info) {
-            const virtualFiles = (0, language_core_1.createVirtualFiles)([(0, language_js_1.getLanguageModule)(ts)]);
-            (0, typescript_1.decorateLanguageService)(virtualFiles, info.languageService, true);
-            (0, typescript_1.decorateLanguageServiceHost)(virtualFiles, info.languageServiceHost, ts, ['.astro']);
-            if (semver.lt(ts.version, '5.3.0')) {
-                // HACK: AutoImportProviderProject's script kind does not match the one of the language service host here
-                // this causes TypeScript to throw and crash. So, we'll fake being a TS file here for now until they fix it
-                // Fixed by https://github.com/microsoft/TypeScript/pull/55716
-                const getScriptKind = info.languageServiceHost.getScriptKind?.bind(info.languageServiceHost.getScriptKind);
-                if (getScriptKind) {
-                    info.languageServiceHost.getScriptKind = (fileName) => {
-                        if (fileName.endsWith('.astro')) {
-                            return ts.ScriptKind.TS;
-                        }
-                        return getScriptKind(fileName);
-                    };
-                }
-            }
-            return info.languageService;
-        },
-        getExternalFiles(project, updateLevel = 0) {
-            if (
-            // @ts-expect-error wait for TS 5.3
-            updateLevel >= (1) ||
-                !externalFiles.has(project)) {
-                const oldFiles = externalFiles.get(project);
-                const newFiles = (0, typescript_1.searchExternalFiles)(ts, project, ['.astro']);
-                externalFiles.set(project, newFiles);
-                if (oldFiles && !arrayItemsEqual(oldFiles, newFiles)) {
-                    project.refreshDiagnostics();
-                }
-            }
-            return externalFiles.get(project);
-        },
-    };
-    return pluginModule;
-};
-function arrayItemsEqual(a, b) {
-    if (a.length !== b.length) {
-        return false;
-    }
-    const set = new Set(a);
-    for (const file of b) {
-        if (!set.has(file)) {
-            return false;
-        }
-    }
-    return true;
-}
-module.exports = init;
+module.exports = (0, createLanguageServicePlugin_js_1.createLanguageServicePlugin)((ts) => [(0, language_js_1.getLanguageModule)(ts)]);

package/dist/language.d.ts

@@ -1,17 +1,16 @@
-import { FileCapabilities, FileKind, type Language, type VirtualFile } from '@volar/language-core';
-import type ts from 'typescript/lib/tsserverlibrary.js';
-export declare function getLanguageModule(ts: typeof import('typescript/lib/tsserverlibrary.js')): Language<AstroFile>;
-export declare class AstroFile implements VirtualFile {
-    sourceFileName: string;
+import { type CodeMapping, type LanguagePlugin, type VirtualCode } from '@volar/language-core';
+import type ts from 'typescript';
+export declare function getLanguageModule(ts: typeof import('typescript')): LanguagePlugin<AstroVirtualCode>;
+export declare class AstroVirtualCode implements VirtualCode {
+    fileName: string;
     snapshot: ts.IScriptSnapshot;
     private readonly ts;
-    kind: FileKind;
-    capabilities: FileCapabilities;
-    fileName: string;
-    mappings: VirtualFile['mappings'];
-    embeddedFiles: VirtualFile['embeddedFiles'];
+    id: string;
+    languageId: string;
+    mappings: CodeMapping[];
+    embeddedCodes: VirtualCode[];
     codegenStacks: never[];
-    constructor(sourceFileName: string, snapshot: ts.IScriptSnapshot, ts: typeof import('typescript/lib/tsserverlibrary.js'));
+    constructor(fileName: string, snapshot: ts.IScriptSnapshot, ts: typeof import('typescript'));
     update(newSnapshot: ts.IScriptSnapshot): void;
     onSnapshotUpdated(): void;
 }

package/dist/language.js

@@ -1,30 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AstroFile = exports.getLanguageModule = void 0;
+exports.AstroVirtualCode = exports.getLanguageModule = void 0;
 const language_core_1 = require("@volar/language-core");
 const astro2tsx_js_1 = require("./astro2tsx.js");
 function getLanguageModule(ts) {
     return {
-        createVirtualFile(fileName, snapshot) {
-            if (fileName.endsWith('.astro')) {
-                return new AstroFile(fileName, snapshot, ts);
+        createVirtualCode(fileId, languageId, snapshot) {
+            if (languageId === 'astro') {
+                const fileName = fileId.includes('://') ? fileId.split('://')[1] : fileId;
+                return new AstroVirtualCode(fileName, snapshot, ts);
             }
         },
-        updateVirtualFile(astroFile, snapshot) {
+        updateVirtualCode(_fileId, astroFile, snapshot) {
             astroFile.update(snapshot);
+            return astroFile;
+        },
+        typescript: {
+            extraFileExtensions: [{ extension: 'astro', isMixedContent: true, scriptKind: 7 }],
+            getScript(astroCode) {
+                for (const code of (0, language_core_1.forEachEmbeddedCode)(astroCode)) {
+                    if (code.id === 'tsx') {
+                        return {
+                            code,
+                            extension: '.tsx',
+                            scriptKind: 4,
+                        };
+                    }
+                }
+            },
         },
     };
 }
 exports.getLanguageModule = getLanguageModule;
-class AstroFile {
-    constructor(sourceFileName, snapshot, ts) {
-        this.sourceFileName = sourceFileName;
+class AstroVirtualCode {
+    constructor(fileName, snapshot, ts) {
+        this.fileName = fileName;
         this.snapshot = snapshot;
         this.ts = ts;
-        this.kind = language_core_1.FileKind.TextFile;
-        this.capabilities = language_core_1.FileCapabilities.full;
+        this.id = 'root';
+        this.languageId = 'astro';
         this.codegenStacks = [];
-        this.fileName = sourceFileName;
         this.onSnapshotUpdated();
     }
     update(newSnapshot) {
@@ -34,14 +49,22 @@ class AstroFile {
     onSnapshotUpdated() {
         this.mappings = [
             {
-                sourceRange: [0, this.snapshot.getLength()],
-                generatedRange: [0, this.snapshot.getLength()],
-                data: language_core_1.FileRangeCapabilities.full,
+                sourceOffsets: [0],
+                generatedOffsets: [0],
+                lengths: [this.snapshot.getLength()],
+                data: {
+                    verification: true,
+                    completion: true,
+                    semantic: true,
+                    navigation: true,
+                    structure: true,
+                    format: false,
+                },
             },
         ];
-        this.embeddedFiles = [];
+        this.embeddedCodes = [];
         const tsx = (0, astro2tsx_js_1.astro2tsx)(this.snapshot.getText(0, this.snapshot.getLength()), this.fileName, this.ts);
-        this.embeddedFiles.push(tsx.virtualFile);
+        this.embeddedCodes.push(tsx.virtualFile);
     }
 }
-exports.AstroFile = AstroFile;
+exports.AstroVirtualCode = AstroVirtualCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/ts-plugin",
-  "version": "1.3.1",
+  "version": "1.5.0",
   "description": "A TypeScript Plugin providing Astro intellisense",
   "main": "dist/index.js",
   "type": "commonjs",
@@ -22,9 +22,9 @@
   "author": "withastro",
   "license": "MIT",
   "dependencies": {
-    "@volar/language-core": "~1.10.9",
-    "@volar/typescript": "~1.10.9",
-    "@astrojs/compiler": "^2.2.2",
+    "@volar/language-core": "~2.0.2",
+    "@volar/typescript": "~2.0.2",
+    "@astrojs/compiler": "^2.4.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
     "semver": "^7.3.8",
     "vscode-languageserver-textdocument": "^1.0.11"