@astrojs/ts-plugin 1.10.9 → 1.10.11

package/dist/astro-types.d.ts

@@ -0,0 +1,20 @@
+import type ts from 'typescript';
+/**
+ * Walk up from the given directories until an installed `astro` package is found,
+ * returning the directory that contains its `package.json`.
+ */
+export declare function findAstroPackageDirectory(tsModule: typeof import('typescript'), currentDirectory: string | string[]): string | undefined;
+/**
+ * Check whether a directory belongs to an Astro project, by looking for an `astro`
+ * dependency in the nearest `package.json` and falling back to an `astro.config.*` file
+ * next to it. Mirrors the language server's `getAstroInstall()` check.
+ */
+export declare function isAstroProject(tsModule: typeof import('typescript'), currentDirectory: string): boolean;
+/**
+ * Inject the installed Astro package's `env.d.ts` and `astro-jsx.d.ts` into the
+ * TypeScript program. Without these, the `Astro` global is undeclared and the type
+ * chain through `Astro.locals` can't be resolved, so "Go To References" from a `.ts`
+ * file misses usages inside `.astro` files. Mirrors the language server's
+ * `addAstroTypes()`.
+ */
+export declare function addAstroTypes(tsModule: typeof import('typescript'), host: ts.LanguageServiceHost, currentDirectory: string | string[]): void;

package/dist/astro-types.js

@@ -0,0 +1,105 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findAstroPackageDirectory = findAstroPackageDirectory;
+exports.isAstroProject = isAstroProject;
+exports.addAstroTypes = addAstroTypes;
+const node_path_1 = __importDefault(require("node:path"));
+const decoratedHosts = new WeakSet();
+/**
+ * Walk up from the given directories until an installed `astro` package is found,
+ * returning the directory that contains its `package.json`.
+ */
+function findAstroPackageDirectory(tsModule, currentDirectory) {
+    for (const candidate of Array.isArray(currentDirectory) ? currentDirectory : [currentDirectory]) {
+        const astroDirectory = findAstroPackageDirectoryFrom(tsModule, candidate);
+        if (astroDirectory) {
+            return astroDirectory;
+        }
+    }
+}
+function findAstroPackageDirectoryFrom(tsModule, currentDirectory) {
+    let directory = tsModule.sys.resolvePath(currentDirectory);
+    while (true) {
+        const packageJson = node_path_1.default.join(directory, 'node_modules', 'astro', 'package.json');
+        if (tsModule.sys.fileExists(packageJson)) {
+            return node_path_1.default.dirname(packageJson);
+        }
+        const parent = node_path_1.default.dirname(directory);
+        if (parent === directory) {
+            return undefined;
+        }
+        directory = parent;
+    }
+}
+/**
+ * Check whether a directory belongs to an Astro project, by looking for an `astro`
+ * dependency in the nearest `package.json` and falling back to an `astro.config.*` file
+ * next to it. Mirrors the language server's `getAstroInstall()` check.
+ */
+function isAstroProject(tsModule, currentDirectory) {
+    const packageJson = findNearestPackageJson(tsModule, currentDirectory);
+    if (!packageJson) {
+        return true;
+    }
+    try {
+        const content = JSON.parse(tsModule.sys.readFile(packageJson) ?? '{}');
+        const deps = [
+            ...Object.keys(content.dependencies ?? {}),
+            ...Object.keys(content.devDependencies ?? {}),
+            ...Object.keys(content.peerDependencies ?? {}),
+        ];
+        if (deps.includes('astro')) {
+            return true;
+        }
+    }
+    catch { }
+    return tsModule.sys
+        .readDirectory(node_path_1.default.dirname(packageJson), ['.js', '.mjs', '.cjs', '.ts', '.mts', '.cts'], undefined, undefined, 1)
+        .some((file) => node_path_1.default.basename(file).startsWith('astro.config'));
+}
+function findNearestPackageJson(tsModule, currentDirectory) {
+    let directory = tsModule.sys.resolvePath(currentDirectory);
+    while (true) {
+        const packageJson = node_path_1.default.join(directory, 'package.json');
+        if (tsModule.sys.fileExists(packageJson)) {
+            return packageJson;
+        }
+        const parent = node_path_1.default.dirname(directory);
+        if (parent === directory) {
+            return undefined;
+        }
+        directory = parent;
+    }
+}
+/**
+ * Inject the installed Astro package's `env.d.ts` and `astro-jsx.d.ts` into the
+ * TypeScript program. Without these, the `Astro` global is undeclared and the type
+ * chain through `Astro.locals` can't be resolved, so "Go To References" from a `.ts`
+ * file misses usages inside `.astro` files. Mirrors the language server's
+ * `addAstroTypes()`.
+ */
+function addAstroTypes(tsModule, host, currentDirectory) {
+    if (decoratedHosts.has(host)) {
+        return;
+    }
+    const astroDirectory = findAstroPackageDirectory(tsModule, currentDirectory);
+    if (!astroDirectory) {
+        return;
+    }
+    const addedFileNames = ['./env.d.ts', './astro-jsx.d.ts']
+        .map((filePath) => tsModule.sys.resolvePath(node_path_1.default.resolve(astroDirectory, filePath)))
+        .filter((fileName) => tsModule.sys.fileExists(fileName));
+    if (!addedFileNames.length) {
+        return;
+    }
+    decoratedHosts.add(host);
+    const getScriptFileNames = host.getScriptFileNames.bind(host);
+    host.getScriptFileNames = () => {
+        const fileNames = getScriptFileNames();
+        const seen = new Set(fileNames);
+        return [...fileNames, ...addedFileNames.filter((fileName) => !seen.has(fileName))];
+    };
+}

