@marko/runtime-tags 0.3.42 → 0.3.44

package/dist/debug/dom.js

@@ -47,7 +47,6 @@ __export(dom_exports, {
   data: () => data,
   dynamicClosure: () => dynamicClosure,
   dynamicTag: () => dynamicTag,
-  dynamicTagAttrs: () => dynamicTagAttrs,
   effect: () => effect,
   forIn: () => forIn,
   forOf: () => forOf,
@@ -1693,45 +1692,6 @@ function initBranch(renderer, branch, parentNode) {
     queueRender(branch, renderer.___setup);
   }
 }
-function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
-  return (scope, attrsOrOp) => {
-    const renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
-    if (!renderer || attrsOrOp === DIRTY) {
-      return;
-    }
-    const childScope = scope[nodeAccessor + "!" /* ConditionalScope */];
-    if (attrsOrOp === MARK || attrsOrOp === CLEAN) {
-      return renderer.___args?.(childScope, attrsOrOp);
-    }
-    const content = getContent?.(scope);
-    if (typeof renderer === "string") {
-      const nodeAccessor2 = true ? `#${renderer}/0` : 0;
-      if (renderer === "textarea" && content) {
-        throw new Error(
-          "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
-        );
-      }
-      setConditionalRenderer(
-        childScope,
-        nodeAccessor2,
-        content,
-        createBranchScopeWithTagNameOrRenderer
-      );
-      attrs(childScope, nodeAccessor2, attrsOrOp());
-    } else if (renderer.___args) {
-      const attributes = attrsOrOp();
-      renderer.___args(
-        childScope,
-        inputIsArgs ? attributes : [
-          content ? {
-            ...attributes,
-            content
-          } : attributes
-        ]
-      );
-    }
-  };
-}
 function createRendererWithOwner(template, rawWalks, setup, getArgs) {
   let args;
   const id = true ? Symbol("Marko Renderer") : {};
@@ -1784,31 +1744,59 @@ function conditional(nodeAccessor, ...branches) {
 function patchDynamicTag(fn) {
   dynamicTag = fn(dynamicTag);
 }
-var dynamicTag = function dynamicTag2(nodeAccessor, fn, getIntersection) {
+var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, inputIsArgs) {
+  const childScopeAccessor = nodeAccessor + "!" /* ConditionalScope */;
   const rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
-  let intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
-  return (scope, newRendererOrOp) => {
+  return (scope, newRendererOrOp, getInput) => {
     if (newRendererOrOp === DIRTY) return;
-    const currentRenderer = scope[rendererAccessor];
-    let op = newRendererOrOp;
-    if (newRendererOrOp !== MARK && newRendererOrOp !== CLEAN) {
-      if (isDifferentRenderer(
-        currentRenderer,
-        scope[rendererAccessor] = normalizeDynamicRenderer(newRendererOrOp)
-      )) {
+    if (newRendererOrOp === MARK || newRendererOrOp === CLEAN) {
+      scope[rendererAccessor]?.___args?.(
+        scope[childScopeAccessor],
+        newRendererOrOp
+      );
+    } else {
+      const newRenderer = normalizeDynamicRenderer(newRendererOrOp);
+      if (!(rendererAccessor in scope) || isDifferentRenderer(scope[rendererAccessor], newRenderer)) {
+        scope[rendererAccessor] = newRenderer;
         setConditionalRenderer(
           scope,
           nodeAccessor,
-          scope[rendererAccessor],
+          newRenderer || (getContent ? getContent(scope) : void 0),
           createBranchScopeWithTagNameOrRenderer
         );
-        fn && fn(scope);
-        op = DIRTY;
-      } else {
-        op = CLEAN;
+        if (getTagVar) {
+          setTagVar(scope, childScopeAccessor, getTagVar());
+        }
+        if (getContent && typeof newRenderer === "string") {
+          setConditionalRenderer(
+            scope[childScopeAccessor],
+            true ? `#${newRenderer}/0` : 0,
+            getContent(scope),
+            createBranchScopeWithRenderer
+          );
+        }
+      }
+      if (newRenderer) {
+        const input = getInput?.();
+        if (typeof newRenderer === "string") {
+          attrs(
+            scope[childScopeAccessor],
+            true ? `#${newRenderer}/0` : 0,
+            (inputIsArgs ? input[0] : input) || {}
+          );
+        } else {
+          newRenderer.___args?.(
+            scope[childScopeAccessor],
+            inputIsArgs ? input : [
+              getContent ? {
+                ...input,
+                content: getContent(scope)
+              } : input || {}
+            ]
+          );
+        }
       }
     }
-    intersection2?.(scope, op);
   };
 };
 function setConditionalRenderer(scope, nodeAccessor, newRenderer, createBranch2) {
@@ -1926,7 +1914,7 @@ function isDifferentRenderer(a, b) {
 // src/dom/compat.ts
 var classIdToBranch = /* @__PURE__ */ new Map();
 var compat = {
-  patchConditionals: patchDynamicTag,
+  patchDynamicTag,
   queueEffect,
   init(warp10Noop) {
     register(SET_SCOPE_REGISTER_ID, (branch) => {
@@ -1970,8 +1958,8 @@ var compat = {
     }
     return value2;
   },
-  createRenderer(setup, clone, args) {
-    const renderer = createRenderer("", 0, setup, args && (() => args));
+  createRenderer(args, clone) {
+    const renderer = createRenderer("", 0, 0, () => args);
     renderer.___clone = clone;
     return renderer;
   },

package/dist/debug/dom.mjs

@@ -1607,45 +1607,6 @@ function initBranch(renderer, branch, parentNode) {
     queueRender(branch, renderer.___setup);
   }
 }
-function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
-  return (scope, attrsOrOp) => {
-    const renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
-    if (!renderer || attrsOrOp === DIRTY) {
-      return;
-    }
-    const childScope = scope[nodeAccessor + "!" /* ConditionalScope */];
-    if (attrsOrOp === MARK || attrsOrOp === CLEAN) {
-      return renderer.___args?.(childScope, attrsOrOp);
-    }
-    const content = getContent?.(scope);
-    if (typeof renderer === "string") {
-      const nodeAccessor2 = true ? `#${renderer}/0` : 0;
-      if (renderer === "textarea" && content) {
-        throw new Error(
-          "A dynamic tag rendering a `<textarea>` cannot have `content` and must use the `value` attribute instead."
-        );
-      }
-      setConditionalRenderer(
-        childScope,
-        nodeAccessor2,
-        content,
-        createBranchScopeWithTagNameOrRenderer
-      );
-      attrs(childScope, nodeAccessor2, attrsOrOp());
-    } else if (renderer.___args) {
-      const attributes = attrsOrOp();
-      renderer.___args(
-        childScope,
-        inputIsArgs ? attributes : [
-          content ? {
-            ...attributes,
-            content
-          } : attributes
-        ]
-      );
-    }
-  };
-}
 function createRendererWithOwner(template, rawWalks, setup, getArgs) {
   let args;
   const id = true ? Symbol("Marko Renderer") : {};
@@ -1698,31 +1659,59 @@ function conditional(nodeAccessor, ...branches) {
 function patchDynamicTag(fn) {
   dynamicTag = fn(dynamicTag);
 }
-var dynamicTag = function dynamicTag2(nodeAccessor, fn, getIntersection) {
+var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, inputIsArgs) {
+  const childScopeAccessor = nodeAccessor + "!" /* ConditionalScope */;
   const rendererAccessor = nodeAccessor + "(" /* ConditionalRenderer */;
-  let intersection2 = getIntersection && ((scope, op) => (intersection2 = getIntersection())(scope, op));
-  return (scope, newRendererOrOp) => {
+  return (scope, newRendererOrOp, getInput) => {
     if (newRendererOrOp === DIRTY) return;
-    const currentRenderer = scope[rendererAccessor];
-    let op = newRendererOrOp;
-    if (newRendererOrOp !== MARK && newRendererOrOp !== CLEAN) {
-      if (isDifferentRenderer(
-        currentRenderer,
-        scope[rendererAccessor] = normalizeDynamicRenderer(newRendererOrOp)
-      )) {
+    if (newRendererOrOp === MARK || newRendererOrOp === CLEAN) {
+      scope[rendererAccessor]?.___args?.(
+        scope[childScopeAccessor],
+        newRendererOrOp
+      );
+    } else {
+      const newRenderer = normalizeDynamicRenderer(newRendererOrOp);
+      if (!(rendererAccessor in scope) || isDifferentRenderer(scope[rendererAccessor], newRenderer)) {
+        scope[rendererAccessor] = newRenderer;
         setConditionalRenderer(
           scope,
           nodeAccessor,
-          scope[rendererAccessor],
+          newRenderer || (getContent ? getContent(scope) : void 0),
           createBranchScopeWithTagNameOrRenderer
         );
-        fn && fn(scope);
-        op = DIRTY;
-      } else {
-        op = CLEAN;
+        if (getTagVar) {
+          setTagVar(scope, childScopeAccessor, getTagVar());
+        }
+        if (getContent && typeof newRenderer === "string") {
+          setConditionalRenderer(
+            scope[childScopeAccessor],
+            true ? `#${newRenderer}/0` : 0,
+            getContent(scope),
+            createBranchScopeWithRenderer
+          );
+        }
+      }
+      if (newRenderer) {
+        const input = getInput?.();
+        if (typeof newRenderer === "string") {
+          attrs(
+            scope[childScopeAccessor],
+            true ? `#${newRenderer}/0` : 0,
+            (inputIsArgs ? input[0] : input) || {}
+          );
+        } else {
+          newRenderer.___args?.(
+            scope[childScopeAccessor],
+            inputIsArgs ? input : [
+              getContent ? {
+                ...input,
+                content: getContent(scope)
+              } : input || {}
+            ]
+          );
+        }
       }
     }
-    intersection2?.(scope, op);
   };
 };
 function setConditionalRenderer(scope, nodeAccessor, newRenderer, createBranch2) {
@@ -1840,7 +1829,7 @@ function isDifferentRenderer(a, b) {
 // src/dom/compat.ts
 var classIdToBranch = /* @__PURE__ */ new Map();
 var compat = {
-  patchConditionals: patchDynamicTag,
+  patchDynamicTag,
   queueEffect,
   init(warp10Noop) {
     register(SET_SCOPE_REGISTER_ID, (branch) => {
@@ -1884,8 +1873,8 @@ var compat = {
     }
     return value2;
   },
-  createRenderer(setup, clone, args) {
-    const renderer = createRenderer("", 0, setup, args && (() => args));
+  createRenderer(args, clone) {
+    const renderer = createRenderer("", 0, 0, () => args);
     renderer.___clone = clone;
     return renderer;
   },
@@ -2028,7 +2017,6 @@ export {
   data,
   dynamicClosure,
   dynamicTag,
-  dynamicTagAttrs,
   effect,
   forIn,
   forOf,

package/dist/debug/html.js

@@ -35,7 +35,6 @@ __export(html_exports, {
   controllable_textarea_value: () => controllable_textarea_value,
   createRenderer: () => createRenderer,
   createTemplate: () => createTemplate,
-  debug: () => debug,
   dynamicTagArgs: () => dynamicTagArgs,
   dynamicTagInput: () => dynamicTagInput,
   ensureScopeWithId: () => ensureScopeWithId,
@@ -584,15 +583,12 @@ var Reference = class {
   assigns = "";
 };
 var DEBUG = /* @__PURE__ */ new WeakMap();
-function debug(obj, file, loc, vars) {
-  if (true) {
-    DEBUG.set(obj, {
-      file,
-      loc,
-      vars
-    });
-  }
-  return obj;
+function setDebugInfo(obj, file, loc, vars) {
+  DEBUG.set(obj, {
+    file,
+    loc,
+    vars
+  });
 }
 var Serializer = class {
   #state = new State();
@@ -748,7 +744,7 @@ function writeRegistered(state, val, parent, accessor, { access, scope }) {
       }
       state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
     } else {
-      const pos = state.buf.push("");
+      const pos = state.buf.push("") - 1;
       const assigns = state.assigned.size;
       writeProp(state, scope, parent, "");
       const scopeRef2 = parent && state.refs.get(scope);
@@ -759,7 +755,7 @@ function writeRegistered(state, val, parent, accessor, { access, scope }) {
         fnRef.init = access + "(" + scopeId + ")";
         fnRef.assigns += ensureId(state, parent) + toAccess(accessor) + "=";
       } else {
-        state.buf[pos - 2] += access + "(";
+        state.buf[pos] = access + "(" + state.buf[pos];
         state.buf.push(")");
       }
     }
@@ -1319,21 +1315,21 @@ function throwUnserializable(state, cause, ref = null, accessor = "") {
     let message = "Unable to serialize";
     let access = "";
     while (ref?.accessor) {
-      const debug2 = ref.parent?.debug;
-      if (debug2) {
-        const varLoc = debug2.vars?.[ref.accessor];
+      const debug = ref.parent?.debug;
+      if (debug) {
+        const varLoc = debug.vars?.[ref.accessor];
+        let debugAccess = ref.accessor;
+        let debugLoc = debug.loc;
         if (varLoc) {
           if (Array.isArray(varLoc)) {
-            message += ` "${varLoc[0]}" in ${debug2.file}:${varLoc[1]}`;
+            debugAccess = varLoc[0];
+            if (varLoc[1]) debugLoc = varLoc[1];
           } else {
-            message += ` "${ref.accessor}" in ${debug2.file}:${varLoc}`;
-          }
-        } else {
-          message += ` ${JSON.stringify(ref.accessor)} in ${debug2.file}`;
-          if (debug2.loc) {
-            message += `:${debug2.loc}`;
+            debugLoc = varLoc;
           }
         }
+        message += ` ${JSON.stringify(debugAccess)} in ${debug.file}`;
+        if (debugLoc) message += `:${debugLoc}`;
         break;
       }
       access = toAccess(ref.accessor) + access;
@@ -1729,7 +1725,7 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
     )
   );
 }
-function writeScope(scopeId, partialScope) {
+var writeScope = (scopeId, partialScope) => {
   const { state } = $chunk.boundary;
   const { scopes } = state;
   let scope = scopes.get(scopeId);
@@ -1753,6 +1749,15 @@ function writeScope(scopeId, partialScope) {
     };
   }
   return scope;
+};
+if (true) {
+  writeScope = /* @__PURE__ */ ((writeScope2) => (scopeId, partialScope, file, loc, vars) => {
+    const scope = writeScope2(scopeId, partialScope);
+    if (file && loc !== void 0) {
+      setDebugInfo(scope, file, loc, vars);
+    }
+    return scope;
+  })(writeScope);
 }
 function writeExistingScope(scope) {
   return writeScope(scope[K_SCOPE_ID], scope);
@@ -1888,7 +1893,7 @@ var State2 = class {
     this.$global = $global2;
     this.$global = $global2;
     if ($global2.cspNonce) {
-      this.nonceAttr = " " + escapeAttrValue($global2.cspNonce + "");
+      this.nonceAttr = " nonce" + attrAssignment($global2.cspNonce);
     }
   }
   tagId = 1;
@@ -2263,15 +2268,15 @@ function getFilteredGlobals($global2) {
 }
 
 // src/html/attrs.ts
-function classAttr(val) {
-  return stringAttr("class", classValue(val));
+function classAttr(value) {
+  return stringAttr("class", classValue(value));
 }
-function styleAttr(val) {
-  return stringAttr("style", styleValue(val));
+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` : "");
+  return attr("value", value) + (!isVoid(value) && (Array.isArray(value) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
 }
 var kSelectedValue = Symbol("selectedValue");
 function controllable_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -2350,8 +2355,8 @@ function controllable_detailsOrDialog_open(scopeId, nodeAccessor, open, openChan
   }
   return attr("open", open);
 }
-function attr(name, val) {
-  return isVoid(val) ? "" : nonVoidAttr(name, val);
+function attr(name, value) {
+  return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
 function attrs(data, nodeAccessor, scopeId, tagName) {
   let result = "";
@@ -2412,19 +2417,19 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
       break;
   }
   for (const name in data) {
-    const val = data[name];
+    const value = data[name];
     switch (name) {
       case "class":
-        result += classAttr(val);
+        result += classAttr(value);
         break;
       case "style":
-        result += styleAttr(val);
+        result += styleAttr(value);
         break;
       case "":
       case "content":
         break;
       default:
-        if (!isVoid(val)) {
+        if (!isVoid(value)) {
           if (isEventHandler(name)) {
             if (!events) {
               events = {};
@@ -2432,9 +2437,9 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
                 [nodeAccessor + "~" /* EventAttributes */]: events
               });
             }
-            events[getEventHandlerName(name)] = val;
+            events[getEventHandlerName(name)] = value;
           } else if (!skip.test(name)) {
-            result += nonVoidAttr(name, val);
+            result += nonVoidAttr(name, value);
           }
         }
         break;
@@ -2456,36 +2461,48 @@ function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
     [nodeAccessor + ";" /* ControlledHandler */]: valueChange
   });
 }
-function stringAttr(name, val) {
-  return val && ` ${name}=${escapeAttrValue(val)}`;
+function stringAttr(name, value) {
+  return value && " " + name + attrAssignment(value);
 }
-function nonVoidAttr(name, val) {
-  switch (typeof val) {
+function nonVoidAttr(name, value) {
+  switch (typeof value) {
     case "string":
-      return ` ${name + attrAssignment(val)}`;
+      return " " + name + attrAssignment(value);
     case "boolean":
-      return ` ${name}`;
+      return " " + name;
     case "number":
-      return ` ${name}=${val}`;
+      return " " + name + "=" + value;
     case "object":
-      if (val instanceof RegExp) {
-        return ` ${name + attrAssignment(val.source)}`;
+      if (value instanceof RegExp) {
+        return " " + name + attrAssignment(value.source);
       }
       break;
   }
-  return ` ${name + attrAssignment(val + "")}`;
+  return " " + name + attrAssignment(value + "");
 }
-function attrAssignment(val) {
-  return val ? `=${escapeAttrValue(val)}` : "";
+var singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g;
+var doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g;
+var needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/g;
+function attrAssignment(value) {
+  return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, '"') ? "='" + escapeSingleQuotedAttrValue(value) + "'" : '="' + escapeDoubleQuotedAttrValue(value) + '"' : "=" + value : "";
 }
-var unsafeAttrChars = /["'>\s]/g;
-function escapeAttrValue(str) {
-  if (unsafeAttrChars.test(str)) {
-    const c = str[unsafeAttrChars.lastIndex - 1];
-    unsafeAttrChars.lastIndex = 0;
-    return c === '"' ? `'${str.replace(/'/g, "'")}'` : `"${str.replace(/"/g, """)}"`;
-  }
-  return str;
+function escapeSingleQuotedAttrValue(value) {
+  return singleQuoteAttrReplacements.test(value) ? value.replace(
+    singleQuoteAttrReplacements,
+    replaceUnsafeSingleQuoteAttrChar
+  ) : value;
+}
+function replaceUnsafeSingleQuoteAttrChar(match) {
+  return match === "'" ? "'" : "&";
+}
+function escapeDoubleQuotedAttrValue(value) {
+  return doubleQuoteAttrReplacements.test(value) ? value.replace(
+    doubleQuoteAttrReplacements,
+    replaceUnsafeDoubleQuoteAttrChar
+  ) : value;
+}
+function replaceUnsafeDoubleQuoteAttrChar(match) {
+  return match === '"' ? """ : "&";
 }
 
 // src/common/compat-meta.ts
@@ -2967,7 +2984,6 @@ function NOOP2() {
   controllable_textarea_value,
   createRenderer,
   createTemplate,
-  debug,
   dynamicTagArgs,
   dynamicTagInput,
   ensureScopeWithId,