@marko/language-tools 2.5.17 → 2.5.19

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

@@ -86,14 +86,19 @@ declare global {
           [K in keyof Rendered]: Rendered[K] extends infer Value
             ? undefined extends Value
               ? Value extends { scope: infer Scope }
-                ? Partial<Scope>
+                ? [0] extends [1 & Scope]
+                  ? never
+                  : Partial<Scope>
                 : never
               : Value extends { scope: infer Scope }
-                ? Scope
+                ? [0] extends [1 & Scope]
+                  ? never
+                  : Scope
                 : never
             : never;
         }[keyof Rendered]
-      >;
+      > &
+        Record<any, never>;
 
       export function mutable<Lookup>(lookup: Lookup): UnionToIntersection<
         Lookup extends readonly (infer Item)[]
@@ -152,7 +157,7 @@ declare global {
       >(input: Input): Input;
 
       export function forOfTag<
-        Value,
+        Value extends Iterable,
         Item extends Value extends
           | readonly (infer Item)[]
           | Iterable<infer Item>

package/package.json

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