@marko/language-tools 2.0.6 → 2.0.7

package/dist/index.js

@@ -2000,7 +2000,7 @@ constructor(_?: Return) {}
               }
               this.#writeComments(child);
               this.#extractor.write("if (").copy(
-                ((_a = child.args) == null ? void 0 : _a.value) || this.#getAttrValue(child, ATTR_UNAMED2) || "undefined"
+                this.#getRangeWithoutTrailingComma((_a = child.args) == null ? void 0 : _a.value) || this.#getAttrValue(child, ATTR_UNAMED2) || "undefined"
               ).write(") {\n");
               if (child.body) {
                 const localBindings = getHoistSources(child);
@@ -2081,7 +2081,9 @@ constructor(_?: Return) {}
             }
             case "while": {
               this.#writeComments(child);
-              this.#extractor.write("while (\n").copy(((_b = child.args) == null ? void 0 : _b.value) || "undefined").write("\n) {\n");
+              this.#extractor.write("while (\n").copy(
+                this.#getRangeWithoutTrailingComma((_b = child.args) == null ? void 0 : _b.value) || "undefined"
+              ).write("\n) {\n");
               const body = this.#processBody(child);
               if (body == null ? void 0 : body.renderBody) {
                 this.#writeChildren(child, body.renderBody);
@@ -2436,7 +2438,7 @@ const attrTags = ${varShared(
           const alternates = IF_TAG_ALTERNATES.get(tag);
           this.#writeComments(tag);
           this.#extractor.write("((\n").copy(
-            ((_a = tag.args) == null ? void 0 : _a.value) || this.#getAttrValue(tag, ATTR_UNAMED2) || "undefined"
+            this.#getRangeWithoutTrailingComma((_a = tag.args) == null ? void 0 : _a.value) || this.#getAttrValue(tag, ATTR_UNAMED2) || "undefined"
           ).write("\n) ? ");
           this.#writeDynamicAttrTagBody(tag);
           let needsAlternate = true;
@@ -2475,7 +2477,9 @@ const attrTags = ${varShared(
         case "while": {
           this.#writeComments(tag);
           this.#extractor.write(`${varShared("mergeAttrTags")}((
-`).copy(((_c = tag.args) == null ? void 0 : _c.value) || "undefined").write("\n) ? [");
+`).copy(
+            this.#getRangeWithoutTrailingComma((_c = tag.args) == null ? void 0 : _c.value) || "undefined"
+          ).write("\n) ? [");
           this.#writeDynamicAttrTagBody(tag);
           this.#extractor.write("] : [])");
           break;
@@ -2663,7 +2667,9 @@ const attrTags = ${varShared(
                       switch (nextChild.nameText) {
                         case "else-if": {
                           const alternate = {
-                            condition: ((_a = nextChild.args) == null ? void 0 : _a.value) || this.#getAttrValue(nextChild, ATTR_UNAMED2),
+                            condition: this.#getRangeWithoutTrailingComma(
+                              (_a = nextChild.args) == null ? void 0 : _a.value
+                            ) || this.#getAttrValue(nextChild, ATTR_UNAMED2),
                             node: nextChild
                           };
                           hasDynamicAttrTags ||= nextChild.hasAttrTags;
@@ -2763,6 +2769,22 @@ const attrTags = ${varShared(
       }
     }
   }
+  #getRangeWithoutTrailingComma(range) {
+    if (!range)
+      return void 0;
+    const { start } = range;
+    let end = range.end - 1;
+    while (end >= start) {
+      if (isWhitespaceCode(this.#code.charCodeAt(end))) {
+        end--;
+      } else if (this.#code.charAt(end) === ",") {
+        return { start, end };
+      } else {
+        break;
+      }
+    }
+    return range;
+  }
   #isEmptyText(text) {
     let pos = text.start;
     while (pos < text.end) {

package/dist/index.mjs

@@ -1969,7 +1969,7 @@ constructor(_?: Return) {}
               }
               this.#writeComments(child);
               this.#extractor.write("if (").copy(
-                ((_a = child.args) == null ? void 0 : _a.value) || this.#getAttrValue(child, ATTR_UNAMED2) || "undefined"
+                this.#getRangeWithoutTrailingComma((_a = child.args) == null ? void 0 : _a.value) || this.#getAttrValue(child, ATTR_UNAMED2) || "undefined"
               ).write(") {\n");
               if (child.body) {
                 const localBindings = getHoistSources(child);
@@ -2050,7 +2050,9 @@ constructor(_?: Return) {}
             }
             case "while": {
               this.#writeComments(child);
-              this.#extractor.write("while (\n").copy(((_b = child.args) == null ? void 0 : _b.value) || "undefined").write("\n) {\n");
+              this.#extractor.write("while (\n").copy(
+                this.#getRangeWithoutTrailingComma((_b = child.args) == null ? void 0 : _b.value) || "undefined"
+              ).write("\n) {\n");
               const body = this.#processBody(child);
               if (body == null ? void 0 : body.renderBody) {
                 this.#writeChildren(child, body.renderBody);
@@ -2405,7 +2407,7 @@ const attrTags = ${varShared(
           const alternates = IF_TAG_ALTERNATES.get(tag);
           this.#writeComments(tag);
           this.#extractor.write("((\n").copy(
-            ((_a = tag.args) == null ? void 0 : _a.value) || this.#getAttrValue(tag, ATTR_UNAMED2) || "undefined"
+            this.#getRangeWithoutTrailingComma((_a = tag.args) == null ? void 0 : _a.value) || this.#getAttrValue(tag, ATTR_UNAMED2) || "undefined"
           ).write("\n) ? ");
           this.#writeDynamicAttrTagBody(tag);
           let needsAlternate = true;
@@ -2444,7 +2446,9 @@ const attrTags = ${varShared(
         case "while": {
           this.#writeComments(tag);
           this.#extractor.write(`${varShared("mergeAttrTags")}((
-`).copy(((_c = tag.args) == null ? void 0 : _c.value) || "undefined").write("\n) ? [");
+`).copy(
+            this.#getRangeWithoutTrailingComma((_c = tag.args) == null ? void 0 : _c.value) || "undefined"
+          ).write("\n) ? [");
           this.#writeDynamicAttrTagBody(tag);
           this.#extractor.write("] : [])");
           break;
@@ -2632,7 +2636,9 @@ const attrTags = ${varShared(
                       switch (nextChild.nameText) {
                         case "else-if": {
                           const alternate = {
-                            condition: ((_a = nextChild.args) == null ? void 0 : _a.value) || this.#getAttrValue(nextChild, ATTR_UNAMED2),
+                            condition: this.#getRangeWithoutTrailingComma(
+                              (_a = nextChild.args) == null ? void 0 : _a.value
+                            ) || this.#getAttrValue(nextChild, ATTR_UNAMED2),
                             node: nextChild
                           };
                           hasDynamicAttrTags ||= nextChild.hasAttrTags;
@@ -2732,6 +2738,22 @@ const attrTags = ${varShared(
       }
     }
   }
+  #getRangeWithoutTrailingComma(range) {
+    if (!range)
+      return void 0;
+    const { start } = range;
+    let end = range.end - 1;
+    while (end >= start) {
+      if (isWhitespaceCode(this.#code.charCodeAt(end))) {
+        end--;
+      } else if (this.#code.charAt(end) === ",") {
+        return { start, end };
+      } else {
+        break;
+      }
+    }
+    return range;
+  }
   #isEmptyText(text) {
     let pos = text.start;
     while (pos < text.end) {

package/dist/util/project.d.ts

@@ -25,6 +25,8 @@ export declare function getCompiler(dir?: string): typeof defaultCompiler;
 export declare function getCache(dir?: string): Map<any, any>;
 export declare function getConfig(dir?: string): Omit<{
     output?: "source" | "html" | "dom" | "hydrate" | "migrate" | undefined;
+    errorRecovery?: boolean | undefined;
+    applyFixes?: Map<number, unknown> | undefined;
     stripTypes?: boolean | undefined;
     runtimeId?: string | null | undefined;
     ast?: boolean | undefined;

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "dependencies": {
-    "@babel/helper-validator-identifier": "^7.19.1",
-    "@babel/parser": "^7.21.8",
-    "@marko/compiler": "5.27.7",
-    "@marko/translator-default": "5.25.7",
-    "htmljs-parser": "^5.4.3",
+    "@babel/helper-validator-identifier": "^7.22.5",
+    "@babel/parser": "^7.22.5",
+    "@marko/compiler": "5.28.4",
+    "@marko/translator-default": "5.26.4",
+    "htmljs-parser": "^5.5.0",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/code-frame": "^7.21.4",
-    "@marko/compiler": "^5.27.7",
+    "@babel/code-frame": "^7.22.5",
+    "@marko/compiler": "^5.28.3",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__helper-validator-identifier": "^7.15.0",
     "@typescript/vfs": "^1.4.0",
-    "marko": "^5.25.11",
+    "marko": "^5.26.4",
     "mitata": "^0.1.6",
     "tsx": "^3.12.7"
   },