@marko/language-tools 2.0.5 → 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);
@@ -2259,9 +2261,13 @@ ${varShared(renderer)})`);
             break;
           case 10 /* AttrNamed */: {
             const isDefault = isEmptyRange(attr.name);
-            const name = isDefault ? ATTR_UNAMED2 : attr.name;
             const value = attr.value;
+            const modifierIndex = !isDefault && (!value || value.type === 13 /* AttrValue */) && this.#getNamedAttrModifierIndex(attr);
             const defaultMapPosition = isDefault ? attr.name : void 0;
+            let name = isDefault ? ATTR_UNAMED2 : attr.name;
+            if (modifierIndex !== false) {
+              name = { start: attr.name.start, end: modifierIndex };
+            }
             if (value) {
               switch (value.type) {
                 case 14 /* AttrMethod */:
@@ -2342,7 +2348,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
 `).copy(attr.args.value).write("\n)");
               }
             } else {
-              this.#extractor.write('"').copy(defaultMapPosition).copy(name).write('": true');
+              this.#extractor.write('"').copy(defaultMapPosition).copy(name).write(`": ${modifierIndex === false ? "true" : '""'}`);
             }
             break;
           }
@@ -2432,13 +2438,9 @@ 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.#extractor.write("{\n");
-          const body = this.#processBody(tag);
-          if (body)
-            this.#writeAttrTags(body, true);
-          this.#extractor.write("\n} ");
+          this.#writeDynamicAttrTagBody(tag);
           let needsAlternate = true;
           if (alternates) {
             for (const { node, condition } of alternates) {
@@ -2451,14 +2453,7 @@ const attrTags = ${varShared(
               } else {
                 this.#extractor.write(": undefined ? ");
               }
-              const body2 = this.#processBody(tag);
-              if (body2) {
-                this.#extractor.write("{\n");
-                this.#writeAttrTags(body2, true);
-                this.#extractor.write("}");
-              } else {
-                this.#extractor.write("{}");
-              }
+              this.#writeDynamicAttrTagBody(node);
             }
           }
           if (needsAlternate) {
@@ -2474,20 +2469,19 @@ const attrTags = ${varShared(
             this.#writeTagNameComment(tag);
           this.#extractor.write("}, \n");
           this.#writeComments(tag);
-          this.#extractor.copy(tag.typeParams).write("(\n").copy((_b = tag.params) == null ? void 0 : _b.value).write("\n) => ({\n");
-          const body = this.#processBody(tag);
-          if (body)
-            this.#writeAttrTags(body, true);
-          this.#extractor.write("}))");
+          this.#extractor.copy(tag.typeParams).write("(\n").copy((_b = tag.params) == null ? void 0 : _b.value).write("\n) => (");
+          this.#writeDynamicAttrTagBody(tag);
+          this.#extractor.write("))");
           break;
         }
         case "while": {
           this.#writeComments(tag);
           this.#extractor.write(`${varShared("mergeAttrTags")}((
-`).copy(((_c = tag.args) == null ? void 0 : _c.value) || "undefined").write("\n) ? [{\n");
-          const body = this.#processBody(tag);
-          this.#writeAttrTags(body, true);
-          this.#extractor.write("}] : [])");
+`).copy(
+            this.#getRangeWithoutTrailingComma((_c = tag.args) == null ? void 0 : _c.value) || "undefined"
+          ).write("\n) ? [");
+          this.#writeDynamicAttrTagBody(tag);
+          this.#extractor.write("] : [])");
           break;
         }
       }
@@ -2673,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;
@@ -2746,6 +2742,24 @@ const attrTags = ${varShared(
       return { renderBody, staticAttrTags, dynamicAttrTagParents };
     }
   }
+  #writeDynamicAttrTagBody(tag) {
+    const body = this.#processBody(tag);
+    if (body) {
+      if (body.renderBody) {
+        this.#extractor.write("(() => {\n");
+        this.#writeChildren(tag, body.renderBody);
+        this.#extractor.write("return ");
+      }
+      this.#extractor.write("{\n");
+      this.#writeAttrTags(body, true);
+      this.#extractor.write("}");
+      if (body.renderBody) {
+        this.#extractor.write(";\n})()");
+      }
+    } else {
+      this.#extractor.write("{}");
+    }
+  }
   #getAttrValue(tag, name) {
     if (tag.attrs) {
       for (const attr of tag.attrs) {
@@ -2755,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) {
@@ -2828,6 +2858,15 @@ const attrTags = ${varShared(
     }
     return renderId;
   }
+  #getNamedAttrModifierIndex(attr) {
+    const start = attr.name.start + 1;
+    const end = attr.name.end - 1;
+    for (let i = end; i-- > start; ) {
+      if (this.#code.charAt(i) === ":")
+        return i;
+    }
+    return false;
+  }
   #testAtIndex(reg, index) {
     reg.lastIndex = index;
     return reg.test(this.#code);

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);
@@ -2228,9 +2230,13 @@ ${varShared(renderer)})`);
             break;
           case 10 /* AttrNamed */: {
             const isDefault = isEmptyRange(attr.name);
-            const name = isDefault ? ATTR_UNAMED2 : attr.name;
             const value = attr.value;
+            const modifierIndex = !isDefault && (!value || value.type === 13 /* AttrValue */) && this.#getNamedAttrModifierIndex(attr);
             const defaultMapPosition = isDefault ? attr.name : void 0;
+            let name = isDefault ? ATTR_UNAMED2 : attr.name;
+            if (modifierIndex !== false) {
+              name = { start: attr.name.start, end: modifierIndex };
+            }
             if (value) {
               switch (value.type) {
                 case 14 /* AttrMethod */:
@@ -2311,7 +2317,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
 `).copy(attr.args.value).write("\n)");
               }
             } else {
-              this.#extractor.write('"').copy(defaultMapPosition).copy(name).write('": true');
+              this.#extractor.write('"').copy(defaultMapPosition).copy(name).write(`": ${modifierIndex === false ? "true" : '""'}`);
             }
             break;
           }
