@astrojs/ts-plugin 1.0.4 → 1.0.6

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/ts-plugin:build: cache hit, replaying output 00614ff6501ebd18
+@astrojs/ts-plugin:build: cache hit, replaying output 3f3b3eeed56ebe05
 @astrojs/ts-plugin:build: 
-@astrojs/ts-plugin:build: > @astrojs/ts-plugin@1.0.4 build /home/runner/work/language-tools/language-tools/packages/ts-plugin
+@astrojs/ts-plugin:build: > @astrojs/ts-plugin@1.0.6 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
 
+## 1.0.6
+
+### Patch Changes
+
+- 3fcbc1a: Fix TypeScript plugin crashing at start in certain circumstances
+
+## 1.0.5
+
+### Patch Changes
+
+- ae15420: Fix importing `.astro` files in `.ts` files not working with TypeScript 5.0+
+
 ## 1.0.4
 
 ### Patch Changes

package/dist/astro-sys.js

@@ -1,9 +1,7 @@
 "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)
@@ -17,31 +15,26 @@ 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 astro_sys_exports = {};
 __export(astro_sys_exports, {
   createAstroSys: () => createAstroSys
 });
 module.exports = __toCommonJS(astro_sys_exports);
-var import_typescript = __toESM(require("typescript"));
 var import_utils = require("./utils.js");
