marko 6.0.0-next.3.81 → 6.0.0-next.3.83

package/dist/debug/html.js

@@ -1666,6 +1666,12 @@ var K_SCOPE_ID = Symbol("Scope ID");
 function getChunk() {
   return $chunk;
 }
+function getContext(key) {
+  return $chunk.context?.[key];
+}
+function getState() {
+  return $chunk.boundary.state;
+}
 function getScopeId(scope) {
   return scope[K_SCOPE_ID];
 }
@@ -2592,8 +2598,8 @@ function styleAttr(value) {
   return stringAttr("style", styleValue(value));
 }
 function optionValueAttr(value) {
-  const { [kSelectedValue]: selectedValue } = getChunk()?.context || {};
-  return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  const selectedValue = getContext(kSelectedValue);
+  return attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
 function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -2841,7 +2847,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       throw new Error(`Invalid renderer passed for dynamic tag: ${renderer}`);
     }
   }
-  const chunk = getChunk();
+  const state = getState();
   const branchId = peekNextScopeId();
   let result;
   if (typeof renderer === "string") {
@@ -2883,8 +2889,8 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       throw new Error(`Body content is not supported for a "${renderer}" tag.`);
     }
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark(
+      write(
+        state.mark(
           "|" /* BranchSingleNode */,
           scopeId + " " + accessor + " " + branchId
         )
@@ -2892,9 +2898,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
     }
   } else {
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-      );
+      write(state.mark("[" /* BranchStart */, branchId + ""));
     }
     result = withBranchId(branchId, () => {
       if (renderer) {
@@ -2906,12 +2910,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       }
     });
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark(
-          "]" /* BranchEnd */,
-          scopeId + " " + accessor
-        )
-      );
+      write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
     }
   }
   const rendered = peekNextScopeId() !== branchId;

package/dist/debug/html.mjs

@@ -1584,6 +1584,12 @@ var K_SCOPE_ID = Symbol("Scope ID");
 function getChunk() {
   return $chunk;
 }
+function getContext(key) {
+  return $chunk.context?.[key];
+}
+function getState() {
+  return $chunk.boundary.state;
+}
 function getScopeId(scope) {
   return scope[K_SCOPE_ID];
 }
@@ -2510,8 +2516,8 @@ function styleAttr(value) {
   return stringAttr("style", styleValue(value));
 }
 function optionValueAttr(value) {
-  const { [kSelectedValue]: selectedValue } = getChunk()?.context || {};
-  return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  const selectedValue = getContext(kSelectedValue);
+  return attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
 function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -2759,7 +2765,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       throw new Error(`Invalid renderer passed for dynamic tag: ${renderer}`);
     }
   }
-  const chunk = getChunk();
+  const state = getState();
   const branchId = peekNextScopeId();
   let result;
   if (typeof renderer === "string") {
@@ -2801,8 +2807,8 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       throw new Error(`Body content is not supported for a "${renderer}" tag.`);
     }
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark(
+      write(
+        state.mark(
           "|" /* BranchSingleNode */,
           scopeId + " " + accessor + " " + branchId
         )
@@ -2810,9 +2816,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
     }
   } else {
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-      );
+      write(state.mark("[" /* BranchStart */, branchId + ""));
     }
     result = withBranchId(branchId, () => {
       if (renderer) {
@@ -2824,12 +2828,7 @@ var dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, res
       }
     });
     if (resume) {
-      chunk.writeHTML(
-        chunk.boundary.state.mark(
-          "]" /* BranchEnd */,
-          scopeId + " " + accessor
-        )
-      );
+      write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
     }
   }
   const rendered = peekNextScopeId() !== branchId;

package/dist/html/writer.d.ts

@@ -11,6 +11,8 @@ declare enum Mark {
     ReorderMarker = "#"
 }
 export declare function getChunk(): Chunk | undefined;
+export declare function getContext(key: keyof NonNullable<Chunk["context"]>): unknown;
+export declare function getState(): State;
 export declare function getScopeId(scope: unknown): number | undefined;
 export declare function write(html: string): void;
 export declare function writeScript(script: string): void;

