@marko/language-tools 2.5.18 → 2.5.20

package/dist/index.js

@@ -2226,6 +2226,19 @@ ${varShared("noop")}(`);
         if (!WROTE_COMMENT.has(comment)) {
           if (this.#code.charAt(comment.start + 1) === "/") {
             this.#extractor.write("//").copy(comment.value).write("\n");
+          } else if (this.#code.charAt(comment.start + 1) === "!") {
+            this.#extractor.write("/*");
+            let startIndex = comment.value.start;
+            for (const { index } of this.#read(comment.value).matchAll(
+              /\*\//g
+            )) {
+              this.#extractor.copy({
+                start: startIndex,
+                end: startIndex = comment.value.start + index + 1
+              }).write("\\");
+            }
+            this.#extractor.copy({ start: startIndex, end: comment.value.end });
+            this.#extractor.write("*/");
           } else {
             this.#extractor.write("/*").copy(comment.value).write("*/");
           }
@@ -3218,7 +3231,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
         this.#writeAttrTagTree(nested2, `input["@${name}"]`, true);
       }
     }
-    this.#extractor.write(`})`);
+    this.#extractor.write(`});`);
   }
   #getAttrTagTree(tag, attrTags) {
     if (!tag.hasAttrTags || !tag.body) return attrTags;

package/dist/index.mjs

@@ -2189,6 +2189,19 @@ ${varShared("noop")}(`);
         if (!WROTE_COMMENT.has(comment)) {
           if (this.#code.charAt(comment.start + 1) === "/") {
             this.#extractor.write("//").copy(comment.value).write("\n");
+          } else if (this.#code.charAt(comment.start + 1) === "!") {
+            this.#extractor.write("/*");
+            let startIndex = comment.value.start;
+            for (const { index } of this.#read(comment.value).matchAll(
+              /\*\//g
+            )) {
+              this.#extractor.copy({
+                start: startIndex,
+                end: startIndex = comment.value.start + index + 1
+              }).write("\\");
+            }
+            this.#extractor.copy({ start: startIndex, end: comment.value.end });
+            this.#extractor.write("*/");
           } else {
             this.#extractor.write("/*").copy(comment.value).write("*/");
           }
@@ -3181,7 +3194,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
         this.#writeAttrTagTree(nested2, `input["@${name}"]`, true);
       }
     }
-    this.#extractor.write(`})`);
+    this.#extractor.write(`});`);
   }
   #getAttrTagTree(tag, attrTags) {
     if (!tag.hasAttrTags || !tag.body) return attrTags;

package/marko.internal.d.ts

@@ -158,11 +158,11 @@ declare global {
 
       export function forOfTag<
         Value extends Iterable,
-        Item extends Value extends
-          | readonly (infer Item)[]
-          | Iterable<infer Item>
-          ? Item
-          : unknown,
+        Item extends [0] extends [1 & Value]
+          ? any
+          : Value extends readonly (infer Item)[] | Iterable<infer Item>
+            ? Item
+            : never,
         BodyContent extends Marko.Body<
           [item: Item, index: number, all: Value],
           void
@@ -222,19 +222,18 @@ declare global {
       ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
       export function forOfAttrTag<
-        Value extends Iterable<any> | readonly any[],
+        Value extends Iterable,
+        Item extends [0] extends [1 & Value]
+          ? any
+          : Value extends readonly (infer Item)[] | Iterable<infer Item>
+            ? Item
+            : never,
         const Return,
       >(
         input: {
           of: Value | false | void | null;
         },
-        content: (
-          value: Value extends readonly (infer Item)[] | Iterable<infer Item>
-            ? Item
-            : unknown,
-          index: number,
-          all: Value,
-        ) => Return,
+        content: (value: Item, index: number, all: Value) => Return,
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.18",
+  "version": "2.5.20",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"