@astrojs/ts-plugin 1.5.0 → 1.5.2

package/dist/astro2tsx.d.ts

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

package/dist/astro2tsx.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.astro2tsx = void 0;
+const node_path_1 = __importDefault(require("node:path"));
 const sync_1 = require("@astrojs/compiler/sync");
 const sourcemap_codec_1 = require("@jridgewell/sourcemap-codec");
-const node_path_1 = __importDefault(require("node:path"));
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 function safeConvertToTSX(content, options) {
     try {
@@ -46,15 +46,15 @@ function safeConvertToTSX(content, options) {
         };
     }
 }
-function astro2tsx(input, fileName, ts) {
+function astro2tsx(input, fileName) {
     const tsx = safeConvertToTSX(input, { filename: fileName });
     return {
-        virtualFile: getVirtualFileTSX(input, tsx, fileName, ts),
+        virtualFile: getVirtualFileTSX(input, tsx, fileName),
         diagnostics: tsx.diagnostics,
     };
 }
 exports.astro2tsx = astro2tsx;
-function getVirtualFileTSX(input, tsx, fileName, ts) {
+function getVirtualFileTSX(input, tsx, fileName) {
     tsx.code = patchTSX(tsx.code, fileName);
     const v3Mappings = (0, sourcemap_codec_1.decode)(tsx.map.mappings);
     const sourcedDoc = vscode_languageserver_textdocument_1.TextDocument.create(fileName, 'astro', 0, input);

package/dist/index.js

@@ -1,4 +1,4 @@
 "use strict";
 const createLanguageServicePlugin_js_1 = require("@volar/typescript/lib/quickstart/createLanguageServicePlugin.js");
 const language_js_1 = require("./language.js");
-module.exports = (0, createLanguageServicePlugin_js_1.createLanguageServicePlugin)((ts) => [(0, language_js_1.getLanguageModule)(ts)]);
+module.exports = (0, createLanguageServicePlugin_js_1.createLanguageServicePlugin)(() => [(0, language_js_1.getLanguageModule)()]);

package/dist/language.d.ts

@@ -1,16 +1,15 @@
 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 function getLanguageModule(): LanguagePlugin<AstroVirtualCode>;
 export declare class AstroVirtualCode implements VirtualCode {
     fileName: string;
     snapshot: ts.IScriptSnapshot;
-    private readonly ts;
     id: string;
     languageId: string;
     mappings: CodeMapping[];
     embeddedCodes: VirtualCode[];
     codegenStacks: never[];
-    constructor(fileName: string, snapshot: ts.IScriptSnapshot, ts: typeof import('typescript'));
+    constructor(fileName: string, snapshot: ts.IScriptSnapshot);
     update(newSnapshot: ts.IScriptSnapshot): void;
     onSnapshotUpdated(): void;
 }

package/dist/language.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstroVirtualCode = exports.getLanguageModule = void 0;
 const language_core_1 = require("@volar/language-core");
 const astro2tsx_js_1 = require("./astro2tsx.js");
-function getLanguageModule(ts) {
+function getLanguageModule() {
     return {
         createVirtualCode(fileId, languageId, snapshot) {
             if (languageId === 'astro') {
-                const fileName = fileId.includes('://') ? fileId.split('://')[1] : fileId;
-                return new AstroVirtualCode(fileName, snapshot, ts);
+                // fileId will never be a uri in ts plugin
+                const fileName = fileId;
+                return new AstroVirtualCode(fileName, snapshot);
             }
         },
         updateVirtualCode(_fileId, astroFile, snapshot) {
@@ -33,10 +34,9 @@ function getLanguageModule(ts) {
 }
 exports.getLanguageModule = getLanguageModule;
 class AstroVirtualCode {
-    constructor(fileName, snapshot, ts) {
+    constructor(fileName, snapshot) {
         this.fileName = fileName;
         this.snapshot = snapshot;
-        this.ts = ts;
         this.id = 'root';
         this.languageId = 'astro';
         this.codegenStacks = [];
@@ -63,7 +63,7 @@ class AstroVirtualCode {
             },
         ];
         this.embeddedCodes = [];
-        const tsx = (0, astro2tsx_js_1.astro2tsx)(this.snapshot.getText(0, this.snapshot.getLength()), this.fileName, this.ts);
+        const tsx = (0, astro2tsx_js_1.astro2tsx)(this.snapshot.getText(0, this.snapshot.getLength()), this.fileName);
         this.embeddedCodes.push(tsx.virtualFile);
     }
 }

package/package.json

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