@astrojs/ts-plugin 1.0.4 → 1.0.5

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 295b71fd393768a9
 @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.5 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,11 @@
 # @astrojs/ts-plugin
 
+## 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/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) {
@@ -51,4 +54,4 @@ function init(modules) {
   return { create, getExternalFiles };
 }
 module.exports = init;
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQUNBLDZCQUFxQztBQUNyQyw4QkFBd0M7QUFDeEMsb0JBQXVCO0FBQ3ZCLDJCQUFrQztBQUNsQyxpQ0FBeUM7QUFDekMsbUJBQXFFO0FBRXJFLFNBQVMsS0FBSyxTQUEwRTtBQUN2RixRQUFNLEtBQUssUUFBUTtBQUVuQixXQUFTLE9BQU8sTUFBc0Q7QUFYdkU7QUFZRSxVQUFNLFNBQVMsSUFBSSxxQkFBTyxLQUFLLFFBQVEsZUFBZSxNQUFNO0FBQzVELFVBQU0scUJBQW9CLGdCQUFLLHFCQUFvQix5QkFBekIsZ0NBQWdELHNDQUF3QixLQUFLLE9BQU87QUFFOUcsUUFBSSxDQUFDLGVBQWUsS0FBSyxTQUFTLGlCQUFpQixHQUFHO0FBQ3JELGFBQU8sSUFBSSx1RUFBdUU7QUFDbEYsYUFBTyxLQUFLO0FBQUEsSUFDYjtBQUVBLFdBQU8sSUFBSSx1QkFBdUI7QUFFbEMsVUFBTSxrQkFBa0IsSUFBSSw0Q0FBcUIsUUFBUSxZQUFZLEtBQUssUUFBUSxnQkFBZ0IsTUFBTTtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixVQUFJO0FBQUEsUUFDSCxRQUFRO0FBQUEsUUFDUixLQUFLO0FBQUEsUUFDTCxLQUFLO0FBQUEsUUFDTDtBQUFBLFFBQ0E7QUFBQSxNQUNEO0FBQUEsSUFDRDtBQUVBLGdEQUFrQixRQUFRLGlCQUFpQixRQUFRLFlBQVksS0FBSyxxQkFBcUIsS0FBSyxPQUFPO0FBQ3JHLGVBQU8saURBQXdCLEtBQUssaUJBQWlCLGlCQUFpQixNQUFNO0FBQUEsRUFDN0U7QUFFQSxXQUFTLGlCQUFpQixTQUFzQztBQXJDakU7QUFzQ0UsWUFBTywrREFBeUIsWUFBWSxRQUFRLGVBQWUsQ0FBQyxNQUE3RCxtQkFBZ0UsZUFBaEUsWUFBOEUsQ0FBQztBQUFBLEVBQ3ZGO0FBRUEsV0FBUyxlQUFlLFNBQTRCLG1CQUFxRDtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixZQUFNLGlCQUFhLDBDQUE0QixJQUFJLFNBQVMsaUJBQWlCO0FBRTdFLFVBQUksV0FBVyxTQUFTO0FBQUcsZUFBTztBQUFBLElBQ25DO0FBRUEsUUFBSTtBQUNILFlBQU0sa0JBQWtCLFFBQVEsbUJBQW1CO0FBQ25ELFlBQU0sb0JBQ0wsT0FBTyxnQkFBZ0IsbUJBQW1CLFlBQzFDLFFBQVEsUUFBUSxTQUFTLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixjQUFjLEVBQUUsQ0FBQztBQUVyRSxhQUFPO0FBQUEsSUFDUixTQUFTLEdBQVA7QUFDRCxjQUFRLGVBQWUsT0FBTyxLQUFLLENBQVc7QUFDOUMsYUFBTztBQUFBLElBQ1I7QUFBQSxFQUNEO0FBRUEsU0FBTyxFQUFFLFFBQVEsaUJBQWlCO0FBQ25DO0FBRUEsaUJBQVM7IiwKICAibmFtZXMiOiBbXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQUNBLDZCQUFxQztBQUNyQyw4QkFBbUQ7QUFDbkQsb0JBQXVCO0FBQ3ZCLDJCQUFrQztBQUNsQyxpQ0FBeUM7QUFDekMsbUJBQXFFO0FBRXJFLFNBQVMsS0FBSyxTQUEwRTtBQUN2RixRQUFNLEtBQUssUUFBUTtBQUVuQixXQUFTLE9BQU8sTUFBc0Q7QUFYdkU7QUFZRSxVQUFNLFNBQVMsSUFBSSxxQkFBTyxLQUFLLFFBQVEsZUFBZSxNQUFNO0FBQzVELFVBQU0scUJBQW9CLGdCQUFLLHFCQUFvQix5QkFBekIsZ0NBQWdELHNDQUF3QixLQUFLLE9BQU87QUFFOUcsUUFBSSxDQUFDLGVBQWUsS0FBSyxTQUFTLGlCQUFpQixHQUFHO0FBQ3JELGFBQU8sSUFBSSx1RUFBdUU7QUFDbEYsYUFBTyxLQUFLO0FBQUEsSUFDYjtBQUVBLFlBQUksbUNBQVUsS0FBSyxlQUFlLEdBQUc7QUFDcEMsYUFBTyxLQUFLO0FBQUEsSUFDYjtBQUVBLFdBQU8sSUFBSSx1QkFBdUI7QUFFbEMsVUFBTSxrQkFBa0IsSUFBSSw0Q0FBcUIsUUFBUSxZQUFZLEtBQUssUUFBUSxnQkFBZ0IsTUFBTTtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixVQUFJO0FBQUEsUUFDSCxRQUFRO0FBQUEsUUFDUixLQUFLO0FBQUEsUUFDTCxLQUFLO0FBQUEsUUFDTDtBQUFBLFFBQ0E7QUFBQSxNQUNEO0FBQUEsSUFDRDtBQUVBLGdEQUFrQixRQUFRLGlCQUFpQixRQUFRLFlBQVksS0FBSyxxQkFBcUIsS0FBSyxPQUFPO0FBQ3JHLGVBQU8saURBQXdCLEtBQUssaUJBQWlCLGlCQUFpQixNQUFNO0FBQUEsRUFDN0U7QUFFQSxXQUFTLGlCQUFpQixTQUFzQztBQXpDakU7QUEwQ0UsWUFBTywrREFBeUIsWUFBWSxRQUFRLGVBQWUsQ0FBQyxNQUE3RCxtQkFBZ0UsZUFBaEUsWUFBOEUsQ0FBQztBQUFBLEVBQ3ZGO0FBRUEsV0FBUyxlQUFlLFNBQTRCLG1CQUFxRDtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixZQUFNLGlCQUFhLDBDQUE0QixJQUFJLFNBQVMsaUJBQWlCO0FBRTdFLFVBQUksV0FBVyxTQUFTO0FBQUcsZUFBTztBQUFBLElBQ25DO0FBRUEsUUFBSTtBQUNILFlBQU0sa0JBQWtCLFFBQVEsbUJBQW1CO0FBQ25ELFlBQU0sb0JBQ0wsT0FBTyxnQkFBZ0IsbUJBQW1CLFlBQzFDLFFBQVEsUUFBUSxTQUFTLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixjQUFjLEVBQUUsQ0FBQztBQUVyRSxhQUFPO0FBQUEsSUFDUixTQUFTLEdBQVA7QUFDRCxjQUFRLGVBQWUsT0FBTyxLQUFLLENBQVc7QUFDOUMsYUFBTztBQUFBLElBQ1I7QUFBQSxFQUNEO0FBRUEsU0FBTyxFQUFFLFFBQVEsaUJBQWlCO0FBQ25DO0FBRUEsaUJBQVM7IiwKICAibmFtZXMiOiBbXQp9Cg==

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");
+const astroPluginPatchSymbol = Symbol("astroPluginPatchSymbol");
+function isPatched(ls) {
+  return ls[astroPluginPatchSymbol] === true;
+}
 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 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);
