marko 6.0.145 → 6.0.146

package/dist/dom.mjs

@@ -557,17 +557,20 @@ function _attr_input_checked_script(scope, nodeAccessor) {
   });
 }
 function _attr_input_checkedValue(scope, nodeAccessor, checkedValue, checkedValueChange, value) {
-  scope["G" /* ControlledValue */ + nodeAccessor] = checkedValue, _attr(scope[nodeAccessor], "value", value), setCheckboxValue(
+  let multiple = Array.isArray(checkedValue), normalizedValue = normalizeStrProp(value), normalizedCheckedValue = multiple ? checkedValue.map(normalizeStrProp) : normalizeStrProp(checkedValue);
+  scope["G" /* ControlledValue */ + nodeAccessor] = normalizedCheckedValue, _attr(scope[nodeAccessor], "value", normalizedValue), setCheckboxValue(
     scope,
     nodeAccessor,
     1 /* InputCheckedValue */,
-    Array.isArray(checkedValue) ? checkedValue.includes(value) : checkedValue === value,
+    multiple ? normalizedCheckedValue.includes(normalizedValue) : normalizedValue === normalizedCheckedValue,
     checkedValueChange
   );
 }
 function _attr_input_checkedValue_script(scope, nodeAccessor) {
   let el = scope[nodeAccessor];
-  syncControllable(el, "input", hasCheckboxChanged, () => {
+  isResuming && el.defaultChecked && (scope["G" /* ControlledValue */ + nodeAccessor] ? scope["G" /* ControlledValue */ + nodeAccessor].push(
+    el.value
+  ) : scope["G" /* ControlledValue */ + nodeAccessor] = el.value), syncControllable(el, "input", hasCheckboxChanged, () => {
     let checkedValueChange = scope["E" /* ControlledHandler */ + nodeAccessor];
     if (checkedValueChange) {
       let oldValue = scope["G" /* ControlledValue */ + nodeAccessor], newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
@@ -584,7 +587,7 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 }
 function _attr_input_value(scope, nodeAccessor, value, valueChange) {
   let el = scope[nodeAccessor], normalizedValue = normalizeStrProp(value);
-  scope["E" /* ControlledHandler */ + nodeAccessor] = valueChange, valueChange ? (scope["F" /* ControlledType */ + nodeAccessor] = 2 /* InputValue */, scope["G" /* ControlledValue */ + nodeAccessor] = value, el.isConnected ? setValueAndUpdateSelection(el, normalizedValue) : el.defaultValue = normalizedValue) : (scope["F" /* ControlledType */ + nodeAccessor] = 5 /* None */, el.defaultValue = normalizedValue);
+  scope["E" /* ControlledHandler */ + nodeAccessor] = valueChange, valueChange ? (scope["F" /* ControlledType */ + nodeAccessor] = 2 /* InputValue */, scope["G" /* ControlledValue */ + nodeAccessor] = normalizedValue, el.isConnected ? setValueAndUpdateSelection(el, normalizedValue) : el.defaultValue = normalizedValue) : (scope["F" /* ControlledType */ + nodeAccessor] = 5 /* None */, el.defaultValue = normalizedValue);
 }
 function _attr_input_value_script(scope, nodeAccessor) {
   let el = scope[nodeAccessor];
@@ -597,10 +600,11 @@ function _attr_input_value_script(scope, nodeAccessor) {
   });
 }
 function _attr_select_value(scope, nodeAccessor, value, valueChange) {
-  scope["E" /* ControlledHandler */ + nodeAccessor] = valueChange, valueChange ? (scope["F" /* ControlledType */ + nodeAccessor] = 3 /* SelectValue */, scope["G" /* ControlledValue */ + nodeAccessor] = value) : scope["F" /* ControlledType */ + nodeAccessor] = 5 /* None */, pendingEffects.unshift(
+  let normalizedValue = Array.isArray(value) ? value.map(normalizeStrProp) : normalizeStrProp(value);
+  scope["E" /* ControlledHandler */ + nodeAccessor] = valueChange, valueChange ? (scope["F" /* ControlledType */ + nodeAccessor] = 3 /* SelectValue */, scope["G" /* ControlledValue */ + nodeAccessor] = normalizedValue) : scope["F" /* ControlledType */ + nodeAccessor] = 5 /* None */, pendingEffects.unshift(
     () => setSelectOptions(
       scope[nodeAccessor],
-      value,
+      normalizedValue,
       valueChange
     ),
     scope
@@ -610,19 +614,26 @@ function _attr_select_value_script(scope, nodeAccessor) {
   let el = scope[nodeAccessor], onChange = () => {
     let valueChange = scope["E" /* ControlledHandler */ + nodeAccessor];
     if (valueChange) {
-      let newValue = Array.isArray(
-        scope["G" /* ControlledValue */ + nodeAccessor]
-      ) ? Array.from(el.selectedOptions, toValueProp) : el.value;
-      setSelectOptions(
-        el,
-        scope["G" /* ControlledValue */ + nodeAccessor],
-        valueChange
-      ), valueChange(newValue), run();
+      let oldValue = scope["G" /* ControlledValue */ + nodeAccessor], newValue = Array.isArray(oldValue) ? Array.from(el.selectedOptions, toValueProp) : el.value;
+      setSelectOptions(el, oldValue, valueChange), valueChange(newValue), run();
     }
   };
+  if (isResuming)
+    if (el.multiple) {
+      scope["G" /* ControlledValue */ + nodeAccessor] = [];
+      for (let opt of el.options)
+        opt.defaultSelected && scope["G" /* ControlledValue */ + nodeAccessor].push(opt.value);
+    } else {
+      scope["G" /* ControlledValue */ + nodeAccessor] = "";
+      for (let opt of el.options)
+        if (opt.defaultSelected) {
+          scope["G" /* ControlledValue */ + nodeAccessor] = opt.value;
+          break;
+        }
+    }
   el._ || new MutationObserver(() => {
     let value = scope["G" /* ControlledValue */ + nodeAccessor];
-    (Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((value2, i) => value2 != el.selectedOptions[i].value) : el.value != value) && onChange();
+    (Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((value2, i) => value2 != el.selectedOptions[i].value) : el.value !== value) && onChange();
   }).observe(el, {
     childList: !0,
     subtree: !0
@@ -634,20 +645,17 @@ function setSelectOptions(el, value, valueChange) {
       let selected = value.includes(opt.value);
       valueChange ? opt.selected = selected : opt.defaultSelected = selected;
     }
-  else {
-    let normalizedValue = normalizeStrProp(value);
-    if (valueChange)
-      el.value = normalizedValue;
-    else
-      for (let opt of el.options)
-        opt.defaultSelected = opt.value === normalizedValue;
-  }
+  else if (valueChange)
+    el.value = value;
+  else
+    for (let opt of el.options)
+      opt.defaultSelected = opt.value === value;
 }
 function _attr_details_or_dialog_open(scope, nodeAccessor, open, openChange) {
-  scope["E" /* ControlledHandler */ + nodeAccessor] = openChange, openChange ? scope["F" /* ControlledType */ + nodeAccessor] = 4 /* DetailsOrDialogOpen */ : scope["F" /* ControlledType */ + nodeAccessor] = 5 /* None */, scope[nodeAccessor].open = scope["G" /* ControlledValue */ + nodeAccessor] = normalizeBoolProp(open);
+  scope["E" /* ControlledHandler */ + nodeAccessor] = openChange, scope["F" /* ControlledType */ + nodeAccessor] = openChange ? 4 /* DetailsOrDialogOpen */ : 5 /* None */, scope[nodeAccessor].open = scope["G" /* ControlledValue */ + nodeAccessor] = normalizeBoolProp(open);
 }
 function _attr_details_or_dialog_open_script(scope, nodeAccessor) {
-  let el = scope[nodeAccessor], hasChanged = () => el.open !== scope["G" /* ControlledValue */ + nodeAccessor];
+  let el = scope[nodeAccessor], hasChanged = () => el.open === !scope["G" /* ControlledValue */ + nodeAccessor];
   syncControllable(
     el,
     el.tagName === "DIALOG" ? "close" : "toggle",

package/dist/html/attrs.d.ts

@@ -5,9 +5,9 @@ export declare function _attr_option_value(value: unknown): string;
 export declare function _attr_select_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown, content?: () => void): void;
 export declare function _attr_textarea_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown): string;
 export declare function _attr_input_value(scopeId: number, nodeAccessor: Accessor, value: unknown, valueChange: unknown): string;
-export declare function _attr_input_checked(scopeId: number, nodeAccessor: Accessor, checked: unknown, checkedChange: unknown): string;
+export declare function _attr_input_checked(scopeId: number, nodeAccessor: Accessor, checked: unknown, checkedChange: unknown): "" | " checked";
 export declare function _attr_input_checkedValue(scopeId: number, nodeAccessor: Accessor, checkedValue: unknown, checkedValueChange: unknown, value: unknown): string;
-export declare function _attr_details_or_dialog_open(scopeId: number, nodeAccessor: Accessor, open: unknown, openChange: unknown): string;
+export declare function _attr_details_or_dialog_open(scopeId: number, nodeAccessor: Accessor, open: unknown, openChange: unknown): "" | " open";
 export declare function _attr_nonce(): string;
 export declare function _attr(name: string, value: unknown): string;
 export declare function _attrs(data: Record<string, unknown>, nodeAccessor: Accessor, scopeId: number, tagName: string): string;

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) {
@@ -6491,7 +6491,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,9 +6513,6 @@ function trackDelimitedAttrObjectProperties(obj, meta) {
     (meta.dynamicItems ||= []).push(import_compiler32.types.objectExpression(dynamicProps));
   }
 }
-function isNativeTagChangeHandler(propName) {
-  return /^(?:value|checked(?:Value)?|open)Change$/.test(propName);
-}
 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.146",
   "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