@astrojs/ts-plugin - npm Package Compare versions

Comparing version 0.3.0 to 0.4.0

CHANGELOG.md

 # @astrojs/ts-plugin
 
+## 0.4.0
+
+### Minor Changes
+
+- c8cdef9: Improved support for `.astro` imports inside JavaScript/TypeScript files:
+  - Added support for finding file references inside Astro files
+  - Added support for path completions for .astro, .md and .mdx files
+  - Fixed cases where our TypeScript plugin would fail to load under certain circumstance
+  - Fixed certain cases where Go to definition / implementation would fail
+
 ## 0.3.0
@@ -4,0 +14,0 @@

dist/astro-snapshots.js

@@ -1,44 +0,40 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var astro_snapshots_exports = {};
+__export(astro_snapshots_exports, {
   AstroSnapshot: () => AstroSnapshot,
   AstroSnapshotManager: () => AstroSnapshotManager
 });
-var import_astro2tsx = __toModule(require("./astro2tsx.js"));
-var import_source_mapper = __toModule(require("./source-mapper.js"));
-var import_utils = __toModule(require("./utils.js"));
+module.exports = __toCommonJS(astro_snapshots_exports);
+var import_trace_mapping = require("@jridgewell/trace-mapping");
+var import_astro2tsx = require("./astro2tsx.js");
+var import_utils = require("./utils.js");
 class AstroSnapshot {
-  constructor(typescript, fileName, astroCode, mapper, logger, isTsFile) {
+  constructor(typescript, fileName, astroCode, traceMap, logger) {
     this.typescript = typescript;
     this.fileName = fileName;
     this.astroCode = astroCode;
-    this.mapper = mapper;
+    this.traceMap = traceMap;
     this.logger = logger;
-    this.isTsFile = isTsFile;
     this.convertInternalCodePositions = false;
   }
-  update(astroCode, mapper) {
+  update(astroCode, traceMap) {
     this.astroCode = astroCode;
-    this.mapper = mapper;
+    this.traceMap = traceMap;
     this.lineOffsets = void 0;
@@ -48,5 +44,2 @@ this.log("Updated Snapshot");
   getOriginalTextSpan(textSpan) {
-    if (!(0, import_utils.isNoTextSpanInGeneratedCode)(this.getText(), textSpan)) {
-      return null;
-    }
     const start = this.getOriginalOffset(textSpan.start);
@@ -68,11 +61,11 @@ if (start === -1) {
     this.debug("try convert offset", generatedOffset, "/", lineOffset);
-    const original = this.mapper.getOriginalPosition({
-      line: lineOffset.line - 1,
-      character: lineOffset.offset - 1
+    const original = (0, import_trace_mapping.originalPositionFor)(this.traceMap, {
+      line: lineOffset.line,
+      column: lineOffset.offset
     });
     this.toggleMappingMode(false);
-    if (original.line === -1) {
+    if (!original.line) {
       return -1;
     }
-    const originalOffset = this.scriptInfo.lineOffsetToPosition(original.line + 1, original.character + 1);
+    const originalOffset = this.scriptInfo.lineOffsetToPosition(original.line, original.column);
     this.debug("converted offset to", original, "/", originalOffset);
@@ -92,3 +85,3 @@ return originalOffset;
       this.debug("positionToLineOffset for original code", position, lineOffset);
-      return {line: lineOffset.line + 1, offset: lineOffset.character + 1};
+      return { line: lineOffset.line + 1, offset: lineOffset.character + 1 };
     };
@@ -99,7 +92,7 @@ const lineOffsetToPosition = scriptInfo.lineOffsetToPosition.bind(scriptInfo);
         const position2 = lineOffsetToPosition(line, offset);
-        this.debug("lineOffsetToPosition for generated code", {line, offset}, position2);
+        this.debug("lineOffsetToPosition for generated code", { line, offset }, position2);
         return position2;
       }
-      const position = this.offsetAt({line: line - 1, character: offset - 1});
-      this.debug("lineOffsetToPosition for original code", {line, offset}, position);
+      const position = this.offsetAt({ line: line - 1, character: offset - 1 });
+      this.debug("lineOffsetToPosition for original code", { line, offset }, position);
       return position;
@@ -116,3 +109,3 @@ };
     if (high === 0) {
-      return {line: 0, character: offset};
+      return { line: 0, character: offset };
     }
@@ -128,3 +121,3 @@ while (low < high) {
     const line = low - 1;
-    return {line, character: offset - lineOffsets[line]};
+    return { line, character: offset - lineOffsets[line] };
   }
@@ -192,3 +185,3 @@ offsetAt(position) {
     this.logger = logger;
-    this.snapshots = new Map();
+    this.snapshots = /* @__PURE__ */ new Map();
     this.patchProjectServiceReadFile();
@@ -203,3 +196,6 @@ }
     }
-    const scriptInfo = this.projectService.getOrCreateScriptInfoForNormalizedPath(this.typescript.server.toNormalizedPath(fileName), false);
+    const scriptInfo = this.projectService.getOrCreateScriptInfoForNormalizedPath(
+      this.typescript.server.toNormalizedPath(fileName),
+      false
+    );
     if (!scriptInfo) {
@@ -230,12 +226,17 @@ this.logger.log("Was not able get snapshot for", fileName);
         try {
-          const isTsFile = true;
-          const result = (0, import_astro2tsx.astro2tsx)(astroCode, {
-            filename: path.split("/").pop(),
-            isTsFile
-          });
+          const result = (0, import_astro2tsx.astro2tsx)(astroCode, path);
           const existingSnapshot = this.snapshots.get(path);
           if (existingSnapshot) {
-            existingSnapshot.update(astroCode, new import_source_mapper.SourceMapper(result.map.mappings));
+            existingSnapshot.update(astroCode, new import_trace_mapping.TraceMap(result.map));
           } else {
-            this.snapshots.set(path, new AstroSnapshot(this.typescript, path, astroCode, new import_source_mapper.SourceMapper(result.map.mappings), this.logger, isTsFile));
+            this.snapshots.set(
+              path,
+              new AstroSnapshot(
+                this.typescript,
+                path,
+                astroCode,
+                new import_trace_mapping.TraceMap(result.map),
+                this.logger
+              )
+            );
           }
@@ -259,2 +260,2 @@ this.logger.log("Successfully read Astro file contents of", path);
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvLXNuYXBzaG90cy50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ0EsdUJBQTBCO0FBRTFCLDJCQUE2QjtBQUM3QixtQkFBNkQ7QUFFdEQsb0JBQW9CO0FBQUEsRUFLMUIsWUFDUyxZQUNBLFVBQ0EsV0FDQSxRQUNBLFFBQ1EsVUFDZjtBQU5PO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDUTtBQVJULHdDQUErQjtBQUFBO0FBQUEsRUFXdkMsT0FBTyxXQUFtQixRQUFzQjtBQUMvQyxTQUFLLFlBQVk7QUFDakIsU0FBSyxTQUFTO0FBQ2QsU0FBSyxjQUFjO0FBQ25CLFNBQUssSUFBSTtBQUFBO0FBQUEsRUFHVixvQkFBb0IsVUFBMkM7QUFDOUQsUUFBSSxDQUFDLDhDQUE0QixLQUFLLFdBQVcsV0FBVztBQUMzRCxhQUFPO0FBQUE7QUFHUixVQUFNLFFBQVEsS0FBSyxrQkFBa0IsU0FBUztBQUM5QyxRQUFJLFVBQVUsSUFBSTtBQUNqQixhQUFPO0FBQUE7QUFJUixXQUFPO0FBQUEsTUFDTjtBQUFBLE1BQ0EsUUFBUSxTQUFTO0FBQUE7QUFBQTtBQUFBLEVBSW5CLGtCQUFrQixpQkFBeUI7QUFDMUMsUUFBSSxDQUFDLEtBQUssWUFBWTtBQUNyQixhQUFPO0FBQUE7QUFHUixTQUFLLGtCQUFrQjtBQUN2QixVQUFNLGFBQWEsS0FBSyxXQUFXLHFCQUFxQjtBQUN4RCxTQUFLLE1BQU0sc0JBQXNCLGlCQUFpQixLQUFLO0FBQ3ZELFVBQU0sV0FBVyxLQUFLLE9BQU8sb0JBQW9CO0FBQUEsTUFDaEQsTUFBTSxXQUFXLE9BQU87QUFBQSxNQUN4QixXQUFXLFdBQVcsU0FBUztBQUFBO0FBRWhDLFNBQUssa0JBQWtCO0FBQ3ZCLFFBQUksU0FBUyxTQUFTLElBQUk7QUFDekIsYUFBTztBQUFBO0FBR1IsVUFBTSxpQkFBaUIsS0FBSyxXQUFXLHFCQUFxQixTQUFT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
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvLXNuYXBzaG90cy50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLDJCQUFnRTtBQUVoRSx1QkFBMEI7QUFFMUIsbUJBQWdDO0FBRXpCLE1BQU0sY0FBYztBQUFBLEVBSzFCLFlBQ1MsWUFDQSxVQUNBLFdBQ0EsVUFDQSxRQUNQO0FBTE87QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQVBULFNBQVEsK0JBQStCO0FBQUEsRUFRcEM7QUFBQSxFQUVILE9BQU8sV0FBbUIsVUFBb0I7QUFDN0MsU0FBSyxZQUFZO0FBQ2pCLFNBQUssV0FBVztBQUNoQixTQUFLLGNBQWM7QUFDbkIsU0FBSyxJQUFJLGtCQUFrQjtBQUFBLEVBQzVCO0FBQUEsRUFFQSxvQkFBb0IsVUFBMkM7QUFDOUQsVUFBTSxRQUFRLEtBQUssa0JBQWtCLFNBQVMsS0FBSztBQUNuRCxRQUFJLFVBQVUsSUFBSTtBQUNqQixhQUFPO0FBQUEsSUFDUjtBQUdBLFdBQU87QUFBQSxNQUNOO0FBQUEsTUFDQSxRQUFRLFNBQVM7QUFBQSxJQUNsQjtBQUFBLEVBQ0Q7QUFBQSxFQUVBLGtCQUFrQixpQkFBeUI7QUFDMUMsUUFBSSxDQUFDLEtBQUssWUFBWTtBQUNyQixhQUFPO0FBQUEsSUFDUjtBQUVBLFNBQUssa0JBQWtCLElBQUk7QUFDM0IsVUFBTSxhQUFhLEtBQUssV0FBVyxxQkFBcUIsZUFBZTtBQUN2RSxTQUFLLE1BQU0sc0JBQXNCLGlCQUFpQixLQUFLLFVBQVU7QUFDakUsVUFBTSxlQUFXLDBDQUFvQixLQUFLLFVBQVU7QUFBQSxNQUNuRCxNQUFNLFdBQVc7QUFBQSxNQUNqQixRQUFRLFdBQVc7QUFBQSxJQUNwQixDQUFDO0FBQ0QsU0FBSyxrQkFBa0IsS0FBSztBQUU1QixRQUFJLENBQUMsU0FBUyxNQUFNO0FBQ25CLGFBQU87QUFBQSxJQUNSO0FBRUEsVUFBTSxpQkFBaUIsS0FBSyxX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RUEsT0FBTyxVQUE2QztBQUNuRCxRQUFJLEtBQUssVUFBVSxJQUFJLFFBQVEsR0FBRztBQUNqQyxhQUFPLEtBQUssVUFBVSxJQUFJLFFBQVE7QUFBQSxJQUNuQztBQUdBLFVBQU0sYUFBYSxLQUFLLGVBQWU7QUFBQSxNQUN0QyxLQUFLLFdBQVcsT0FBTyxpQkFBaUIsUUFBUTtBQUFBLE1BQ2hEO0FBQUEsSUFDRDtBQUNBLFFBQUksQ0FBQyxZQUFZO0FBQ2hCLFdBQUssT0FBTyxJQUFJLGlDQUFpQyxRQUFRO0FBQ3pEO0FBQUEsSUFDRDtBQUVBLFFBQUk7QUFDSCxpQkFBVyxZQUFZO0FBQUEsSUFDeEIsU0FBUyxHQUFQO0FBQ0QsV0FBSyxPQUFPLElBQUksMkJBQTJCLFFBQVE7QUFBQSxJQUNwRDtBQUNBLFVBQU0sV0FBVyxLQUFLLFVBQVUsSUFBSSxRQUFRO0FBQzVDLFFBQUksQ0FBQyxVQUFVO0FBQ2QsV0FBSyxPQUFPLElBQUkseUVBQXlFLFFBQVE7QUFDakc7QUFBQSxJQUNEO0FBQ0EsYUFBUyxzQkFBc0IsVUFBVTtBQUN6QyxTQUFLLFVBQVUsSUFBSSxVQUFVLFFBQVE7QUFDckMsV0FBTztBQUFBLEVBQ1I7QUFBQSxFQUVRLDhCQUE4QjtBQUNyQyxVQUFNLFdBQVcsS0FBSyxlQUFlLEtBQUs7QUFDMUMsU0FBSyxlQUFlLEtBQUssV0FBVyxDQUFDLFNBQWlCO0FBQ3JELGNBQUksOEJBQWdCLElBQUksR0FBRztBQUMxQixhQUFLLE9BQU8sTUFBTSxvQkFBb0IsSUFBSTtBQUMxQyxjQUFNLFlBQVksU0FBUyxJQUFJLEtBQUs7QUFDcEMsWUFBSTtBQUNILGdCQUFNLGFBQVMsNEJBQVUsV0FBVyxJQUFJO0FBQ3hDLGdCQUFNLG1CQUFtQixLQUFLLFVBQVUsSUFBSSxJQUFJO0FBQ2hELGNBQUksa0JBQWtCO0FBQ3JCLDZCQUFpQixPQUFPLFdBQVcsSUFBSSw4QkFBUyxPQUFPLEdBQXVCLENBQUM7QUFBQSxVQUNoRixPQUFPO0FBQ04saUJBQUssVUFBVTtBQUFBLGNBQ2Q7QUFBQSxjQUNBLElBQUk7QUFBQSxnQkFDSCxLQUFLO0FBQUEsZ0JBQ0w7QUFBQSxnQkFDQTtBQUFBLGdCQUNBLElBQUksOEJBQVMsT0FBTyxHQUF1QjtBQUFBLGdCQUMzQyxLQUFLO0FBQUEsY0FDTjtBQUFBLFlBQ0Q7QUFBQSxVQUNEO0FBQ0EsZUFBSyxPQUFPLElBQUksNENBQTRDLElBQUk7QUFDaEUsaUJBQU8sT0FBTztBQUFBLFFBQ2YsU0FBUyxHQUFQO0FBQ0QsZUFBSyxPQUFPLElBQUksNkJBQTZCLElBQUk7QUFDakQsZUFBSyxPQUFPLE1BQU0sVUFBVSxDQUFDO0FBQUEsUUFDOUI7QUFBQSxNQUNELE9BQU87QUFDTixlQUFPLFNBQVMsSUFBSTtBQUFBLE1BQ3JCO0FBQUEsSUFDRDtBQUFBLEVBQ0Q7QUFDRDsiLAogICJuYW1lcyI6IFsibGluZU9mZnNldCIsICJwb3NpdGlvbiJdCn0K

dist/astro-sys.js

@@ -0,48 +1,35 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+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
 });
-var import_typescript = __toModule(require("typescript"));
-var import_utils = __toModule(require("./utils.js"));
+module.exports = __toCommonJS(astro_sys_exports);
+var import_typescript = __toESM(require("typescript"));
+var import_utils = require("./utils.js");
 function createAstroSys(logger) {
-  const astroSys = __spreadProps(__spreadValues({}, import_typescript.default.sys), {
+  const astroSys = {
+    ...import_typescript.default.sys,
     fileExists(path) {
@@ -55,3 +42,3 @@ return import_typescript.default.sys.fileExists((0, import_utils.ensureRealAstroFilePath)(path));
     }
-  });
+  };
   if (import_typescript.default.sys.realpath) {
@@ -72,2 +59,2 @@ const realpath = import_typescript.default.sys.realpath;
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvLXN5cy50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsd0JBQWU7QUFFZixtQkFBcUY7QUFLOUUsd0JBQXdCLFFBQWdCO0FBQzlDLFFBQU0sV0FBc0IsaUNBQ3hCLDBCQUFHLE1BRHFCO0FBQUEsSUFFM0IsV0FBVyxNQUFjO0FBQ3hCLGFBQU8sMEJBQUcsSUFBSSxXQUFXLDBDQUF3QjtBQUFBO0FBQUEsSUFFbEQsY0FBYyxNQUFNLFlBQVksU0FBUyxTQUFTLE9BQU87QUFDeEQsWUFBTSxzQkFBdUIsbUNBQWMsSUFBSSxPQUFPO0FBRXRELGFBQU8sMEJBQUcsSUFBSSxjQUFjLE1BQU0scUJBQXFCLFNBQVMsU0FBUztBQUFBO0FBQUE7QUFJM0UsTUFBSSwwQkFBRyxJQUFJLFVBQVU7QUFDcEIsVUFBTSxXQUFXLDBCQUFHLElBQUk7QUFDeEIsYUFBUyxXQUFXLFNBQVUsTUFBTTtBQUNuQyxVQUFJLHlDQUF1QixPQUFPO0FBQ2pDLGVBQU8sU0FBUyxzQ0FBb0IsU0FBUztBQUFBO0FBRTlDLGFBQU8sU0FBUztBQUFBO0FBQUE7QUFJbEIsU0FBTztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvLXN5cy50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSx3QkFBZTtBQUVmLG1CQUFxRjtBQUs5RSxTQUFTLGVBQWUsUUFBZ0I7QUFDOUMsUUFBTSxXQUFzQjtBQUFBLElBQzNCLEdBQUcsa0JBQUFBLFFBQUc7QUFBQSxJQUNOLFdBQVcsTUFBYztBQUN4QixhQUFPLGtCQUFBQSxRQUFHLElBQUksZUFBVyxzQ0FBd0IsSUFBSSxDQUFDO0FBQUEsSUFDdkQ7QUFBQSxJQUNBLGNBQWMsTUFBTSxZQUFZLFNBQVMsU0FBUyxPQUFPO0FBQ3hELFlBQU0sdUJBQXVCLGtDQUFjLENBQUMsR0FBRyxPQUFPLFFBQVE7QUFFOUQsYUFBTyxrQkFBQUEsUUFBRyxJQUFJLGNBQWMsTUFBTSxxQkFBcUIsU0FBUyxTQUFTLEtBQUs7QUFBQSxJQUMvRTtBQUFBLEVBQ0Q7QUFFQSxNQUFJLGtCQUFBQSxRQUFHLElBQUksVUFBVTtBQUNwQixVQUFNLFdBQVcsa0JBQUFBLFFBQUcsSUFBSTtBQUN4QixhQUFTLFdBQVcsU0FBVSxNQUFNO0FBQ25DLGNBQUkscUNBQXVCLElBQUksR0FBRztBQUNqQyxlQUFPLGFBQVMsa0NBQW9CLElBQUksQ0FBQyxJQUFJO0FBQUEsTUFDOUM7QUFDQSxhQUFPLFNBQVMsSUFBSTtBQUFBLElBQ3JCO0FBQUEsRUFDRDtBQUVBLFNBQU87QUFDUjsiLAogICJuYW1lcyI6IFsidHMiXQp9Cg==

dist/astro2tsx.js

@@ -0,33 +1,29 @@
+"use strict";
 var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-__markAsModule(exports);
-__export(exports, {
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var astro2tsx_exports = {};
+__export(astro2tsx_exports, {
   astro2tsx: () => astro2tsx
 });
-function astro2tsx(code, options) {
-  const compiled = transformContent(code);
-  const result = {
-    code: compiled,
-    map: {
-      mappings: []
-    }
-  };
-  return result;
+module.exports = __toCommonJS(astro2tsx_exports);
+var import_TSXService = require("./workers/TSXService");
+function astro2tsx(content, fileName) {
+  const tsx = (0, import_TSXService.convertToTSX)(content, { sourcefile: fileName });
+  return tsx;
 }
-function addProps(content) {
-  let defaultExportType = "Record<string, any>";
-  if (/(interface|type) Props/.test(content)) {
-    defaultExportType = "Props";
-  }
-  return `
-export default function (props: ${defaultExportType}): string;`;
-}
-function transformContent(content) {
-  const ts = content.replace(/---/g, "///");
-  return ts + addProps(ts);
-}
 // Annotate the CommonJS export names for ESM import in node:
@@ -37,2 +33,2 @@ 0 && (module.exports = {
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvMnRzeC50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBaUJPLG1CQUFtQixNQUFjLFNBQTRDO0FBQ25GLFFBQU0sV0FBVyxpQkFBaUI7QUFFbEMsUUFBTSxTQUEwQjtBQUFBLElBQy9CLE1BQU07QUFBQSxJQUNOLEtBQUs7QUFBQSxNQUNKLFVBQVU7QUFBQTtBQUFBO0FBSVosU0FBTztBQUFBO0FBSVIsa0JBQWtCLFNBQXlCO0FBQzFDLE1BQUksb0JBQW9CO0FBRXhCLE1BQUkseUJBQXlCLEtBQUssVUFBVTtBQUMzQyx3QkFBb0I7QUFBQTtBQUdyQixTQUFPO0FBQUEsa0NBQTBDO0FBQUE7QUFHbEQsMEJBQTBCLFNBQWlCO0FBQzFDLFFBQU0sS0FBSyxRQUFRLFFBQVEsUUFBUTtBQUNuQyxTQUNDLEtBRUEsU0FBUztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2FzdHJvMnRzeC50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDQSx3QkFBNkI7QUFFdEIsU0FBUyxVQUFVLFNBQWlCLFVBQTZCO0FBQ3ZFLFFBQU0sVUFBTSxnQ0FBYSxTQUFTLEVBQUUsWUFBWSxTQUFTLENBQUM7QUFFMUQsU0FBTztBQUNSOyIsCiAgIm5hbWVzIjogW10KfQo=

dist/index.js

@@ -1,27 +0,15 @@
-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 __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-var import_astro_snapshots = __toModule(require("./astro-snapshots.js"));
-var import_language_service = __toModule(require("./language-service/index.js"));
-var import_logger = __toModule(require("./logger.js"));
-var import_module_loader = __toModule(require("./module-loader.js"));
+"use strict";
+var import_astro_snapshots = require("./astro-snapshots.js");
+var import_language_service = require("./language-service/index.js");
+var import_logger = require("./logger.js");
+var import_module_loader = require("./module-loader.js");
+var import_project_astro_files = require("./project-astro-files.js");
+var import_utils = require("./utils.js");
 function init(modules) {
+  const ts = modules.typescript;
   function create(info) {
+    var _a, _b;
     const logger = new import_logger.Logger(info.project.projectService.logger);
-    if (!isAstroProject(info)) {
+    const parsedCommandLine = (_b = (_a = info.languageServiceHost).getParsedCommandLine) == null ? void 0 : _b.call(_a, (0, import_utils.getConfigPathForProject)(info.project));
+    if (!isAstroProject(info.project, parsedCommandLine)) {
       logger.log("Detected that this is not an Astro project, abort patching TypeScript");
@@ -32,25 +20,36 @@ return info.languageService;
     const snapshotManager = new import_astro_snapshots.AstroSnapshotManager(modules.typescript, info.project.projectService, logger);
-    patchCompilerOptions(info.project);
+    if (parsedCommandLine) {
+      new import_project_astro_files.ProjectAstroFilesManager(
+        modules.typescript,
+        info.project,
+        info.serverHost,
+        snapshotManager,
+        parsedCommandLine
+      );
+    }
     (0, import_module_loader.patchModuleLoader)(logger, snapshotManager, modules.typescript, info.languageServiceHost, info.project);
     return (0, import_language_service.decorateLanguageService)(info.languageService, snapshotManager, logger);
   }
-  function getExternalFiles(_project) {
-    return [];
+  function getExternalFiles(project) {
+    var _a, _b;
+    return (_b = (_a = import_project_astro_files.ProjectAstroFilesManager.getInstance(project.getProjectName())) == null ? void 0 : _a.getFiles()) != null ? _b : [];
   }
-  function patchCompilerOptions(project) {
-    var _a;
-    const compilerOptions = project.getCompilerOptions();
-    compilerOptions.jsx = modules.typescript.JsxEmit.Preserve;
-    if (!((_a = compilerOptions.jsxFactory) == null ? void 0 : _a.startsWith("astro"))) {
-      compilerOptions.jsxFactory = "astro.createElement";
+  function isAstroProject(project, parsedCommandLine) {
+    if (parsedCommandLine) {
+      const astroFiles = (0, import_utils.readProjectAstroFilesFromFs)(ts, project, parsedCommandLine);
+      if (astroFiles.length > 0)
+        return true;
     }
+    try {
+      const compilerOptions = project.getCompilerOptions();
+      const hasAstroInstalled = typeof compilerOptions.configFilePath !== "string" || require.resolve("astro", { paths: [compilerOptions.configFilePath] });
+      return hasAstroInstalled;
+    } catch (e) {
+      project.projectService.logger.info(e);
+      return false;
+    }
   }
-  function isAstroProject(info) {
-    const compilerOptions = info.project.getCompilerOptions();
-    const isNoJsxProject = (!compilerOptions.jsx || compilerOptions.jsx === modules.typescript.JsxEmit.Preserve) && (!compilerOptions.jsxFactory || compilerOptions.jsxFactory.startsWith("astro")) && !compilerOptions.jsxFragmentFactory && !compilerOptions.jsxImportSource;
-    return isNoJsxProject;
-  }
-  return {create, getExternalFiles};
+  return { create, getExternalFiles };
 }
 module.exports = init;
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsNkJBQXFDO0FBQ3JDLDhCQUF3QztBQUN4QyxvQkFBdUI7QUFDdkIsMkJBQWtDO0FBRWxDLGNBQWMsU0FBb0M7QUFDakQsa0JBQWdCLE1BQWtDO0FBQ2pELFVBQU0sU0FBUyxJQUFJLHFCQUFPLEtBQUssUUFBUSxlQUFlO0FBRXRELFFBQUksQ0FBQyxlQUFlLE9BQU87QUFDMUIsYUFBTyxJQUFJO0FBQ1gsYUFBTyxLQUFLO0FBQUE7QUFHYixXQUFPLElBQUk7QUFFWCxVQUFNLGtCQUFrQixJQUFJLDRDQUFxQixRQUFRLFlBQVksS0FBSyxRQUFRLGdCQUFnQjtBQUVsRyx5QkFBcUIsS0FBSztBQUMxQixnREFBa0IsUUFBUSxpQkFBaUIsUUFBUSxZQUFZLEtBQUsscUJBQXFCLEtBQUs7QUFDOUYsV0FBTyxxREFBd0IsS0FBSyxpQkFBaUIsaUJBQWlCO0FBQUE7QUFHdkUsNEJBQTBCLFVBQXVDO0FBU2hFLFdBQU87QUFBQTtBQUdSLGdDQUE4QixTQUE0QjtBQXBDM0Q7QUFxQ0UsVUFBTSxrQkFBa0IsUUFBUTtBQUVoQyxvQkFBZ0IsTUFBTSxRQUFRLFdBQVcsUUFBUTtBQUdqRCxRQUFJLENBQUMsdUJBQWdCLGVBQWhCLG1CQUE0QixXQUFXLFdBQVU7QUFJckQsc0JBQWdCLGFBQWE7QUFBQTtBQUFBO0FBSS9CLDBCQUF3QixNQUFrQztBQUV6RCxVQUFNLGtCQUFrQixLQUFLLFFBQVE7QUFDckMsVUFBTSxpQkFDSixFQUFDLGdCQUFnQixPQUFPLGdCQUFnQixRQUFRLFFBQVEsV0FBVyxRQUFRLGFBQzNFLEVBQUMsZ0JBQWdCLGNBQWMsZ0JBQWdCLFdBQVcsV0FBVyxhQUN0RSxDQUFDLGdCQUFnQixzQkFDakIsQ0FBQyxnQkFBZ0I7QUFDbEIsV0FBTztBQUFBO0FBR1IsU0FBTyxDQUFFLFFBQVE7QUFBQTtBQUdsQixpQkFBUzsiLAogICJuYW1lcyI6IFtdCn0K
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQUNBLDZCQUFxQztBQUNyQyw4QkFBd0M7QUFDeEMsb0JBQXVCO0FBQ3ZCLDJCQUFrQztBQUNsQyxpQ0FBeUM7QUFDekMsbUJBQXFFO0FBRXJFLFNBQVMsS0FBSyxTQUEwRTtBQUN2RixRQUFNLEtBQUssUUFBUTtBQUVuQixXQUFTLE9BQU8sTUFBc0Q7QUFYdkU7QUFZRSxVQUFNLFNBQVMsSUFBSSxxQkFBTyxLQUFLLFFBQVEsZUFBZSxNQUFNO0FBQzVELFVBQU0scUJBQW9CLGdCQUFLLHFCQUFvQix5QkFBekIsZ0NBQWdELHNDQUF3QixLQUFLLE9BQU87QUFFOUcsUUFBSSxDQUFDLGVBQWUsS0FBSyxTQUFTLGlCQUFpQixHQUFHO0FBQ3JELGFBQU8sSUFBSSx1RUFBdUU7QUFDbEYsYUFBTyxLQUFLO0FBQUEsSUFDYjtBQUVBLFdBQU8sSUFBSSx1QkFBdUI7QUFFbEMsVUFBTSxrQkFBa0IsSUFBSSw0Q0FBcUIsUUFBUSxZQUFZLEtBQUssUUFBUSxnQkFBZ0IsTUFBTTtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixVQUFJO0FBQUEsUUFDSCxRQUFRO0FBQUEsUUFDUixLQUFLO0FBQUEsUUFDTCxLQUFLO0FBQUEsUUFDTDtBQUFBLFFBQ0E7QUFBQSxNQUNEO0FBQUEsSUFDRDtBQUVBLGdEQUFrQixRQUFRLGlCQUFpQixRQUFRLFlBQVksS0FBSyxxQkFBcUIsS0FBSyxPQUFPO0FBQ3JHLGVBQU8saURBQXdCLEtBQUssaUJBQWlCLGlCQUFpQixNQUFNO0FBQUEsRUFDN0U7QUFFQSxXQUFTLGlCQUFpQixTQUFzQztBQXJDakU7QUFzQ0UsWUFBTywrREFBeUIsWUFBWSxRQUFRLGVBQWUsQ0FBQyxNQUE3RCxtQkFBZ0UsZUFBaEUsWUFBOEUsQ0FBQztBQUFBLEVBQ3ZGO0FBRUEsV0FBUyxlQUFlLFNBQTRCLG1CQUFxRDtBQUN4RyxRQUFJLG1CQUFtQjtBQUN0QixZQUFNLGlCQUFhLDBDQUE0QixJQUFJLFNBQVMsaUJBQWlCO0FBRTdFLFVBQUksV0FBVyxTQUFTO0FBQUcsZUFBTztBQUFBLElBQ25DO0FBRUEsUUFBSTtBQUNILFlBQU0sa0JBQWtCLFFBQVEsbUJBQW1CO0FBQ25ELFlBQU0sb0JBQ0wsT0FBTyxnQkFBZ0IsbUJBQW1CLFlBQzFDLFFBQVEsUUFBUSxTQUFTLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixjQUFjLEVBQUUsQ0FBQztBQUVyRSxhQUFPO0FBQUEsSUFDUixTQUFTLEdBQVA7QUFDRCxjQUFRLGVBQWUsT0FBTyxLQUFLLENBQVc7QUFDOUMsYUFBTztBQUFBLElBQ1I7QUFBQSxFQUNEO0FBRUEsU0FBTyxFQUFFLFFBQVEsaUJBQWlCO0FBQ25DO0FBRUEsaUJBQVM7IiwKICAibmFtZXMiOiBbXQp9Cg==

dist/language-service/completions.js

@@ -1,45 +0,25 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var completions_exports = {};
+__export(completions_exports, {
   decorateCompletions: () => decorateCompletions
 });
-var import_utils = __toModule(require("../utils.js"));
+module.exports = __toCommonJS(completions_exports);
+var import_utils = require("../utils.js");
 const componentPostfix = "__AstroComponent_";
@@ -53,3 +33,4 @@ function decorateCompletions(ls, logger) {
     }
-    return __spreadProps(__spreadValues({}, completions), {
+    return {
+      ...completions,
       entries: completions.entries.map((entry) => {
@@ -59,15 +40,34 @@ if (!(0, import_utils.isAstroFilePath)(entry.source || "") || !entry.name.endsWith(componentPostfix)) {
         }
-        return __spreadProps(__spreadValues({}, entry), {
+        return {
+          ...entry,
           name: entry.name.slice(0, -componentPostfix.length)
-        });
+        };
       })
-    });
+    };
   };
   const getCompletionEntryDetails = ls.getCompletionEntryDetails;
   ls.getCompletionEntryDetails = (fileName, position, entryName, formatOptions, source, preferences, data) => {
-    const details = getCompletionEntryDetails(fileName, position, entryName, formatOptions, source, preferences, data);
-    if (details || !(0, import_utils.isAstroFilePath)(source || "")) {
-      return details;
+    if (!(0, import_utils.isAstroFilePath)(source || "")) {
+      const details = getCompletionEntryDetails(
+        fileName,
+        position,
+        entryName,
+        formatOptions,
+        source,
+        preferences,
+        data
+      );
+      if (details) {
+        return details;
+      }
     }
-    const astroDetails = getCompletionEntryDetails(fileName, position, entryName + componentPostfix, formatOptions, source, preferences, data);
+    const astroDetails = getCompletionEntryDetails(
+      fileName,
+      position,
+      entryName + componentPostfix,
+      formatOptions,
+      source,
+      preferences,
+      data
+    );
     if (!astroDetails) {
@@ -84,2 +84,2 @@ return void 0;
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvY29tcGxldGlvbnMudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUVBLG1CQUE2QztBQUU3QyxNQUFNLG1CQUFtQjtBQUVsQiw2QkFBNkIsSUFBd0IsUUFBc0I7QUFDakYsUUFBTSwyQkFBMkIsR0FBRztBQUNwQyxLQUFHLDJCQUEyQixDQUFDLFVBQVUsVUFBVSxZQUFZO0FBQzlELFVBQU0sY0FBYyx5QkFBeUIsVUFBVSxVQUFVO0FBQ2pFLFFBQUksQ0FBQyxhQUFhO0FBQ2pCLGFBQU87QUFBQTtBQUVSLFdBQU8saUNBQ0gsY0FERztBQUFBLE1BRU4sU0FBUyxZQUFZLFFBQVEsSUFBSSxDQUFDLFVBQVU7QUFDM0MsWUFBSSxDQUFDLGtDQUFnQixNQUFNLFVBQVUsT0FBTyxDQUFDLE1BQU0sS0FBSyxTQUFTLG1CQUFtQjtBQUNuRixpQkFBTztBQUFBO0FBRVIsZUFBTyxpQ0FDSCxRQURHO0FBQUEsVUFFTixNQUFNLE1BQU0sS0FBSyxNQUFNLEdBQUcsQ0FBQyxpQkFBaUI7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQU1oRCxRQUFNLDRCQUE0QixHQUFHO0FBQ3JDLEtBQUcsNEJBQTRCLENBQUMsVUFBVSxVQUFVLFdBQVcsZUFBZSxRQUFRLGFBQWEsU0FBUztBQUMzRyxVQUFNLFVBQVUsMEJBQTBCLFVBQVUsVUFBVSxXQUFXLGVBQWUsUUFBUSxhQUFhO0FBQzdHLFFBQUksV0FBVyxDQUFDLGtDQUFnQixVQUFVLEtBQUs7QUFDOUMsYUFBTztBQUFBO0FBTVIsVUFBTSxlQUFlLDBCQUNwQixVQUNBLFVBQ0EsWUFBWSxrQkFDWixlQUNBLFFBQ0EsYUFDQTtBQUVELFFBQUksQ0FBQyxjQUFjO0FBQ2xCLGFBQU87QUFBQTtBQUVSLFdBQU8sTUFBTTtBQUViLFdBQU8sOEJBQVksY0FBYyxrQkFBa0I7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvY29tcGxldGlvbnMudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRUEsbUJBQTZDO0FBRTdDLE1BQU0sbUJBQW1CO0FBRWxCLFNBQVMsb0JBQW9CLElBQXdCLFFBQXNCO0FBQ2pGLFFBQU0sMkJBQTJCLEdBQUc7QUFDcEMsS0FBRywyQkFBMkIsQ0FBQyxVQUFVLFVBQVUsWUFBWTtBQUM5RCxVQUFNLGNBQWMseUJBQXlCLFVBQVUsVUFBVSxPQUFPO0FBQ3hFLFFBQUksQ0FBQyxhQUFhO0FBQ2pCLGFBQU87QUFBQSxJQUNSO0FBQ0EsV0FBTztBQUFBLE1BQ04sR0FBRztBQUFBLE1BQ0gsU0FBUyxZQUFZLFFBQVEsSUFBSSxDQUFDLFVBQVU7QUFDM0MsWUFBSSxLQUFDLDhCQUFnQixNQUFNLFVBQVUsRUFBRSxLQUFLLENBQUMsTUFBTSxLQUFLLFNBQVMsZ0JBQWdCLEdBQUc7QUFDbkYsaUJBQU87QUFBQSxRQUNSO0FBQ0EsZUFBTztBQUFBLFVBQ04sR0FBRztBQUFBLFVBQ0gsTUFBTSxNQUFNLEtBQUssTUFBTSxHQUFHLENBQUMsaUJBQWlCLE1BQU07QUFBQSxRQUNuRDtBQUFBLE1BQ0QsQ0FBQztBQUFBLElBQ0Y7QUFBQSxFQUNEO0FBRUEsUUFBTSw0QkFBNEIsR0FBRztBQUNyQyxLQUFHLDRCQUE0QixDQUFDLFVBQVUsVUFBVSxXQUFXLGVBQWUsUUFBUSxhQUFhLFNBQVM7QUFDM0csUUFBSSxLQUFDLDhCQUFnQixVQUFVLEVBQUUsR0FBRztBQUNuQyxZQUFNLFVBQVU7QUFBQSxRQUNmO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsTUFDRDtBQUVBLFVBQUksU0FBUztBQUNaLGVBQU87QUFBQSxNQUNSO0FBQUEsSUFDRDtBQUtBLFVBQU0sZUFBZTtBQUFBLE1BQ3BCO0FBQUEsTUFDQTtBQUFBLE1BQ0EsWUFBWTtBQUFBLE1BQ1o7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxJQUNEO0FBQ0EsUUFBSSxDQUFDLGNBQWM7QUFDbEIsYUFBTztBQUFBLElBQ1I7QUFDQSxXQUFPLE1BQU0saURBQWlEO0FBRTlELGVBQU8sMEJBQVksY0FBYyxrQkFBa0IsRUFBRTtBQUFBLEVBQ3REO0FBQ0Q7IiwKICAibmFtZXMiOiBbXQp9Cg==

dist/language-service/definition.js

@@ -1,46 +0,26 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var definition_exports = {};
+__export(definition_exports, {
   decorateGetDefinition: () => decorateGetDefinition
 });
-var import_utils = __toModule(require("../utils"));
-function decorateGetDefinition(ls, snapshotManager, logger) {
+module.exports = __toCommonJS(definition_exports);
+var import_utils = require("../utils");
+function decorateGetDefinition(ls, snapshotManager) {
   const getDefinitionAndBoundSpan = ls.getDefinitionAndBoundSpan;
@@ -52,3 +32,4 @@ ls.getDefinitionAndBoundSpan = (fileName, position) => {
     }
-    return __spreadProps(__spreadValues({}, definition), {
+    return {
+      ...definition,
       definitions: definition.definitions.map((def) => {
@@ -61,5 +42,6 @@ var _a;
         if (!textSpan) {
-          textSpan = {start: 0, length: 1};
+          textSpan = { start: 0, length: 1 };
         }
-        return __spreadProps(__spreadValues({}, def), {
+        return {
+          ...def,
           textSpan,
@@ -69,5 +51,5 @@ originalTextSpan: void 0,
           originalContextSpan: void 0
-        });
+        };
       }).filter(import_utils.isNotNullOrUndefined)
-    });
+    };
   };
@@ -79,2 +61,2 @@ }
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZGVmaW5pdGlvbi50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBR0EsbUJBQXNEO0FBRS9DLCtCQUNOLElBQ0EsaUJBQ0EsUUFDTztBQUNQLFFBQU0sNEJBQTRCLEdBQUc7QUFDckMsS0FBRyw0QkFBNEIsQ0FBQyxVQUFVLGFBQWE7QUFDdEQsVUFBTSxhQUFhLDBCQUEwQixVQUFVO0FBQ3ZELFFBQUksQ0FBQywwQ0FBWSxjQUFhO0FBQzdCLGFBQU87QUFBQTtBQUdSLFdBQU8saUNBQ0gsYUFERztBQUFBLE1BRU4sYUFBYSxXQUFXLFlBQ3RCLElBQUksQ0FBQyxRQUFRO0FBcEJsQjtBQXFCSyxZQUFJLENBQUMsa0NBQWdCLElBQUksV0FBVztBQUNuQyxpQkFBTztBQUFBO0FBR1IsWUFBSSxXQUFXLHNCQUFnQixJQUFJLElBQUksY0FBeEIsbUJBQW1DLG9CQUFvQixJQUFJO0FBQzFFLFlBQUksQ0FBQyxVQUFVO0FBR2QscUJBQVcsQ0FBRSxPQUFPLEdBQUcsUUFBUTtBQUFBO0FBRWhDLGVBQU8saUNBQ0gsTUFERztBQUFBLFVBRU47QUFBQSxVQUVBLGtCQUFrQjtBQUFBLFVBQ2xCLGFBQWE7QUFBQSxVQUNiLHFCQUFxQjtBQUFBO0FBQUEsU0FHdEIsT0FBTztBQUFBO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZGVmaW5pdGlvbi50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFQSxtQkFBc0Q7QUFFL0MsU0FBUyxzQkFBc0IsSUFBd0IsaUJBQTZDO0FBQzFHLFFBQU0sNEJBQTRCLEdBQUc7QUFDckMsS0FBRyw0QkFBNEIsQ0FBQyxVQUFVLGFBQWE7QUFDdEQsVUFBTSxhQUFhLDBCQUEwQixVQUFVLFFBQVE7QUFDL0QsUUFBSSxFQUFDLHlDQUFZLGNBQWE7QUFDN0IsYUFBTztBQUFBLElBQ1I7QUFFQSxXQUFPO0FBQUEsTUFDTixHQUFHO0FBQUEsTUFDSCxhQUFhLFdBQVcsWUFDdEIsSUFBSSxDQUFDLFFBQVE7QUFmbEI7QUFnQkssWUFBSSxLQUFDLDhCQUFnQixJQUFJLFFBQVEsR0FBRztBQUNuQyxpQkFBTztBQUFBLFFBQ1I7QUFFQSxZQUFJLFlBQVcscUJBQWdCLElBQUksSUFBSSxRQUFRLE1BQWhDLG1CQUFtQyxvQkFBb0IsSUFBSTtBQUMxRSxZQUFJLENBQUMsVUFBVTtBQUdkLHFCQUFXLEVBQUUsT0FBTyxHQUFHLFFBQVEsRUFBRTtBQUFBLFFBQ2xDO0FBQ0EsZUFBTztBQUFBLFVBQ04sR0FBRztBQUFBLFVBQ0g7QUFBQSxVQUVBLGtCQUFrQjtBQUFBLFVBQ2xCLGFBQWE7QUFBQSxVQUNiLHFCQUFxQjtBQUFBLFFBQ3RCO0FBQUEsTUFDRCxDQUFDLEVBQ0EsT0FBTyxpQ0FBb0I7QUFBQSxJQUM5QjtBQUFBLEVBQ0Q7QUFDRDsiLAogICJuYW1lcyI6IFtdCn0K

dist/language-service/diagnostics.js

@@ -1,29 +0,26 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var diagnostics_exports = {};
+__export(diagnostics_exports, {
   decorateDiagnostics: () => decorateDiagnostics
 });
-var import_utils = __toModule(require("../utils.js"));
-function decorateDiagnostics(ls, logger) {
+module.exports = __toCommonJS(diagnostics_exports);
+var import_utils = require("../utils.js");
+function decorateDiagnostics(ls) {
   decorateSyntacticDiagnostics(ls);
@@ -64,2 +61,2 @@ decorateSemanticDiagnostics(ls);
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZGlhZ25vc3RpY3MudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFQSxtQkFBZ0M7QUFFekIsNkJBQTZCLElBQXdCLFFBQXNCO0FBQ2pGLCtCQUE2QjtBQUM3Qiw4QkFBNEI7QUFDNUIsZ0NBQThCO0FBQUE7QUFHL0Isc0NBQXNDLElBQThCO0FBQ25FLFFBQU0sMEJBQTBCLEdBQUc7QUFDbkMsS0FBRywwQkFBMEIsQ0FBQyxhQUFxQjtBQUdsRCxRQUFJLGtDQUFnQixXQUFXO0FBQzlCLGFBQU87QUFBQTtBQUVSLFdBQU8sd0JBQXdCO0FBQUE7QUFBQTtBQUlqQyxxQ0FBcUMsSUFBOEI7QUFDbEUsUUFBTSx5QkFBeUIsR0FBRztBQUNsQyxLQUFHLHlCQUF5QixDQUFDLGFBQXFCO0FBR2pELFFBQUksa0NBQWdCLFdBQVc7QUFDOUIsYUFBTztBQUFBO0FBRVIsV0FBTyx1QkFBdUI7QUFBQTtBQUFBO0FBSWhDLHVDQUF1QyxJQUE4QjtBQUNwRSxRQUFNLDJCQUEyQixHQUFHO0FBQ3BDLEtBQUcsMkJBQTJCLENBQUMsYUFBcUI7QUFHbkQsUUFBSSxrQ0FBZ0IsV0FBVztBQUM5QixhQUFPO0FBQUE7QUFFUixXQUFPLHlCQUF5QjtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZGlhZ25vc3RpY3MudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ0EsbUJBQWdDO0FBRXpCLFNBQVMsb0JBQW9CLElBQThCO0FBQ2pFLCtCQUE2QixFQUFFO0FBQy9CLDhCQUE0QixFQUFFO0FBQzlCLGdDQUE4QixFQUFFO0FBQ2pDO0FBRUEsU0FBUyw2QkFBNkIsSUFBOEI7QUFDbkUsUUFBTSwwQkFBMEIsR0FBRztBQUNuQyxLQUFHLDBCQUEwQixDQUFDLGFBQXFCO0FBR2xELFlBQUksOEJBQWdCLFFBQVEsR0FBRztBQUM5QixhQUFPLENBQUM7QUFBQSxJQUNUO0FBQ0EsV0FBTyx3QkFBd0IsUUFBUTtBQUFBLEVBQ3hDO0FBQ0Q7QUFFQSxTQUFTLDRCQUE0QixJQUE4QjtBQUNsRSxRQUFNLHlCQUF5QixHQUFHO0FBQ2xDLEtBQUcseUJBQXlCLENBQUMsYUFBcUI7QUFHakQsWUFBSSw4QkFBZ0IsUUFBUSxHQUFHO0FBQzlCLGFBQU8sQ0FBQztBQUFBLElBQ1Q7QUFDQSxXQUFPLHVCQUF1QixRQUFRO0FBQUEsRUFDdkM7QUFDRDtBQUVBLFNBQVMsOEJBQThCLElBQThCO0FBQ3BFLFFBQU0sMkJBQTJCLEdBQUc7QUFDcEMsS0FBRywyQkFBMkIsQ0FBQyxhQUFxQjtBQUduRCxZQUFJLDhCQUFnQixRQUFRLEdBQUc7QUFDOUIsYUFBTyxDQUFDO0FBQUEsSUFDVDtBQUNBLFdBQU8seUJBQXlCLFFBQVE7QUFBQSxFQUN6QztBQUNEOyIsCiAgIm5hbWVzIjogW10KfQo=

dist/language-service/find-references.js

@@ -1,45 +0,25 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var find_references_exports = {};
+__export(find_references_exports, {
   decorateFindReferences: () => decorateFindReferences
 });
-var import_utils = __toModule(require("../utils.js"));
+module.exports = __toCommonJS(find_references_exports);
+var import_utils = require("../utils.js");
 function decorateFindReferences(ls, snapshotManager, logger) {
@@ -63,6 +43,7 @@ decorateGetReferencesAtPosition(ls, snapshotManager, logger);
       return {
-        definition: __spreadProps(__spreadValues({}, reference.definition), {
+        definition: {
+          ...reference.definition,
           textSpan,
           originalTextSpan: void 0
-        }),
+        },
         references: mapReferences(reference.references, snapshotManager, logger)
@@ -91,3 +72,4 @@ };
     logger.debug("Find references; map textSpan: changed", reference.textSpan, "to", textSpan);
-    return __spreadProps(__spreadValues({}, reference), {
+    return {
+      ...reference,
       textSpan,
@@ -97,3 +79,3 @@ contextSpan: void 0,
       originalContextSpan: void 0
-    });
+    };
   }).filter(import_utils.isNotNullOrUndefined);
@@ -105,2 +87,2 @@ }
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZmluZC1yZWZlcmVuY2VzLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFHQSxtQkFBc0Q7QUFFL0MsZ0NBQ04sSUFDQSxpQkFDQSxRQUNPO0FBQ1Asa0NBQWdDLElBQUksaUJBQWlCO0FBQ3JELDBCQUF3QixJQUFJLGlCQUFpQjtBQUFBO0FBRzlDLGlDQUFpQyxJQUF3QixpQkFBdUMsUUFBZ0I7QUFDL0csUUFBTSxpQkFBaUIsR0FBRztBQUMxQixLQUFHLGlCQUFpQixDQUFDLFVBQVUsYUFBYTtBQUMzQyxVQUFNLGFBQWEsZUFBZSxVQUFVO0FBQzVDLFdBQU8seUNBQ0osSUFBSSxDQUFDLGNBQWM7QUFDcEIsWUFBTSxXQUFXLGdCQUFnQixJQUFJLFVBQVUsV0FBVztBQUMxRCxVQUFJLENBQUMsa0NBQWdCLFVBQVUsV0FBVyxhQUFhLENBQUMsVUFBVTtBQUNqRSxlQUFPO0FBQUE7QUFHUixZQUFNLFdBQVcsU0FBUyxvQkFBb0IsVUFBVSxXQUFXO0FBQ25FLFVBQUksQ0FBQyxVQUFVO0FBQ2QsZUFBTztBQUFBO0FBR1IsYUFBTztBQUFBLFFBQ04sWUFBWSxpQ0FDUixVQUFVLGFBREY7QUFBQSxVQUVYO0FBQUEsVUFFQSxrQkFBa0I7QUFBQTtBQUFBLFFBRW5CLFlBQVksY0FBYyxVQUFVLFlBQVksaUJBQWlCO0FBQUE7QUFBQSxPQUdsRSxPQUFPO0FBQUE7QUFBQTtBQUlYLHlDQUNDLElBQ0EsaUJBQ0EsUUFDQztBQUNELFFBQU0sMEJBQTBCLEdBQUc7QUFDbkMsS0FBRywwQkFBMEIsQ0FBQyxVQUFVLGFBQWE7QUFDcEQsVUFBTSxhQUFhLHdCQUF3QixVQUFVO0FBQ3JELFdBQU8sY0FBYyxjQUFjLFlBQVksaUJBQWlCO0FBQUE7QUFBQTtBQUlsRSx1QkFDQyxZQUNBLGlCQUNBLFFBQ3NCO0FBQ3RCLFNBQU8sV0FDTCxJQUFJLENBQUMsY0FBYztBQUNuQixVQUFNLFdBQVcsZ0JBQWdCLElBQUksVUFBVTtBQUMvQyxRQUFJLENBQUMsa0NBQWdCLFVBQVUsYUFBYSxDQUFDLFVBQVU7QUFDdEQsYUFBTztBQUFBO0FBR1IsVUFBTSxXQUFXLFNBQVMsb0JBQW9CLFVBQVU7QUFDeEQsUUFBSSxDQUFDLFVBQVU7QUFDZCxhQUFPO0FBQUE7QUFHUixXQUFPLE1BQU0sMENBQTBDLFVBQVUsVUFBVSxNQUFNO0FBRWpGLFdBQU8saUNBQ0gsWUFERztBQUFBLE1BRU47QUFBQSxNQUVBLGFBQWE7QUFBQSxNQUNiLGtCQUFrQjtBQUFBLE1BQ2xCLHFCQUFxQjtBQUFBO0FBQUEsS0FHdEIsT0FBTztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvZmluZC1yZWZlcmVuY2VzLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUdBLG1CQUFzRDtBQUUvQyxTQUFTLHVCQUNmLElBQ0EsaUJBQ0EsUUFDTztBQUNQLGtDQUFnQyxJQUFJLGlCQUFpQixNQUFNO0FBQzNELDBCQUF3QixJQUFJLGlCQUFpQixNQUFNO0FBQ3BEO0FBRUEsU0FBUyx3QkFBd0IsSUFBd0IsaUJBQXVDLFFBQWdCO0FBQy9HLFFBQU0saUJBQWlCLEdBQUc7QUFDMUIsS0FBRyxpQkFBaUIsQ0FBQyxVQUFVLGFBQWE7QUFDM0MsVUFBTSxhQUFhLGVBQWUsVUFBVSxRQUFRO0FBQ3BELFdBQU8seUNBQ0osSUFBSSxDQUFDLGNBQWM7QUFDcEIsWUFBTSxXQUFXLGdCQUFnQixJQUFJLFVBQVUsV0FBVyxRQUFRO0FBQ2xFLFVBQUksS0FBQyw4QkFBZ0IsVUFBVSxXQUFXLFFBQVEsS0FBSyxDQUFDLFVBQVU7QUFDakUsZUFBTztBQUFBLE1BQ1I7QUFFQSxZQUFNLFdBQVcsU0FBUyxvQkFBb0IsVUFBVSxXQUFXLFFBQVE7QUFDM0UsVUFBSSxDQUFDLFVBQVU7QUFDZCxlQUFPO0FBQUEsTUFDUjtBQUVBLGFBQU87QUFBQSxRQUNOLFlBQVk7QUFBQSxVQUNYLEdBQUcsVUFBVTtBQUFBLFVBQ2I7QUFBQSxVQUVBLGtCQUFrQjtBQUFBLFFBQ25CO0FBQUEsUUFDQSxZQUFZLGNBQWMsVUFBVSxZQUFZLGlCQUFpQixNQUFNO0FBQUEsTUFDeEU7QUFBQSxJQUNELEdBQ0MsT0FBTztBQUFBLEVBQ1Y7QUFDRDtBQUVBLFNBQVMsZ0NBQ1IsSUFDQSxpQkFDQSxRQUNDO0FBQ0QsUUFBTSwwQkFBMEIsR0FBRztBQUNuQyxLQUFHLDBCQUEwQixDQUFDLFVBQVUsYUFBYTtBQUNwRCxVQUFNLGFBQWEsd0JBQXdCLFVBQVUsUUFBUTtBQUM3RCxXQUFPLGNBQWMsY0FBYyxZQUFZLGlCQUFpQixNQUFNO0FBQUEsRUFDdkU7QUFDRDtBQUVBLFNBQVMsY0FDUixZQUNBLGlCQUNBLFFBQ3NCO0FBQ3RCLFNBQU8sV0FDTCxJQUFJLENBQUMsY0FBYztBQUNuQixVQUFNLFdBQVcsZ0JBQWdCLElBQUksVUFBVSxRQUFRO0FBQ3ZELFFBQUksS0FBQyw4QkFBZ0IsVUFBVSxRQUFRLEtBQUssQ0FBQyxVQUFVO0FBQ3RELGFBQU87QUFBQSxJQUNSO0FBRUEsVUFBTSxXQUFXLFNBQVMsb0JBQW9CLFVBQVUsUUFBUTtBQUNoRSxRQUFJLENBQUMsVUFBVTtBQUNkLGFBQU87QUFBQSxJQUNSO0FBRUEsV0FBTyxNQUFNLDBDQUEwQyxVQUFVLFVBQVUsTUFBTSxRQUFRO0FBRXpGLFdBQU87QUFBQSxNQUNOLEdBQUc7QUFBQSxNQUNIO0FBQUEsTUFFQSxhQUFhO0FBQUEsTUFDYixrQkFBa0I7QUFBQSxNQUNsQixxQkFBcUI7QUFBQSxJQUN0QjtBQUFBLEVBQ0QsQ0FBQyxFQUNBLE9BQU8saUNBQW9CO0FBQzlCOyIsCiAgIm5hbWVzIjogW10KfQo=

dist/language-service/implementation.js

@@ -1,46 +0,26 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var implementation_exports = {};
+__export(implementation_exports, {
   decorateGetImplementation: () => decorateGetImplementation
 });
-var import_utils = __toModule(require("../utils.js"));
-function decorateGetImplementation(ls, snapshotManager, logger) {
+module.exports = __toCommonJS(implementation_exports);
+var import_utils = require("../utils.js");
+function decorateGetImplementation(ls, snapshotManager) {
   const getImplementationAtPosition = ls.getImplementationAtPosition;
@@ -58,3 +38,4 @@ ls.getImplementationAtPosition = (fileName, position) => {
       }
-      return __spreadProps(__spreadValues({}, impl), {
+      return {
+        ...impl,
         textSpan,
@@ -64,3 +45,3 @@ contextSpan: void 0,
         originalContextSpan: void 0
-      });
+      };
     }).filter(import_utils.isNotNullOrUndefined);
@@ -73,2 +54,2 @@ };
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvaW1wbGVtZW50YXRpb24udHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUdBLG1CQUFzRDtBQUUvQyxtQ0FDTixJQUNBLGlCQUNBLFFBQ087QUFDUCxRQUFNLDhCQUE4QixHQUFHO0FBQ3ZDLEtBQUcsOEJBQThCLENBQUMsVUFBVSxhQUFhO0FBQ3hELFVBQU0saUJBQWlCLDRCQUE0QixVQUFVO0FBQzdELFdBQU8saURBQ0osSUFBSSxDQUFDLFNBQVM7QUFkbkI7QUFlSSxVQUFJLENBQUMsa0NBQWdCLEtBQUssV0FBVztBQUNwQyxlQUFPO0FBQUE7QUFHUixZQUFNLFdBQVcsc0JBQWdCLElBQUksS0FBSyxjQUF6QixtQkFBb0Msb0JBQW9CLEtBQUs7QUFDOUUsVUFBSSxDQUFDLFVBQVU7QUFDZCxlQUFPO0FBQUE7QUFHUixhQUFPLGlDQUNILE9BREc7QUFBQSxRQUVOO0FBQUEsUUFFQSxhQUFhO0FBQUEsUUFDYixrQkFBa0I7QUFBQSxRQUNsQixxQkFBcUI7QUFBQTtBQUFBLE9BR3RCLE9BQU87QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvaW1wbGVtZW50YXRpb24udHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRUEsbUJBQXNEO0FBRS9DLFNBQVMsMEJBQTBCLElBQXdCLGlCQUE2QztBQUM5RyxRQUFNLDhCQUE4QixHQUFHO0FBQ3ZDLEtBQUcsOEJBQThCLENBQUMsVUFBVSxhQUFhO0FBQ3hELFVBQU0saUJBQWlCLDRCQUE0QixVQUFVLFFBQVE7QUFDckUsV0FBTyxpREFDSixJQUFJLENBQUMsU0FBUztBQVRuQjtBQVVJLFVBQUksS0FBQyw4QkFBZ0IsS0FBSyxRQUFRLEdBQUc7QUFDcEMsZUFBTztBQUFBLE1BQ1I7QUFFQSxZQUFNLFlBQVcscUJBQWdCLElBQUksS0FBSyxRQUFRLE1BQWpDLG1CQUFvQyxvQkFBb0IsS0FBSztBQUM5RSxVQUFJLENBQUMsVUFBVTtBQUNkLGVBQU87QUFBQSxNQUNSO0FBRUEsYUFBTztBQUFBLFFBQ04sR0FBRztBQUFBLFFBQ0g7QUFBQSxRQUVBLGFBQWE7QUFBQSxRQUNiLGtCQUFrQjtBQUFBLFFBQ2xCLHFCQUFxQjtBQUFBLE1BQ3RCO0FBQUEsSUFDRCxHQUNDLE9BQU87QUFBQSxFQUNWO0FBQ0Q7IiwKICAibmFtZXMiOiBbXQp9Cg==

dist/language-service/index.js

@@ -1,59 +0,43 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var language_service_exports = {};
+__export(language_service_exports, {
   decorateLanguageService: () => decorateLanguageService
 });
-var import_utils = __toModule(require("../utils.js"));
-var import_completions = __toModule(require("./completions.js"));
-var import_definition = __toModule(require("./definition.js"));
-var import_diagnostics = __toModule(require("./diagnostics.js"));
-var import_find_references = __toModule(require("./find-references.js"));
-var import_implementation = __toModule(require("./implementation.js"));
-var import_rename = __toModule(require("./rename.js"));
+module.exports = __toCommonJS(language_service_exports);
+var import_completions = require("./completions.js");
+var import_definition = require("./definition.js");
+var import_diagnostics = require("./diagnostics.js");
+var import_file_references = require("./file-references.js");
+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) {
-  patchLineColumnOffset(ls, snapshotManager);
+  (0, import_line_column_offset.decorateLineColumnOffset)(ls, snapshotManager);
   (0, import_rename.decorateRename)(ls, snapshotManager, logger);
-  (0, import_diagnostics.decorateDiagnostics)(ls, 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, logger);
-  (0, import_implementation.decorateGetImplementation)(ls, snapshotManager, logger);
+  (0, import_definition.decorateGetDefinition)(ls, snapshotManager);
+  (0, import_implementation.decorateGetImplementation)(ls, snapshotManager);
+  (0, import_file_references.decorateGetFileReferences)(ls, snapshotManager);
   return ls;
 }
-function patchLineColumnOffset(ls, snapshotManager) {
-  if (!ls.toLineColumnOffset) {
-    return;
-  }
-  const toLineColumnOffset = ls.toLineColumnOffset;
-  ls.toLineColumnOffset = (fileName, position) => {
-    if ((0, import_utils.isAstroFilePath)(fileName)) {
-      const snapshot = snapshotManager.get(fileName);
-      if (snapshot) {
-        return snapshot.positionAt(position);
-      }
-    }
-    return toLineColumnOffset(fileName, position);
-  };
-}
 // Annotate the CommonJS export names for ESM import in node:
@@ -63,2 +47,2 @@ 0 && (module.exports = {
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvaW5kZXgudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFHQSxtQkFBZ0M7QUFDaEMseUJBQW9DO0FBQ3BDLHdCQUFzQztBQUN0Qyx5QkFBb0M7QUFDcEMsNkJBQXVDO0FBQ3ZDLDRCQUEwQztBQUMxQyxvQkFBK0I7QUFFeEIsaUNBQ04sSUFDQSxpQkFDQSxRQUNxQjtBQUNyQix3QkFBc0IsSUFBSTtBQUMxQixvQ0FBZSxJQUFJLGlCQUFpQjtBQUNwQyw4Q0FBb0IsSUFBSTtBQUN4QixxREFBdUIsSUFBSSxpQkFBaUI7QUFDNUMsOENBQW9CLElBQUk7QUFDeEIsK0NBQXNCLElBQUksaUJBQWlCO0FBQzNDLHVEQUEwQixJQUFJLGlCQUFpQjtBQUMvQyxTQUFPO0FBQUE7QUFHUiwrQkFBK0IsSUFBd0IsaUJBQXVDO0FBQzdGLE1BQUksQ0FBQyxHQUFHLG9CQUFvQjtBQUMzQjtBQUFBO0FBSUQsUUFBTSxxQkFBcUIsR0FBRztBQUM5QixLQUFHLHFCQUFxQixDQUFDLFVBQVUsYUFBYTtBQUMvQyxRQUFJLGtDQUFnQixXQUFXO0FBQzlCLFlBQU0sV0FBVyxnQkFBZ0IsSUFBSTtBQUNyQyxVQUFJLFVBQVU7QUFDYixlQUFPLFNBQVMsV0FBVztBQUFBO0FBQUE7QUFHN0IsV0FBTyxtQkFBbUIsVUFBVTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvaW5kZXgudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBR0EseUJBQW9DO0FBQ3BDLHdCQUFzQztBQUN0Qyx5QkFBb0M7QUFDcEMsNkJBQTBDO0FBQzFDLDZCQUF1QztBQUN2Qyw0QkFBMEM7QUFDMUMsZ0NBQXlDO0FBQ3pDLG9CQUErQjtBQUV4QixTQUFTLHdCQUNmLElBQ0EsaUJBQ0EsUUFDcUI7QUFDckIsMERBQXlCLElBQUksZUFBZTtBQUM1QyxvQ0FBZSxJQUFJLGlCQUFpQixNQUFNO0FBQzFDLDhDQUFvQixFQUFFO0FBQ3RCLHFEQUF1QixJQUFJLGlCQUFpQixNQUFNO0FBQ2xELDhDQUFvQixJQUFJLE1BQU07QUFDOUIsK0NBQXNCLElBQUksZUFBZTtBQUN6Qyx1REFBMEIsSUFBSSxlQUFlO0FBQzdDLHdEQUEwQixJQUFJLGVBQWU7QUFFN0MsU0FBTztBQUNSOyIsCiAgIm5hbWVzIjogW10KfQo=

dist/language-service/rename.js

@@ -1,49 +0,35 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rename_exports = {};
+__export(rename_exports, {
   decorateRename: () => decorateRename
 });
-var import_utils = __toModule(require("../utils.js"));
+module.exports = __toCommonJS(rename_exports);
+var import_utils = require("../utils.js");
 function decorateRename(ls, snapshotManager, logger) {
   const findRenameLocations = ls.findRenameLocations;
   ls.findRenameLocations = (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) => {
-    const renameLocations = findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename);
+    const renameLocations = findRenameLocations(
+      fileName,
+      position,
+      findInStrings,
+      findInComments,
+      providePrefixAndSuffixTextForRename
+    );
     return renameLocations == null ? void 0 : renameLocations.map((renameLocation) => {
@@ -58,5 +44,6 @@ const snapshot = snapshotManager.get(renameLocation.fileName);
       }
-      const converted = __spreadProps(__spreadValues({}, renameLocation), {
+      const converted = {
+        ...renameLocation,
         textSpan
-      });
+      };
       if (converted.contextSpan) {
@@ -74,2 +61,2 @@ converted.contextSpan = void 0;
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvcmVuYW1lLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFHQSxtQkFBc0Q7QUFFL0Msd0JBQXdCLElBQXdCLGlCQUF1QyxRQUFzQjtBQUNuSCxRQUFNLHNCQUFzQixHQUFHO0FBQy9CLEtBQUcsc0JBQXNCLENBQUMsVUFBVSxVQUFVLGVBQWUsZ0JBQWdCLHdDQUF3QztBQUNwSCxVQUFNLGtCQUFrQixvQkFDdkIsVUFDQSxVQUNBLGVBQ0EsZ0JBQ0E7QUFFRCxXQUFPLG1EQUNKLElBQUksQ0FBQyxtQkFBbUI7QUFDekIsWUFBTSxXQUFXLGdCQUFnQixJQUFJLGVBQWU7QUFDcEQsVUFBSSxDQUFDLGtDQUFnQixlQUFlLGFBQWEsQ0FBQyxVQUFVO0FBQzNELGVBQU87QUFBQTtBQUlSLFlBQU0sV0FBVyxTQUFTLG9CQUFvQixlQUFlO0FBQzdELFVBQUksQ0FBQyxVQUFVO0FBQ2QsZUFBTztBQUFBO0FBR1IsWUFBTSxZQUFZLGlDQUNkLGlCQURjO0FBQUEsUUFFakI7QUFBQTtBQUVELFVBQUksVUFBVSxhQUFhO0FBRTFCLGtCQUFVLGNBQWM7QUFBQTtBQUV6QixhQUFPLE1BQU0sOEJBQThCO0FBQzNDLGFBQU87QUFBQSxPQUVQLE9BQU87QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2xhbmd1YWdlLXNlcnZpY2UvcmVuYW1lLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUdBLG1CQUFzRDtBQUUvQyxTQUFTLGVBQWUsSUFBd0IsaUJBQXVDLFFBQXNCO0FBQ25ILFFBQU0sc0JBQXNCLEdBQUc7QUFDL0IsS0FBRyxzQkFBc0IsQ0FBQyxVQUFVLFVBQVUsZUFBZSxnQkFBZ0Isd0NBQXdDO0FBQ3BILFVBQU0sa0JBQWtCO0FBQUEsTUFDdkI7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsSUFDRDtBQUNBLFdBQU8sbURBQ0osSUFBSSxDQUFDLG1CQUFtQjtBQUN6QixZQUFNLFdBQVcsZ0JBQWdCLElBQUksZUFBZSxRQUFRO0FBQzVELFVBQUksS0FBQyw4QkFBZ0IsZUFBZSxRQUFRLEtBQUssQ0FBQyxVQUFVO0FBQzNELGVBQU87QUFBQSxNQUNSO0FBR0EsWUFBTSxXQUFXLFNBQVMsb0JBQW9CLGVBQWUsUUFBUTtBQUNyRSxVQUFJLENBQUMsVUFBVTtBQUNkLGVBQU87QUFBQSxNQUNSO0FBRUEsWUFBTSxZQUFZO0FBQUEsUUFDakIsR0FBRztBQUFBLFFBQ0g7QUFBQSxNQUNEO0FBQ0EsVUFBSSxVQUFVLGFBQWE7QUFFMUIsa0JBQVUsY0FBYztBQUFBLE1BQ3pCO0FBQ0EsYUFBTyxNQUFNLDhCQUE4QixTQUFTO0FBQ3BELGFBQU87QUFBQSxJQUNSLEdBQ0MsT0FBTztBQUFBLEVBQ1Y7QUFDRDsiLAogICJuYW1lcyI6IFtdCn0K

dist/logger.js

@@ -0,11 +1,24 @@
+"use strict";
 var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-__markAsModule(exports);
-__export(exports, {
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var logger_exports = {};
+__export(logger_exports, {
   Logger: () => Logger
 });
+module.exports = __toCommonJS(logger_exports);
 class Logger {
@@ -48,2 +61,2 @@ constructor(tsLogService, suppressNonAstroLogs = false, logDebug = false) {
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2xvZ2dlci50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRU8sYUFBYTtBQUFBLEVBQ25CLFlBQW9CLGNBQWdDLHVCQUF1QixPQUFlLFdBQVcsT0FBTztBQUF4RjtBQUFzRTtBQUN6RixRQUFJLHNCQUFzQjtBQUN6QixZQUFNLE1BQU0sS0FBSyxhQUFhLEtBQUssS0FBSyxLQUFLO0FBQzdDLFdBQUssYUFBYSxPQUFPLENBQUMsTUFBYztBQUN2QyxZQUFJLEVBQUUsV0FBVyxtQkFBbUI7QUFDbkMsY0FBSTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsRUFNUixPQUFPLE1BQWE7QUFDbkIsVUFBTSxNQUFNLEtBQ1YsSUFBSSxDQUFDLFFBQVE7QUFDYixVQUFJLE9BQU8sUUFBUSxVQUFVO0FBQzVCLFlBQUk7QUFDSCxpQkFBTyxLQUFLLFVBQVU7QUFBQSxpQkFDZCxHQUFQO0FBQ0QsaUJBQU87QUFBQTtBQUFBO0FBR1QsYUFBTztBQUFBLE9BRVAsS0FBSztBQUNQLFNBQUssYUFBYSxLQUFLLG9CQUFvQjtBQUFBO0FBQUEsRUFHNUMsU0FBUyxNQUFhO0FBQ3JCLFFBQUksQ0FBQyxLQUFLLFVBQVU7QUFDbkI7QUFBQTtBQUVELFNBQUssSUFBSSxHQUFHO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2xvZ2dlci50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFTyxNQUFNLE9BQU87QUFBQSxFQUNuQixZQUFvQixjQUFnQyx1QkFBdUIsT0FBZSxXQUFXLE9BQU87QUFBeEY7QUFBc0U7QUFDekYsUUFBSSxzQkFBc0I7QUFDekIsWUFBTSxNQUFNLEtBQUssYUFBYSxLQUFLLEtBQUssS0FBSyxZQUFZO0FBQ3pELFdBQUssYUFBYSxPQUFPLENBQUMsTUFBYztBQUN2QyxZQUFJLEVBQUUsV0FBVyxnQkFBZ0IsR0FBRztBQUNuQyxjQUFJLENBQUM7QUFBQSxRQUNOO0FBQUEsTUFDRDtBQUFBLElBQ0Q7QUFBQSxFQUNEO0FBQUEsRUFFQSxPQUFPLE1BQWE7QUFDbkIsVUFBTSxNQUFNLEtBQ1YsSUFBSSxDQUFDLFFBQVE7QUFDYixVQUFJLE9BQU8sUUFBUSxVQUFVO0FBQzVCLFlBQUk7QUFDSCxpQkFBTyxLQUFLLFVBQVUsR0FBRztBQUFBLFFBQzFCLFNBQVMsR0FBUDtBQUNELGlCQUFPO0FBQUEsUUFDUjtBQUFBLE1BQ0Q7QUFDQSxhQUFPO0FBQUEsSUFDUixDQUFDLEVBQ0EsS0FBSyxHQUFHO0FBQ1YsU0FBSyxhQUFhLEtBQUssb0JBQW9CLEdBQUc7QUFBQSxFQUMvQztBQUFBLEVBRUEsU0FBUyxNQUFhO0FBQ3JCLFFBQUksQ0FBQyxLQUFLLFVBQVU7QUFDbkI7QUFBQSxJQUNEO0FBQ0EsU0FBSyxJQUFJLEdBQUcsSUFBSTtBQUFBLEVBQ2pCO0FBQ0Q7IiwKICAibmFtZXMiOiBbXQp9Cg==

dist/module-loader.js

@@ -1,32 +0,29 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var module_loader_exports = {};
+__export(module_loader_exports, {
   patchModuleLoader: () => patchModuleLoader
 });
-var import_astro_sys = __toModule(require("./astro-sys.js"));
-var import_utils = __toModule(require("./utils.js"));
+module.exports = __toCommonJS(module_loader_exports);
+var import_astro_sys = require("./astro-sys.js");
+var import_utils = require("./utils.js");
 class ModuleResolutionCache {
   constructor() {
-    this.cache = new Map();
+    this.cache = /* @__PURE__ */ new Map();
   }
@@ -65,4 +62,8 @@ get(moduleName, containingFile) {
   };
+  const origReadDirectory = project.readDirectory.bind(project);
+  project.readDirectory = (path, extensions, exclude, include, depth) => {
+    const extensionsWithAstro = (extensions != null ? extensions : []).concat(".astro", ".md", ".mdx");
+    return origReadDirectory(path, extensionsWithAstro, exclude, include, depth);
+  };
   function resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, compilerOptions) {
-    logger.log("Resolving modules names for " + containingFile);
     const resolved = (origResolveModuleNames == null ? void 0 : origResolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, compilerOptions)) || Array.from(Array(moduleNames.length));
@@ -84,3 +85,8 @@ return resolved.map((moduleName, idx) => {
   function resolveModuleName(name, containingFile, compilerOptions) {
-    const astroResolvedModule = typescript.resolveModuleName(name, containingFile, compilerOptions, astroSys).resolvedModule;
+    const astroResolvedModule = typescript.resolveModuleName(
+      name,
+      containingFile,
+      compilerOptions,
+      astroSys
+    ).resolvedModule;
     if (!astroResolvedModule || !(0, import_utils.isVirtualAstroFilePath)(astroResolvedModule.resolvedFileName)) {
@@ -96,3 +102,3 @@ return astroResolvedModule;
     const resolvedAstroModule = {
-      extension: snapshot.isTsFile ? typescript.Extension.Tsx : typescript.Extension.Jsx,
+      extension: typescript.Extension.Tsx,
       resolvedFileName
@@ -107,2 +113,2 @@ };
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL21vZHVsZS1sb2FkZXIudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFQSx1QkFBK0I7QUFFL0IsbUJBQWdFO0FBS2hFLDRCQUE0QjtBQUFBLEVBQTVCLGNBVEE7QUFVUyxpQkFBUSxJQUFJO0FBQUE7QUFBQSxFQUtwQixJQUFJLFlBQW9CLGdCQUF1RDtBQUM5RSxXQUFPLEtBQUssTUFBTSxJQUFJLEtBQUssT0FBTyxZQUFZO0FBQUE7QUFBQSxFQU0vQyxJQUFJLFlBQW9CLGdCQUF3QixnQkFBK0M7QUFDOUYsUUFBSSxDQUFDLGdCQUFnQjtBQUNwQjtBQUFBO0FBRUQsU0FBSyxNQUFNLElBQUksS0FBSyxPQUFPLFlBQVksaUJBQWlCO0FBQUE7QUFBQSxFQU96RCxPQUFPLG9CQUFrQztBQUN4QyxTQUFLLE1BQU0sUUFBUSxDQUFDLEtBQUssUUFBUTtBQUNoQyxVQUFJLElBQUkscUJBQXFCLG9CQUFvQjtBQUNoRCxhQUFLLE1BQU0sT0FBTztBQUFBO0FBQUE7QUFBQTtBQUFBLEVBS2IsT0FBTyxZQUFvQixnQkFBd0I7QUFDMUQsV0FBTyxpQkFBaUIsUUFBUSwwQ0FBd0I7QUFBQTtBQUFBO0FBYW5ELDJCQUNOLFFBQ0EsaUJBQ0EsWUFDQSxRQUNBLFNBQ087QUE3RFI7QUE4REMsUUFBTSxXQUFXLHFDQUFlO0FBQ2hDLFFBQU0sY0FBYyxJQUFJO0FBQ3hCLFFBQU0seUJBQXlCLGFBQU8sdUJBQVAsbUJBQTJCLEtBQUs7QUFFL0QsU0FBTyxxQkFBcUI7QUFFNUIsUUFBTSxpQkFBaUIsUUFBUSxXQUFXLEtBQUs7QUFDL0MsVUFBUSxhQUFhLENBQUMsTUFBTSxZQUFZLHNCQUFzQjtBQUM3RCxXQUFPLElBQUksOENBQThDLEtBQUs7QUFDOUQsZ0JBQVksT0FBTyxLQUFLO0FBQ3hCLFdBQU8sZUFBZSxNQUFNLFlBQVk7QUFBQTtBQUd6Qyw4QkFDQyxhQUNBLGdCQUNBLGFBQ0EscUJBQ0EsaUJBQ3VDO0FBQ3ZDLFdBQU8sSUFBSSxpQ0FBaUM7QUFLNUMsVUFBTSxXQUNMLGtFQUF5QixhQUFhLGdCQUFnQixhQUFhLHFCQUFxQixxQkFDeEYsTUFBTSxLQUFnQixNQUFNLFlBQVk7QUFFekMsV0FBTyxTQUFTLElBQUksQ0FBQyxZQUFZLFFBQVE7QUFDeEMsWUFBTSxXQUFXLFlBQVk7QUFDN0IsVUFBSSxjQUFjLENBQUMsMENBQXdCLFVBQVUsU0FBUyxXQUFXO0FBQ3hFLGVBQU87QUFBQTtBQUdSLFlBQU0sZUFBZSxZQUFZLElBQUksVUFBVTtBQUMvQyxVQUFJLGNBQWM7QUFDakIsZUFBTztBQUFBO0FBR1IsWUFBTSxpQkFBaUIsa0JBQWtCLFVBQVUsZ0JBQWdCO0FBQ25FLGtCQUFZLElBQUksVUFBVSxnQkFBZ0I7QUFDMUMsYUFBTztBQUFBO0FBQUE7QUFJVCw2QkFDQyxNQUNBLGdCQUNBLGlCQUNnQztBQUNoQyxVQUFNLHNCQUFzQixXQUFXLGtCQUN0QyxNQUNBLGdCQUNBLGlCQUNBLFVBQ0M7QUFDRixRQUFJLENBQUMsdUJBQXVCLENBQUMseUNBQXVCLG9CQUFvQixtQkFBbUI7QUFDMUYsYUFBTztBQUFBO0FBR1IsVUFBTSxtQkFBbUIsMENBQXdCLG9CQUFvQjtBQUNyRSxXQUFPLElBQUksWUFBWSxNQUFNLGlCQUFpQjtBQUM5QyxVQUFNLFdBQVcsZ0JBQWdCLE9BQU87QUFDeEMsUUFBSSxDQUFDLFVBQVU7QUFDZCxhQUFPO0FBQUE7QUFHUixVQUFNLHNCQUE2QztBQUFBLE1BQ2xELFdBQVcsU0FBUyxXQUFXLFdBQVcsVUFBVSxNQUFNLFdBQVcsVUFBVTtBQUFBLE1BQy9FO0FBQUE7QUFFRCxXQUFPO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL21vZHVsZS1sb2FkZXIudHMiXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRUEsdUJBQStCO0FBRS9CLG1CQUFnRTtBQUtoRSxNQUFNLHNCQUFzQjtBQUFBLEVBQTVCO0FBQ0MsU0FBUSxRQUFRLG9CQUFJLElBQStCO0FBQUE7QUFBQSxFQUtuRCxJQUFJLFlBQW9CLGdCQUF1RDtBQUM5RSxXQUFPLEtBQUssTUFBTSxJQUFJLEtBQUssT0FBTyxZQUFZLGNBQWMsQ0FBQztBQUFBLEVBQzlEO0FBQUEsRUFLQSxJQUFJLFlBQW9CLGdCQUF3QixnQkFBK0M7QUFDOUYsUUFBSSxDQUFDLGdCQUFnQjtBQUNwQjtBQUFBLElBQ0Q7QUFDQSxTQUFLLE1BQU0sSUFBSSxLQUFLLE9BQU8sWUFBWSxjQUFjLEdBQUcsY0FBYztBQUFBLEVBQ3ZFO0FBQUEsRUFNQSxPQUFPLG9CQUFrQztBQUN4QyxTQUFLLE1BQU0sUUFBUSxDQUFDLEtBQUssUUFBUTtBQUNoQyxVQUFJLElBQUkscUJBQXFCLG9CQUFvQjtBQUNoRCxhQUFLLE1BQU0sT0FBTyxHQUFHO0FBQUEsTUFDdEI7QUFBQSxJQUNELENBQUM7QUFBQSxFQUNGO0FBQUEsRUFFUSxPQUFPLFlBQW9CLGdCQUF3QjtBQUMxRCxXQUFPLGlCQUFpQixZQUFRLHNDQUF3QixVQUFVO0FBQUEsRUFDbkU7QUFDRDtBQVdPLFNBQVMsa0JBQ2YsUUFDQSxpQkFDQSxZQUNBLFFBQ0EsU0FDTztBQTdEUjtBQThEQyxRQUFNLGVBQVcsaUNBQWUsTUFBTTtBQUN0QyxRQUFNLGNBQWMsSUFBSSxzQkFBc0I7QUFDOUMsUUFBTSwwQkFBeUIsWUFBTyx1QkFBUCxtQkFBMkIsS0FBSztBQUUvRCxTQUFPLHFCQUFxQjtBQUU1QixRQUFNLGlCQUFpQixRQUFRLFdBQVcsS0FBSyxPQUFPO0FBQ3RELFVBQVEsYUFBYSxDQUFDLE1BQU0sWUFBWSxzQkFBc0I7QUFDN0QsV0FBTyxJQUFJLDhDQUE4QyxLQUFLLFFBQVE7QUFDdEUsZ0JBQVksT0FBTyxLQUFLLFFBQVE7QUFDaEMsV0FBTyxlQUFlLE1BQU0sWUFBWSxpQkFBaUI7QUFBQSxFQUMxRDtBQUdBLFFBQU0sb0JBQW9CLFFBQVEsY0FBYyxLQUFLLE9BQU87QUFDNUQsVUFBUSxnQkFBZ0IsQ0FBQyxNQUFNLFlBQVksU0FBUyxTQUFTLFVBQVU7QUFDdEUsVUFBTSx1QkFBdUIsa0NBQWMsQ0FBQyxHQUFHLE9BQU8sVUFBVSxPQUFPLE1BQU07QUFDN0UsV0FBTyxrQkFBa0IsTUFBTSxxQkFBcUIsU0FBUyxTQUFTLEtBQUs7QUFBQSxFQUM1RTtBQUVBLFdBQVMsbUJBQ1IsYUFDQSxnQkFDQSxhQUNBLHFCQUNBLGlCQUN1QztBQU92QyxVQUFNLFlBQ0wsaUVBQXlCLGFBQWEsZ0JBQWdCLGFBQWEscUJBQXFCLHFCQUN4RixNQUFNLEtBQWdCLE1BQU0sWUFBWSxNQUFNLENBQUM7QUFFaEQsV0FBTyxTQUFTLElBQUksQ0FBQyxZQUFZLFFBQVE7QUFDeEMsWUFBTSxXQUFXLFlBQVk7QUFDN0IsVUFBSSxjQUFjLEtBQUMsc0NBQXdCLFFBQVEsRUFBRSxTQUFTLFFBQVEsR0FBRztBQUN4RSxlQUFPO0FBQUEsTUFDUjtBQUVBLFlBQU0sZUFBZSxZQUFZLElBQUksVUFBVSxjQUFjO0FBQzdELFVBQUksY0FBYztBQUNqQixlQUFPO0FBQUEsTUFDUjtBQUVBLFlBQU0saUJBQWlCLGtCQUFrQixVQUFVLGdCQUFnQixlQUFlO0FBQ2xGLGtCQUFZLElBQUksVUFBVSxnQkFBZ0IsY0FBYztBQUN4RCxhQUFPO0FBQUEsSUFDUixDQUFDO0FBQUEsRUFDRjtBQUVBLFdBQVMsa0JBQ1IsTUFDQSxnQkFDQSxpQkFDZ0M7QUFDaEMsVUFBTSxzQkFBc0IsV0FBVztBQUFBLE1BQ3RDO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsSUFDRCxFQUFFO0FBQ0YsUUFBSSxDQUFDLHVCQUF1QixLQUFDLHFDQUF1QixvQkFBb0IsZ0JBQWdCLEdBQUc7QUFDMUYsYUFBTztBQUFBLElBQ1I7QUFFQSxVQUFNLHVCQUFtQixzQ0FBd0Isb0JBQW9CLGdCQUFnQjtBQUNyRixXQUFPLElBQUksWUFBWSxNQUFNLGlCQUFpQixnQkFBZ0I7QUFDOUQsVUFBTSxXQUFXLGdCQUFnQixPQUFPLGdCQUFnQjtBQUN4RCxRQUFJLENBQUMsVUFBVTtBQUNkLGFBQU87QUFBQSxJQUNSO0FBRUEsVUFBTSxzQkFBNkM7QUFBQSxNQUNsRCxXQUFXLFdBQVcsVUFBVTtBQUFBLE1BQ2hDO0FBQUEsSUFDRDtBQUNBLFdBQU87QUFBQSxFQUNSO0FBQ0Q7IiwKICAibmFtZXMiOiBbXQp9Cg==

dist/utils.js

@@ -0,18 +1,31 @@
+"use strict";
 var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-__markAsModule(exports);
-__export(exports, {
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
   ensureRealAstroFilePath: () => ensureRealAstroFilePath,
+  getConfigPathForProject: () => getConfigPathForProject,
   isAstroFilePath: () => isAstroFilePath,
-  isInGeneratedCode: () => isInGeneratedCode,
-  isNoTextSpanInGeneratedCode: () => isNoTextSpanInGeneratedCode,
   isNotNullOrUndefined: () => isNotNullOrUndefined,
   isVirtualAstroFilePath: () => isVirtualAstroFilePath,
+  readProjectAstroFilesFromFs: () => readProjectAstroFilesFromFs,
   replaceDeep: () => replaceDeep,
   toRealAstroFilePath: () => toRealAstroFilePath
 });
+module.exports = __toCommonJS(utils_exports);
 function isAstroFilePath(filePath) {
@@ -33,12 +46,2 @@ return filePath.endsWith(".astro");
 }
-function isInGeneratedCode(text, start, end) {
-  const lineStart = text.lastIndexOf("\n", start);
-  const lineEnd = text.indexOf("\n", end);
-  const lastStart = text.substring(lineStart, start).lastIndexOf("/*\u03A9ignore_start\u03A9*/");
-  const lastEnd = text.substring(lineStart, start).lastIndexOf("/*\u03A9ignore_end\u03A9*/");
-  return lastStart > lastEnd && text.substring(end, lineEnd).includes("/*\u03A9ignore_end\u03A9*/");
-}
-function isNoTextSpanInGeneratedCode(text, span) {
-  return !isInGeneratedCode(text, span.start, span.start + span.length);
-}
 function replaceDeep(obj, searchStr, replacementStr) {
@@ -62,13 +65,25 @@ return _replaceDeep(obj);
 }
+function getConfigPathForProject(project) {
+  var _a;
+  return (_a = project.canonicalConfigFilePath) != null ? _a : project.getCompilerOptions().configFilePath;
+}
+function readProjectAstroFilesFromFs(ts, project, parsedCommandLine) {
+  const fileSpec = parsedCommandLine.raw;
+  const { include, exclude } = fileSpec;
+  if ((include == null ? void 0 : include.length) === 0) {
+    return [];
+  }
+  return ts.sys.readDirectory(project.getCurrentDirectory() || process.cwd(), [".astro"], exclude, include).map(ts.server.toNormalizedPath);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ensureRealAstroFilePath,
+  getConfigPathForProject,
   isAstroFilePath,
-  isInGeneratedCode,
-  isNoTextSpanInGeneratedCode,
   isNotNullOrUndefined,
   isVirtualAstroFilePath,
+  readProjectAstroFilesFromFs,
   replaceDeep,
   toRealAstroFilePath
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3V0aWxzLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFPLHlCQUF5QixVQUFrQjtBQUNqRCxTQUFPLFNBQVMsU0FBUztBQUFBO0FBR25CLGdDQUFnQyxVQUFrQjtBQUN4RCxTQUFPLFNBQVMsU0FBUztBQUFBO0FBR25CLDZCQUE2QixVQUFrQjtBQUNyRCxTQUFPLFNBQVMsTUFBTSxHQUFHLENBQUMsTUFBTTtBQUFBO0FBRzFCLGlDQUFpQyxVQUFrQjtBQUN6RCxTQUFPLHVCQUF1QixZQUFZLG9CQUFvQixZQUFZO0FBQUE7QUFHcEUsOEJBQWlDLEtBQXFDO0FBQzVFLFNBQU8sUUFBUSxVQUFhLFFBQVE7QUFBQTtBQU85QiwyQkFBMkIsTUFBYyxPQUFlLEtBQWE7QUFDM0UsUUFBTSxZQUFZLEtBQUssWUFBWSxNQUFNO0FBQ3pDLFFBQU0sVUFBVSxLQUFLLFFBQVEsTUFBTTtBQUNuQyxRQUFNLFlBQVksS0FBSyxVQUFVLFdBQVcsT0FBTyxZQUFZO0FBQy9ELFFBQU0sVUFBVSxLQUFLLFVBQVUsV0FBVyxPQUFPLFlBQVk7QUFDN0QsU0FBTyxZQUFZLFdBQVcsS0FBSyxVQUFVLEtBQUssU0FBUyxTQUFTO0FBQUE7QUFPOUQscUNBQXFDLE1BQWMsTUFBbUI7QUFDNUUsU0FBTyxDQUFDLGtCQUFrQixNQUFNLEtBQUssT0FBTyxLQUFLLFFBQVEsS0FBSztBQUFBO0FBTXhELHFCQUNOLEtBQ0EsV0FDQSxnQkFDSTtBQUNKLFNBQU8sYUFBYTtBQUVwQix3QkFBc0IsTUFBZ0I7QUFDckMsUUFBSSxPQUFPLFNBQVMsVUFBVTtBQUM3QixhQUFPLEtBQUssUUFBUSxXQUFXO0FBQUE7QUFFaEMsUUFBSSxNQUFNLFFBQVEsT0FBTztBQUN4QixhQUFPLEtBQUssSUFBSSxDQUFDLFVBQVUsYUFBYTtBQUFBO0FBRXpDLFFBQUksT0FBTyxTQUFTLFVBQVU7QUFDN0IsYUFBTyxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUMsSUFBSSxRQUFRO0FBQzVDLFdBQUcsT0FBTyxhQUFhLEtBQUs7QUFDNUIsZUFBTztBQUFBLFNBQ0w7QUFBQTtBQUVKLFdBQU87QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3V0aWxzLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQU8sU0FBUyxnQkFBZ0IsVUFBa0I7QUFDakQsU0FBTyxTQUFTLFNBQVMsUUFBUTtBQUNsQztBQUVPLFNBQVMsdUJBQXVCLFVBQWtCO0FBQ3hELFNBQU8sU0FBUyxTQUFTLFdBQVc7QUFDckM7QUFFTyxTQUFTLG9CQUFvQixVQUFrQjtBQUNyRCxTQUFPLFNBQVMsTUFBTSxHQUFHLENBQUMsTUFBTSxNQUFNO0FBQ3ZDO0FBRU8sU0FBUyx3QkFBd0IsVUFBa0I7QUFDekQsU0FBTyx1QkFBdUIsUUFBUSxJQUFJLG9CQUFvQixRQUFRLElBQUk7QUFDM0U7QUFFTyxTQUFTLHFCQUF3QixLQUFxQztBQUM1RSxTQUFPLFFBQVEsVUFBYSxRQUFRO0FBQ3JDO0FBS08sU0FBUyxZQUNmLEtBQ0EsV0FDQSxnQkFDSTtBQUNKLFNBQU8sYUFBYSxHQUFHO0FBRXZCLFdBQVMsYUFBYSxNQUFnQjtBQUNyQyxRQUFJLE9BQU8sU0FBUyxVQUFVO0FBQzdCLGFBQU8sS0FBSyxRQUFRLFdBQVcsY0FBYztBQUFBLElBQzlDO0FBQ0EsUUFBSSxNQUFNLFFBQVEsSUFBSSxHQUFHO0FBQ3hCLGFBQU8sS0FBSyxJQUFJLENBQUMsVUFBVSxhQUFhLEtBQUssQ0FBQztBQUFBLElBQy9DO0FBQ0EsUUFBSSxPQUFPLFNBQVMsVUFBVTtBQUM3QixhQUFPLE9BQU8sS0FBSyxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksUUFBUTtBQUM1QyxXQUFHLE9BQU8sYUFBYSxLQUFLLElBQUk7QUFDaEMsZUFBTztBQUFBLE1BQ1IsR0FBRyxDQUFDLENBQVE7QUFBQSxJQUNiO0FBQ0EsV0FBTztBQUFBLEVBQ1I7QUFDRDtBQUVPLFNBQVMsd0JBQXdCLFNBQTRCO0FBL0NwRTtBQWdEQyxVQUNFLGFBQXdDLDRCQUF4QyxZQUNBLFFBQVEsbUJBQW1CLEVBQVU7QUFFeEM7QUFFTyxTQUFTLDRCQUNmLElBQ0EsU0FDQSxtQkFDQztBQUNELFFBQU0sV0FBd0Isa0JBQWtCO0FBQ2hELFFBQU0sRUFBRSxTQUFTLFFBQVEsSUFBSTtBQUU3QixPQUFJLG1DQUFTLFlBQVcsR0FBRztBQUMxQixXQUFPLENBQUM7QUFBQSxFQUNUO0FBRUEsU0FBTyxHQUFHLElBQ1IsY0FBYyxRQUFRLG9CQUFvQixLQUFLLFFBQVEsSUFBSSxHQUFHLENBQUMsUUFBUSxHQUFHLFNBQVMsT0FBTyxFQUMxRixJQUFJLEdBQUcsT0FBTyxnQkFBZ0I7QUFDakM7IiwKICAibmFtZXMiOiBbXQp9Cg==

package.json

 {
   "name": "@astrojs/ts-plugin",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A TypeScript Plugin providing Astro intellisense",
@@ -13,16 +13,26 @@ "main": "dist/index.js",
   ],
-  "scripts": {
-    "build": "astro-scripts build \"src/**/*.ts\"",
-    "dev": "astro-scripts dev \"src/**/*.ts\""
-  },
   "author": "withastro",
   "license": "MIT",
+  "dependencies": {
+    "@astrojs/compiler": "^0.29.15",
+    "@jridgewell/trace-mapping": "^0.3.15",
+    "synckit": "^0.8.4"
+  },
   "devDependencies": {
-    "@tsconfig/node12": "^1.0.0",
-    "@types/node": "^13.9.0",
-    "typescript": "*"
+    "@types/chai": "^4.3.0",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^16.11.58",
+    "@types/vscode": "^1.67.0",
+    "@vscode/test-electron": "^2.1.5",
+    "astro-scripts": "*",
+    "chai": "^4.3.6",
+    "glob": "^8.0.3",
+    "mocha": "^9.2.2",
+    "typescript": "~4.8.2"
   },
-  "dependencies": {
-    "sourcemap-codec": "^1.4.8"
+  "scripts": {
+    "build": "astro-scripts build \"src/**/*.ts\"",
+    "dev": "astro-scripts dev \"src/**/*.ts\"",
+    "test": "node ./test/runTest.js"
   }
-}
+}

src/astro-snapshots.ts

@@ -0,6 +1,6 @@
+import { EncodedSourceMap, originalPositionFor, TraceMap } from '@jridgewell/trace-mapping';
 import type ts from 'typescript/lib/tsserverlibrary';
 import { astro2tsx } from './astro2tsx.js';
-import { Logger } from './logger.js';
-import { SourceMapper } from './source-mapper.js';
-import { isAstroFilePath, isNoTextSpanInGeneratedCode } from './utils.js';
+import type { Logger } from './logger.js';
+import { isAstroFilePath } from './utils.js';
 
@@ -16,10 +16,9 @@ export class AstroSnapshot {
 		private astroCode: string,
-		private mapper: SourceMapper,
-		private logger: Logger,
-		public readonly isTsFile: boolean
+		private traceMap: TraceMap,
+		private logger: Logger
 	) {}
 
-	update(astroCode: string, mapper: SourceMapper) {
+	update(astroCode: string, traceMap: TraceMap) {
 		this.astroCode = astroCode;
-		this.mapper = mapper;
+		this.traceMap = traceMap;
 		this.lineOffsets = undefined;
@@ -30,6 +29,2 @@ this.log('Updated Snapshot');
 	getOriginalTextSpan(textSpan: ts.TextSpan): ts.TextSpan | null {
-		if (!isNoTextSpanInGeneratedCode(this.getText(), textSpan)) {
-			return null;
-		}
-
 		const start = this.getOriginalOffset(textSpan.start);
@@ -55,12 +50,13 @@ if (start === -1) {
 		this.debug('try convert offset', generatedOffset, '/', lineOffset);
-		const original = this.mapper.getOriginalPosition({
-			line: lineOffset.line - 1,
-			character: lineOffset.offset - 1,
+		const original = originalPositionFor(this.traceMap, {
+			line: lineOffset.line,
+			column: lineOffset.offset,
 		});
 		this.toggleMappingMode(false);
-		if (original.line === -1) {
+
+		if (!original.line) {
 			return -1;
 		}
 
-		const originalOffset = this.scriptInfo.lineOffsetToPosition(original.line + 1, original.character + 1);
+		const originalOffset = this.scriptInfo.lineOffsetToPosition(original.line, original.column);
 		this.debug('converted offset to', original, '/', originalOffset);
@@ -256,10 +252,6 @@ return originalOffset;
 				try {
-					const isTsFile = true;
-					const result = astro2tsx(astroCode, {
-						filename: path.split('/').pop(),
-						isTsFile,
-					});
+					const result = astro2tsx(astroCode, path);
 					const existingSnapshot = this.snapshots.get(path);
 					if (existingSnapshot) {
-						existingSnapshot.update(astroCode, new SourceMapper(result.map.mappings));
+						existingSnapshot.update(astroCode, new TraceMap(result.map as EncodedSourceMap));
 					} else {
@@ -272,5 +264,4 @@ this.snapshots.set(
 								astroCode,
-								new SourceMapper(result.map.mappings),
-								this.logger,
-								isTsFile
+								new TraceMap(result.map as EncodedSourceMap),
+								this.logger
 							)
@@ -277,0 +268,0 @@ );

src/astro-sys.ts

 import ts from 'typescript';
-import { Logger } from './logger.js';
+import type { Logger } from './logger.js';
 import { ensureRealAstroFilePath, isVirtualAstroFilePath, toRealAstroFilePath } from './utils.js';
@@ -4,0 +4,0 @@

src/astro2tsx.ts

@@ -1,49 +0,8 @@
-import type { FileMapping } from './source-mapper';
+import type { TSXResult } from '@astrojs/compiler/shared/types';
+import { convertToTSX } from './workers/TSXService';
 
-// Note that this is a bit of a hack until the new compiler with proper
-// source map support.
+export function astro2tsx(content: string, fileName: string): TSXResult {
+	const tsx = convertToTSX(content, { sourcefile: fileName });
 
-interface Astro2TSXOptions {
-	filename: string | undefined;
-	isTsFile: boolean;
+	return tsx;
 }
-
-interface Astro2TSXResult {
-	code: string;
-	map: {
-		mappings: FileMapping;
-	};
-}
-
-export function astro2tsx(code: string, options: Astro2TSXOptions): Astro2TSXResult {
-	const compiled = transformContent(code);
-
-	const result: Astro2TSXResult = {
-		code: compiled,
-		map: {
-			mappings: [],
-		},
-	};
-
-	return result;
-}
-
-// This is hacky but it works for now
-function addProps(content: string): string {
-	let defaultExportType = 'Record<string, any>';
-
-	if (/(interface|type) Props/.test(content)) {
-		defaultExportType = 'Props';
-	}
-
-	return '\n' + `export default function (props: ${defaultExportType}): string;`;
-}
-
-function transformContent(content: string) {
-	const ts = content.replace(/---/g, '///');
-	return (
-		ts +
-		// Add TypeScript definitions
-		addProps(ts)
-	);
-}

src/index.ts

@@ -6,8 +6,13 @@ import type ts from 'typescript/lib/tsserverlibrary';
 import { patchModuleLoader } from './module-loader.js';
+import { ProjectAstroFilesManager } from './project-astro-files.js';
+import { getConfigPathForProject, readProjectAstroFilesFromFs } from './utils.js';
 
-function init(modules: { typescript: typeof ts }) {
-	function create(info: ts.server.PluginCreateInfo) {
+function init(modules: { typescript: typeof import('typescript/lib/tsserverlibrary') }) {
+	const ts = modules.typescript;
+
+	function create(info: ts.server.PluginCreateInfo): ts.LanguageService {
 		const logger = new Logger(info.project.projectService.logger);
+		const parsedCommandLine = info.languageServiceHost.getParsedCommandLine?.(getConfigPathForProject(info.project));
 
-		if (!isAstroProject(info)) {
+		if (!isAstroProject(info.project, parsedCommandLine)) {
 			logger.log('Detected that this is not an Astro project, abort patching TypeScript');
@@ -20,4 +25,12 @@ return info.languageService;
 		const snapshotManager = new AstroSnapshotManager(modules.typescript, info.project.projectService, logger);
+		if (parsedCommandLine) {
+			new ProjectAstroFilesManager(
+				modules.typescript,
+				info.project,
+				info.serverHost,
+				snapshotManager,
+				parsedCommandLine
+			);
+		}
 
-		patchCompilerOptions(info.project);
 		patchModuleLoader(logger, snapshotManager, modules.typescript, info.languageServiceHost, info.project);
@@ -27,37 +40,24 @@ return decorateLanguageService(info.languageService, snapshotManager, logger);
 
-	function getExternalFiles(_project: ts.server.ConfiguredProject) {
-		// Needed so the ambient definitions are known inside the tsx files
-		/*const astroTsPath = dirname(require.resolve('astro2tsx'));
-      const astroTsxFiles = [
-          './astro-shims.d.ts',
-          './astro-jsx.d.ts',
-          './astro-native-jsx.d.ts'
-      ].map((f) => modules.typescript.sys.resolvePath(resolve(astroTsPath, f)));
-      return astroTsxFiles;*/
-		return [];
+	function getExternalFiles(project: ts.server.ConfiguredProject) {
+		return ProjectAstroFilesManager.getInstance(project.getProjectName())?.getFiles() ?? [];
 	}
 
-	function patchCompilerOptions(project: ts.server.Project) {
-		const compilerOptions = project.getCompilerOptions();
-		// Patch needed because astro2tsx creates jsx/tsx files
-		compilerOptions.jsx = modules.typescript.JsxEmit.Preserve;
+	function isAstroProject(project: ts.server.Project, parsedCommandLine: ts.ParsedCommandLine | undefined) {
+		if (parsedCommandLine) {
+			const astroFiles = readProjectAstroFilesFromFs(ts, project, parsedCommandLine);
 
-		// detect which JSX namespace to use (astro | astronative) if not specified or not compatible
-		if (!compilerOptions.jsxFactory?.startsWith('astro')) {
-			// Default to regular astro, this causes the usage of the "astro.JSX" namespace
-			// We don't need to add a switch for astro-native because the jsx is only relevant
-			// within Astro files, which this plugin does not deal with.
-			compilerOptions.jsxFactory = 'astro.createElement';
+			if (astroFiles.length > 0) return true;
 		}
-	}
 
-	function isAstroProject(info: ts.server.PluginCreateInfo) {
-		// Add more checks like "no Astro file found" or "no config file found"?
-		const compilerOptions = info.project.getCompilerOptions();
-		const isNoJsxProject =
-			(!compilerOptions.jsx || compilerOptions.jsx === modules.typescript.JsxEmit.Preserve) &&
-			(!compilerOptions.jsxFactory || compilerOptions.jsxFactory.startsWith('astro')) &&
-			!compilerOptions.jsxFragmentFactory &&
-			!compilerOptions.jsxImportSource;
-		return isNoJsxProject;
+		try {
+			const compilerOptions = project.getCompilerOptions();
+			const hasAstroInstalled =
+				typeof compilerOptions.configFilePath !== 'string' ||
+				require.resolve('astro', { paths: [compilerOptions.configFilePath] });
+
+			return hasAstroInstalled;
+		} catch (e) {
+			project.projectService.logger.info(e as string);
+			return false;
+		}
 	}
@@ -64,0 +64,0 @@

src/language-service/completions.ts

 import type ts from 'typescript/lib/tsserverlibrary';
-import { Logger } from '../logger.js';
+import type { Logger } from '../logger.js';
 import { isAstroFilePath, replaceDeep } from '../utils.js';
@@ -30,5 +30,16 @@
 	ls.getCompletionEntryDetails = (fileName, position, entryName, formatOptions, source, preferences, data) => {
-		const details = getCompletionEntryDetails(fileName, position, entryName, formatOptions, source, preferences, data);
-		if (details || !isAstroFilePath(source || '')) {
-			return details;
+		if (!isAstroFilePath(source || '')) {
+			const details = getCompletionEntryDetails(
+				fileName,
+				position,
+				entryName,
+				formatOptions,
+				source,
+				preferences,
+				data
+			);
+
+			if (details) {
+				return details;
+			}
 		}
@@ -35,0 +46,0 @@

src/language-service/definition.ts

 import type ts from 'typescript/lib/tsserverlibrary';
-import { AstroSnapshotManager } from '../astro-snapshots';
-import { Logger } from '../logger';
+import type { AstroSnapshotManager } from '../astro-snapshots';
 import { isAstroFilePath, isNotNullOrUndefined } from '../utils';
 
-export function decorateGetDefinition(
-	ls: ts.LanguageService,
-	snapshotManager: AstroSnapshotManager,
-	logger: Logger
-): void {
+export function decorateGetDefinition(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager): void {
 	const getDefinitionAndBoundSpan = ls.getDefinitionAndBoundSpan;
@@ -12,0 +7,0 @@ ls.getDefinitionAndBoundSpan = (fileName, position) => {

src/language-service/diagnostics.ts

 import type ts from 'typescript/lib/tsserverlibrary';
-import { Logger } from '../logger.js';
 import { isAstroFilePath } from '../utils.js';
 
-export function decorateDiagnostics(ls: ts.LanguageService, logger: Logger): void {
+export function decorateDiagnostics(ls: ts.LanguageService): void {
 	decorateSyntacticDiagnostics(ls);
@@ -7,0 +6,0 @@ decorateSemanticDiagnostics(ls);

src/language-service/find-references.ts

 import type ts from 'typescript/lib/tsserverlibrary';
-import { AstroSnapshotManager } from '../astro-snapshots.js';
-import { Logger } from '../logger';
+import type { AstroSnapshotManager } from '../astro-snapshots.js';
+import type { Logger } from '../logger';
 import { isAstroFilePath, isNotNullOrUndefined } from '../utils.js';
@@ -5,0 +5,0 @@

src/language-service/implementation.ts

 import type ts from 'typescript/lib/tsserverlibrary';
-import { AstroSnapshotManager } from '../astro-snapshots.js';
-import { Logger } from '../logger.js';
+import type { AstroSnapshotManager } from '../astro-snapshots.js';
 import { isAstroFilePath, isNotNullOrUndefined } from '../utils.js';
 
-export function decorateGetImplementation(
-	ls: ts.LanguageService,
-	snapshotManager: AstroSnapshotManager,
-	logger: Logger
-): void {
+export function decorateGetImplementation(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager): void {
 	const getImplementationAtPosition = ls.getImplementationAtPosition;
@@ -12,0 +7,0 @@ ls.getImplementationAtPosition = (fileName, position) => {

src/language-service/index.ts

 import type ts from 'typescript/lib/tsserverlibrary';
-import { AstroSnapshotManager } from '../astro-snapshots.js';
-import { Logger } from '../logger';
-import { isAstroFilePath } from '../utils.js';
+import type { AstroSnapshotManager } from '../astro-snapshots.js';
+import type { Logger } from '../logger';
 import { decorateCompletions } from './completions.js';
 import { decorateGetDefinition } from './definition.js';
 import { decorateDiagnostics } from './diagnostics.js';
+import { decorateGetFileReferences } from './file-references.js';
 import { decorateFindReferences } from './find-references.js';
 import { decorateGetImplementation } from './implementation.js';
+import { decorateLineColumnOffset } from './line-column-offset.js';
 import { decorateRename } from './rename.js';
@@ -17,28 +18,12 @@
 ): ts.LanguageService {
-	patchLineColumnOffset(ls, snapshotManager);
+	decorateLineColumnOffset(ls, snapshotManager);
 	decorateRename(ls, snapshotManager, logger);
-	decorateDiagnostics(ls, logger);
+	decorateDiagnostics(ls);
 	decorateFindReferences(ls, snapshotManager, logger);
 	decorateCompletions(ls, logger);
-	decorateGetDefinition(ls, snapshotManager, logger);
-	decorateGetImplementation(ls, snapshotManager, logger);
+	decorateGetDefinition(ls, snapshotManager);
+	decorateGetImplementation(ls, snapshotManager);
+	decorateGetFileReferences(ls, snapshotManager);
+
 	return ls;
 }
-
-function patchLineColumnOffset(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager) {
-	if (!ls.toLineColumnOffset) {
-		return;
-	}
-
-	// We need to patch this because (according to source, only) getDefinition uses this
-	const toLineColumnOffset = ls.toLineColumnOffset;
-	ls.toLineColumnOffset = (fileName, position) => {
-		if (isAstroFilePath(fileName)) {
-			const snapshot = snapshotManager.get(fileName);
-			if (snapshot) {
-				return snapshot.positionAt(position);
-			}
-		}
-		return toLineColumnOffset(fileName, position);
-	};
-}

src/language-service/rename.ts

 import type ts from 'typescript/lib/tsserverlibrary';
-import { AstroSnapshotManager } from '../astro-snapshots.js';
-import { Logger } from '../logger.js';
+import type { AstroSnapshotManager } from '../astro-snapshots.js';
+import type { Logger } from '../logger.js';
 import { isAstroFilePath, isNotNullOrUndefined } from '../utils.js';
@@ -5,0 +5,0 @@

src/module-loader.ts

 import type ts from 'typescript/lib/tsserverlibrary';
-import { AstroSnapshotManager } from './astro-snapshots.js';
+import type { AstroSnapshotManager } from './astro-snapshots.js';
 import { createAstroSys } from './astro-sys.js';
-import { Logger } from './logger.js';
+import type { Logger } from './logger.js';
 import { ensureRealAstroFilePath, isVirtualAstroFilePath } from './utils.js';
@@ -76,2 +76,9 @@
 
+	// Patch readDirectory so we get completions for .astro files
+	const origReadDirectory = project.readDirectory.bind(project);
+	project.readDirectory = (path, extensions, exclude, include, depth) => {
+		const extensionsWithAstro = (extensions ?? []).concat('.astro', '.md', '.mdx');
+		return origReadDirectory(path, extensionsWithAstro, exclude, include, depth);
+	};
+
 	function resolveModuleNames(
@@ -84,3 +91,4 @@ moduleNames: string[],
 	): Array<ts.ResolvedModule | undefined> {
-		logger.log('Resolving modules names for ' + containingFile);
+		// logger.log('Resolving modules names for ' + containingFile);
+
 		// Try resolving all module names with the original method first.
@@ -134,3 +142,3 @@ // The ones that are undefined will be re-checked if they are a
 		const resolvedAstroModule: ts.ResolvedModuleFull = {
-			extension: snapshot.isTsFile ? typescript.Extension.Tsx : typescript.Extension.Jsx,
+			extension: typescript.Extension.Tsx,
 			resolvedFileName,
@@ -137,0 +145,0 @@ };

src/utils.ts

@@ -22,22 +22,2 @@ export function isAstroFilePath(filePath: string) {
 /**
- * Checks if this a section that should be completely ignored
- * because it's purely generated.
- */
-export function isInGeneratedCode(text: string, start: number, end: number) {
-	const lineStart = text.lastIndexOf('\n', start);
-	const lineEnd = text.indexOf('\n', end);
-	const lastStart = text.substring(lineStart, start).lastIndexOf('/*Ωignore_startΩ*/');
-	const lastEnd = text.substring(lineStart, start).lastIndexOf('/*Ωignore_endΩ*/');
-	return lastStart > lastEnd && text.substring(end, lineEnd).includes('/*Ωignore_endΩ*/');
-}
-
-/**
- * Checks that this isn't a text span that should be completely ignored
- * because it's purely generated.
- */
-export function isNoTextSpanInGeneratedCode(text: string, span: ts.TextSpan) {
-	return !isInGeneratedCode(text, span.start, span.start + span.length);
-}
-
-/**
  * Replace all occurrences of a string within an object with another string,
@@ -68,1 +48,30 @@ */
 }
+
+export function getConfigPathForProject(project: ts.server.Project) {
+	return (
+		(project as ts.server.ConfiguredProject).canonicalConfigFilePath ??
+		(project.getCompilerOptions() as any).configFilePath
+	);
+}
+
+export function readProjectAstroFilesFromFs(
+	ts: typeof import('typescript/lib/tsserverlibrary'),
+	project: ts.server.Project,
+	parsedCommandLine: ts.ParsedCommandLine
+) {
+	const fileSpec: TsFilesSpec = parsedCommandLine.raw;
+	const { include, exclude } = fileSpec;
+
+	if (include?.length === 0) {
+		return [];
+	}
+
+	return ts.sys
+		.readDirectory(project.getCurrentDirectory() || process.cwd(), ['.astro'], exclude, include)
+		.map(ts.server.toNormalizedPath);
+}
+
+export interface TsFilesSpec {
+	include?: readonly string[];
+	exclude?: readonly string[];
+}

tsconfig.json

@@ -7,3 +7,4 @@ {
     "target": "ES2020",
-    "module": "CommonJS"
+    "module": "CommonJS",
+    "importsNotUsedAsValues": "error"
   },
@@ -10,0 +11,0 @@ "include": ["src"],

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Uses eval

Supply chain risk

Package uses dynamic code execution (e.g., eval()), which is a dangerous practice. This can prevent the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

128034

increased by15.48%

Number of package files

52

increased by48.57%

Lines of code

2706

increased by14.66%

Worsened metrics

Dependency count

3

increased by200%

Dev dependency count

10

increased by233.33%

Number of low supply chain risk alerts

2

increased by100%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Added@astrojs/compiler@^0.29.15

• + Added@jridgewell/trace-mapping@^0.3.15

• + Addedsynckit@^0.8.4

• + Added@astrojs/compiler@0.29.19(transitive)

• + Added@jridgewell/resolve-uri@3.1.2(transitive)

• + Added@jridgewell/sourcemap-codec@1.5.0(transitive)

• + Added@jridgewell/trace-mapping@0.3.25(transitive)

• + Added@pkgr/core@0.1.1(transitive)

• + Addedsynckit@0.8.8(transitive)

• + Addedtslib@2.8.1(transitive)

• - Removedsourcemap-codec@^1.4.8

• - Removedsourcemap-codec@1.4.8(transitive)