marko 6.0.145 → 6.0.147

package/dist/html.js

@@ -1775,8 +1775,8 @@ function _attr_style(value) {
   return stringAttr("style", styleValue(value));
 }
 function _attr_option_value(value) {
-  let selectedValue = getContext(kSelectedValue);
-  return _attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  let valueAttr = _attr("value", value);
+  return normalizedValueMatches(getContext(kSelectedValue), value) ? valueAttr + " selected" : valueAttr;
 }
 var kSelectedValue = /* @__PURE__ */ Symbol("selectedValue");
 function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -1784,7 +1784,7 @@ function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content)
     3 /* SelectValue */,
     scopeId,
     nodeAccessor,
-    value,
+    void 0,
     valueChange
   ), content && withContext(kSelectedValue, value, content);
 }
@@ -1813,26 +1813,34 @@ function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange) {
     nodeAccessor,
     void 0,
     checkedChange
-  ), _attr("checked", checked);
+  ), normalizeBoolAttrValue(checked) ? " checked" : "";
 }
 function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value) {
-  let multiple = Array.isArray(checkedValue), valueAttr = _attr("value", value);
+  let valueAttr = _attr("value", value);
   return checkedValueChange && writeControlledScope(
     1 /* InputCheckedValue */,
     scopeId,
     nodeAccessor,
-    checkedValue,
+    getCheckedValueRef(checkedValue),
     checkedValueChange
-  ), (multiple ? checkedValue.includes(value) : checkedValue === value) ? valueAttr + " checked" : valueAttr;
+  ), normalizedValueMatches(checkedValue, value) ? valueAttr + " checked" : valueAttr;
+}
+var checkedValuesRefs = /* @__PURE__ */ new WeakMap();
+function getCheckedValueRef(checkedValue) {
+  if (Array.isArray(checkedValue)) {
+    let ref = checkedValuesRefs.get(checkedValue);
+    return ref || (ref = [], checkedValuesRefs.set(checkedValue, ref)), ref;
+  }
 }
 function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
