marko 6.0.73 → 6.0.76

package/dist/debug/dom.js

@@ -1004,7 +1004,7 @@ function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   const branchAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + ownerConditionalNodeAccessor;
   const ownerSignal = (scope) => {
     const ifScope = scope[scopeAccessor];
-    if (ifScope && !ifScope.___creating && (scope[branchAccessor] ?? branch) === branch) {
+    if (ifScope && !ifScope.___creating && (scope[branchAccessor] || 0) === branch) {
       queueRender(ifScope, childSignal, -1);
     }
   };

package/dist/debug/dom.mjs

@@ -905,7 +905,7 @@ function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   const branchAccessor = "ConditionalRenderer:" /* ConditionalRenderer */ + ownerConditionalNodeAccessor;
   const ownerSignal = (scope) => {
     const ifScope = scope[scopeAccessor];
-    if (ifScope && !ifScope.___creating && (scope[branchAccessor] ?? branch) === branch) {
+    if (ifScope && !ifScope.___creating && (scope[branchAccessor] || 0) === branch) {
       queueRender(ifScope, childSignal, -1);
     }
   };

package/dist/debug/html.js

@@ -46,6 +46,7 @@ __export(html_exports, {
   _escape: () => _escape,
   _escape_script: () => _escape_script,
   _escape_style: () => _escape_style,
+  _escape_textarea_value: () => _escape_textarea_value,
   _existing_scope: () => _existing_scope,
   _for_in: () => _for_in,
   _for_of: () => _for_of,
@@ -171,7 +172,7 @@ var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, r
 function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "‍";
 }
-function escapeTextAreaValue(val) {
+function _escape_textarea_value(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g;
@@ -823,7 +824,7 @@ function writeReferenceOr(state, write, val, parent, accessor) {
     ref.debug = DEBUG.get(val);
   }
   if (write(state, val, ref)) return true;
-  state.refs.delete(ref);
+  state.refs.delete(val);
   return false;
 }
 function writeRegistered(state, val, parent, accessor, { access, scope, getter }) {
@@ -2014,7 +2015,11 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
   const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   if (shouldWriteBranch) {
     writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
+      // TODO: technically conditional renderer should only be written when either the
+      // condition is stateful, or if there are direct closures.
+      // It may make sense to pass in another arg for this.
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
+      // we convert 0 to undefined since the runtime defaults branch to 0.
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
   }
@@ -2708,7 +2713,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
       valueChange
     );
   }
-  return escapeTextAreaValue(value);
+  return _escape_textarea_value(value);
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   if (valueChange) {
@@ -3457,6 +3462,7 @@ function NOOP3() {
   _escape,
   _escape_script,
   _escape_style,
+  _escape_textarea_value,
   _existing_scope,
   _for_in,
   _for_of,

package/dist/debug/html.mjs

@@ -85,7 +85,7 @@ var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, r
 function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "‍";
 }
-function escapeTextAreaValue(val) {
+function _escape_textarea_value(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g;
@@ -737,7 +737,7 @@ function writeReferenceOr(state, write, val, parent, accessor) {
     ref.debug = DEBUG.get(val);
   }
   if (write(state, val, ref)) return true;
-  state.refs.delete(ref);
+  state.refs.delete(val);
   return false;
 }
 function writeRegistered(state, val, parent, accessor, { access, scope, getter }) {
@@ -1928,7 +1928,11 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
   const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   if (shouldWriteBranch) {
     writeScope(scopeId, {
-      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
+      // TODO: technically conditional renderer should only be written when either the
+      // condition is stateful, or if there are direct closures.
+      // It may make sense to pass in another arg for this.
+      ["ConditionalRenderer:" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
+      // we convert 0 to undefined since the runtime defaults branch to 0.
       ["ConditionalScope:" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     });
   }
@@ -2622,7 +2626,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
       valueChange
     );
   }
-  return escapeTextAreaValue(value);
+  return _escape_textarea_value(value);
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   if (valueChange) {
@@ -3370,6 +3374,7 @@ export {
   _escape,
   _escape_script,
   _escape_style,
+  _escape_textarea_value,
   _existing_scope,
   _for_in,
   _for_of,

package/dist/dom.js

@@ -643,7 +643,7 @@ function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.q && (scope[branchAccessor] ?? branch) === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.q && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }

package/dist/dom.mjs

@@ -547,7 +547,7 @@ function _for_closure(valueAccessor, ownerLoopNodeAccessor, fn) {
 function _if_closure(valueAccessor, ownerConditionalNodeAccessor, branch, fn) {
   let childSignal = closure(valueAccessor, fn), scopeAccessor = "d" /* ConditionalScope */ + ownerConditionalNodeAccessor, branchAccessor = "c" /* ConditionalRenderer */ + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
     let ifScope = scope[scopeAccessor];
-    ifScope && !ifScope.q && (scope[branchAccessor] ?? branch) === branch && queueRender(ifScope, childSignal, -1);
+    ifScope && !ifScope.q && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, childSignal, -1);
   };
   return ownerSignal._ = childSignal, ownerSignal;
 }

package/dist/html/content.d.ts

@@ -1,5 +1,5 @@
 export declare function _unescaped(val: unknown): string;
 export declare function _escape(val: unknown): string;
-export declare function escapeTextAreaValue(val: unknown): string;
+export declare function _escape_textarea_value(val: unknown): string;
 export declare function _escape_script(val: unknown): string;
 export declare function _escape_style(val: unknown): string;

package/dist/html.d.ts

@@ -1,7 +1,7 @@
 export { attrTag, attrTags } from "./common/attr-tag";
 export { _attr, _attr_class, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_option_value, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, } from "./html/attrs";
 export { compat } from "./html/compat";
-export { _escape, _escape_script, _escape_style, _unescaped, } from "./html/content";
+export { _escape, _escape_script, _escape_style, _escape_textarea_value, _unescaped, } from "./html/content";
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, } from "./html/for";
 export { _template } from "./html/template";

package/dist/html.js

@@ -43,6 +43,7 @@ __export(html_exports, {
   _escape: () => _escape,
   _escape_script: () => _escape_script,
   _escape_style: () => _escape_style,
+  _escape_textarea_value: () => _escape_textarea_value,
   _existing_scope: () => _existing_scope,
   _for_in: () => _for_in,
   _for_of: () => _for_of,
@@ -140,7 +141,7 @@ var unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt
 function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
 }
-function escapeTextAreaValue(val) {
+function _escape_textarea_value(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
@@ -580,7 +581,7 @@ function writeReferenceOr(state, write, val, parent, accessor) {
   return registered ? writeRegistered(state, val, parent, accessor, registered) : (state.refs.set(
     val,
     ref = new Reference(parent, accessor, state.flush, state.buf.length)
-  ), write(state, val, ref) ? !0 : (state.refs.delete(ref), !1));
+  ), write(state, val, ref) ? !0 : (state.refs.delete(val), !1));
 }
 function writeRegistered(state, val, parent, accessor, { access, scope, getter }) {
   if (scope) {
@@ -1306,7 +1307,11 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
   resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
   let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && writeScope(scopeId, {
-    ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
+    // TODO: technically conditional renderer should only be written when either the
+    // condition is stateful, or if there are direct closures.
+    // It may make sense to pass in another arg for this.
+    ["c" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
+    // we convert 0 to undefined since the runtime defaults branch to 0.
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
   }), writeBranchEnd(
     scopeId,
@@ -1721,7 +1726,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
     nodeAccessor,
     void 0,
     valueChange
-  ), escapeTextAreaValue(value);
+  ), _escape_textarea_value(value);
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   return valueChange && writeControlledScope(
@@ -2250,6 +2255,7 @@ function NOOP3() {
   _escape,
   _escape_script,
   _escape_style,
+  _escape_textarea_value,
   _existing_scope,
   _for_in,
   _for_of,

package/dist/html.mjs

@@ -57,7 +57,7 @@ var unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt
 function _escape(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
 }
-function escapeTextAreaValue(val) {
+function _escape_textarea_value(val) {
   return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 var unsafeScriptReg = /<\/script/g, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
@@ -497,7 +497,7 @@ function writeReferenceOr(state, write, val, parent, accessor) {
   return registered ? writeRegistered(state, val, parent, accessor, registered) : (state.refs.set(
     val,
     ref = new Reference(parent, accessor, state.flush, state.buf.length)
-  ), write(state, val, ref) ? !0 : (state.refs.delete(ref), !1));
+  ), write(state, val, ref) ? !0 : (state.refs.delete(val), !1));
 }
 function writeRegistered(state, val, parent, accessor, { access, scope, getter }) {
   if (scope) {
@@ -1223,7 +1223,11 @@ function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeS
   resumeMarker && resumeBranch && !singleNode && $chunk.writeHTML(state.mark("[" /* BranchStart */, ""));
   let branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb(), shouldWriteBranch = resumeBranch && branchIndex !== void 0;
   shouldWriteBranch && writeScope(scopeId, {
-    ["c" /* ConditionalRenderer */ + accessor]: resumeMarker ? branchIndex : void 0,
+    // TODO: technically conditional renderer should only be written when either the
+    // condition is stateful, or if there are direct closures.
+    // It may make sense to pass in another arg for this.
+    ["c" /* ConditionalRenderer */ + accessor]: branchIndex || void 0,
+    // we convert 0 to undefined since the runtime defaults branch to 0.
     ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
   }), writeBranchEnd(
     scopeId,
@@ -1638,7 +1642,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
     nodeAccessor,
     void 0,
     valueChange
-  ), escapeTextAreaValue(value);
+  ), _escape_textarea_value(value);
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
   return valueChange && writeControlledScope(
@@ -2166,6 +2170,7 @@ export {
   _escape,
   _escape_script,
   _escape_style,
+  _escape_textarea_value,
   _existing_scope,
   _for_in,
   _for_of,

package/dist/translator/index.js

@@ -4775,7 +4775,7 @@ function trackParamsReferences(body, type, upstreamAlias) {
           section,
           paramsBinding,
           void 0,
-          addNumericPropertiesUntil(void 0, i - 1)
+          i > 0 ? addNumericPropertiesUntil(void 0, i - 1) : void 0
         );
       } else if (import_compiler25.types.isLVal(param)) {
         createBindingsAndTrackReferences(
@@ -4978,10 +4978,7 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
         i++;
         if (element) {
           if (element.type === "RestElement") {
-            excludeProperties = addNumericPropertiesUntil(
-              excludeProperties,
-              i - 1
-            );
+            excludeProperties = i > 0 ? addNumericPropertiesUntil(excludeProperties, i - 1) : void 0;
             createBindingsAndTrackReferences(
               element.argument,
               type,
@@ -6392,7 +6389,7 @@ var native_tag_default = {
         }
       }
       assertExclusiveControllableGroups(tag, seen);
-      if (node.var || hasEventHandlers || hasDynamicAttributes) {
+      if (node.var || hasEventHandlers || hasDynamicAttributes || getRelatedControllable(tagName, seen)?.special) {
         const tagExtra = node.extra ??= {};
         const tagSection = getOrCreateSection(tag);
         const nodeBinding = tagExtra[kNativeTagBinding] = createBinding(
@@ -6400,7 +6397,9 @@ var native_tag_default = {
           0 /* dom */,
           tagSection
         );
-        (0, import_babel_utils25.getProgram)().node.extra.isInteractive ||= hasEventHandlers;
+        if (hasEventHandlers) {
+          (0, import_babel_utils25.getProgram)().node.extra.isInteractive = true;
+        }
         if (spreadReferenceNodes) {
           if (relatedControllable && !relatedControllable.attrs.every(Boolean)) {
             for (const attr of relatedControllable.attrs) {
@@ -6486,12 +6485,17 @@ var native_tag_default = {
         const { staticAttrs, staticControllable, skipExpression } = usedAttrs;
         let { spreadExpression } = usedAttrs;
         if (staticControllable) {
-          const { helper, attrs } = staticControllable;
           if (tagName !== "select" && tagName !== "textarea") {
-            const values = attrs.map((attr) => attr?.value);
-            write`${callRuntime(helper, getScopeIdIdentifier(tagSection), visitAccessor, ...values)}`;
+            write`${callRuntime(
+              staticControllable.helper,
+              getScopeIdIdentifier(tagSection),
+              visitAccessor,
+              ...staticControllable.attrs.map((attr) => attr?.value)
+            )}`;
+          }
+          if (!(staticControllable.special && !staticControllable.attrs[1])) {
+            addHTMLEffectCall(tagSection, void 0);
           }
-          addHTMLEffectCall(tagSection, void 0);
         }
         let writeAtStartOfBody;
         if (tagName === "select") {
@@ -6539,14 +6543,16 @@ var native_tag_default = {
             );
             spreadExpression = spreadIdentifier;
           }
-          if (value || valueChange) {
+          if (valueChange) {
             writeAtStartOfBody = callRuntime(
               "_attr_textarea_value",
               getScopeIdIdentifier(getSection(tag)),
-              getScopeAccessorLiteral(nodeBinding),
+              visitAccessor,
               value,
               valueChange
             );
+          } else if (value) {
+            writeAtStartOfBody = callRuntime("_escape_textarea_value", value);
           }
         }
         for (const attr of staticAttrs) {
@@ -6683,7 +6689,7 @@ var native_tag_default = {
               callRuntime(
                 "_attr_select_value",
                 getScopeIdIdentifier(getSection(tag)),
-                getScopeAccessorLiteral(nodeBinding),
+                nodeBinding && getScopeAccessorLiteral(nodeBinding),
                 selectArgs.value,
                 selectArgs.valueChange,
                 import_compiler32.types.arrowFunctionExpression(
@@ -6798,14 +6804,16 @@ var native_tag_default = {
               callRuntime(helper, scopeIdentifier, visitAccessor, ...values)
             )
           );
-          addStatement(
-            "effect",
-            tagSection,
-            void 0,
-            import_compiler32.types.expressionStatement(
-              callRuntime(`${helper}_script`, scopeIdentifier, visitAccessor)
-            )
-          );
+          if (!(staticControllable.special && !attrs[1])) {
+            addStatement(
+              "effect",
+              tagSection,
+              void 0,
+              import_compiler32.types.expressionStatement(
+                callRuntime(`${helper}_script`, scopeIdentifier, visitAccessor)
+              )
+            );
+          }
         }
         for (const attr of staticAttrs) {
           const { name: name2, value } = attr;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.73",
+  "version": "6.0.76",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",