@@ -2401,13 +2407,9 @@ 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.#extractor.write("{\n");
-          const body = this.#processBody(tag);
-          if (body)
-            this.#writeAttrTags(body, true);
-          this.#extractor.write("\n} ");
+          this.#writeDynamicAttrTagBody(tag);
           let needsAlternate = true;
           if (alternates) {
             for (const { node, condition } of alternates) {
@@ -2420,14 +2422,7 @@ const attrTags = ${varShared(
               } else {
                 this.#extractor.write(": undefined ? ");
               }
-              const body2 = this.#processBody(tag);
-              if (body2) {
-                this.#extractor.write("{\n");
-                this.#writeAttrTags(body2, true);
-                this.#extractor.write("}");
-              } else {
-                this.#extractor.write("{}");
-              }
+              this.#writeDynamicAttrTagBody(node);
             }
           }
           if (needsAlternate) {
@@ -2443,20 +2438,19 @@ const attrTags = ${varShared(
             this.#writeTagNameComment(tag);
           this.#extractor.write("}, \n");
           this.#writeComments(tag);
-          this.#extractor.copy(tag.typeParams).write("(\n").copy((_b = tag.params) == null ? void 0 : _b.value).write("\n) => ({\n");
-          const body = this.#processBody(tag);
-          if (body)
-            this.#writeAttrTags(body, true);
-          this.#extractor.write("}))");
+          this.#extractor.copy(tag.typeParams).write("(\n").copy((_b = tag.params) == null ? void 0 : _b.value).write("\n) => (");
+          this.#writeDynamicAttrTagBody(tag);
+          this.#extractor.write("))");
           break;
         }
         case "while": {
           this.#writeComments(tag);
           this.#extractor.write(`${varShared("mergeAttrTags")}((
-`).copy(((_c = tag.args) == null ? void 0 : _c.value) || "undefined").write("\n) ? [{\n");
-          const body = this.#processBody(tag);
-          this.#writeAttrTags(body, true);
-          this.#extractor.write("}] : [])");
+`).copy(
+            this.#getRangeWithoutTrailingComma((_c = tag.args) == null ? void 0 : _c.value) || "undefined"
+          ).write("\n) ? [");
+          this.#writeDynamicAttrTagBody(tag);
+          this.#extractor.write("] : [])");
           break;
         }
       }
@@ -2642,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;
@@ -2715,6 +2711,24 @@ const attrTags = ${varShared(
       return { renderBody, staticAttrTags, dynamicAttrTagParents };
     }
   }
+  #writeDynamicAttrTagBody(tag) {
+    const body = this.#processBody(tag);
+    if (body) {
+      if (body.renderBody) {
+        this.#extractor.write("(() => {\n");
+        this.#writeChildren(tag, body.renderBody);
+        this.#extractor.write("return ");
+      }
+      this.#extractor.write("{\n");
+      this.#writeAttrTags(body, true);
+      this.#extractor.write("}");
+      if (body.renderBody) {
+        this.#extractor.write(";\n})()");
+      }
+    } else {
+      this.#extractor.write("{}");
+    }
+  }
   #getAttrValue(tag, name) {
     if (tag.attrs) {
       for (const attr of tag.attrs) {
@@ -2724,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) {
@@ -2797,6 +2827,15 @@ const attrTags = ${varShared(
     }
     return renderId;
   }
+  #getNamedAttrModifierIndex(attr) {
+    const start = attr.name.start + 1;
+    const end = attr.name.end - 1;
+    for (let i = end; i-- > start; ) {
+      if (this.#code.charAt(i) === ":")
+        return i;
+    }
+    return false;
+  }
   #testAtIndex(reg, index) {
     reg.lastIndex = index;
     return reg.test(this.#code);

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,25 +1,25 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.0.5",
+  "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.4",
-    "@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.8",
+    "marko": "^5.26.4",
     "mitata": "^0.1.6",
-    "tsx": "^3.12.6"
+    "tsx": "^3.12.7"
   },
   "exports": {
     ".": {