+  let normalizedOpen = normalizeBoolAttrValue(open);
   return openChange && writeControlledScope(
     4 /* DetailsOrDialogOpen */,
     scopeId,
     nodeAccessor,
-    open,
+    normalizedOpen,
     openChange
-  ), _attr("open", open);
+  ), normalizedOpen ? " open" : "";
 }
 function _attr_nonce() {
   return getChunk().boundary.state.nonceAttr;
@@ -1966,6 +1974,23 @@ function escapeDoubleQuotedAttrValue(value) {
 function replaceUnsafeDoubleQuoteAttrChar(match) {
   return match === '"' ? """ : "&";
 }
+function normalizedValueMatches(a, b) {
+  let value = normalizeStrAttrValue(b);
+  if (Array.isArray(a)) {
+    for (let item of a)
+      if (normalizeStrAttrValue(item) === value)
+        return !0;
+  } else if (normalizeStrAttrValue(a) === value)
+    return !0;
+  return !1;
+}
+function normalizeStrAttrValue(value) {
+  return value && value !== !0 || value === 0 ? value + "" : "";
+}
+function normalizeBoolAttrValue(value) {
+  if (value != null && value !== !1)
+    return !0;
+}
 
 // src/common/compat-meta.ts
 var RENDERER_REGISTER_ID = "$C_r", SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_ID = "$C_b";

package/dist/html.mjs

@@ -1685,8 +1685,8 @@ function _attr_style(value) {
   return stringAttr("style", styleValue(value));
 }
 function _attr_option_value(value) {
-  let selectedValue = getContext(kSelectedValue);
-  return _attr("value", value) + (!isVoid(value) && (Array.isArray(selectedValue) ? selectedValue.includes(value) : selectedValue === value) ? " selected" : "");
+  let valueAttr = _attr("value", value);
+  return normalizedValueMatches(getContext(kSelectedValue), value) ? valueAttr + " selected" : valueAttr;
 }
 var kSelectedValue = /* @__PURE__ */ Symbol("selectedValue");
 function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content) {
@@ -1694,7 +1694,7 @@ function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content)
     3 /* SelectValue */,
     scopeId,
     nodeAccessor,
-    value,
+    void 0,
     valueChange
   ), content && withContext(kSelectedValue, value, content);
 }
@@ -1723,26 +1723,34 @@ function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange) {
     nodeAccessor,
     void 0,
     checkedChange
-  ), _attr("checked", checked);
+  ), normalizeBoolAttrValue(checked) ? " checked" : "";
 }
 function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value) {
-  let multiple = Array.isArray(checkedValue), valueAttr = _attr("value", value);
+  let valueAttr = _attr("value", value);
   return checkedValueChange && writeControlledScope(
     1 /* InputCheckedValue */,
     scopeId,
     nodeAccessor,
-    checkedValue,
+    getCheckedValueRef(checkedValue),
     checkedValueChange
-  ), (multiple ? checkedValue.includes(value) : checkedValue === value) ? valueAttr + " checked" : valueAttr;
+  ), normalizedValueMatches(checkedValue, value) ? valueAttr + " checked" : valueAttr;
+}
+var checkedValuesRefs = /* @__PURE__ */ new WeakMap();
+function getCheckedValueRef(checkedValue) {
+  if (Array.isArray(checkedValue)) {
+    let ref = checkedValuesRefs.get(checkedValue);
+    return ref || (ref = [], checkedValuesRefs.set(checkedValue, ref)), ref;
+  }
 }
 function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
+  let normalizedOpen = normalizeBoolAttrValue(open);
   return openChange && writeControlledScope(
     4 /* DetailsOrDialogOpen */,
     scopeId,
     nodeAccessor,
-    open,
+    normalizedOpen,
     openChange
-  ), _attr("open", open);
+  ), normalizedOpen ? " open" : "";
 }
 function _attr_nonce() {
   return getChunk().boundary.state.nonceAttr;
@@ -1876,6 +1884,23 @@ function escapeDoubleQuotedAttrValue(value) {
 function replaceUnsafeDoubleQuoteAttrChar(match) {
   return match === '"' ? """ : "&";
 }
+function normalizedValueMatches(a, b) {
+  let value = normalizeStrAttrValue(b);
+  if (Array.isArray(a)) {
+    for (let item of a)
+      if (normalizeStrAttrValue(item) === value)
+        return !0;
+  } else if (normalizeStrAttrValue(a) === value)
+    return !0;
+  return !1;
+}
+function normalizeStrAttrValue(value) {
+  return value && value !== !0 || value === 0 ? value + "" : "";
+}
+function normalizeBoolAttrValue(value) {
+  if (value != null && value !== !1)
+    return !0;
+}
 
 // src/common/compat-meta.ts
 var RENDERER_REGISTER_ID = "$C_r", SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_ID = "$C_b";

package/dist/translator/index.js

@@ -5597,7 +5597,7 @@ var native_tag_default = {
           if (injectNonce && attr.name === "nonce") {
             injectNonce = false;
           }
-          if (isEventHandler(attr.name) || isNativeTagChangeHandler(attr.name)) {
+          if (isEventHandler(attr.name)) {
             valueExtra.isEffect = true;
             hasEventHandlers = true;
           } else if (!evaluate(attr.value).confident) {
@@ -5633,7 +5633,7 @@ var native_tag_default = {
           }
         }
       }
-      if (node.var || hasDynamicAttributes || hasEventHandlers || textPlaceholders || injectNonce || getRelatedControllable(tagName, seen)?.special) {
+      if (node.var || hasDynamicAttributes || hasEventHandlers || textPlaceholders || injectNonce || isDynamicControllable(getRelatedControllable(tagName, seen))) {
         const tagExtra = node.extra ??= {};
         const tagSection = getOrCreateSection(tag);
         const nodeBinding = tagExtra[kNativeTagBinding] = createBinding(
@@ -5713,6 +5713,7 @@ var native_tag_default = {
           write`${callRuntime("_attr_nonce")}`;
         }
         if (staticControllable) {
+          const hasChangeHandler = !!staticControllable.attrs[1];
           if (tagName !== "select" && tagName !== "textarea") {
             write`${callRuntime(
               staticControllable.helper,
@@ -5721,7 +5722,7 @@ var native_tag_default = {
               ...staticControllable.attrs.map((attr) => attr?.value)
             )}`;
           }
-          if (!(staticControllable.special && !staticControllable.attrs[1])) {
+          if (hasChangeHandler) {
             addHTMLEffectCall(tagSection, void 0);
           }
         }
@@ -6002,25 +6003,34 @@ var native_tag_default = {
           );
         }
         if (staticControllable) {
-          const { helper, attrs } = staticControllable;
-          const firstAttr = attrs.find(Boolean);
+          const hasChangeHandler = !!staticControllable.attrs[1];
+          const firstAttr = staticControllable.attrs.find(Boolean);
           const referencedBindings = firstAttr.value.extra?.referencedBindings;
-          const values = attrs.map((attr) => attr?.value);
+          const values = (hasChangeHandler ? staticControllable.attrs : staticControllable.attrs.toSpliced(1, 1)).map((attr) => attr?.value);
           addStatement(
             "render",
             tagSection,
             referencedBindings,
             import_compiler32.types.expressionStatement(
-              callRuntime(helper, scopeIdentifier, visitAccessor, ...values)
+              callRuntime(
+                hasChangeHandler ? staticControllable.helper : `${staticControllable.helper}_default`,
+                scopeIdentifier,
+                visitAccessor,
+                ...values
+              )
             )
           );
-          if (!(staticControllable.special && !attrs[1])) {
+          if (hasChangeHandler) {
             addStatement(
               "effect",
               tagSection,
               void 0,
               import_compiler32.types.expressionStatement(
-                callRuntime(`${helper}_script`, scopeIdentifier, visitAccessor)
+                callRuntime(
+                  `${staticControllable.helper}_script`,
+                  scopeIdentifier,
+                  visitAccessor
+                )
               )
             );
           }
@@ -6345,7 +6355,7 @@ function getUsedAttrs(tagName, tag) {
   }
   if (!spreadProps) {
     staticControllable = getRelatedControllable(tagName, seen);
-    if (staticControllable?.special === false && !staticControllable.attrs[1]) {
+    if (!isDynamicControllable(staticControllable)) {
       staticControllable = void 0;
     }
   }
@@ -6491,7 +6501,7 @@ function trackDelimitedAttrObjectProperties(obj, meta) {
       key = prop.key.name;
     } else {
       const keyEval = evaluate(prop.key);
-      if (keyEval.confident) {
+      if (keyEval.confident && typeof keyEval.computed === "string" && !/\s/.test(keyEval.computed)) {
         key = keyEval.computed + "";
       } else {
         (dynamicProps ||= []).push(prop);
@@ -6513,8 +6523,11 @@ function trackDelimitedAttrObjectProperties(obj, meta) {
     (meta.dynamicItems ||= []).push(import_compiler32.types.objectExpression(dynamicProps));
   }
 }
-function isNativeTagChangeHandler(propName) {
-  return /^(?:value|checked(?:Value)?|open)Change$/.test(propName);
+function isDynamicControllable(controllable) {
+  if (controllable) {
+    return controllable.special || !!(controllable.attrs[1] || controllable.attrs.find(Boolean).value.extra?.referencedBindings);
+  }
+  return false;
 }
 function buildUndefined2() {
   return import_compiler32.types.unaryExpression("void", import_compiler32.types.numericLiteral(0));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.145",
+  "version": "6.0.147",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,7 +48,7 @@
     "build": "node -r ~ts ./scripts/bundle.ts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.39.53",
+    "@marko/compiler": "^5.39.56",
     "csstype": "^3.2.3",
     "magic-string": "^0.30.21"
   },

package/tags/id.d.marko

@@ -1,7 +1,7 @@
 /** File for types only, not actual implementation **/
 
 export interface Input {
-  value?: string;
+  value?: string | null | false;
 }
 
 return="" as string