package/dist/html.js

@@ -1083,6 +1083,12 @@ var $chunk, NOOP = () => {
 function getChunk() {
   return $chunk;
 }
+function getContext(key) {
+  return $chunk.context?.[key];
+}
+function getState() {
+  return $chunk.boundary.state;
+}
 function getScopeId(scope) {
   return scope[K_SCOPE_ID];
 }
@@ -1659,8 +1665,8 @@ function styleAttr(value) {
   return stringAttr("style", styleValue(value));
 }
 function optionValueAttr(value) {
-  let { [kSelectedValue]: selectedValue } = getChunk()?.context || {};
-  return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  let selectedValue = getContext(kSelectedValue);
+  return attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
 function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -1851,7 +1857,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, resume) => {
-  let renderer = normalizeDynamicRenderer(tag), chunk = getChunk(), branchId = peekNextScopeId(), result;
+  let renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), voidElementsReg.test(renderer) || (withBranchId(branchId, () => {
@@ -1869,28 +1875,21 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
         input.valueChange,
         content
       ) : content());
-    }), write(`</${renderer}>`)), resume && chunk.writeHTML(
-      chunk.boundary.state.mark(
+    }), write(`</${renderer}>`)), resume && write(
+      state.mark(
         "|" /* BranchSingleNode */,
         scopeId + " " + accessor + " " + branchId
       )
     );
   } else