package/dist/astro2tsx.js

@@ -10,7 +10,14 @@ const sourcemap_codec_1 = require("@jridgewell/sourcemap-codec");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 function safeConvertToTSX(content, options) {
     try {
-        const tsx = (0, sync_1.convertToTSX)(content, { filename: options.filename });
+        // Match the language server: strip `<script>`/`<style>` content from the TSX.
+        // The compiler otherwise wraps script bodies in `{() => { ... }}`, where
+        // `import` declarations are syntactically invalid and pollute the virtual file.
+        const tsx = (0, sync_1.convertToTSX)(content, {
+            filename: options.filename,
+            includeScripts: false,
+            includeStyles: false,
+        });
         return tsx;
     }
     catch (e) {

package/dist/index.js

@@ -1,11 +1,25 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const node_path_1 = __importDefault(require("node:path"));
 const createLanguageServicePlugin_js_1 = require("@volar/typescript/lib/quickstart/createLanguageServicePlugin.js");
+const astro_types_js_1 = require("./astro-types.js");
 const frontmatter_js_1 = require("./frontmatter.js");
 const language_js_1 = require("./language.js");
 module.exports = (0, createLanguageServicePlugin_js_1.createLanguageServicePlugin)((ts, info) => {
     let collectionConfig = undefined;
+    const currentDir = info.project.getCurrentDirectory();
+    // Make "Go To References" from `.ts` files aware of usages inside `.astro` files
+    // by injecting the Astro ambient types so type chains like `Astro.locals.*` resolve.
+    // (`.astro` files themselves already enter the program via Volar's external files.)
+    if ((0, astro_types_js_1.isAstroProject)(ts, currentDir)) {
+        (0, astro_types_js_1.addAstroTypes)(ts, info.languageServiceHost, [
+            currentDir,
+            ...info.languageServiceHost.getScriptFileNames().map((fileName) => node_path_1.default.dirname(fileName)),
+        ]);
+    }
     try {
-        const currentDir = info.project.getCurrentDirectory();
         const fileContent = ts.sys.readFile(currentDir + '/.astro/collections/collections.json');
         if (fileContent) {
             collectionConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/ts-plugin",
-  "version": "1.10.9",
+  "version": "1.10.11",
   "description": "A TypeScript Plugin providing Astro intellisense",
   "main": "dist/index.js",
   "type": "commonjs",
@@ -32,13 +32,13 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.9.0",
+    "@types/node": "^22.10.6",
     "@types/semver": "^7.7.1",
     "@types/vscode": "^1.101.0",
     "@vscode/test-cli": "^0.0.12",
     "@vscode/test-electron": "^2.5.2",
     "mocha": "^11.7.5",
-    "tsx": "^4.21.0",
+    "tsx": "^4.22.0",
     "typescript": "^6.0.3",
     "vscode-uri": "^3.1.0"
   },