+  (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,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvaW5kZXgudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFHQSx5QkFBb0M7QUFDcEMsd0JBQXNDO0FBQ3RDLHlCQUFvQztBQUNwQyw2QkFBMEM7QUFDMUMsNkJBQXVDO0FBQ3ZDLDRCQUEwQztBQUMxQyxnQ0FBeUM7QUFDekMsb0JBQStCO0FBRS9CLE1BQU0seUJBQXlCLE9BQU8sd0JBQXdCO0FBRXZELFNBQVMsVUFBVSxJQUF3QjtBQUNqRCxTQUFRLEdBQVcsNEJBQTRCO0FBQ2hEO0FBRU8sU0FBUyx3QkFDZixJQUNBLGlCQUNBLFFBQ3FCO0FBQ3JCLFFBQU0sUUFBUSxJQUFJLE1BQU0sSUFBSSxtQkFBbUIsQ0FBQztBQUVoRCwwREFBeUIsT0FBTyxlQUFlO0FBQy9DLG9DQUFlLE9BQU8saUJBQWlCLE1BQU07QUFDN0MsOENBQW9CLEtBQUs7QUFDekIscURBQXVCLE9BQU8saUJBQWlCLE1BQU07QUFDckQsOENBQW9CLE9BQU8sTUFBTTtBQUNqQywrQ0FBc0IsT0FBTyxlQUFlO0FBQzVDLHVEQUEwQixPQUFPLGVBQWU7QUFDaEQsd0RBQTBCLE9BQU8sZUFBZTtBQUVoRCxTQUFPO0FBQ1I7QUFFQSxTQUFTLHFCQUF1RDtBQUMvRCxRQUFNLFlBQXlDLENBQUM7QUFFaEQsU0FBTztBQUFBLElBQ04sSUFBSSxRQUFRLEdBQUc7QUF6Q2pCO0FBMENHLFVBQUksTUFBTSx3QkFBd0I7QUFDakMsZUFBTztBQUFBLE1BQ1I7QUFFQSxjQUFPLGVBQVUsT0FBVixZQUE0QyxPQUFPO0FBQUEsSUFDM0Q7QUFBQSxJQUNBLElBQUksR0FBRyxHQUFHLE9BQU87QUFDaEIsZ0JBQVUsS0FBaUM7QUFFM0MsYUFBTztBQUFBLElBQ1I7QUFBQSxFQUNEO0FBQ0Q7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist/module-loader.js

@@ -48,11 +48,16 @@ class ModuleResolutionCache {
   }
 }
 function patchModuleLoader(logger, snapshotManager, typescript, lsHost, project) {
-  var _a;
+  var _a, _b;
   const astroSys = (0, import_astro_sys.createAstroSys)(logger);
   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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QUFXO0FBQUEsTUFDdEM7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxJQUNELEVBQUU7QUFDRixRQUFJLENBQUMsdUJBQXVCLEtBQUMscUNBQXVCLG9CQUFvQixnQkFBZ0IsR0FBRztBQUMxRixhQUFPO0FBQUEsSUFDUjtBQUVBLFVBQU0sdUJBQW1CLHNDQUF3QixvQkFBb0IsZ0JBQWdCO0FBQ3JGLFdBQU8sSUFBSSxZQUFZLE1BQU0saUJBQWlCLGdCQUFnQjtBQUM5RCxVQUFNLFdBQVcsZ0JBQWdCLE9BQU8sZ0JBQWdCO0FBQ3hELFFBQUksQ0FBQyxVQUFVO0FBQ2QsYUFBTztBQUFBLElBQ1I7QUFFQSxVQUFNLHNCQUE2QztBQUFBLE1BQ2xELFdBQVcsV0FBVyxVQUFVO0FBQUEsTUFDaEM7QUFBQSxJQUNEO0FBQ0EsV0FBTztBQUFBLEVBQ1I7QUFFQSxXQUFTLDBCQUNSLGdCQUNBLGdCQUNBLHFCQUNBLFNBQ0Esc0JBQ0EsYUFDd0Q7QUE3SjFELFFBQUFBO0FBOEpFLFdBQU8sSUFBSSxpQ0FBaUMsY0FBYztBQUsxRCxVQUFNLFlBQ0xBLE1BQUE7QUFBQSxNQUNDO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxVQU5ELE9BQUFBLE1BUUEsZUFBZTtBQUFBLE1BQ2QsT0FBbUQ7QUFBQSxRQUNsRCxnQkFBZ0I7QUFBQSxNQUNqQjtBQUFBLElBQ0Q7QUFFRCxXQUFPLFNBQVMsSUFBSSxDQUFDLGtCQUFrQixRQUFRO0FBQzlDLFlBQU0sYUFBYSxlQUFlLEtBQUs7QUFDdkMsVUFBSSxpQkFBaUIsa0JBQWtCLEtBQUMsc0NBQXdCLFVBQVUsRUFBRSxTQUFTLFFBQVEsR0FBRztBQUMvRixlQUFPO0FBQUEsTUFDUjtBQUVBLGFBQU8sZ0NBQWdDLFlBQVksZ0JBQWdCLE9BQU87QUFBQSxJQUMzRSxDQUFDO0FBQUEsRUFDRjtBQUVBLFdBQVMsZ0NBQWdDLFlBQW9CLGdCQUF3QixTQUE2QjtBQUNqSCxVQUFNLGVBQWUsWUFBWSxJQUFJLFlBQVksY0FBYztBQUMvRCxRQUFJLGNBQWM7QUFDakIsYUFBTztBQUFBLFFBQ04sZ0JBQWdCO0FBQUEsTUFDakI7QUFBQSxJQUNEO0FBRUEsVUFBTSxpQkFBaUIsa0JBQWtCLFlBQVksZ0JBQWdCLE9BQU87QUFDNUUsZ0JBQVksSUFBSSxZQUFZLGdCQUFnQixjQUFjO0FBQzFELFdBQU87QUFBQSxNQUNOO0FBQUEsSUFDRDtBQUFBLEVBQ0Q7QUFDRDsiLAogICJuYW1lcyI6IFsiX2EiXQp9Cg==

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.5",
   "description": "A TypeScript Plugin providing Astro intellisense",
   "main": "dist/index.js",
   "type": "commonjs",

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);

package/src/language-service/index.ts

@@ -10,19 +10,46 @@ 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,
 	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);
+	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;
 		}
@@ -63,8 +63,13 @@ export function patchModuleLoader(
 	const astroSys = createAstroSys(logger);
 	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');
 }