-    resume && chunk.writeHTML(
-      chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-    ), result = withBranchId(branchId, () => {
+    resume && write(state.mark("[" /* BranchStart */, branchId + "")), result = withBranchId(branchId, () => {
       if (renderer)
         return inputIsArgs ? renderer(...inputOrArgs) : renderer(
           content ? { ...inputOrArgs, content } : inputOrArgs
         );
       if (content)
         return content();
-    }), resume && chunk.writeHTML(
-      chunk.boundary.state.mark(
-        "]" /* BranchEnd */,
-        scopeId + " " + accessor
-      )
-    );
+    }), resume && write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
   return peekNextScopeId() !== branchId ? resume && writeScope(scopeId, {
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
     ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer

package/dist/html.mjs

@@ -1004,6 +1004,12 @@ var $chunk, NOOP = () => {
 function getChunk() {
   return $chunk;
 }
+function getContext(key) {
+  return $chunk.context?.[key];
+}
+function getState() {
+  return $chunk.boundary.state;
+}
 function getScopeId(scope) {
   return scope[K_SCOPE_ID];
 }
@@ -1580,8 +1586,8 @@ function styleAttr(value) {
   return stringAttr("style", styleValue(value));
 }
 function optionValueAttr(value) {
-  let { [kSelectedValue]: selectedValue } = getChunk()?.context || {};
-  return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  let selectedValue = getContext(kSelectedValue);
+  return attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
 function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -1772,7 +1778,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, dynamicTag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, resume) => {
-  let renderer = normalizeDynamicRenderer(tag), chunk = getChunk(), branchId = peekNextScopeId(), result;
+  let renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = peekNextScopeId(), result;
   if (typeof renderer == "string") {
     let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
     nextScopeId(), write(`<${renderer}${attrs(input, accessor, scopeId, renderer)}>`), voidElementsReg.test(renderer) || (withBranchId(branchId, () => {
@@ -1790,28 +1796,21 @@ var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|p
         input.valueChange,
         content
       ) : content());
-    }), write(`</${renderer}>`)), resume && chunk.writeHTML(
-      chunk.boundary.state.mark(
+    }), write(`</${renderer}>`)), resume && write(
+      state.mark(
         "|" /* BranchSingleNode */,
         scopeId + " " + accessor + " " + branchId
       )
     );
   } else
-    resume && chunk.writeHTML(
-      chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
-    ), result = withBranchId(branchId, () => {
+    resume && write(state.mark("[" /* BranchStart */, branchId + "")), result = withBranchId(branchId, () => {
       if (renderer)
         return inputIsArgs ? renderer(...inputOrArgs) : renderer(
           content ? { ...inputOrArgs, content } : inputOrArgs
         );
       if (content)
         return content();
-    }), resume && chunk.writeHTML(
-      chunk.boundary.state.mark(
-        "]" /* BranchEnd */,
-        scopeId + " " + accessor
-      )
-    );
+    }), resume && write(state.mark("]" /* BranchEnd */, scopeId + " " + accessor));
   return peekNextScopeId() !== branchId ? resume && writeScope(scopeId, {
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {}),
     ["c" /* ConditionalRenderer */ + accessor]: renderer?.h || renderer

package/dist/translator/index.js

@@ -257,9 +257,9 @@ function generateUid(name2 = "") {
     countsForFile.set(file, counts);
   }
   name2 = name2.replace(/^[^a-z$_]|[^a-z$_0-9]/gi, "") || "temp";
-  name2 = /^_?(.*?)\d*$/.exec(name2)?.[1] || name2;
+  name2 = /^\$?(.*?)\d*$/.exec(name2)?.[1] || name2;
   const i = (counts.get(name2) || 0) + 1;
-  const uniqueName = `_${i > 1 ? name2 + i : name2}`;
+  const uniqueName = `$${i > 1 ? name2 + i : name2}`;
   counts.set(name2, i);
   return uniqueName;
 }
@@ -270,7 +270,7 @@ function getInitialCounts(file) {
   const counts = /* @__PURE__ */ new Map();
   const program = file.path;
   const countName = (name2) => {
-    const match = /^_(.*?)([1-9]\d*)?$/.exec(name2);
+    const match = /^$(.*?)([1-9]\d*)?$/.exec(name2);
     if (match) {
       const name3 = match[1];
       const count = match[2] ? +match[2] + 1 : 1;
@@ -829,6 +829,9 @@ function getContentInfo(path5) {
     const endType = getNodeContentType(body[endIndex], "endType", contentInfo);
     if (endType !== null) {
       contentInfo.endType = endType;
+      if (endType === 1 /* Dynamic */) {
+        contentInfo.singleChild = false;
+      }
       for (let startIndex = 0; startIndex < endIndex; startIndex++) {
         const startType = getNodeContentType(body[startIndex], "startType");
         if (startType !== null) {
@@ -3418,7 +3421,7 @@ function replaceRegisteredFunctionNode(node) {
 function getRegisteredFnExpression(node) {
   const { extra } = node;
   if (isRegisteredFnExtra(extra)) {
-    const id = generateUid(extra.name);
+    const id = extra.name;
     const referencesScope = extra.referencesScope;
     const referencedBindings = extra.referencedBindingsInFunction;
     let registedFns = registeredFnsForProgram.get((0, import_babel_utils12.getProgram)().node);
@@ -8659,7 +8662,6 @@ var document_type_default = {
 // src/translator/visitors/function.ts
 var import_compiler51 = require("@marko/compiler");
 var import_babel_utils42 = require("@marko/compiler/babel-utils");
-var functionIdsBySection = /* @__PURE__ */ new WeakMap();
 var function_default = {
   analyze(fn) {
     if (fn !== getFnRoot(fn)) {
@@ -8673,33 +8675,22 @@ var function_default = {
       return;
     }
     const { node } = fn;
+    const section = getSection(fn);
     const extra = node.extra ??= {};
-    const name2 = extra.name = fn.node.id?.name || (isMarkoAttribute(markoRoot) ? markoRoot.node.default ? import_compiler51.types.toIdentifier(
-      markoRoot.parentPath.has("var") ? markoRoot.parentPath.get("var") : markoRoot.parentPath.get("name")
-    ) : markoRoot.node.name : import_compiler51.types.isVariableDeclarator(fn.parent) && import_compiler51.types.isIdentifier(fn.parent.id) ? fn.parent.id.name : import_compiler51.types.isObjectMethod(node) && import_compiler51.types.isIdentifier(node.key) ? node.key.name : "anonymous");
     const {
       markoOpts,
       opts: { filename }
     } = (0, import_babel_utils42.getFile)();
-    const section = getSection(fn);
-    let functionNameCounts = functionIdsBySection.get(section);
-    if (!functionNameCounts) {
-      functionNameCounts = /* @__PURE__ */ new Map();
-      functionIdsBySection.set(section, functionNameCounts);
-    }
-    const index = functionNameCounts.get(name2);
-    let id = "";
-    if (index === void 0) {
-      functionNameCounts.set(name2, 0);
-    } else {
-      functionNameCounts.set(name2, index + 1);
-      id = `_${index}`;
-    }
+    const name2 = extra.name = generateUid(
+      fn.node.id?.name || (isMarkoAttribute(markoRoot) ? markoRoot.node.default ? import_compiler51.types.toIdentifier(
+        markoRoot.parentPath.has("var") ? markoRoot.parentPath.get("var") : markoRoot.parentPath.get("name")
+      ) : markoRoot.node.name : import_compiler51.types.isVariableDeclarator(fn.parent) && import_compiler51.types.isIdentifier(fn.parent.id) ? fn.parent.id.name : import_compiler51.types.isObjectMethod(node) && import_compiler51.types.isIdentifier(node.key) ? node.key.name : "anonymous")
+    );
     extra.section = section;
     extra.registerId = (0, import_babel_utils42.getTemplateId)(
       markoOpts,
       filename,
-      `${section.id}/${name2 + id}`
+      `${section.id}/${name2.slice(1)}`
     );
   }
 };
@@ -9796,14 +9787,12 @@ var dynamic_tag_default = {
         isClassAPI ? "renderBody" : "content"
       );
       const args = [];
-      let hasMultipleArgs = false;
-      if (node.arguments?.length) {
+      let hasTagArgs = false;
+      if (node.arguments) {
+        hasTagArgs = true;
         args.push(...node.arguments);
         if (properties.length) {
-          hasMultipleArgs = true;
           args.push(propsToExpression(properties));
-        } else {
-          hasMultipleArgs = node.arguments.length > 1 || import_compiler57.types.isSpreadElement(node.arguments[0]);
         }
       } else {
         const contentProp = getTranslatedBodyContentProperty(properties);
@@ -9818,7 +9807,7 @@ var dynamic_tag_default = {
         flushInto(tag);
         writeHTMLResumeStatements(tag.get("body"));
         const serializeReason = isClassAPI || !!node.var || getDynamicSourcesForExtra(tagExtra);
-        const dynamicTagExpr = hasMultipleArgs ? callRuntime(
+        const dynamicTagExpr = hasTagArgs ? callRuntime(
           "dynamicTag",
           getScopeIdIdentifier(section),
           getScopeAccessorLiteral(nodeRef2),
@@ -9906,11 +9895,11 @@ var dynamic_tag_default = {
             getScopeAccessorLiteral(nodeRef2),
             bodySection && import_compiler57.types.identifier(bodySection.name),
             tagVarSignal ? import_compiler57.types.arrowFunctionExpression([], tagVarSignal.identifier) : void 0,
-            hasMultipleArgs && import_compiler57.types.numericLiteral(1)
+            hasTagArgs && import_compiler57.types.numericLiteral(1)
           );
         };
         if (args.length) {
-          const argsOrInput = hasMultipleArgs ? import_compiler57.types.arrayExpression(args) : args[0];
+          const argsOrInput = hasTagArgs ? import_compiler57.types.arrayExpression(args) : args[0];
           if (!import_compiler57.types.isObjectExpression(argsOrInput) || argsOrInput.properties.length) {
             signal.extraArgs = [
               import_compiler57.types.arrowFunctionExpression(

package/dist/translator/util/references.d.ts

@@ -93,7 +93,7 @@ export interface AssignedBindingExtra extends ReferencedExtra {
 export declare function isAssignedBindingExtra(extra: t.NodeExtra | undefined): extra is AssignedBindingExtra;
 export interface RegisteredFnExtra extends ReferencedExtra {
     registerId: string;
-    name: string | undefined;
+    name: string;
     referencesScope?: boolean;
     referencedBindingsInFunction: ReferencedBindings;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.81",
+  "version": "6.0.0-next.3.83",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",