astro-vscode 2.0.13 → 2.0.15

package/dist/node/client.js

@@ -220517,7 +220517,7 @@ var require_utils6 = __commonJS({
         return getVirtualFile(EMPTY_FILE);
       }
       const className = classNameFromFilename(filePath);
-      const tsx = patchTSX(integrationEditorEntrypoint.toTSX(sourceCode, className));
+      const tsx = patchTSX(integrationEditorEntrypoint.toTSX(sourceCode, className), fileName);
       return getVirtualFile(tsx);
       function getVirtualFile(content) {
         return {
@@ -220556,8 +220556,17 @@ var require_utils6 = __commonJS({
       return finalName;
     }
     exports.classNameFromFilename = classNameFromFilename;
-    function patchTSX(code) {
-      return code.replace("__AstroComponent_", "");
+    function patchTSX(code, fileName) {
+      const basename = path2.basename(fileName, path2.extname(fileName));
+      const isDynamic = basename.startsWith("[") && basename.endsWith("]");
+      return code.replace(/\b(\S*)__AstroComponent_/gm, (fullMatch, m1) => {
+        if (!m1) {
+          if (basename === "404")
+            return "FourOhFour";
+          return fullMatch;
+        }
+        return isDynamic ? `_${m1}_` : m1[0].toUpperCase() + m1.slice(1);
+      });
     }
     exports.patchTSX = patchTSX;
   }
@@ -220583,7 +220592,7 @@ var require_astro2tsx = __commonJS({
     }
     exports.astro2tsx = astro2tsx;
     function getVirtualFileTSX(input, tsx, fileName, ts, htmlDocument) {
-      tsx.code = (0, utils_js_1.patchTSX)(tsx.code);
+      tsx.code = (0, utils_js_1.patchTSX)(tsx.code, fileName);
       const v3Mappings = (0, sourcemap_codec_1.decode)(tsx.map.mappings);
       const sourcedDoc = vscode_html_languageservice_1.TextDocument.create(fileName, "astro", 0, input);
       const genDoc = vscode_html_languageservice_1.TextDocument.create(fileName + ".tsx", "typescriptreact", 0, tsx.code);
@@ -243249,12 +243258,7 @@ async function activate(context) {
     documentSelector: [{ language: "astro" }],
     initializationOptions
   };
-  client = new lsp.LanguageClient(
-    "astro-language-server",
-    "Astro Language Server",
-    serverOptions,
-    clientOptions
-  );
+  client = new lsp.LanguageClient("astro", "Astro Language Server", serverOptions, clientOptions);
   await client.start();
   (0, import_vscode.activateAutoInsertion)([client], (document2) => document2.languageId === "astro");
   (0, import_vscode.activateFindFileReferences)("astro.findFileReferences", client);

package/dist/node/server.js

@@ -65,7 +65,7 @@ var require_package = __commonJS({
   "../language-server/package.json"(exports2, module2) {
     module2.exports = {
       name: "@astrojs/language-server",
-      version: "2.0.0",
+      version: "2.0.15",
       author: "withastro",
       license: "MIT",
       repository: {
@@ -93,19 +93,19 @@ var require_package = __commonJS({
       dependencies: {
         "@astrojs/compiler": "^1.5.0",
         "@jridgewell/sourcemap-codec": "^1.4.15",
-        "@volar/kit": "^1.6.9",
-        "@volar/language-core": "^1.6.9",
-        "@volar/language-server": "^1.6.9",
-        "@volar/language-service": "^1.6.9",
-        "@volar/source-map": "^1.6.9",
+        "@volar/kit": "1.6.9",
+        "@volar/language-core": "1.6.9",
+        "@volar/language-server": "1.6.9",
+        "@volar/language-service": "1.6.9",
+        "@volar/source-map": "1.6.9",
         "fast-glob": "^3.2.12",
         "muggle-string": "^0.3.1",
-        "volar-service-css": "^0.0.4",
-        "volar-service-emmet": "^0.0.4",
-        "volar-service-html": "^0.0.4",
-        "volar-service-prettier": "^0.0.4",
-        "volar-service-typescript": "^0.0.4",
-        "volar-service-typescript-twoslash-queries": "^0.0.4",
+        "volar-service-css": "0.0.4",
+        "volar-service-emmet": "0.0.4",
+        "volar-service-html": "0.0.4",
+        "volar-service-prettier": "0.0.4",
+        "volar-service-typescript": "0.0.4",
+        "volar-service-typescript-twoslash-queries": "0.0.4",
         "vscode-html-languageservice": "^5.0.5",
         "vscode-uri": "^3.0.7"
       },
@@ -239816,7 +239816,7 @@ var require_utils = __commonJS({
         return getVirtualFile(EMPTY_FILE);
       }
       const className = classNameFromFilename(filePath);
-      const tsx = patchTSX(integrationEditorEntrypoint.toTSX(sourceCode, className));
+      const tsx = patchTSX(integrationEditorEntrypoint.toTSX(sourceCode, className), fileName);
       return getVirtualFile(tsx);
       function getVirtualFile(content) {
         return {
@@ -239855,8 +239855,17 @@ var require_utils = __commonJS({
       return finalName;
     }
     exports2.classNameFromFilename = classNameFromFilename;
-    function patchTSX(code) {
-      return code.replace("__AstroComponent_", "");
+    function patchTSX(code, fileName) {
+      const basename = path.basename(fileName, path.extname(fileName));
+      const isDynamic = basename.startsWith("[") && basename.endsWith("]");
+      return code.replace(/\b(\S*)__AstroComponent_/gm, (fullMatch, m1) => {
+        if (!m1) {
+          if (basename === "404")
+            return "FourOhFour";
+          return fullMatch;
+        }
+        return isDynamic ? `_${m1}_` : m1[0].toUpperCase() + m1.slice(1);
+      });
     }
     exports2.patchTSX = patchTSX;
   }
@@ -239882,7 +239891,7 @@ var require_astro2tsx = __commonJS({
     }
     exports2.astro2tsx = astro2tsx;
     function getVirtualFileTSX(input, tsx, fileName, ts, htmlDocument) {
-      tsx.code = (0, utils_js_1.patchTSX)(tsx.code);
+      tsx.code = (0, utils_js_1.patchTSX)(tsx.code, fileName);
       const v3Mappings = (0, sourcemap_codec_1.decode)(tsx.map.mappings);
       const sourcedDoc = vscode_html_languageservice_1.TextDocument.create(fileName, "astro", 0, input);
       const genDoc = vscode_html_languageservice_1.TextDocument.create(fileName + ".tsx", "typescriptreact", 0, tsx.code);

package/package.json

@@ -24,7 +24,7 @@
     "color": "#17191E",
     "theme": "dark"
   },
-  "version": "2.0.13",
+  "version": "2.0.15",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
@@ -208,7 +208,7 @@
     ]
   },
   "devDependencies": {
-    "@astrojs/language-server": "^2.0.0",
+    "@astrojs/language-server": "^2.0.15",
     "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.1",
     "@types/node": "^16.18.26",