@astrojs/ts-plugin 0.4.2 → 0.4.4

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/ts-plugin:build: cache hit, replaying output 692291da82d98101
+@astrojs/ts-plugin:build: cache hit, replaying output 7b2874bdd1ab34a6
 @astrojs/ts-plugin:build: 
-@astrojs/ts-plugin:build: > @astrojs/ts-plugin@0.4.2 build /home/runner/work/language-tools/language-tools/packages/ts-plugin
+@astrojs/ts-plugin:build: > @astrojs/ts-plugin@0.4.4 build /home/runner/work/language-tools/language-tools/packages/ts-plugin
 @astrojs/ts-plugin:build: > astro-scripts build "src/**/*.ts"
 @astrojs/ts-plugin:build: 

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @astrojs/ts-plugin
 
+## 0.4.4
+
+### Patch Changes
+
+- c04adf3: Upgrade compiler version to 1.1.1
+
+## 0.4.3
+
+### Patch Changes
+
+- 6b81412: Added an explanation on how to generate types for content collections to the error message for the `astro:content` import
+
 ## 0.4.2
 
 ### Patch Changes

package/dist/astro2tsx.js

@@ -23,11 +23,11 @@ __export(astro2tsx_exports, {
 module.exports = __toCommonJS(astro2tsx_exports);
 var import_TSXService = require("./workers/TSXService");
 function astro2tsx(content, fileName) {
-  const tsx = (0, import_TSXService.convertToTSX)(content, { sourcefile: fileName });
+  const tsx = (0, import_TSXService.convertToTSX)(content, { filename: fileName });
   return tsx;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   astro2tsx
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvMnRzeC50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDQSx3QkFBNkI7QUFFdEIsU0FBUyxVQUFVLFNBQWlCLFVBQTZCO0FBQ3ZFLFFBQU0sVUFBTSxnQ0FBYSxTQUFTLEVBQUUsWUFBWSxTQUFTLENBQUM7QUFFMUQsU0FBTztBQUNSOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvMnRzeC50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDQSx3QkFBNkI7QUFFdEIsU0FBUyxVQUFVLFNBQWlCLFVBQTZCO0FBQ3ZFLFFBQU0sVUFBTSxnQ0FBYSxTQUFTLEVBQUUsVUFBVSxTQUFTLENBQUM7QUFFeEQsU0FBTztBQUNSOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/language-service/diagnostics.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,13 +17,23 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var diagnostics_exports = {};
 __export(diagnostics_exports, {
+  DiagnosticCodes: () => DiagnosticCodes,
   decorateDiagnostics: () => decorateDiagnostics
 });
 module.exports = __toCommonJS(diagnostics_exports);
+var import_tsserverlibrary = __toESM(require("typescript/lib/tsserverlibrary"));
 var import_utils = require("../utils.js");
+var DiagnosticCodes = /* @__PURE__ */ ((DiagnosticCodes2) => {
+  DiagnosticCodes2[DiagnosticCodes2["CANNOT_FIND_MODULE"] = 2307] = "CANNOT_FIND_MODULE";
+  return DiagnosticCodes2;
+})(DiagnosticCodes || {});
 function decorateDiagnostics(ls) {
   decorateSyntacticDiagnostics(ls);
   decorateSemanticDiagnostics(ls);
@@ -42,7 +54,15 @@ function decorateSemanticDiagnostics(ls) {
     if ((0, import_utils.isAstroFilePath)(fileName)) {
       return [];
     }
-    return getSemanticDiagnostics(fileName);
+    let diagnostics = getSemanticDiagnostics(fileName);
+    diagnostics = diagnostics.map((diag) => {
+      const message = import_tsserverlibrary.default.flattenDiagnosticMessageText(diag.messageText, import_tsserverlibrary.default.sys.newLine);
+      if (diag.code === 2307 /* CANNOT_FIND_MODULE */ && message.includes("astro:content") && !message.includes("content collections")) {
+        diag.messageText = message + `${import_tsserverlibrary.default.sys.newLine}${import_tsserverlibrary.default.sys.newLine}If you're using content collections, make sure to run \`astro dev\`, \`astro build\` or \`astro sync\` to first generate the types so you can import from them. If you already ran one of those commands, restarting the TS Server might be necessary in order for the change to take effect`;
+      }
+      return diag;
+    });
+    return diagnostics;
   };
 }
 function decorateSuggestionDiagnostics(ls) {
@@ -56,6 +76,7 @@ function decorateSuggestionDiagnostics(ls) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DiagnosticCodes,
   decorateDiagnostics
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZGlhZ25vc3RpY3MudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ0EsbUJBQWdDO0FBRXpCLFNBQVMsb0JBQW9CLElBQThCO0FBQ2pFLCtCQUE2QixFQUFFO0FBQy9CLDhCQUE0QixFQUFFO0FBQzlCLGdDQUE4QixFQUFFO0FBQ2pDO0FBRUEsU0FBUyw2QkFBNkIsSUFBOEI7QUFDbkUsUUFBTSwwQkFBMEIsR0FBRztBQUNuQyxLQUFHLDBCQUEwQixDQUFDLGFBQXFCO0FBR2xELFlBQUksOEJBQWdCLFFBQVEsR0FBRztBQUM5QixhQUFPLENBQUM7QUFBQSxJQUNUO0FBQ0EsV0FBTyx3QkFBd0IsUUFBUTtBQUFBLEVBQ3hDO0FBQ0Q7QUFFQSxTQUFTLDRCQUE0QixJQUE4QjtBQUNsRSxRQUFNLHlCQUF5QixHQUFHO0FBQ2xDLEtBQUcseUJBQXlCLENBQUMsYUFBcUI7QUFHakQsWUFBSSw4QkFBZ0IsUUFBUSxHQUFHO0FBQzlCLGFBQU8sQ0FBQztBQUFBLElBQ1Q7QUFDQSxXQUFPLHVCQUF1QixRQUFRO0FBQUEsRUFDdkM7QUFDRDtBQUVBLFNBQVMsOEJBQThCLElBQThCO0FBQ3BFLFFBQU0sMkJBQTJCLEdBQUc7QUFDcEMsS0FBRywyQkFBMkIsQ0FBQyxhQUFxQjtBQUduRCxZQUFJLDhCQUFnQixRQUFRLEdBQUc7QUFDOUIsYUFBTyxDQUFDO0FBQUEsSUFDVDtBQUNBLFdBQU8seUJBQXlCLFFBQVE7QUFBQSxFQUN6QztBQUNEOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZGlhZ25vc3RpY3MudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSw2QkFBZTtBQUNmLG1CQUFnQztBQUV6QixJQUFLLGtCQUFMLGtCQUFLQSxxQkFBTDtBQUNOLEVBQUFBLGtDQUFBLHdCQUFxQixRQUFyQjtBQURXLFNBQUFBO0FBQUEsR0FBQTtBQUlMLFNBQVMsb0JBQW9CLElBQThCO0FBQ2pFLCtCQUE2QixFQUFFO0FBQy9CLDhCQUE0QixFQUFFO0FBQzlCLGdDQUE4QixFQUFFO0FBQ2pDO0FBRUEsU0FBUyw2QkFBNkIsSUFBOEI7QUFDbkUsUUFBTSwwQkFBMEIsR0FBRztBQUNuQyxLQUFHLDBCQUEwQixDQUFDLGFBQXFCO0FBR2xELFlBQUksOEJBQWdCLFFBQVEsR0FBRztBQUM5QixhQUFPLENBQUM7QUFBQSxJQUNUO0FBQ0EsV0FBTyx3QkFBd0IsUUFBUTtBQUFBLEVBQ3hDO0FBQ0Q7QUFFQSxTQUFTLDRCQUE0QixJQUE4QjtBQUNsRSxRQUFNLHlCQUF5QixHQUFHO0FBQ2xDLEtBQUcseUJBQXlCLENBQUMsYUFBcUI7QUFHakQsWUFBSSw4QkFBZ0IsUUFBUSxHQUFHO0FBQzlCLGFBQU8sQ0FBQztBQUFBLElBQ1Q7QUFFQSxRQUFJLGNBQWMsdUJBQXVCLFFBQVE7QUFDakQsa0JBQWMsWUFBWSxJQUFJLENBQUMsU0FBUztBQUN2QyxZQUFNLFVBQVUsdUJBQUFDLFFBQUcsNkJBQTZCLEtBQUssYUFBYSx1QkFBQUEsUUFBRyxJQUFJLE9BQU87QUFDaEYsVUFDQyxLQUFLLFNBQVMsaUNBQ2QsUUFBUSxTQUFTLGVBQWUsS0FHaEMsQ0FBQyxRQUFRLFNBQVMscUJBQXFCLEdBQ3RDO0FBQ0QsYUFBSyxjQUNKLFVBQ0EsR0FBRyx1QkFBQUEsUUFBRyxJQUFJLFVBQVUsdUJBQUFBLFFBQUcsSUFBSTtBQUFBLE1BRTdCO0FBRUEsYUFBTztBQUFBLElBQ1IsQ0FBQztBQUVELFdBQU87QUFBQSxFQUNSO0FBQ0Q7QUFFQSxTQUFTLDhCQUE4QixJQUE4QjtBQUNwRSxRQUFNLDJCQUEyQixHQUFHO0FBQ3BDLEtBQUcsMkJBQTJCLENBQUMsYUFBcUI7QUFHbkQsWUFBSSw4QkFBZ0IsUUFBUSxHQUFHO0FBQzlCLGFBQU8sQ0FBQztBQUFBLElBQ1Q7QUFDQSxXQUFPLHlCQUF5QixRQUFRO0FBQUEsRUFDekM7QUFDRDsiLAogICJuYW1lcyI6IFsiRGlhZ25vc3RpY0NvZGVzIiwgInRzIl0KfQo=

package/dist/workers/TSXService.js

@@ -36,4 +36,4 @@ function convertToTSX(source, options) {
 0 && (module.exports = {
   convertToTSX
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3dvcmtlcnMvVFNYU2VydmljZS50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDQSxxQkFBNkI7QUFFN0IsTUFBTSx1QkFBbUIsNkJBQTZCLDhCQUFjO0FBSzdELFNBQVMsYUFBYSxRQUFnQixTQUE0QztBQUN4RixTQUFPLGlCQUFpQixRQUFRLE9BQU87QUFDeEM7IiwKICAibmFtZXMiOiBbXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3dvcmtlcnMvVFNYU2VydmljZS50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDQSxxQkFBNkI7QUFFN0IsTUFBTSx1QkFBbUIsNkJBQTZCLDhCQUFjO0FBSzdELFNBQVMsYUFBYSxRQUFnQixTQUEwQztBQUN0RixTQUFPLGlCQUFpQixRQUFRLE9BQU87QUFDeEM7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/ts-plugin",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "A TypeScript Plugin providing Astro intellisense",
   "main": "dist/index.js",
   "type": "commonjs",
@@ -13,7 +13,7 @@
   "author": "withastro",
   "license": "MIT",
   "dependencies": {
-    "@astrojs/compiler": "^0.31.3",
+    "@astrojs/compiler": "^1.1.1",
     "@jridgewell/trace-mapping": "^0.3.15",
     "synckit": "^0.8.4"
   },

package/src/astro2tsx.ts

@@ -2,7 +2,7 @@ import type { TSXResult } from '@astrojs/compiler/types';
 import { convertToTSX } from './workers/TSXService';
 
 export function astro2tsx(content: string, fileName: string): TSXResult {
-	const tsx = convertToTSX(content, { sourcefile: fileName });
+	const tsx = convertToTSX(content, { filename: fileName });
 
 	return tsx;
 }

package/src/language-service/diagnostics.ts

@@ -1,6 +1,10 @@
-import type ts from 'typescript/lib/tsserverlibrary';
+import ts from 'typescript/lib/tsserverlibrary';
 import { isAstroFilePath } from '../utils.js';
 
+export enum DiagnosticCodes {
+	CANNOT_FIND_MODULE = 2307, // Cannot find module '{0}' or its corresponding type declarations.
+}
+
 export function decorateDiagnostics(ls: ts.LanguageService): void {
 	decorateSyntacticDiagnostics(ls);
 	decorateSemanticDiagnostics(ls);
@@ -27,7 +31,27 @@ function decorateSemanticDiagnostics(ls: ts.LanguageService): void {
 		if (isAstroFilePath(fileName)) {
 			return [];
 		}
-		return getSemanticDiagnostics(fileName);
+
+		let diagnostics = getSemanticDiagnostics(fileName);
+		diagnostics = diagnostics.map((diag) => {
+			const message = ts.flattenDiagnosticMessageText(diag.messageText, ts.sys.newLine);
+			if (
+				diag.code === DiagnosticCodes.CANNOT_FIND_MODULE &&
+				message.includes('astro:content') &&
+				// TypeScript will keep the diagnostics here in cache, so if we just blindly always add to it, our added message will be there twice
+				// Not sure if there's a generic way to ensure that we only add it once, so for now we'll just check for the message we want to add
+				!message.includes('content collections')
+			) {
+				diag.messageText =
+					message +
+					`${ts.sys.newLine}${ts.sys.newLine}` +
+					"If you're using content collections, make sure to run `astro dev`, `astro build` or `astro sync` to first generate the types so you can import from them. If you already ran one of those commands, restarting the TS Server might be necessary in order for the change to take effect";
+			}
+
+			return diag;
+		});
+
+		return diagnostics;
 	};
 }
 

package/src/workers/TSXService.ts

@@ -6,6 +6,6 @@ const convertToTSXSync = createSyncFn(require.resolve('./TSXWorker'));
 /**
  * Parse code by `@astrojs/compiler`
  */
-export function convertToTSX(source: string, options: { sourcefile: string }): TSXResult {
+export function convertToTSX(source: string, options: { filename: string }): TSXResult {
 	return convertToTSXSync(source, options);
 }