fix: parsing error in multiple tags with spaces (#289)

* fix: parsing error in multiple tags with spaces

* Create clever-trees-melt.md

Author: ota-meshi

.changeset/clever-trees-melt.md

@@ -0,0 +1,5 @@
+---
+"astro-eslint-parser": patch
+---
+
+fix: parsing error in multiple tags with spaces

explorer-v3/astro.config.mjs

@@ -1,6 +1,7 @@
 import { defineConfig } from "astro/config";
 import svelte from "@astrojs/svelte";
 import { resolve } from "path";
+import { version as monacoVersion } from "monaco-editor/package.json";
 
 // https://astro.build/config
 export default defineConfig({
@@ -11,23 +12,26 @@ export default defineConfig({
     server: {
       fs: { strict: false },
     },
+    define: {
+      MONACO_EDITOR_VERSION: JSON.stringify(monacoVersion),
+    },
     resolve: {
       alias: {
         assert: resolve("./build-system/shim/assert.js"),
         path: resolve("./build-system/shim/path.js"),
         fs: resolve("./build-system/shim/fs.js"),
         module: resolve("./build-system/shim/module.js"),
         "eslint/package.json": resolve(
-          "./build-system/shim/eslint/package.json"
+          "./build-system/shim/eslint/package.json",
         ),
         eslint: resolve("./build-system/shim/eslint/index.js"),
         "astro-eslint-parser": resolve(
-          "./build-system/shim/astro-eslint-parser/index.js"
+          "./build-system/shim/astro-eslint-parser/index.js",
         ),
         globby: resolve("./build-system/shim/globby.js"),
         tslib: resolve("../node_modules/tslib/tslib.es6.js"),
         "escape-string-regexp": resolve(
-          "./build-system/shim/escape-string-regexp/index.js"
+          "./build-system/shim/escape-string-regexp/index.js",
         ),
         resolve: resolve("./build-system/shim/resolve.js"),
       },

explorer-v3/package.json

@@ -18,6 +18,7 @@
     "astro-eslint-parser": "file:..",
     "eslint": "^8.15.0",
     "eslint-plugin-react": "^7.29.4",
+    "monaco-editor": "^0.45.0",
     "pako": "^2.0.4",
     "svelte": "^4.0.0",
     "webpack": "^5.72.1",

explorer-v3/src/components/scripts/monaco-loader.js

@@ -1,4 +1,5 @@
-async function setupMonaco() {
+/* global MONACO_EDITOR_VERSION -- defined */
+async function loadMonaco() {
   if (typeof window !== "undefined") {
     const monacoScript =
       Array.from(document.head.querySelectorAll("script")).find(
@@ -23,8 +24,12 @@ async function setupMonaco() {
 function appendMonacoEditorScript() {
   return new Promise((resolve) => {
     const script = document.createElement("script");
-    script.src =
-      "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.26.1/min/vs/loader.min.js";
+
+    if (typeof MONACO_EDITOR_VERSION !== "undefined") {
+      script.src = `https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/${MONACO_EDITOR_VERSION}/min/vs/loader.min.js`;
+    } else {
+      script.src = "https://unpkg.com/monaco-editor@latest/min/vs/loader.js";
+    }
     script.onload = () => {
       script.onload = null;
 
@@ -42,11 +47,11 @@ function appendMonacoEditorScript() {
   });
 }
 
-let setupedMonaco = null;
+let loadedMonaco = null;
 let editorLoaded = null;
 
 export async function loadMonacoEditor() {
-  await (setupedMonaco || (setupedMonaco = setupMonaco()));
+  await (loadedMonaco || (loadedMonaco = loadMonaco()));
   return (
     editorLoaded ||
     (editorLoaded = new Promise((resolve) => {

src/parser/process-template.ts

@@ -118,10 +118,13 @@ export function processTemplate(
       } else if (isTag(node)) {
         // Process for multiple tag
         if (parent.type === "expression") {
-          const index = parent.children.indexOf(node);
-          const before = parent.children[index - 1];
+          const siblings = parent.children.filter(
+            (n) => n.type !== "text" || n.value.trim(),
+          );
+          const index = siblings.indexOf(node);
+          const before = siblings[index - 1];
           if (!before || !isTag(before)) {
-            const after = parent.children[index + 1];
+            const after = siblings[index + 1];
             if (after && (isTag(after) || after.type === "comment")) {
               const start = node.position!.start.offset;
               script.appendOriginal(start);
@@ -427,10 +430,13 @@ export function processTemplate(
         (isTag(node) || node.type === "comment") &&
         parent.type === "expression"
       ) {
-        const index = parent.children.indexOf(node);
-        const after = parent.children[index + 1];
+        const siblings = parent.children.filter(
+          (n) => n.type !== "text" || n.value.trim(),
+        );
+        const index = siblings.indexOf(node);
+        const after = siblings[index + 1];
         if (!after || (!isTag(after) && after.type !== "comment")) {
-          const before = parent.children[index - 1];
+          const before = siblings[index - 1];
           if (before && (isTag(before) || before.type === "comment")) {
             const end = getEndOffset(node, ctx);
             script.appendOriginal(end);

tests/fixtures/parser/ast/fragment-with-expression03-array-map-input.astro

@@ -0,0 +1,6 @@
+{
+  [].map(i => (
+      <p>title</p>
+      <p>{i}</p>
+  ))
+}