-function createAstroSys(logger) {
+function createAstroSys(logger, typescript) {
   const astroSys = {
-    ...import_typescript.default.sys,
+    ...typescript.sys,
     fileExists(path) {
-      return import_typescript.default.sys.fileExists((0, import_utils.ensureRealAstroFilePath)(path));
+      return typescript.sys.fileExists((0, import_utils.ensureRealAstroFilePath)(path));
     },
     readDirectory(path, extensions, exclude, include, depth) {
       const extensionsWithAstro = (extensions != null ? extensions : []).concat(".astro");
-      return import_typescript.default.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
+      return typescript.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
     }
   };
-  if (import_typescript.default.sys.realpath) {
-    const realpath = import_typescript.default.sys.realpath;
+  if (typescript.sys.realpath) {
+    const realpath = typescript.sys.realpath;
     astroSys.realpath = function(path) {
       if ((0, import_utils.isVirtualAstroFilePath)(path)) {
         return realpath((0, import_utils.toRealAstroFilePath)(path)) + ".ts";
@@ -55,4 +48,4 @@ function createAstroSys(logger) {
 0 && (module.exports = {
   createAstroSys
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvLXN5cy50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSx3QkFBZTtBQUVmLG1CQUFxRjtBQUs5RSxTQUFTLGVBQWUsUUFBZ0I7QUFDOUMsUUFBTSxXQUFzQjtBQUFBLElBQzNCLEdBQUcsa0JBQUFBLFFBQUc7QUFBQSxJQUNOLFdBQVcsTUFBYztBQUN4QixhQUFPLGtCQUFBQSxRQUFHLElBQUksZUFBVyxzQ0FBd0IsSUFBSSxDQUFDO0FBQUEsSUFDdkQ7QUFBQSxJQUNBLGNBQWMsTUFBTSxZQUFZLFNBQVMsU0FBUyxPQUFPO0FBQ3hELFlBQU0sdUJBQXVCLGtDQUFjLENBQUMsR0FBRyxPQUFPLFFBQVE7QUFFOUQsYUFBTyxrQkFBQUEsUUFBRyxJQUFJLGNBQWMsTUFBTSxxQkFBcUIsU0FBUyxTQUFTLEtBQUs7QUFBQSxJQUMvRTtBQUFBLEVBQ0Q7QUFFQSxNQUFJLGtCQUFBQSxRQUFHLElBQUksVUFBVTtBQUNwQixVQUFNLFdBQVcsa0JBQUFBLFFBQUcsSUFBSTtBQUN4QixhQUFTLFdBQVcsU0FBVSxNQUFNO0FBQ25DLGNBQUkscUNBQXVCLElBQUksR0FBRztBQUNqQyxlQUFPLGFBQVMsa0NBQW9CLElBQUksQ0FBQyxJQUFJO0FBQUEsTUFDOUM7QUFDQSxhQUFPLFNBQVMsSUFBSTtBQUFBLElBQ3JCO0FBQUEsRUFDRDtBQUVBLFNBQU87QUFDUjsiLAogICJuYW1lcyI6IFsidHMiXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvLXN5cy50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFQSxtQkFBcUY7QUFLOUUsU0FBUyxlQUFlLFFBQWdCLFlBQTZEO0FBQzNHLFFBQU0sV0FBc0I7QUFBQSxJQUMzQixHQUFHLFdBQVc7QUFBQSxJQUNkLFdBQVcsTUFBYztBQUN4QixhQUFPLFdBQVcsSUFBSSxlQUFXLHNDQUF3QixJQUFJLENBQUM7QUFBQSxJQUMvRDtBQUFBLElBQ0EsY0FBYyxNQUFNLFlBQVksU0FBUyxTQUFTLE9BQU87QUFDeEQsWUFBTSx1QkFBdUIsa0NBQWMsQ0FBQyxHQUFHLE9BQU8sUUFBUTtBQUU5RCxhQUFPLFdBQVcsSUFBSSxjQUFjLE1BQU0scUJBQXFCLFNBQVMsU0FBUyxLQUFLO0FBQUEsSUFDdkY7QUFBQSxFQUNEO0FBRUEsTUFBSSxXQUFXLElBQUksVUFBVTtBQUM1QixVQUFNLFdBQVcsV0FBVyxJQUFJO0FBQ2hDLGFBQVMsV0FBVyxTQUFVLE1BQU07QUFDbkMsY0FBSSxxQ0FBdUIsSUFBSSxHQUFHO0FBQ2pDLGVBQU8sYUFBUyxrQ0FBb0IsSUFBSSxDQUFDLElBQUk7QUFBQSxNQUM5QztBQUNBLGFBQU8sU0FBUyxJQUFJO0FBQUEsSUFDckI7QUFBQSxFQUNEO0FBRUEsU0FBTztBQUNSOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/index.js

@@ -15,6 +15,9 @@ function init(modules) {
       logger.log("Detected that this is not an Astro project, abort patching TypeScript");
       return info.languageService;
     }
+    if ((0, import_language_service.isPatched)(info.languageService)) {
+      return info.languageService;
+    }
     logger.log("Starting Astro plugin");
     const snapshotManager = new import_astro_snapshots.AstroSnapshotManager(modules.typescript, info.project.projectService, logger);
     if (parsedCommandLine) {
@@ -27,7 +30,7 @@ function init(modules) {
       );
     }
     (0, import_module_loader.patchModuleLoader)(logger, snapshotManager, modules.typescript, info.languageServiceHost, info.project);
-    return (0, import_language_service.decorateLanguageService)(info.languageService, snapshotManager, logger);
+    return (0, import_language_service.decorateLanguageService)(info.languageService, snapshotManager, ts, logger);
   }
   function getExternalFiles(project) {
     var _a, _b;
@@ -51,4 +54,4 @@ function init(modules) {
   return { create, getExternalFiles };
 }
 module.exports = init;
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQUNBLDZCQUFxQztBQUNyQyw4QkFBd0M7QUFDeEMsb0JBQXVCO0FBQ3ZCLDJCQUFrQztBQUNsQyxpQ0FBeUM7QUFDekMsbUJBQXFFO0FBRXJFLFNBQVMsS0FBSyxTQUEwRTtBQUN2RixRQUFNLEtBQUssUUFBUTtBQUVuQixXQUFTLE9BQU8sTUFBc0Q7QUFYdkU7QUFZRSxVQUFNLFNBQVMsSUFBSSxxQkFBTyxLQUFLLFFBQVEsZUFBZSxNQUFNO0FBQzVELFVBQU0scUJBQW9CLGdCQUFLLHFCQUFvQix5QkFBekIsZ0NBQWdELHNDQUF3QixLQUFLLE9BQU87QUFFOUcsUUFBSSxDQUFDLGVBQWUsS0FBSyxTQUFTLGlCQUFpQixHQUFHO0FBQ3JELGFBQU8sSUFBSSx1RUFBdUU7QUFDbEYsYUFBTyxLQUFLO0FBQUEsSUFDYjtBQUVBLFdBQU8sSUFBSSx1QkFBdUI7QUFFbEMsVUFBTSxrQkFBa0IsSUFBSSw0Q0FBcUIsUUFBUSxZQUFZLEtBQUssUUFBUSxnQkFBZ0IsTUFBTTtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixVQUFJO0FBQUEsUUFDSCxRQUFRO0FBQUEsUUFDUixLQUFLO0FBQUEsUUFDTCxLQUFLO0FBQUEsUUFDTDtBQUFBLFFBQ0E7QUFBQSxNQUNEO0FBQUEsSUFDRDtBQUVBLGdEQUFrQixRQUFRLGlCQUFpQixRQUFRLFlBQVksS0FBSyxxQkFBcUIsS0FBSyxPQUFPO0FBQ3JHLGVBQU8saURBQXdCLEtBQUssaUJBQWlCLGlCQUFpQixNQUFNO0FBQUEsRUFDN0U7QUFFQSxXQUFTLGlCQUFpQixTQUFzQztBQXJDakU7QUFzQ0UsWUFBTywrREFBeUIsWUFBWSxRQUFRLGVBQWUsQ0FBQyxNQUE3RCxtQkFBZ0UsZUFBaEUsWUFBOEUsQ0FBQztBQUFBLEVBQ3ZGO0FBRUEsV0FBUyxlQUFlLFNBQTRCLG1CQUFxRDtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixZQUFNLGlCQUFhLDBDQUE0QixJQUFJLFNBQVMsaUJBQWlCO0FBRTdFLFVBQUksV0FBVyxTQUFTO0FBQUcsZUFBTztBQUFBLElBQ25DO0FBRUEsUUFBSTtBQUNILFlBQU0sa0JBQWtCLFFBQVEsbUJBQW1CO0FBQ25ELFlBQU0sb0JBQ0wsT0FBTyxnQkFBZ0IsbUJBQW1CLFlBQzFDLFFBQVEsUUFBUSxTQUFTLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixjQUFjLEVBQUUsQ0FBQztBQUVyRSxhQUFPO0FBQUEsSUFDUixTQUFTLEdBQVA7QUFDRCxjQUFRLGVBQWUsT0FBTyxLQUFLLENBQVc7QUFDOUMsYUFBTztBQUFBLElBQ1I7QUFBQSxFQUNEO0FBRUEsU0FBTyxFQUFFLFFBQVEsaUJBQWlCO0FBQ25DO0FBRUEsaUJBQVM7IiwKICAibmFtZXMiOiBbXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQUNBLDZCQUFxQztBQUNyQyw4QkFBbUQ7QUFDbkQsb0JBQXVCO0FBQ3ZCLDJCQUFrQztBQUNsQyxpQ0FBeUM7QUFDekMsbUJBQXFFO0FBRXJFLFNBQVMsS0FBSyxTQUEwRTtBQUN2RixRQUFNLEtBQUssUUFBUTtBQUVuQixXQUFTLE9BQU8sTUFBc0Q7QUFYdkU7QUFZRSxVQUFNLFNBQVMsSUFBSSxxQkFBTyxLQUFLLFFBQVEsZUFBZSxNQUFNO0FBQzVELFVBQU0scUJBQW9CLGdCQUFLLHFCQUFvQix5QkFBekIsZ0NBQWdELHNDQUF3QixLQUFLLE9BQU87QUFFOUcsUUFBSSxDQUFDLGVBQWUsS0FBSyxTQUFTLGlCQUFpQixHQUFHO0FBQ3JELGFBQU8sSUFBSSx1RUFBdUU7QUFDbEYsYUFBTyxLQUFLO0FBQUEsSUFDYjtBQUVBLFlBQUksbUNBQVUsS0FBSyxlQUFlLEdBQUc7QUFDcEMsYUFBTyxLQUFLO0FBQUEsSUFDYjtBQUVBLFdBQU8sSUFBSSx1QkFBdUI7QUFFbEMsVUFBTSxrQkFBa0IsSUFBSSw0Q0FBcUIsUUFBUSxZQUFZLEtBQUssUUFBUSxnQkFBZ0IsTUFBTTtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixVQUFJO0FBQUEsUUFDSCxRQUFRO0FBQUEsUUFDUixLQUFLO0FBQUEsUUFDTCxLQUFLO0FBQUEsUUFDTDtBQUFBLFFBQ0E7QUFBQSxNQUNEO0FBQUEsSUFDRDtBQUVBLGdEQUFrQixRQUFRLGlCQUFpQixRQUFRLFlBQVksS0FBSyxxQkFBcUIsS0FBSyxPQUFPO0FBQ3JHLGVBQU8saURBQXdCLEtBQUssaUJBQWlCLGlCQUFpQixJQUFJLE1BQU07QUFBQSxFQUNqRjtBQUVBLFdBQVMsaUJBQWlCLFNBQXNDO0FBekNqRTtBQTBDRSxZQUFPLCtEQUF5QixZQUFZLFFBQVEsZUFBZSxDQUFDLE1BQTdELG1CQUFnRSxlQUFoRSxZQUE4RSxDQUFDO0FBQUEsRUFDdkY7QUFFQSxXQUFTLGVBQWUsU0FBNEIsbUJBQXFEO0FBQ3hHLFFBQUksbUJBQW1CO0FBQ3RCLFlBQU0saUJBQWEsMENBQTRCLElBQUksU0FBUyxpQkFBaUI7QUFFN0UsVUFBSSxXQUFXLFNBQVM7QUFBRyxlQUFPO0FBQUEsSUFDbkM7QUFFQSxRQUFJO0FBQ0gsWUFBTSxrQkFBa0IsUUFBUSxtQkFBbUI7QUFDbkQsWUFBTSxvQkFDTCxPQUFPLGdCQUFnQixtQkFBbUIsWUFDMUMsUUFBUSxRQUFRLFNBQVMsRUFBRSxPQUFPLENBQUMsZ0JBQWdCLGNBQWMsRUFBRSxDQUFDO0FBRXJFLGFBQU87QUFBQSxJQUNSLFNBQVMsR0FBUDtBQUNELGNBQVEsZUFBZSxPQUFPLEtBQUssQ0FBVztBQUM5QyxhQUFPO0FBQUEsSUFDUjtBQUFBLEVBQ0Q7QUFFQSxTQUFPLEVBQUUsUUFBUSxpQkFBaUI7QUFDbkM7QUFFQSxpQkFBUzsiLAogICJuYW1lcyI6IFtdCn0K

package/dist/language-service/diagnostics.js

@@ -1,9 +1,7 @@
 "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)
@@ -17,10 +15,6 @@ 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, {
@@ -28,15 +22,14 @@ __export(diagnostics_exports, {
   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) {
+function decorateDiagnostics(ls, typescript) {
   decorateSyntacticDiagnostics(ls);
-  decorateSemanticDiagnostics(ls);
+  decorateSemanticDiagnostics(ls, typescript);
   decorateSuggestionDiagnostics(ls);
 }
 function decorateSyntacticDiagnostics(ls) {
@@ -48,7 +41,7 @@ function decorateSyntacticDiagnostics(ls) {
     return getSyntacticDiagnostics(fileName);
   };
 }
-function decorateSemanticDiagnostics(ls) {
+function decorateSemanticDiagnostics(ls, typescript) {
   const getSemanticDiagnostics = ls.getSemanticDiagnostics;
   ls.getSemanticDiagnostics = (fileName) => {
     if ((0, import_utils.isAstroFilePath)(fileName)) {
@@ -56,9 +49,9 @@ function decorateSemanticDiagnostics(ls) {
     }
     let diagnostics = getSemanticDiagnostics(fileName);
     diagnostics = diagnostics.map((diag) => {
-      const message = import_tsserverlibrary.default.flattenDiagnosticMessageText(diag.messageText, import_tsserverlibrary.default.sys.newLine);
+      const message = typescript.flattenDiagnosticMessageText(diag.messageText, typescript.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`;
+        diag.messageText = message + `${typescript.sys.newLine}${typescript.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;
     });
@@ -79,4 +72,4 @@ function decorateSuggestionDiagnostics(ls) {
   DiagnosticCodes,
   decorateDiagnostics
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZGlhZ25vc3RpY3MudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSw2QkFBZTtBQUNmLG1CQUFnQztBQUV6QixJQUFLLGtCQUFMLGtCQUFLQSxxQkFBTDtBQUNOLEVBQUFBLGtDQUFBLHdCQUFxQixRQUFyQjtBQURXLFNBQUFBO0FBQUEsR0FBQTtBQUlMLFNBQVMsb0JBQW9CLElBQThCO0FBQ2pFLCtCQUE2QixFQUFFO0FBQy9CLDhCQUE0QixFQUFFO0FBQzlCLGdDQUE4QixFQUFFO0FBQ2pDO0FBRUEsU0FBUyw2QkFBNkIsSUFBOEI7QUFDbkUsUUFBTSwwQkFBMEIsR0FBRztBQUNuQyxLQUFHLDBCQUEwQixDQUFDLGFBQXFCO0FBR2xELFlBQUksOEJBQWdCLFFBQVEsR0FBRztBQUM5QixhQUFPLENBQUM7QUFBQSxJQUNUO0FBQ0EsV0FBTyx3QkFBd0IsUUFBUTtBQUFBLEVBQ3hDO0FBQ0Q7QUFFQSxTQUFTLDRCQUE0QixJQUE4QjtBQUNsRSxRQUFNLHlCQUF5QixHQUFHO0FBQ2xDLEtBQUcseUJBQXlCLENBQUMsYUFBcUI7QUFHakQsWUFBSSw4QkFBZ0IsUUFBUSxHQUFHO0FBQzlCLGFBQU8sQ0FBQztBQUFBLElBQ1Q7QUFFQSxRQUFJLGNBQWMsdUJBQXVCLFFBQVE7QUFDakQsa0JBQWMsWUFBWSxJQUFJLENBQUMsU0FBUztBQUN2QyxZQUFNLFVBQVUsdUJBQUFDLFFBQUcsNkJBQTZCLEtBQUssYUFBYSx1QkFBQUEsUUFBRyxJQUFJLE9BQU87QUFDaEYsVUFDQyxLQUFLLFNBQVMsaUNBQ2QsUUFBUSxTQUFTLGVBQWUsS0FHaEMsQ0FBQyxRQUFRLFNBQVMscUJBQXFCLEdBQ3RDO0FBQ0QsYUFBSyxjQUNKLFVBQ0EsR0FBRyx1QkFBQUEsUUFBRyxJQUFJLFVBQVUsdUJBQUFBLFFBQUcsSUFBSTtBQUFBLE1BRTdCO0FBRUEsYUFBTztBQUFBLElBQ1IsQ0FBQztBQUVELFdBQU87QUFBQSxFQUNSO0FBQ0Q7QUFFQSxTQUFTLDhCQUE4QixJQUE4QjtBQUNwRSxRQUFNLDJCQUEyQixHQUFHO0FBQ3BDLEtBQUcsMkJBQTJCLENBQUMsYUFBcUI7QUFHbkQsWUFBSSw4QkFBZ0IsUUFBUSxHQUFHO0FBQzlCLGFBQU8sQ0FBQztBQUFBLElBQ1Q7QUFDQSxXQUFPLHlCQUF5QixRQUFRO0FBQUEsRUFDekM7QUFDRDsiLAogICJuYW1lcyI6IFsiRGlhZ25vc3RpY0NvZGVzIiwgInRzIl0KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZGlhZ25vc3RpY3MudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDQSxtQkFBZ0M7QUFJekIsSUFBSyxrQkFBTCxrQkFBS0EscUJBQUw7QUFDTixFQUFBQSxrQ0FBQSx3QkFBcUIsUUFBckI7QUFEVyxTQUFBQTtBQUFBLEdBQUE7QUFJTCxTQUFTLG9CQUFvQixJQUF3QixZQUF1QjtBQUNsRiwrQkFBNkIsRUFBRTtBQUMvQiw4QkFBNEIsSUFBSSxVQUFVO0FBQzFDLGdDQUE4QixFQUFFO0FBQ2pDO0FBRUEsU0FBUyw2QkFBNkIsSUFBOEI7QUFDbkUsUUFBTSwwQkFBMEIsR0FBRztBQUNuQyxLQUFHLDBCQUEwQixDQUFDLGFBQXFCO0FBR2xELFlBQUksOEJBQWdCLFFBQVEsR0FBRztBQUM5QixhQUFPLENBQUM7QUFBQSxJQUNUO0FBQ0EsV0FBTyx3QkFBd0IsUUFBUTtBQUFBLEVBQ3hDO0FBQ0Q7QUFFQSxTQUFTLDRCQUE0QixJQUF3QixZQUF1QjtBQUNuRixRQUFNLHlCQUF5QixHQUFHO0FBQ2xDLEtBQUcseUJBQXlCLENBQUMsYUFBcUI7QUFHakQsWUFBSSw4QkFBZ0IsUUFBUSxHQUFHO0FBQzlCLGFBQU8sQ0FBQztBQUFBLElBQ1Q7QUFFQSxRQUFJLGNBQWMsdUJBQXVCLFFBQVE7QUFDakQsa0JBQWMsWUFBWSxJQUFJLENBQUMsU0FBUztBQUN2QyxZQUFNLFVBQVUsV0FBVyw2QkFBNkIsS0FBSyxhQUFhLFdBQVcsSUFBSSxPQUFPO0FBQ2hHLFVBQ0MsS0FBSyxTQUFTLGlDQUNkLFFBQVEsU0FBUyxlQUFlLEtBR2hDLENBQUMsUUFBUSxTQUFTLHFCQUFxQixHQUN0QztBQUNELGFBQUssY0FDSixVQUNBLEdBQUcsV0FBVyxJQUFJLFVBQVUsV0FBVyxJQUFJO0FBQUEsTUFFN0M7QUFFQSxhQUFPO0FBQUEsSUFDUixDQUFDO0FBRUQsV0FBTztBQUFBLEVBQ1I7QUFDRDtBQUVBLFNBQVMsOEJBQThCLElBQThCO0FBQ3BFLFFBQU0sMkJBQTJCLEdBQUc7QUFDcEMsS0FBRywyQkFBMkIsQ0FBQyxhQUFxQjtBQUduRCxZQUFJLDhCQUFnQixRQUFRLEdBQUc7QUFDOUIsYUFBTyxDQUFDO0FBQUEsSUFDVDtBQUNBLFdBQU8seUJBQXlCLFFBQVE7QUFBQSxFQUN6QztBQUNEOyIsCiAgIm5hbWVzIjogWyJEaWFnbm9zdGljQ29kZXMiXQp9Cg==

package/dist/language-service/index.js

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var language_service_exports = {};
 __export(language_service_exports, {
-  decorateLanguageService: () => decorateLanguageService
+  decorateLanguageService: () => decorateLanguageService,
+  isPatched: () => isPatched
 });
 module.exports = __toCommonJS(language_service_exports);
 var import_completions = require("./completions.js");
@@ -29,19 +30,41 @@ var import_find_references = require("./find-references.js");
 var import_implementation = require("./implementation.js");
 var import_line_column_offset = require("./line-column-offset.js");
 var import_rename = require("./rename.js");
-function decorateLanguageService(ls, snapshotManager, logger) {
-  (0, import_line_column_offset.decorateLineColumnOffset)(ls, snapshotManager);
-  (0, import_rename.decorateRename)(ls, snapshotManager, logger);
-  (0, import_diagnostics.decorateDiagnostics)(ls);
-  (0, import_find_references.decorateFindReferences)(ls, snapshotManager, logger);
-  (0, import_completions.decorateCompletions)(ls, logger);
-  (0, import_definition.decorateGetDefinition)(ls, snapshotManager);
-  (0, import_implementation.decorateGetImplementation)(ls, snapshotManager);
-  (0, import_file_references.decorateGetFileReferences)(ls, snapshotManager);
-  return ls;
+const astroPluginPatchSymbol = Symbol("astroPluginPatchSymbol");
+function isPatched(ls) {
+  return ls[astroPluginPatchSymbol] === true;
+}
+function decorateLanguageService(ls, snapshotManager, ts, logger) {
+  const proxy = new Proxy(ls, createProxyHandler());
+  (0, import_line_column_offset.decorateLineColumnOffset)(proxy, snapshotManager);
+  (0, import_rename.decorateRename)(proxy, snapshotManager, logger);
+  (0, import_diagnostics.decorateDiagnostics)(proxy, ts);
+  (0, import_find_references.decorateFindReferences)(proxy, snapshotManager, logger);
+  (0, import_completions.decorateCompletions)(proxy, logger);
+  (0, import_definition.decorateGetDefinition)(proxy, snapshotManager);
+  (0, import_implementation.decorateGetImplementation)(proxy, snapshotManager);
+  (0, import_file_references.decorateGetFileReferences)(proxy, snapshotManager);
+  return proxy;
+}
+function createProxyHandler() {
+  const decorated = {};
+  return {
+    get(target, p) {
+      var _a;
+      if (p === astroPluginPatchSymbol) {
+        return true;
+      }
+      return (_a = decorated[p]) != null ? _a : target[p];
+    },
+    set(_, p, value) {
+      decorated[p] = value;
+      return true;
+    }
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  decorateLanguageService
+  decorateLanguageService,
+  isPatched
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvaW5kZXgudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBR0EseUJBQW9DO0FBQ3BDLHdCQUFzQztBQUN0Qyx5QkFBb0M7QUFDcEMsNkJBQTBDO0FBQzFDLDZCQUF1QztBQUN2Qyw0QkFBMEM7QUFDMUMsZ0NBQXlDO0FBQ3pDLG9CQUErQjtBQUV4QixTQUFTLHdCQUNmLElBQ0EsaUJBQ0EsUUFDcUI7QUFDckIsMERBQXlCLElBQUksZUFBZTtBQUM1QyxvQ0FBZSxJQUFJLGlCQUFpQixNQUFNO0FBQzFDLDhDQUFvQixFQUFFO0FBQ3RCLHFEQUF1QixJQUFJLGlCQUFpQixNQUFNO0FBQ2xELDhDQUFvQixJQUFJLE1BQU07QUFDOUIsK0NBQXNCLElBQUksZUFBZTtBQUN6Qyx1REFBMEIsSUFBSSxlQUFlO0FBQzdDLHdEQUEwQixJQUFJLGVBQWU7QUFFN0MsU0FBTztBQUNSOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvaW5kZXgudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFHQSx5QkFBb0M7QUFDcEMsd0JBQXNDO0FBQ3RDLHlCQUFvQztBQUNwQyw2QkFBMEM7QUFDMUMsNkJBQXVDO0FBQ3ZDLDRCQUEwQztBQUMxQyxnQ0FBeUM7QUFDekMsb0JBQStCO0FBRS9CLE1BQU0seUJBQXlCLE9BQU8sd0JBQXdCO0FBRXZELFNBQVMsVUFBVSxJQUF3QjtBQUNqRCxTQUFRLEdBQVcsNEJBQTRCO0FBQ2hEO0FBRU8sU0FBUyx3QkFDZixJQUNBLGlCQUNBLElBQ0EsUUFDcUI7QUFDckIsUUFBTSxRQUFRLElBQUksTUFBTSxJQUFJLG1CQUFtQixDQUFDO0FBRWhELDBEQUF5QixPQUFPLGVBQWU7QUFDL0Msb0NBQWUsT0FBTyxpQkFBaUIsTUFBTTtBQUM3Qyw4Q0FBb0IsT0FBTyxFQUFFO0FBQzdCLHFEQUF1QixPQUFPLGlCQUFpQixNQUFNO0FBQ3JELDhDQUFvQixPQUFPLE1BQU07QUFDakMsK0NBQXNCLE9BQU8sZUFBZTtBQUM1Qyx1REFBMEIsT0FBTyxlQUFlO0FBQ2hELHdEQUEwQixPQUFPLGVBQWU7QUFFaEQsU0FBTztBQUNSO0FBRUEsU0FBUyxxQkFBdUQ7QUFDL0QsUUFBTSxZQUF5QyxDQUFDO0FBRWhELFNBQU87QUFBQSxJQUNOLElBQUksUUFBUSxHQUFHO0FBMUNqQjtBQTJDRyxVQUFJLE1BQU0sd0JBQXdCO0FBQ2pDLGVBQU87QUFBQSxNQUNSO0FBRUEsY0FBTyxlQUFVLE9BQVYsWUFBNEMsT0FBTztBQUFBLElBQzNEO0FBQUEsSUFDQSxJQUFJLEdBQUcsR0FBRyxPQUFPO0FBQ2hCLGdCQUFVLEtBQWlDO0FBRTNDLGFBQU87QUFBQSxJQUNSO0FBQUEsRUFDRDtBQUNEOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/module-loader.js

@@ -48,11 +48,16 @@ class ModuleResolutionCache {
   }
 }
 function patchModuleLoader(logger, snapshotManager, typescript, lsHost, project) {
-  var _a;
-  const astroSys = (0, import_astro_sys.createAstroSys)(logger);
+  var _a, _b;
+  const astroSys = (0, import_astro_sys.createAstroSys)(logger, typescript);
   const moduleCache = new ModuleResolutionCache();
   const origResolveModuleNames = (_a = lsHost.resolveModuleNames) == null ? void 0 : _a.bind(lsHost);
-  lsHost.resolveModuleNames = resolveModuleNames;
+  const origResolveModuleNamLiterals = (_b = lsHost.resolveModuleNameLiterals) == null ? void 0 : _b.bind(lsHost);
+  if (lsHost.resolveModuleNameLiterals) {
+    lsHost.resolveModuleNameLiterals = resolveModuleNameLiterals;
+  } else {
+    lsHost.resolveModuleNames = resolveModuleNames;
+  }
   const origRemoveFile = project.removeFile.bind(project);
   project.removeFile = (info, fileExists, detachFromProject) => {
     logger.log("File is being removed. Delete from cache: ", info.fileName);
@@ -102,9 +107,45 @@ function patchModuleLoader(logger, snapshotManager, typescript, lsHost, project)
     };
     return resolvedAstroModule;
   }
+  function resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, reusedNames) {
+    var _a2;
+    logger.log("Resolving modules names for " + containingFile);
+    const resolved = (_a2 = origResolveModuleNamLiterals == null ? void 0 : origResolveModuleNamLiterals(
+      moduleLiterals,
+      containingFile,
+      redirectedReference,
+      options,
+      containingSourceFile,
+      reusedNames
+    )) != null ? _a2 : moduleLiterals.map(
+      () => ({
+        resolvedModule: void 0
+      })
+    );
+    return resolved.map((tsResolvedModule, idx) => {
+      const moduleName = moduleLiterals[idx].text;
+      if (tsResolvedModule.resolvedModule || !(0, import_utils.ensureRealAstroFilePath)(moduleName).endsWith(".astro")) {
+        return tsResolvedModule;
+      }
+      return resolveAstroModuleNameFromCache(moduleName, containingFile, options);
+    });
+  }
+  function resolveAstroModuleNameFromCache(moduleName, containingFile, options) {
+    const cachedModule = moduleCache.get(moduleName, containingFile);
+    if (cachedModule) {
+      return {
+        resolvedModule: cachedModule
+      };
+    }
+    const resolvedModule = resolveModuleName(moduleName, containingFile, options);
+    moduleCache.set(moduleName, containingFile, resolvedModule);
+    return {
+      resolvedModule
+    };
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   patchModuleLoader
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL21vZHVsZS1sb2FkZXIudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRUEsdUJBQStCO0FBRS9CLG1CQUFnRTtBQUtoRSxNQUFNLHNCQUFzQjtBQUFBLEVBQTVCO0FBQ0MsU0FBUSxRQUFRLG9CQUFJLElBQStCO0FBQUE7QUFBQSxFQUtuRCxJQUFJLFlBQW9CLGdCQUF1RDtBQUM5RSxXQUFPLEtBQUssTUFBTSxJQUFJLEtBQUssT0FBTyxZQUFZLGNBQWMsQ0FBQztBQUFBLEVBQzlEO0FBQUEsRUFLQSxJQUFJLFlBQW9CLGdCQUF3QixnQkFBK0M7QUFDOUYsUUFBSSxDQUFDLGdCQUFnQjtBQUNwQjtBQUFBLElBQ0Q7QUFDQSxTQUFLLE1BQU0sSUFBSSxLQUFLLE9BQU8sWUFBWSxjQUFjLEdBQUcsY0FBYztBQUFBLEVBQ3ZFO0FBQUEsRUFNQSxPQUFPLG9CQUFrQztBQUN4QyxTQUFLLE1BQU0sUUFBUSxDQUFDLEtBQUssUUFBUTtBQUNoQyxVQUFJLElBQUkscUJBQXFCLG9CQUFvQjtBQUNoRCxhQUFLLE1BQU0sT0FBTyxHQUFHO0FBQUEsTUFDdEI7QUFBQSxJQUNELENBQUM7QUFBQSxFQUNGO0FBQUEsRUFFUSxPQUFPLFlBQW9CLGdCQUF3QjtBQUMxRCxXQUFPLGlCQUFpQixZQUFRLHNDQUF3QixVQUFVO0FBQUEsRUFDbkU7QUFDRDtBQVdPLFNBQVMsa0JBQ2YsUUFDQSxpQkFDQSxZQUNBLFFBQ0EsU0FDTztBQTdEUjtBQThEQyxRQUFNLGVBQVcsaUNBQWUsTUFBTTtBQUN0QyxRQUFNLGNBQWMsSUFBSSxzQkFBc0I7QUFDOUMsUUFBTSwwQkFBeUIsWUFBTyx1QkFBUCxtQkFBMkIsS0FBSztBQUUvRCxTQUFPLHFCQUFxQjtBQUU1QixRQUFNLGlCQUFpQixRQUFRLFdBQVcsS0FBSyxPQUFPO0FBQ3RELFVBQVEsYUFBYSxDQUFDLE1BQU0sWUFBWSxzQkFBc0I7QUFDN0QsV0FBTyxJQUFJLDhDQUE4QyxLQUFLLFFBQVE7QUFDdEUsZ0JBQVksT0FBTyxLQUFLLFFBQVE7QUFDaEMsV0FBTyxlQUFlLE1BQU0sWUFBWSxpQkFBaUI7QUFBQSxFQUMxRDtBQUdBLFFBQU0sb0JBQW9CLFFBQVEsY0FBYyxLQUFLLE9BQU87QUFDNUQsVUFBUSxnQkFBZ0IsQ0FBQyxNQUFNLFlBQVksU0FBUyxTQUFTLFVBQVU7QUFDdEUsVUFBTSx1QkFBdUIsa0NBQWMsQ0FBQyxHQUFHLE9BQU8sVUFBVSxPQUFPLE1BQU07QUFDN0UsV0FBTyxrQkFBa0IsTUFBTSxxQkFBcUIsU0FBUyxTQUFTLEtBQUs7QUFBQSxFQUM1RTtBQUVBLFdBQVMsbUJBQ1IsYUFDQSxnQkFDQSxhQUNBLHFCQUNBLGlCQUN1QztBQU92QyxVQUFNLFlBQ0wsaUVBQXlCLGFBQWEsZ0JBQWdCLGFBQWEscUJBQXFCLHFCQUN4RixNQUFNLEtBQWdCLE1BQU0sWUFBWSxNQUFNLENBQUM7QUFFaEQsV0FBTyxTQUFTLElBQUksQ0FBQyxZQUFZLFFBQVE7QUFDeEMsWUFBTSxXQUFXLFlBQVk7QUFDN0IsVUFBSSxjQUFjLEtBQUMsc0NBQXdCLFFBQVEsRUFBRSxTQUFTLFFBQVEsR0FBRztBQUN4RSxlQUFPO0FBQUEsTUFDUjtBQUVBLFlBQU0sZUFBZSxZQUFZLElBQUksVUFBVSxjQUFjO0FBQzdELFVBQUksY0FBYztBQUNqQixlQUFPO0FBQUEsTUFDUjtBQUVBLFlBQU0saUJBQWlCLGtCQUFrQixVQUFVLGdCQUFnQixlQUFlO0FBQ2xGLGtCQUFZLElBQUksVUFBVSxnQkFBZ0IsY0FBYztBQUN4RCxhQUFPO0FBQUEsSUFDUixDQUFDO0FBQUEsRUFDRjtBQUVBLFdBQVMsa0JBQ1IsTUFDQSxnQkFDQSxpQkFDZ0M7QUFDaEMsVUFBTSxzQkFBc0IsV0FBVztBQUFBLE1BQ3RDO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsSUFDRCxFQUFFO0FBQ0YsUUFBSSxDQUFDLHVCQUF1QixLQUFDLHFDQUF1QixvQkFBb0IsZ0JBQWdCLEdBQUc7QUFDMUYsYUFBTztBQUFBLElBQ1I7QUFFQSxVQUFNLHVCQUFtQixzQ0FBd0Isb0JBQW9CLGdCQUFnQjtBQUNyRixXQUFPLElBQUksWUFBWSxNQUFNLGlCQUFpQixnQkFBZ0I7QUFDOUQsVUFBTSxXQUFXLGdCQUFnQixPQUFPLGdCQUFnQjtBQUN4RCxRQUFJLENBQUMsVUFBVTtBQUNkLGFBQU87QUFBQSxJQUNSO0FBRUEsVUFBTSxzQkFBNkM7QUFBQSxNQUNsRCxXQUFXLFdBQVcsVUFBVTtBQUFBLE1BQ2hDO0FBQUEsSUFDRDtBQUNBLFdBQU87QUFBQSxFQUNSO0FBQ0Q7IiwKICAibmFtZXMiOiBbXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,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QXNCLFdBQVc7QUFBQSxNQUN0QztBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLElBQ0QsRUFBRTtBQUNGLFFBQUksQ0FBQyx1QkFBdUIsS0FBQyxxQ0FBdUIsb0JBQW9CLGdCQUFnQixHQUFHO0FBQzFGLGFBQU87QUFBQSxJQUNSO0FBRUEsVUFBTSx1QkFBbUIsc0NBQXdCLG9CQUFvQixnQkFBZ0I7QUFDckYsV0FBTyxJQUFJLFlBQVksTUFBTSxpQkFBaUIsZ0JBQWdCO0FBQzlELFVBQU0sV0FBVyxnQkFBZ0IsT0FBTyxnQkFBZ0I7QUFDeEQsUUFBSSxDQUFDLFVBQVU7QUFDZCxhQUFPO0FBQUEsSUFDUjtBQUVBLFVBQU0sc0JBQTZDO0FBQUEsTUFDbEQsV0FBVyxXQUFXLFVBQVU7QUFBQSxNQUNoQztBQUFBLElBQ0Q7QUFDQSxXQUFPO0FBQUEsRUFDUjtBQUVBLFdBQVMsMEJBQ1IsZ0JBQ0EsZ0JBQ0EscUJBQ0EsU0FDQSxzQkFDQSxhQUN3RDtBQTdKMUQsUUFBQUE7QUE4SkUsV0FBTyxJQUFJLGlDQUFpQyxjQUFjO0FBSzFELFVBQU0sWUFDTEEsTUFBQTtBQUFBLE1BQ0M7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLFVBTkQsT0FBQUEsTUFRQSxlQUFlO0FBQUEsTUFDZCxPQUFtRDtBQUFBLFFBQ2xELGdCQUFnQjtBQUFBLE1BQ2pCO0FBQUEsSUFDRDtBQUVELFdBQU8sU0FBUyxJQUFJLENBQUMsa0JBQWtCLFFBQVE7QUFDOUMsWUFBTSxhQUFhLGVBQWUsS0FBSztBQUN2QyxVQUFJLGlCQUFpQixrQkFBa0IsS0FBQyxzQ0FBd0IsVUFBVSxFQUFFLFNBQVMsUUFBUSxHQUFHO0FBQy9GLGVBQU87QUFBQSxNQUNSO0FBRUEsYUFBTyxnQ0FBZ0MsWUFBWSxnQkFBZ0IsT0FBTztBQUFBLElBQzNFLENBQUM7QUFBQSxFQUNGO0FBRUEsV0FBUyxnQ0FBZ0MsWUFBb0IsZ0JBQXdCLFNBQTZCO0FBQ2pILFVBQU0sZUFBZSxZQUFZLElBQUksWUFBWSxjQUFjO0FBQy9ELFFBQUksY0FBYztBQUNqQixhQUFPO0FBQUEsUUFDTixnQkFBZ0I7QUFBQSxNQUNqQjtBQUFBLElBQ0Q7QUFFQSxVQUFNLGlCQUFpQixrQkFBa0IsWUFBWSxnQkFBZ0IsT0FBTztBQUM1RSxnQkFBWSxJQUFJLFlBQVksZ0JBQWdCLGNBQWM7QUFDMUQsV0FBTztBQUFBLE1BQ047QUFBQSxJQUNEO0FBQUEsRUFDRDtBQUNEOyIsCiAgIm5hbWVzIjogWyJfYSJdCn0K

package/dist/utils.js

@@ -84,4 +84,4 @@ function readProjectAstroFilesFromFs(ts, project, parsedCommandLine) {
   replaceDeep,
   toRealAstroFilePath
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3V0aWxzLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQU8sU0FBUyxnQkFBZ0IsVUFBa0I7QUFDakQsU0FBTyxTQUFTLFNBQVMsUUFBUTtBQUNsQztBQUVPLFNBQVMsdUJBQXVCLFVBQWtCO0FBQ3hELFNBQU8sU0FBUyxTQUFTLFdBQVc7QUFDckM7QUFFTyxTQUFTLG9CQUFvQixVQUFrQjtBQUNyRCxTQUFPLFNBQVMsTUFBTSxHQUFHLENBQUMsTUFBTSxNQUFNO0FBQ3ZDO0FBRU8sU0FBUyx3QkFBd0IsVUFBa0I7QUFDekQsU0FBTyx1QkFBdUIsUUFBUSxJQUFJLG9CQUFvQixRQUFRLElBQUk7QUFDM0U7QUFFTyxTQUFTLHFCQUF3QixLQUFxQztBQUM1RSxTQUFPLFFBQVEsVUFBYSxRQUFRO0FBQ3JDO0FBS08sU0FBUyxZQUNmLEtBQ0EsV0FDQSxnQkFDSTtBQUNKLFNBQU8sYUFBYSxHQUFHO0FBRXZCLFdBQVMsYUFBYSxNQUFnQjtBQUNyQyxRQUFJLE9BQU8sU0FBUyxVQUFVO0FBQzdCLGFBQU8sS0FBSyxRQUFRLFdBQVcsY0FBYztBQUFBLElBQzlDO0FBQ0EsUUFBSSxNQUFNLFFBQVEsSUFBSSxHQUFHO0FBQ3hCLGFBQU8sS0FBSyxJQUFJLENBQUMsVUFBVSxhQUFhLEtBQUssQ0FBQztBQUFBLElBQy9DO0FBQ0EsUUFBSSxPQUFPLFNBQVMsVUFBVTtBQUM3QixhQUFPLE9BQU8sS0FBSyxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksUUFBUTtBQUM1QyxXQUFHLE9BQU8sYUFBYSxLQUFLLElBQUk7QUFDaEMsZUFBTztBQUFBLE1BQ1IsR0FBRyxDQUFDLENBQVE7QUFBQSxJQUNiO0FBQ0EsV0FBTztBQUFBLEVBQ1I7QUFDRDtBQUVPLFNBQVMsd0JBQXdCLFNBQTRCO0FBL0NwRTtBQWdEQyxVQUNFLGFBQXdDLDRCQUF4QyxZQUNBLFFBQVEsbUJBQW1CLEVBQVU7QUFFeEM7QUFFTyxTQUFTLDRCQUNmLElBQ0EsU0FDQSxtQkFDQztBQUNELFFBQU0sV0FBd0Isa0JBQWtCO0FBQ2hELFFBQU0sRUFBRSxTQUFTLFFBQVEsSUFBSTtBQUU3QixPQUFJLG1DQUFTLFlBQVcsR0FBRztBQUMxQixXQUFPLENBQUM7QUFBQSxFQUNUO0FBRUEsU0FBTyxHQUFHLElBQ1IsY0FBYyxRQUFRLG9CQUFvQixLQUFLLFFBQVEsSUFBSSxHQUFHLENBQUMsUUFBUSxHQUFHLFNBQVMsT0FBTyxFQUMxRixJQUFJLEdBQUcsT0FBTyxnQkFBZ0I7QUFDakM7IiwKICAibmFtZXMiOiBbXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3V0aWxzLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRU8sU0FBUyxnQkFBZ0IsVUFBa0I7QUFDakQsU0FBTyxTQUFTLFNBQVMsUUFBUTtBQUNsQztBQUVPLFNBQVMsdUJBQXVCLFVBQWtCO0FBQ3hELFNBQU8sU0FBUyxTQUFTLFdBQVc7QUFDckM7QUFFTyxTQUFTLG9CQUFvQixVQUFrQjtBQUNyRCxTQUFPLFNBQVMsTUFBTSxHQUFHLENBQUMsTUFBTSxNQUFNO0FBQ3ZDO0FBRU8sU0FBUyx3QkFBd0IsVUFBa0I7QUFDekQsU0FBTyx1QkFBdUIsUUFBUSxJQUFJLG9CQUFvQixRQUFRLElBQUk7QUFDM0U7QUFFTyxTQUFTLHFCQUF3QixLQUFxQztBQUM1RSxTQUFPLFFBQVEsVUFBYSxRQUFRO0FBQ3JDO0FBS08sU0FBUyxZQUNmLEtBQ0EsV0FDQSxnQkFDSTtBQUNKLFNBQU8sYUFBYSxHQUFHO0FBRXZCLFdBQVMsYUFBYSxNQUFnQjtBQUNyQyxRQUFJLE9BQU8sU0FBUyxVQUFVO0FBQzdCLGFBQU8sS0FBSyxRQUFRLFdBQVcsY0FBYztBQUFBLElBQzlDO0FBQ0EsUUFBSSxNQUFNLFFBQVEsSUFBSSxHQUFHO0FBQ3hCLGFBQU8sS0FBSyxJQUFJLENBQUMsVUFBVSxhQUFhLEtBQUssQ0FBQztBQUFBLElBQy9DO0FBQ0EsUUFBSSxPQUFPLFNBQVMsVUFBVTtBQUM3QixhQUFPLE9BQU8sS0FBSyxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksUUFBUTtBQUM1QyxXQUFHLE9BQU8sYUFBYSxLQUFLLElBQUk7QUFDaEMsZUFBTztBQUFBLE1BQ1IsR0FBRyxDQUFDLENBQVE7QUFBQSxJQUNiO0FBQ0EsV0FBTztBQUFBLEVBQ1I7QUFDRDtBQUVPLFNBQVMsd0JBQXdCLFNBQTRCO0FBakRwRTtBQWtEQyxVQUNFLGFBQXdDLDRCQUF4QyxZQUNBLFFBQVEsbUJBQW1CLEVBQVU7QUFFeEM7QUFFTyxTQUFTLDRCQUNmLElBQ0EsU0FDQSxtQkFDQztBQUNELFFBQU0sV0FBd0Isa0JBQWtCO0FBQ2hELFFBQU0sRUFBRSxTQUFTLFFBQVEsSUFBSTtBQUU3QixPQUFJLG1DQUFTLFlBQVcsR0FBRztBQUMxQixXQUFPLENBQUM7QUFBQSxFQUNUO0FBRUEsU0FBTyxHQUFHLElBQ1IsY0FBYyxRQUFRLG9CQUFvQixLQUFLLFFBQVEsSUFBSSxHQUFHLENBQUMsUUFBUSxHQUFHLFNBQVMsT0FBTyxFQUMxRixJQUFJLEdBQUcsT0FBTyxnQkFBZ0I7QUFDakM7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/ts-plugin",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A TypeScript Plugin providing Astro intellisense",
   "main": "dist/index.js",
   "type": "commonjs",

package/src/astro-sys.ts

@@ -1,25 +1,25 @@
-import ts from 'typescript';
+import type ts from 'typescript/lib/tsserverlibrary';
 import type { Logger } from './logger.js';
 import { ensureRealAstroFilePath, isVirtualAstroFilePath, toRealAstroFilePath } from './utils.js';
 
 /**
  * This should only be accessed by TS astro module resolution.
  */
-export function createAstroSys(logger: Logger) {
+export function createAstroSys(logger: Logger, typescript: typeof import('typescript/lib/tsserverlibrary')) {
 	const astroSys: ts.System = {
-		...ts.sys,
+		...typescript.sys,
 		fileExists(path: string) {
-			return ts.sys.fileExists(ensureRealAstroFilePath(path));
+			return typescript.sys.fileExists(ensureRealAstroFilePath(path));
 		},
 		readDirectory(path, extensions, exclude, include, depth) {
 			const extensionsWithAstro = (extensions ?? []).concat('.astro');
 
-			return ts.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
+			return typescript.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
 		},
 	};
 
-	if (ts.sys.realpath) {
-		const realpath = ts.sys.realpath;
+	if (typescript.sys.realpath) {
+		const realpath = typescript.sys.realpath;
 		astroSys.realpath = function (path) {
 			if (isVirtualAstroFilePath(path)) {
 				return realpath(toRealAstroFilePath(path)) + '.ts';

package/src/index.ts

@@ -1,6 +1,6 @@
 import type ts from 'typescript/lib/tsserverlibrary';
 import { AstroSnapshotManager } from './astro-snapshots.js';
-import { decorateLanguageService } from './language-service/index.js';
+import { decorateLanguageService, isPatched } from './language-service/index.js';
 import { Logger } from './logger.js';
 import { patchModuleLoader } from './module-loader.js';
 import { ProjectAstroFilesManager } from './project-astro-files.js';
@@ -18,6 +18,10 @@ function init(modules: { typescript: typeof import('typescript/lib/tsserverlibra
 			return info.languageService;
 		}
 
+		if (isPatched(info.languageService)) {
+			return info.languageService;
+		}
+
 		logger.log('Starting Astro plugin');
 
 		const snapshotManager = new AstroSnapshotManager(modules.typescript, info.project.projectService, logger);
@@ -32,7 +36,7 @@ function init(modules: { typescript: typeof import('typescript/lib/tsserverlibra
 		}
 
 		patchModuleLoader(logger, snapshotManager, modules.typescript, info.languageServiceHost, info.project);
-		return decorateLanguageService(info.languageService, snapshotManager, logger);
+		return decorateLanguageService(info.languageService, snapshotManager, ts, logger);
 	}
 
 	function getExternalFiles(project: ts.server.ConfiguredProject) {

package/src/language-service/diagnostics.ts

@@ -1,13 +1,15 @@
-import ts from 'typescript/lib/tsserverlibrary';
+import type ts from 'typescript/lib/tsserverlibrary';
 import { isAstroFilePath } from '../utils.js';
 
+type _ts = typeof ts;
+
 export enum DiagnosticCodes {
 	CANNOT_FIND_MODULE = 2307, // Cannot find module '{0}' or its corresponding type declarations.
 }
 
-export function decorateDiagnostics(ls: ts.LanguageService): void {
+export function decorateDiagnostics(ls: ts.LanguageService, typescript: _ts): void {
 	decorateSyntacticDiagnostics(ls);
-	decorateSemanticDiagnostics(ls);
+	decorateSemanticDiagnostics(ls, typescript);
 	decorateSuggestionDiagnostics(ls);
 }
 
@@ -23,7 +25,7 @@ function decorateSyntacticDiagnostics(ls: ts.LanguageService): void {
 	};
 }
 
-function decorateSemanticDiagnostics(ls: ts.LanguageService): void {
+function decorateSemanticDiagnostics(ls: ts.LanguageService, typescript: _ts): void {
 	const getSemanticDiagnostics = ls.getSemanticDiagnostics;
 	ls.getSemanticDiagnostics = (fileName: string) => {
 		// Diagnostics inside Astro files are done
@@ -34,7 +36,7 @@ function decorateSemanticDiagnostics(ls: ts.LanguageService): void {
 
 		let diagnostics = getSemanticDiagnostics(fileName);
 		diagnostics = diagnostics.map((diag) => {
-			const message = ts.flattenDiagnosticMessageText(diag.messageText, ts.sys.newLine);
+			const message = typescript.flattenDiagnosticMessageText(diag.messageText, typescript.sys.newLine);
 			if (
 				diag.code === DiagnosticCodes.CANNOT_FIND_MODULE &&
 				message.includes('astro:content') &&
@@ -44,8 +46,8 @@ function decorateSemanticDiagnostics(ls: ts.LanguageService): void {
 			) {
 				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";
+					`${typescript.sys.newLine}${typescript.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;

package/src/language-service/index.ts

@@ -10,19 +10,47 @@ import { decorateGetImplementation } from './implementation.js';
 import { decorateLineColumnOffset } from './line-column-offset.js';
 import { decorateRename } from './rename.js';
 
+const astroPluginPatchSymbol = Symbol('astroPluginPatchSymbol');
+
+export function isPatched(ls: ts.LanguageService) {
+	return (ls as any)[astroPluginPatchSymbol] === true;
+}
+
 export function decorateLanguageService(
 	ls: ts.LanguageService,
 	snapshotManager: AstroSnapshotManager,
+	ts: typeof import('typescript/lib/tsserverlibrary'),
 	logger: Logger
 ): ts.LanguageService {
-	decorateLineColumnOffset(ls, snapshotManager);
-	decorateRename(ls, snapshotManager, logger);
-	decorateDiagnostics(ls);
-	decorateFindReferences(ls, snapshotManager, logger);
-	decorateCompletions(ls, logger);
-	decorateGetDefinition(ls, snapshotManager);
-	decorateGetImplementation(ls, snapshotManager);
-	decorateGetFileReferences(ls, snapshotManager);
-
-	return ls;
+	const proxy = new Proxy(ls, createProxyHandler());
+
+	decorateLineColumnOffset(proxy, snapshotManager);
+	decorateRename(proxy, snapshotManager, logger);
+	decorateDiagnostics(proxy, ts);
+	decorateFindReferences(proxy, snapshotManager, logger);
+	decorateCompletions(proxy, logger);
+	decorateGetDefinition(proxy, snapshotManager);
+	decorateGetImplementation(proxy, snapshotManager);
+	decorateGetFileReferences(proxy, snapshotManager);
+
+	return proxy;
+}
+
+function createProxyHandler(): ProxyHandler<ts.LanguageService> {
+	const decorated: Partial<ts.LanguageService> = {};
+
+	return {
+		get(target, p) {
+			if (p === astroPluginPatchSymbol) {
+				return true;
+			}
+
+			return decorated[p as keyof ts.LanguageService] ?? target[p as keyof ts.LanguageService];
+		},
+		set(_, p, value) {
+			decorated[p as keyof ts.LanguageService] = value;
+
+			return true;
+		},
+	};
 }

package/src/module-loader.ts

@@ -8,19 +8,19 @@ import { ensureRealAstroFilePath, isVirtualAstroFilePath } from './utils.js';
  * Caches resolved modules.
  */
 class ModuleResolutionCache {
-	private cache = new Map<string, ts.ResolvedModule>();
+	private cache = new Map<string, ts.ResolvedModuleFull>();
 
 	/**
 	 * Tries to get a cached module.
 	 */
-	get(moduleName: string, containingFile: string): ts.ResolvedModule | undefined {
+	get(moduleName: string, containingFile: string): ts.ResolvedModuleFull | undefined {
 		return this.cache.get(this.getKey(moduleName, containingFile));
 	}
 
 	/**
 	 * Caches resolved module, if it is not undefined.
 	 */
-	set(moduleName: string, containingFile: string, resolvedModule: ts.ResolvedModule | undefined) {
+	set(moduleName: string, containingFile: string, resolvedModule: ts.ResolvedModuleFull | undefined) {
 		if (!resolvedModule) {
 			return;
 		}
@@ -60,11 +60,16 @@ export function patchModuleLoader(
 	lsHost: ts.LanguageServiceHost,
 	project: ts.server.Project
 ): void {
-	const astroSys = createAstroSys(logger);
+	const astroSys = createAstroSys(logger, typescript);
 	const moduleCache = new ModuleResolutionCache();
 	const origResolveModuleNames = lsHost.resolveModuleNames?.bind(lsHost);
+	const origResolveModuleNamLiterals = lsHost.resolveModuleNameLiterals?.bind(lsHost);
 
-	lsHost.resolveModuleNames = resolveModuleNames;
+	if (lsHost.resolveModuleNameLiterals) {
+		lsHost.resolveModuleNameLiterals = resolveModuleNameLiterals;
+	} else {
+		lsHost.resolveModuleNames = resolveModuleNames;
+	}
 
 	const origRemoveFile = project.removeFile.bind(project);
 	project.removeFile = (info, fileExists, detachFromProject) => {
@@ -118,7 +123,7 @@ export function patchModuleLoader(
 		name: string,
 		containingFile: string,
 		compilerOptions: ts.CompilerOptions
-	): ts.ResolvedModule | undefined {
+	): ts.ResolvedModuleFull | undefined {
 		const astroResolvedModule = typescript.resolveModuleName(
 			name,
 			containingFile,
@@ -142,4 +147,57 @@ export function patchModuleLoader(
 		};
 		return resolvedAstroModule;
 	}
+
+	function resolveModuleNameLiterals(
+		moduleLiterals: readonly ts.StringLiteralLike[],
+		containingFile: string,
+		redirectedReference: ts.ResolvedProjectReference | undefined,
+		options: ts.CompilerOptions,
+		containingSourceFile: ts.SourceFile,
+		reusedNames: readonly ts.StringLiteralLike[] | undefined
+	): readonly ts.ResolvedModuleWithFailedLookupLocations[] {
+		logger.log('Resolving modules names for ' + containingFile);
+		// Try resolving all module names with the original method first.
+		// The ones that are undefined will be re-checked if they are a
+		// Astro file and if so, are resolved, too. This way we can defer
+		// all module resolving logic except for Astro files to TypeScript.
+		const resolved =
+			origResolveModuleNamLiterals?.(
+				moduleLiterals,
+				containingFile,
+				redirectedReference,
+				options,
+				containingSourceFile,
+				reusedNames
+			) ??
+			moduleLiterals.map(
+				(): ts.ResolvedModuleWithFailedLookupLocations => ({
+					resolvedModule: undefined,
+				})
+			);
+
+		return resolved.map((tsResolvedModule, idx) => {
+			const moduleName = moduleLiterals[idx].text;
+			if (tsResolvedModule.resolvedModule || !ensureRealAstroFilePath(moduleName).endsWith('.astro')) {
+				return tsResolvedModule;
+			}
+
+			return resolveAstroModuleNameFromCache(moduleName, containingFile, options);
+		});
+	}
+
+	function resolveAstroModuleNameFromCache(moduleName: string, containingFile: string, options: ts.CompilerOptions) {
+		const cachedModule = moduleCache.get(moduleName, containingFile);
+		if (cachedModule) {
+			return {
+				resolvedModule: cachedModule,
+			};
+		}
+
+		const resolvedModule = resolveModuleName(moduleName, containingFile, options);
+		moduleCache.set(moduleName, containingFile, resolvedModule);
+		return {
+			resolvedModule: resolvedModule,
+		};
+	}
 }

package/src/utils.ts

@@ -1,3 +1,5 @@
+import type ts from 'typescript/lib/tsserverlibrary';
+
 export function isAstroFilePath(filePath: string) {
 	return filePath.endsWith('.astro');
 }

package/tsconfig.json

@@ -5,6 +5,7 @@
     "rootDir": "src",
     "target": "ES2020",
     "module": "CommonJS",
+    "ignoreDeprecations": "5.0",
     "importsNotUsedAsValues": "error"
   },
   "include": ["src"],