@marko/language-tools 2.5.19 → 2.5.21

package/dist/index.js

@@ -295,7 +295,7 @@ var Builder = class {
       this.#openTagStart = void 0;
     }
     if (!range.expressions.length) {
-      switch (nameText = this.#code.slice(range.start, range.end)) {
+      switch (nameText = this.#code.slice(range.start, range.end) || "div") {
         // All statement types will early return.
         case "style": {
           styleBlockReg.lastIndex = range.end;
@@ -930,6 +930,9 @@ var HTMLExtractor = class {
         });
         break;
       case 1 /* Tag */: {
+        if (node.nameText === "script" || node.nameText === "style") {
+          break;
+        }
         const nodeId = `${this.#nodeIdCounter++}`;
         ({ isDynamic, hasDynamicAttrs, hasDynamicBody } = this.#writeTag(
           node,
@@ -954,10 +957,10 @@ var HTMLExtractor = class {
   #writeTag(node, id) {
     const isDynamic = !node.nameText || !isHTMLTag(node.nameText);
     let hasDynamicAttrs = false, hasDynamicBody = false;
-    if (!isDynamic) {
-      ({ hasDynamicAttrs, hasDynamicBody } = this.#writeHTMLTag(node, id));
-    } else {
+    if (isDynamic) {
       this.#writeCustomTag(node);
+    } else {
+      ({ hasDynamicAttrs, hasDynamicBody } = this.#writeHTMLTag(node, id));
     }
     return { isDynamic, hasDynamicAttrs, hasDynamicBody };
   }
@@ -965,7 +968,7 @@ var HTMLExtractor = class {
     var _a, _b;
     let hasDynamicAttrs = false, hasDynamicBody = false;
     this.#extractor.write("<");
-    this.#extractor.copy(node.name);
+    this.#extractor.copy(isEmptyRange(node.name) ? node.nameText : node.name);
     this.#extractor.write(` data-marko-node-id="${id}"`);
     (_a = node.attrs) == null ? void 0 : _a.forEach((attr) => {
       if (attr.type === 10 /* AttrNamed */) this.#writeAttrNamed(attr);
@@ -1050,6 +1053,9 @@ function isVoidTag(tagName) {
       return false;
   }
 }
+function isEmptyRange(range) {
+  return range.start === range.end;
+}
 
 // src/extractors/script/index.ts
 var import_relative_import_path = require("relative-import-path");
@@ -2484,7 +2490,7 @@ constructor(_?: Return) {}
       this.#extractor.write(`const ${varLocal("rendered_" + renderId)} = `);
     }
     if (isHTML) {
-      this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(tag.name).write('")');
+      this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(isEmptyRange2(tag.name) ? tagName : tag.name).write('")');
     } else if (tagIdentifier) {
       this.#extractor.write(
         `${varShared(isTemplate ? "renderTemplate" : "renderDynamicTag")}(${tagIdentifier})`
@@ -2572,7 +2578,7 @@ constructor(_?: Return) {}
 )`);
             break;
           case 10 /* AttrNamed */: {
-            const isDefault = isEmptyRange(attr.name);
+            const isDefault = isEmptyRange2(attr.name);
             const value = attr.value;
             const modifierIndex = !isDefault && (!value || value.type === 13 /* AttrValue */) && this.#getNamedAttrModifierIndex(attr);
             const defaultMapPosition = isDefault ? attr.name : void 0;
@@ -3184,7 +3190,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     }
   }
   #getDynamicTagExpression(tag) {
-    if (tag.name.expressions.length === 1 && isEmptyRange(tag.name.quasis[0]) && isEmptyRange(tag.name.quasis[1])) {
+    if (tag.name.expressions.length === 1 && isEmptyRange2(tag.name.quasis[0]) && isEmptyRange2(tag.name.quasis[1])) {
       return tag.name.expressions[0].value;
     }
   }
@@ -3351,7 +3357,7 @@ function stripExt(filename) {
 function removeNewLines(str) {
   return str.replace(REG_NEW_LINE, " ");
 }
-function isEmptyRange(range) {
+function isEmptyRange2(range) {
   return range.start === range.end;
 }
 

package/dist/index.mjs

@@ -255,7 +255,7 @@ var Builder = class {
       this.#openTagStart = void 0;
     }
     if (!range.expressions.length) {
-      switch (nameText = this.#code.slice(range.start, range.end)) {
+      switch (nameText = this.#code.slice(range.start, range.end) || "div") {
         // All statement types will early return.
         case "style": {
           styleBlockReg.lastIndex = range.end;
@@ -890,6 +890,9 @@ var HTMLExtractor = class {
         });
         break;
       case 1 /* Tag */: {
+        if (node.nameText === "script" || node.nameText === "style") {
+          break;
+        }
         const nodeId = `${this.#nodeIdCounter++}`;
         ({ isDynamic, hasDynamicAttrs, hasDynamicBody } = this.#writeTag(
           node,
@@ -914,10 +917,10 @@ var HTMLExtractor = class {
   #writeTag(node, id) {
     const isDynamic = !node.nameText || !isHTMLTag(node.nameText);
     let hasDynamicAttrs = false, hasDynamicBody = false;
-    if (!isDynamic) {
-      ({ hasDynamicAttrs, hasDynamicBody } = this.#writeHTMLTag(node, id));
-    } else {
+    if (isDynamic) {
       this.#writeCustomTag(node);
+    } else {
+      ({ hasDynamicAttrs, hasDynamicBody } = this.#writeHTMLTag(node, id));
     }
     return { isDynamic, hasDynamicAttrs, hasDynamicBody };
   }
@@ -925,7 +928,7 @@ var HTMLExtractor = class {
     var _a, _b;
     let hasDynamicAttrs = false, hasDynamicBody = false;
     this.#extractor.write("<");
-    this.#extractor.copy(node.name);
+    this.#extractor.copy(isEmptyRange(node.name) ? node.nameText : node.name);
     this.#extractor.write(` data-marko-node-id="${id}"`);
     (_a = node.attrs) == null ? void 0 : _a.forEach((attr) => {
       if (attr.type === 10 /* AttrNamed */) this.#writeAttrNamed(attr);
@@ -1010,6 +1013,9 @@ function isVoidTag(tagName) {
       return false;
   }
 }
+function isEmptyRange(range) {
+  return range.start === range.end;
+}
 
 // src/extractors/script/index.ts
 import { relativeImportPath } from "relative-import-path";
@@ -2447,7 +2453,7 @@ constructor(_?: Return) {}
       this.#extractor.write(`const ${varLocal("rendered_" + renderId)} = `);
     }
     if (isHTML) {
-      this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(tag.name).write('")');
+      this.#extractor.write(`${varShared("renderNativeTag")}("`).copy(isEmptyRange2(tag.name) ? tagName : tag.name).write('")');
     } else if (tagIdentifier) {
       this.#extractor.write(
         `${varShared(isTemplate ? "renderTemplate" : "renderDynamicTag")}(${tagIdentifier})`
@@ -2535,7 +2541,7 @@ constructor(_?: Return) {}
 )`);
             break;
           case 10 /* AttrNamed */: {
-            const isDefault = isEmptyRange(attr.name);
+            const isDefault = isEmptyRange2(attr.name);
             const value = attr.value;
             const modifierIndex = !isDefault && (!value || value.type === 13 /* AttrValue */) && this.#getNamedAttrModifierIndex(attr);
             const defaultMapPosition = isDefault ? attr.name : void 0;
@@ -3147,7 +3153,7 @@ ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}
     }
   }
   #getDynamicTagExpression(tag) {
-    if (tag.name.expressions.length === 1 && isEmptyRange(tag.name.quasis[0]) && isEmptyRange(tag.name.quasis[1])) {
+    if (tag.name.expressions.length === 1 && isEmptyRange2(tag.name.quasis[0]) && isEmptyRange2(tag.name.quasis[1])) {
       return tag.name.expressions[0].value;
     }
   }
@@ -3314,7 +3320,7 @@ function stripExt(filename) {
 function removeNewLines(str) {
   return str.replace(REG_NEW_LINE, " ");
 }
-function isEmptyRange(range) {
+function isEmptyRange2(range) {
   return range.start === range.end;
 }
 

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.19",
+  "version": "2.5.21",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"