marko 6.0.7 → 6.0.9

package/dist/translator/index.js

@@ -235,6 +235,268 @@ function isNullableExpr(expr) {
 var import_compiler24 = require("@marko/compiler");
 var import_babel_utils17 = require("@marko/compiler/babel-utils");
 
+// src/html/serializer.ts
+var kTouchedIterator = Symbol();
+var { hasOwnProperty } = {};
+var Generator = function* () {
+}().constructor;
+var AsyncGenerator = async function* () {
+}().constructor;
+patchIteratorNext(Generator.prototype);
+patchIteratorNext(AsyncGenerator.prototype);
+var KNOWN_SYMBOLS = (() => {
+  const KNOWN_SYMBOLS2 = /* @__PURE__ */ new Map();
+  for (const name2 of Object.getOwnPropertyNames(Symbol)) {
+    const symbol = Symbol[name2];
+    if (typeof symbol === "symbol") {
+      KNOWN_SYMBOLS2.set(symbol, "Symbol." + name2);
+    }
+  }
+  return KNOWN_SYMBOLS2;
+})();
+var KNOWN_FUNCTIONS = /* @__PURE__ */ new Map([
+  // This is by no means an exhaustive list,
+  // but it should cover most of the built-in functions.
+  [AggregateError, "AggregateError"],
+  [Array, "Array"],
+  [Array.from, "Array.from"],
+  [Array.isArray, "Array.isArray"],
+  [Array.of, "Array.of"],
+  [ArrayBuffer, "ArrayBuffer"],
+  [ArrayBuffer.isView, "ArrayBuffer.isView"],
+  [Atomics.add, "Atomics.add"],
+  [Atomics.and, "Atomics.and"],
+  [Atomics.compareExchange, "Atomics.compareExchange"],
+  [Atomics.exchange, "Atomics.exchange"],
+  [Atomics.isLockFree, "Atomics.isLockFree"],
+  [Atomics.load, "Atomics.load"],
+  [Atomics.notify, "Atomics.notify"],
+  [Atomics.or, "Atomics.or"],
+  [Atomics.store, "Atomics.store"],
+  [Atomics.sub, "Atomics.sub"],
+  [Atomics.wait, "Atomics.wait"],
+  [BigInt, "BigInt"],
+  [BigInt.asIntN, "BigInt.asIntN"],
+  [BigInt.asUintN, "BigInt.asUintN"],
+  [BigInt64Array, "BigInt64Array"],
+  [BigInt64Array.from, "BigInt64Array.from"],
+  [BigInt64Array.of, "BigInt64Array.of"],
+  [BigUint64Array, "BigUint64Array"],
+  [BigUint64Array.from, "BigUint64Array.from"],
+  [BigUint64Array.of, "BigUint64Array.of"],
+  [Boolean, "Boolean"],
+  [console.assert, "console.assert"],
+  [console.clear, "console.clear"],
+  [console.count, "console.count"],
+  [console.countReset, "console.countReset"],
+  [console.debug, "console.debug"],
+  [console.dir, "console.dir"],
+  [console.dirxml, "console.dirxml"],
+  [console.error, "console.error"],
+  [console.group, "console.group"],
+  [console.groupCollapsed, "console.groupCollapsed"],
+  [console.groupEnd, "console.groupEnd"],
+  [console.info, "console.info"],
+  [console.log, "console.log"],
+  [console.table, "console.table"],
+  [console.time, "console.time"],
+  [console.timeEnd, "console.timeEnd"],
+  [console.timeLog, "console.timeLog"],
+  [console.timeStamp, "console.timeStamp"],
+  [console.trace, "console.trace"],
+  [console.warn, "console.warn"],
+  [DataView, "DataView"],
+  [Date, "Date"],
+  [Date.now, "Date.now"],
+  [Date.parse, "Date.parse"],
+  [Date.UTC, "Date.UTC"],
+  [decodeURI, "decodeURI"],
+  [decodeURIComponent, "decodeURIComponent"],
+  [encodeURI, "encodeURI"],
+  [encodeURIComponent, "encodeURIComponent"],
+  [Error, "Error"],
+  [EvalError, "EvalError"],
+  [Float32Array, "Float32Array"],
+  [Float32Array.from, "Float32Array.from"],
+  [Float32Array.of, "Float32Array.of"],
+  [Float64Array, "Float64Array"],
+  [Float64Array.from, "Float64Array.from"],
+  [Float64Array.of, "Float64Array.of"],
+  [Function, "Function"],
+  [globalThis.atob, "atob"],
+  [globalThis.btoa, "btoa"],
+  [globalThis.clearImmediate, "clearImmediate"],
+  [globalThis.clearInterval, "clearInterval"],
+  [globalThis.clearTimeout, "clearTimeout"],
+  [globalThis.crypto?.getRandomValues, "crypto.getRandomValues"],
+  [globalThis.crypto?.randomUUID, "crypto.randomUUID"],
+  [globalThis.fetch, "fetch"],
+  [globalThis.performance?.now, "performance.now"],
+  [globalThis.queueMicrotask, "queueMicrotask"],
+  [globalThis.setImmediate, "setImmediate"],
+  [globalThis.setInterval, "setInterval"],
+  [globalThis.setTimeout, "setTimeout"],
+  [globalThis.structuredClone, "structuredClone"],
+  [globalThis.URL, "URL"],
+  [globalThis.URLSearchParams, "URLSearchParams"],
+  [globalThis.WritableStream, "WritableStream"],
+  [Int16Array, "Int16Array"],
+  [Int16Array.from, "Int16Array.from"],
+  [Int16Array.of, "Int16Array.of"],
+  [Int32Array, "Int32Array"],
+  [Int32Array.from, "Int32Array.from"],
+  [Int32Array.of, "Int32Array.of"],
+  [Int8Array, "Int8Array"],
+  [Int8Array.from, "Int8Array.from"],
+  [Int8Array.of, "Int8Array.of"],
+  [Intl.Collator, "Intl.Collator"],
+  [Intl.DateTimeFormat, "Intl.DateTimeFormat"],
+  [Intl.DisplayNames, "Intl.DisplayNames"],
+  [Intl.getCanonicalLocales, "Intl.getCanonicalLocales"],
+  [Intl.ListFormat, "Intl.ListFormat"],
+  [Intl.Locale, "Intl.Locale"],
+  [Intl.NumberFormat, "Intl.NumberFormat"],
+  [Intl.PluralRules, "Intl.PluralRules"],
+  [Intl.RelativeTimeFormat, "Intl.RelativeTimeFormat"],
+  [Intl.Segmenter, "Intl.Segmenter"],
+  [Intl.supportedValuesOf, "Intl.supportedValuesOf"],
+  [isFinite, "isFinite"],
+  [isNaN, "isNaN"],
+  [JSON.parse, "JSON.parse"],
+  [JSON.stringify, "JSON.stringify"],
+  [Map, "Map"],
+  [Map.groupBy, "Map.groupBy"],
+  [Math.abs, "Math.abs"],
+  [Math.acos, "Math.acos"],
+  [Math.acosh, "Math.acosh"],
+  [Math.asin, "Math.asin"],
+  [Math.asinh, "Math.asinh"],
+  [Math.atan, "Math.atan"],
+  [Math.atan2, "Math.atan2"],
+  [Math.atanh, "Math.atanh"],
+  [Math.cbrt, "Math.cbrt"],
+  [Math.ceil, "Math.ceil"],
+  [Math.clz32, "Math.clz32"],
+  [Math.cos, "Math.cos"],
+  [Math.cosh, "Math.cosh"],
+  [Math.exp, "Math.exp"],
+  [Math.expm1, "Math.expm1"],
+  [Math.floor, "Math.floor"],
+  [Math.fround, "Math.fround"],
+  [Math.hypot, "Math.hypot"],
+  [Math.imul, "Math.imul"],
+  [Math.log, "Math.log"],
+  [Math.log10, "Math.log10"],
+  [Math.log1p, "Math.log1p"],
+  [Math.log2, "Math.log2"],
+  [Math.max, "Math.max"],
+  [Math.min, "Math.min"],
+  [Math.pow, "Math.pow"],
+  [Math.random, "Math.random"],
+  [Math.round, "Math.round"],
+  [Math.sign, "Math.sign"],
+  [Math.sin, "Math.sin"],
+  [Math.sinh, "Math.sinh"],
+  [Math.sqrt, "Math.sqrt"],
+  [Math.tan, "Math.tan"],
+  [Math.tanh, "Math.tanh"],
+  [Math.trunc, "Math.trunc"],
+  [Number, "Number"],
+  [Number.isFinite, "Number.isFinite"],
+  [Number.isInteger, "Number.isInteger"],
+  [Number.isNaN, "Number.isNaN"],
+  [Number.isSafeInteger, "Number.isSafeInteger"],
+  [Number.parseFloat, "Number.parseFloat"],
+  [Number.parseInt, "Number.parseInt"],
+  [Object, "Object"],
+  [Object.assign, "Object.assign"],
+  [Object.create, "Object.create"],
+  [Object.defineProperties, "Object.defineProperties"],
+  [Object.defineProperty, "Object.defineProperty"],
+  [Object.entries, "Object.entries"],
+  [Object.freeze, "Object.freeze"],
+  [Object.fromEntries, "Object.fromEntries"],
+  [Object.getOwnPropertyDescriptor, "Object.getOwnPropertyDescriptor"],
+  [Object.getOwnPropertyDescriptors, "Object.getOwnPropertyDescriptors"],
+  [Object.getOwnPropertyNames, "Object.getOwnPropertyNames"],
+  [Object.getOwnPropertySymbols, "Object.getOwnPropertySymbols"],
+  [Object.getPrototypeOf, "Object.getPrototypeOf"],
+  [Object.is, "Object.is"],
+  [Object.isExtensible, "Object.isExtensible"],
+  [Object.isFrozen, "Object.isFrozen"],
+  [Object.isSealed, "Object.isSealed"],
+  [Object.keys, "Object.keys"],
+  [Object.preventExtensions, "Object.preventExtensions"],
+  [Object.seal, "Object.seal"],
+  [Object.setPrototypeOf, "Object.setPrototypeOf"],
+  [Object.values, "Object.values"],
+  [parseFloat, "parseFloat"],
+  [parseInt, "parseInt"],
+  [Promise, "Promise"],
+  [Proxy, "Proxy"],
+  [RangeError, "RangeError"],
+  [ReferenceError, "ReferenceError"],
+  [Reflect.apply, "Reflect.apply"],
+  [Reflect.construct, "Reflect.construct"],
+  [Reflect.defineProperty, "Reflect.defineProperty"],
+  [Reflect.deleteProperty, "Reflect.deleteProperty"],
+  [Reflect.get, "Reflect.get"],
+  [Reflect.getOwnPropertyDescriptor, "Reflect.getOwnPropertyDescriptor"],
+  [Reflect.getPrototypeOf, "Reflect.getPrototypeOf"],
+  [Reflect.has, "Reflect.has"],
+  [Reflect.isExtensible, "Reflect.isExtensible"],
+  [Reflect.ownKeys, "Reflect.ownKeys"],
+  [Reflect.preventExtensions, "Reflect.preventExtensions"],
+  [Reflect.set, "Reflect.set"],
+  [Reflect.setPrototypeOf, "Reflect.setPrototypeOf"],
+  [RegExp, "RegExp"],
+  [Set, "Set"],
+  [String, "String"],
+  [String.fromCharCode, "String.fromCharCode"],
+  [String.fromCodePoint, "String.fromCodePoint"],
+  [String.raw, "String.raw"],
+  [Symbol, "Symbol"],
+  [Symbol.for, "Symbol.for"],
+  [SyntaxError, "SyntaxError"],
+  [TypeError, "TypeError"],
+  [Uint16Array, "Uint16Array"],
+  [Uint16Array.from, "Uint16Array.from"],
+  [Uint16Array.of, "Uint16Array.of"],
+  [Uint32Array, "Uint32Array"],
+  [Uint32Array.from, "Uint32Array.from"],
+  [Uint32Array.of, "Uint32Array.of"],
+  [Uint8Array, "Uint8Array"],
+  [Uint8Array.from, "Uint8Array.from"],
+  [Uint8Array.of, "Uint8Array.of"],
+  [Uint8ClampedArray, "Uint8ClampedArray"],
+  [Uint8ClampedArray.from, "Uint8ClampedArray.from"],
+  [Uint8ClampedArray.of, "Uint8ClampedArray.of"],
+  [URIError, "URIError"],
+  [WeakMap, "WeakMap"],
+  [WeakSet, "WeakSet"]
+]);
+var KNOWN_OBJECTS = /* @__PURE__ */ new Map([
+  [Atomics, "Atomics"],
+  [console, "console"],
+  [globalThis, "globalThis"],
+  [globalThis.crypto, "crypto"],
+  [Intl, "Intl"],
+  [JSON, "JSON"],
+  [Math, "Math"],
+  [Reflect, "Reflect"]
+]);
+function toAccess(accessor) {
+  const start = accessor[0];
+  return start === '"' || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
+}
+function patchIteratorNext(proto) {
+  const { next } = proto;
+  proto.next = function(value) {
+    this[kTouchedIterator] = 1;
+    return next.call(this, value);
+  };
+}
+
 // src/translator/util/for-each-identifier.ts
 function forEachIdentifier(node, cb) {
   switch (node.type) {
@@ -588,7 +850,7 @@ var Sorted = class {
       }
       if (b) {
         if (Array.isArray(b)) {
-          return addSorted(this.compare, [...b], a);
+          return addSorted(this.compare, b, a);
         }
         return joinRepeatable(this.compare, b, a);
       }
@@ -735,6 +997,21 @@ function find(data, cb) {
 function toArray(data, cb) {
   return data ? Array.isArray(data) ? data.map(cb) : [cb(data, 0)] : [];
 }
+function mapToString(data, sep, cb) {
+  if (data) {
+    if (Array.isArray(data)) {
+      let str = "";
+      let curSep = "";
+      for (let i = 0; i < data.length; i++) {
+        str += curSep + cb(data[i], i);
+        curSep = sep;
+      }
+      return str;
+    }
+    return cb(data, 0);
+  }
+  return "";
+}
 function filterMap(data, cb) {
   if (data) {
     if (Array.isArray(data)) {
@@ -910,425 +1187,163 @@ var entry_builder_default = {
     };
     const { analyzedTags } = file.metadata.marko;
     state.imports.push(
-      (0, import_babel_utils6.resolveRelativePath)(entryFile, file.opts.filename)
-    );
-    state.init ||= file.path.node.extra.hasInteractiveChild || file.path.node.extra.isInteractive || false;
-    for (const tag of analyzedTags || []) {
-      visitChild(tag);
-    }
-  }
-};
-
-// src/translator/util/get-known-attr-values.ts
-function getKnownAttrValues(tag) {
-  const attrs2 = {};
-  for (const attr2 of tag.attributes) {
-    if (attr2.type === "MarkoAttribute") {
-      attrs2[attr2.name] = attr2.value;
-    }
-  }
-  return attrs2;
-}
-
-// src/translator/util/is-core-tag.ts
-var import_babel_utils7 = require("@marko/compiler/babel-utils");
-
-// src/translator/util/get-tag-name.ts
-function getTagName(tag) {
-  return tag.node.name.value;
-}
-
-// src/translator/util/is-core-tag.ts
-var { taglibId } = runtime_info_default;
-var htmlTaglibId = "marko-html";
-var interopTaglibId = "@marko/translator-interop-class-tags";
-function isCoreTag(tag) {
-  if (tag.isMarkoTag()) {
-    const tagDef = (0, import_babel_utils7.getTagDef)(tag);
-    if (tagDef) {
-      switch (tagDef.taglibId) {
-        case taglibId:
-        case interopTaglibId:
-          return true;
-        case htmlTaglibId:
-          switch (tagDef.name) {
-            case "script":
-            case "style":
-              return true;
-          }
-          break;
-      }
-    }
-  }
-  return false;
-}
-function isCoreTagName(tag, name2) {
-  return isCoreTag(tag) && getTagName(tag) === name2;
-}
-function isConditionTag(tag) {
-  if (isCoreTag(tag)) {
-    switch (getTagName(tag)) {
-      case "if":
-      case "else-if":
-      case "else":
-        return true;
-    }
-  }
-  return false;
-}
-function isControlFlowTag(tag) {
-  if (isCoreTag(tag)) {
-    switch (getTagName(tag)) {
-      case "if":
-      case "else-if":
-      case "else":
-      case "for":
-      case "await":
-      case "try":
-        return true;
-    }
-  }
-  return false;
-}
-
-// src/translator/util/runtime.ts
-var import_compiler7 = require("@marko/compiler");
-var import_babel_utils8 = require("@marko/compiler/babel-utils");
-
-// src/common/attr-tag.ts
-var rest = false ? Symbol("Attribute Tag") : Symbol();
-
-// src/common/helpers.ts
-function classValue(classValue2) {
-  return toDelimitedString(classValue2, " ", stringifyClassObject);
-}
-function stringifyClassObject(name2, value) {
-  return value ? name2 : "";
-}
-function styleValue(styleValue2) {
-  return toDelimitedString(styleValue2, ";", stringifyStyleObject);
-}
-function stringifyStyleObject(name2, value) {
-  return value || value === 0 ? `${name2}:${value && typeof value === "number" && !/^(--|ta|or|li|z)|cou|nk|it|ag|we|do|w$/.test(name2) ? value + "px" : value}` : "";
-}
-function toDelimitedString(val, delimiter, stringify) {
-  let str = "";
-  let sep = "";
-  let part;
-  if (val) {
-    if (typeof val !== "object") {
-      str += val;
-    } else if (Array.isArray(val)) {
-      for (const v of val) {
-        part = toDelimitedString(v, delimiter, stringify);
-        if (part) {
-          str += sep + part;
-          sep = delimiter;
-        }
-      }
-    } else {
-      for (const name2 in val) {
-        part = stringify(name2, val[name2]);
-        if (part) {
-          str += sep + part;
-          sep = delimiter;
-        }
-      }
-    }
-  }
-  return str;
-}
-function isEventHandler(name2) {
-  return /^on[A-Z-]/.test(name2);
-}
-function getEventHandlerName(name2) {
-  return name2[2] === "-" ? name2.slice(3) : name2.slice(2).toLowerCase();
-}
-function isVoid(value) {
-  return value == null || value === false;
-}
-
-// src/html/content.ts
-function toString(val) {
-  return val ? val + "" : val === 0 ? "0" : "";
-}
-var unsafeXMLReg = /[<&]/g;
-var replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;";
-var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
-function escapeXML(val) {
-  return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
-}
-var unsafeScriptReg = /<\/script/g;
-var escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
-function escapeScript(val) {
-  return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
-}
-var unsafeStyleReg = /<\/style/g;
-var escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
-function escapeStyle(val) {
-  return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
-}
-
-// src/html/serializer.ts
-var kTouchedIterator = Symbol();
-var { hasOwnProperty } = {};
-var Generator = function* () {
-}().constructor;
-var AsyncGenerator = async function* () {
-}().constructor;
-patchIteratorNext(Generator.prototype);
-patchIteratorNext(AsyncGenerator.prototype);
-var KNOWN_SYMBOLS = (() => {
-  const KNOWN_SYMBOLS2 = /* @__PURE__ */ new Map();
-  for (const name2 of Object.getOwnPropertyNames(Symbol)) {
-    const symbol = Symbol[name2];
-    if (typeof symbol === "symbol") {
-      KNOWN_SYMBOLS2.set(symbol, "Symbol." + name2);
+      (0, import_babel_utils6.resolveRelativePath)(entryFile, file.opts.filename)
+    );
+    state.init ||= file.path.node.extra.hasInteractiveChild || file.path.node.extra.isInteractive || false;
+    for (const tag of analyzedTags || []) {
+      visitChild(tag);
     }
   }
-  return KNOWN_SYMBOLS2;
-})();
-var KNOWN_FUNCTIONS = /* @__PURE__ */ new Map([
-  // This is by no means an exhaustive list,
-  // but it should cover most of the built-in functions.
-  [AggregateError, "AggregateError"],
-  [Array, "Array"],
-  [Array.from, "Array.from"],
-  [Array.isArray, "Array.isArray"],
-  [Array.of, "Array.of"],
-  [ArrayBuffer, "ArrayBuffer"],
-  [ArrayBuffer.isView, "ArrayBuffer.isView"],
-  [Atomics.add, "Atomics.add"],
-  [Atomics.and, "Atomics.and"],
-  [Atomics.compareExchange, "Atomics.compareExchange"],
-  [Atomics.exchange, "Atomics.exchange"],
-  [Atomics.isLockFree, "Atomics.isLockFree"],
-  [Atomics.load, "Atomics.load"],
-  [Atomics.notify, "Atomics.notify"],
-  [Atomics.or, "Atomics.or"],
-  [Atomics.store, "Atomics.store"],
-  [Atomics.sub, "Atomics.sub"],
-  [Atomics.wait, "Atomics.wait"],
-  [BigInt, "BigInt"],
-  [BigInt.asIntN, "BigInt.asIntN"],
-  [BigInt.asUintN, "BigInt.asUintN"],
-  [BigInt64Array, "BigInt64Array"],
-  [BigInt64Array.from, "BigInt64Array.from"],
-  [BigInt64Array.of, "BigInt64Array.of"],
-  [BigUint64Array, "BigUint64Array"],
-  [BigUint64Array.from, "BigUint64Array.from"],
-  [BigUint64Array.of, "BigUint64Array.of"],
-  [Boolean, "Boolean"],
-  [console.assert, "console.assert"],
-  [console.clear, "console.clear"],
-  [console.count, "console.count"],
-  [console.countReset, "console.countReset"],
-  [console.debug, "console.debug"],
-  [console.dir, "console.dir"],
-  [console.dirxml, "console.dirxml"],
-  [console.error, "console.error"],
-  [console.group, "console.group"],
-  [console.groupCollapsed, "console.groupCollapsed"],
-  [console.groupEnd, "console.groupEnd"],
-  [console.info, "console.info"],
-  [console.log, "console.log"],
-  [console.table, "console.table"],
-  [console.time, "console.time"],
-  [console.timeEnd, "console.timeEnd"],
-  [console.timeLog, "console.timeLog"],
-  [console.timeStamp, "console.timeStamp"],
-  [console.trace, "console.trace"],
-  [console.warn, "console.warn"],
-  [DataView, "DataView"],
-  [Date, "Date"],
-  [Date.now, "Date.now"],
-  [Date.parse, "Date.parse"],
-  [Date.UTC, "Date.UTC"],
-  [decodeURI, "decodeURI"],
-  [decodeURIComponent, "decodeURIComponent"],
-  [encodeURI, "encodeURI"],
-  [encodeURIComponent, "encodeURIComponent"],
-  [Error, "Error"],
-  [EvalError, "EvalError"],
-  [Float32Array, "Float32Array"],
-  [Float32Array.from, "Float32Array.from"],
-  [Float32Array.of, "Float32Array.of"],
-  [Float64Array, "Float64Array"],
-  [Float64Array.from, "Float64Array.from"],
-  [Float64Array.of, "Float64Array.of"],
-  [Function, "Function"],
-  [globalThis.atob, "atob"],
-  [globalThis.btoa, "btoa"],
-  [globalThis.clearImmediate, "clearImmediate"],
-  [globalThis.clearInterval, "clearInterval"],
-  [globalThis.clearTimeout, "clearTimeout"],
-  [globalThis.crypto?.getRandomValues, "crypto.getRandomValues"],
-  [globalThis.crypto?.randomUUID, "crypto.randomUUID"],
-  [globalThis.fetch, "fetch"],
-  [globalThis.performance?.now, "performance.now"],
-  [globalThis.queueMicrotask, "queueMicrotask"],
-  [globalThis.setImmediate, "setImmediate"],
-  [globalThis.setInterval, "setInterval"],
-  [globalThis.setTimeout, "setTimeout"],
-  [globalThis.structuredClone, "structuredClone"],
-  [globalThis.URL, "URL"],
-  [globalThis.URLSearchParams, "URLSearchParams"],
-  [globalThis.WritableStream, "WritableStream"],
-  [Int16Array, "Int16Array"],
-  [Int16Array.from, "Int16Array.from"],
-  [Int16Array.of, "Int16Array.of"],
-  [Int32Array, "Int32Array"],
-  [Int32Array.from, "Int32Array.from"],
-  [Int32Array.of, "Int32Array.of"],
-  [Int8Array, "Int8Array"],
-  [Int8Array.from, "Int8Array.from"],
-  [Int8Array.of, "Int8Array.of"],
-  [Intl.Collator, "Intl.Collator"],
-  [Intl.DateTimeFormat, "Intl.DateTimeFormat"],
-  [Intl.DisplayNames, "Intl.DisplayNames"],
-  [Intl.getCanonicalLocales, "Intl.getCanonicalLocales"],
-  [Intl.ListFormat, "Intl.ListFormat"],
-  [Intl.Locale, "Intl.Locale"],
-  [Intl.NumberFormat, "Intl.NumberFormat"],
-  [Intl.PluralRules, "Intl.PluralRules"],
-  [Intl.RelativeTimeFormat, "Intl.RelativeTimeFormat"],
-  [Intl.Segmenter, "Intl.Segmenter"],
-  [Intl.supportedValuesOf, "Intl.supportedValuesOf"],
-  [isFinite, "isFinite"],
-  [isNaN, "isNaN"],
-  [JSON.parse, "JSON.parse"],
-  [JSON.stringify, "JSON.stringify"],
-  [Map, "Map"],
-  [Map.groupBy, "Map.groupBy"],
-  [Math.abs, "Math.abs"],
-  [Math.acos, "Math.acos"],
-  [Math.acosh, "Math.acosh"],
-  [Math.asin, "Math.asin"],
-  [Math.asinh, "Math.asinh"],
-  [Math.atan, "Math.atan"],
-  [Math.atan2, "Math.atan2"],
-  [Math.atanh, "Math.atanh"],
-  [Math.cbrt, "Math.cbrt"],
-  [Math.ceil, "Math.ceil"],
-  [Math.clz32, "Math.clz32"],
-  [Math.cos, "Math.cos"],
-  [Math.cosh, "Math.cosh"],
-  [Math.exp, "Math.exp"],
-  [Math.expm1, "Math.expm1"],
-  [Math.floor, "Math.floor"],
-  [Math.fround, "Math.fround"],
-  [Math.hypot, "Math.hypot"],
-  [Math.imul, "Math.imul"],
-  [Math.log, "Math.log"],
-  [Math.log10, "Math.log10"],
-  [Math.log1p, "Math.log1p"],
-  [Math.log2, "Math.log2"],
-  [Math.max, "Math.max"],
-  [Math.min, "Math.min"],
-  [Math.pow, "Math.pow"],
-  [Math.random, "Math.random"],
-  [Math.round, "Math.round"],
-  [Math.sign, "Math.sign"],
-  [Math.sin, "Math.sin"],
-  [Math.sinh, "Math.sinh"],
-  [Math.sqrt, "Math.sqrt"],
-  [Math.tan, "Math.tan"],
-  [Math.tanh, "Math.tanh"],
-  [Math.trunc, "Math.trunc"],
-  [Number, "Number"],
-  [Number.isFinite, "Number.isFinite"],
-  [Number.isInteger, "Number.isInteger"],
-  [Number.isNaN, "Number.isNaN"],
-  [Number.isSafeInteger, "Number.isSafeInteger"],
-  [Number.parseFloat, "Number.parseFloat"],
-  [Number.parseInt, "Number.parseInt"],
-  [Object, "Object"],
-  [Object.assign, "Object.assign"],
-  [Object.create, "Object.create"],
-  [Object.defineProperties, "Object.defineProperties"],
-  [Object.defineProperty, "Object.defineProperty"],
-  [Object.entries, "Object.entries"],
-  [Object.freeze, "Object.freeze"],
-  [Object.fromEntries, "Object.fromEntries"],
-  [Object.getOwnPropertyDescriptor, "Object.getOwnPropertyDescriptor"],
-  [Object.getOwnPropertyDescriptors, "Object.getOwnPropertyDescriptors"],
-  [Object.getOwnPropertyNames, "Object.getOwnPropertyNames"],
-  [Object.getOwnPropertySymbols, "Object.getOwnPropertySymbols"],
-  [Object.getPrototypeOf, "Object.getPrototypeOf"],
-  [Object.is, "Object.is"],
-  [Object.isExtensible, "Object.isExtensible"],
-  [Object.isFrozen, "Object.isFrozen"],
-  [Object.isSealed, "Object.isSealed"],
-  [Object.keys, "Object.keys"],
-  [Object.preventExtensions, "Object.preventExtensions"],
-  [Object.seal, "Object.seal"],
-  [Object.setPrototypeOf, "Object.setPrototypeOf"],
-  [Object.values, "Object.values"],
-  [parseFloat, "parseFloat"],
-  [parseInt, "parseInt"],
-  [Promise, "Promise"],
-  [Proxy, "Proxy"],
-  [RangeError, "RangeError"],
-  [ReferenceError, "ReferenceError"],
-  [Reflect.apply, "Reflect.apply"],
-  [Reflect.construct, "Reflect.construct"],
-  [Reflect.defineProperty, "Reflect.defineProperty"],
-  [Reflect.deleteProperty, "Reflect.deleteProperty"],
-  [Reflect.get, "Reflect.get"],
-  [Reflect.getOwnPropertyDescriptor, "Reflect.getOwnPropertyDescriptor"],
-  [Reflect.getPrototypeOf, "Reflect.getPrototypeOf"],
-  [Reflect.has, "Reflect.has"],
-  [Reflect.isExtensible, "Reflect.isExtensible"],
-  [Reflect.ownKeys, "Reflect.ownKeys"],
-  [Reflect.preventExtensions, "Reflect.preventExtensions"],
-  [Reflect.set, "Reflect.set"],
-  [Reflect.setPrototypeOf, "Reflect.setPrototypeOf"],
-  [RegExp, "RegExp"],
-  [Set, "Set"],
-  [String, "String"],
-  [String.fromCharCode, "String.fromCharCode"],
-  [String.fromCodePoint, "String.fromCodePoint"],
-  [String.raw, "String.raw"],
-  [Symbol, "Symbol"],
-  [Symbol.for, "Symbol.for"],
-  [SyntaxError, "SyntaxError"],
-  [TypeError, "TypeError"],
-  [Uint16Array, "Uint16Array"],
-  [Uint16Array.from, "Uint16Array.from"],
-  [Uint16Array.of, "Uint16Array.of"],
-  [Uint32Array, "Uint32Array"],
-  [Uint32Array.from, "Uint32Array.from"],
-  [Uint32Array.of, "Uint32Array.of"],
-  [Uint8Array, "Uint8Array"],
-  [Uint8Array.from, "Uint8Array.from"],
-  [Uint8Array.of, "Uint8Array.of"],
-  [Uint8ClampedArray, "Uint8ClampedArray"],
-  [Uint8ClampedArray.from, "Uint8ClampedArray.from"],
-  [Uint8ClampedArray.of, "Uint8ClampedArray.of"],
-  [URIError, "URIError"],
-  [WeakMap, "WeakMap"],
-  [WeakSet, "WeakSet"]
-]);
-var KNOWN_OBJECTS = /* @__PURE__ */ new Map([
-  [Atomics, "Atomics"],
-  [console, "console"],
-  [globalThis, "globalThis"],
-  [globalThis.crypto, "crypto"],
-  [Intl, "Intl"],
-  [JSON, "JSON"],
-  [Math, "Math"],
-  [Reflect, "Reflect"]
-]);
-function toAccess(accessor) {
-  const start = accessor[0];
-  return start === '"' || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
+};
+
+// src/translator/util/get-known-attr-values.ts
+function getKnownAttrValues(tag) {
+  const attrs2 = {};
+  for (const attr2 of tag.attributes) {
+    if (attr2.type === "MarkoAttribute") {
+      attrs2[attr2.name] = attr2.value;
+    }
+  }
+  return attrs2;
+}
+
+// src/translator/util/is-core-tag.ts
+var import_babel_utils7 = require("@marko/compiler/babel-utils");
+
+// src/translator/util/get-tag-name.ts
+function getTagName(tag) {
+  return tag.node.name.value;
 }
-function patchIteratorNext(proto) {
-  const { next } = proto;
-  proto.next = function(value) {
-    this[kTouchedIterator] = 1;
-    return next.call(this, value);
-  };
+
+// src/translator/util/is-core-tag.ts
+var { taglibId } = runtime_info_default;
+var htmlTaglibId = "marko-html";
+var interopTaglibId = "@marko/translator-interop-class-tags";
+function isCoreTag(tag) {
+  if (tag.isMarkoTag()) {
+    const tagDef = (0, import_babel_utils7.getTagDef)(tag);
+    if (tagDef) {
+      switch (tagDef.taglibId) {
+        case taglibId:
+        case interopTaglibId:
+          return true;
+        case htmlTaglibId:
+          switch (tagDef.name) {
+            case "script":
+            case "style":
+              return true;
+          }
+          break;
+      }
+    }
+  }
+  return false;
+}
+function isCoreTagName(tag, name2) {
+  return isCoreTag(tag) && getTagName(tag) === name2;
+}
+function isConditionTag(tag) {
+  if (isCoreTag(tag)) {
+    switch (getTagName(tag)) {
+      case "if":
+      case "else-if":
+      case "else":
+        return true;
+    }
+  }
+  return false;
+}
+function isControlFlowTag(tag) {
+  if (isCoreTag(tag)) {
+    switch (getTagName(tag)) {
+      case "if":
+      case "else-if":
+      case "else":
+      case "for":
+      case "await":
+      case "try":
+        return true;
+    }
+  }
+  return false;
+}
+
+// src/translator/util/runtime.ts
+var import_compiler7 = require("@marko/compiler");
+var import_babel_utils8 = require("@marko/compiler/babel-utils");
+
+// src/common/attr-tag.ts
+var rest = false ? Symbol("Attribute Tag") : Symbol();
+
+// src/common/helpers.ts
+function classValue(classValue2) {
+  return toDelimitedString(classValue2, " ", stringifyClassObject);
+}
+function stringifyClassObject(name2, value) {
+  return value ? name2 : "";
+}
+function styleValue(styleValue2) {
+  return toDelimitedString(styleValue2, ";", stringifyStyleObject);
+}
+function stringifyStyleObject(name2, value) {
+  return value || value === 0 ? name2 + ":" + value : "";
+}
+function toDelimitedString(val, delimiter, stringify) {
+  let str = "";
+  let sep = "";
+  let part;
+  if (val) {
+    if (typeof val !== "object") {
+      str += val;
+    } else if (Array.isArray(val)) {
+      for (const v of val) {
+        part = toDelimitedString(v, delimiter, stringify);
+        if (part) {
+          str += sep + part;
+          sep = delimiter;
+        }
+      }
+    } else {
+      for (const name2 in val) {
+        part = stringify(name2, val[name2]);
+        if (part) {
+          str += sep + part;
+          sep = delimiter;
+        }
+      }
+    }
+  }
+  return str;
+}
+function isEventHandler(name2) {
+  return /^on[A-Z-]/.test(name2);
+}
+function getEventHandlerName(name2) {
+  return name2[2] === "-" ? name2.slice(3) : name2.slice(2).toLowerCase();
+}
+function isVoid(value) {
+  return value == null || value === false;
+}
+
+// src/html/content.ts
+function toString(val) {
+  return val ? val + "" : val === 0 ? "0" : "";
+}
+var unsafeXMLReg = /[<&]/g;
+var replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;";
+var escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
+function escapeXML(val) {
+  return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "&zwj;";
+}
+var unsafeScriptReg = /<\/script/g;
+var escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str;
+function escapeScript(val) {
+  return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
+}
+var unsafeStyleReg = /<\/style/g;
+var escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
+function escapeStyle(val) {
+  return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
 
 // src/html/writer.ts
@@ -1609,9 +1624,7 @@ function addSectionSerializeReasonRef(section, ref, prop) {
           forceSectionSerialize(section);
         } else {
           const reason = getSerializeSourcesForRef(ref);
-          if (reason === true) {
-            forceSectionSerialize(section);
-          } else {
+          if (reason) {
             setSectionSerializeReason(
               section,
               mergeSerializeReasons(existingReason, reason)
@@ -1629,9 +1642,7 @@ function addKeyedSerializeReasonRef(section, key, ref) {
       forceSerializeKey(section, key);
     } else {
       const reason = getSerializeSourcesForRef(ref);
-      if (reason === true) {
-        forceSerializeKey(section, key);
-      } else {
+      if (reason) {
         setSectionKeyedSerializeReason(
           section,
           key,
@@ -1757,7 +1768,9 @@ function finalizeSectionSerializeReasons(section) {
       }
       reason = mergeSerializeReasons(reason, keyedReason);
     }
-    setSectionSerializeReason(section, reason);
+    if (reason) {
+      setSectionSerializeReason(section, reason);
+    }
   }
 }
 function getSerializeSourcesForExpr(expr) {
@@ -1768,13 +1781,11 @@ function getSerializeSourcesForExpr(expr) {
 function getSerializeSourcesForExprs(exprs) {
   if (exprs) {
     if (Array.isArray(exprs)) {
-      let serializeSource;
+      let allSources;
       for (const expr of exprs) {
-        const exprSources = getSerializeSourcesForExpr(expr);
-        if (exprSources === true) return true;
-        serializeSource = bindingUtil.union(serializeSource, exprSources);
+        allSources = mergeSources(allSources, getSerializeSourcesForExpr(expr));
       }
-      return serializeSource;
+      return allSources;
     } else {
       return getSerializeSourcesForExpr(exprs);
     }
@@ -1782,24 +1793,20 @@ function getSerializeSourcesForExprs(exprs) {
 }
 function getSerializeSourcesForRef(ref) {
   if (ref) {
-    let allSerializeSources;
+    let allSources;
     if (Array.isArray(ref)) {
-      for (const { serializeSources } of ref) {
-        if (serializeSources === true) return serializeSources;
-        allSerializeSources = bindingUtil.union(
-          allSerializeSources,
-          serializeSources
-        );
+      for (const { sources } of ref) {
+        allSources = mergeSources(allSources, sources);
       }
-      return allSerializeSources;
+      return allSources;
     } else {
-      return ref.serializeSources;
+      return ref.sources;
     }
   }
 }
 function mergeSerializeReasons(a, b) {
   if (a === true || b === true) return true;
-  return bindingUtil.union(a, b);
+  return mergeSources(a, b);
 }
 function setSectionSerializeReason(section, reason) {
   section.serializeReason = reason;
@@ -2347,35 +2354,77 @@ function simplifyFunction(fn) {
   }
 }
 
+// src/translator/util/with-comment.ts
+function withLeadingComment(node, value) {
+  const comment = {
+    type: "CommentBlock",
+    value: ` ${value} `
+  };
+  node.leadingComments = node.leadingComments ? [...node.leadingComments, comment] : [comment];
+  return node;
+}
+
 // src/translator/visitors/program/html.ts
 function getTemplateContentName() {
   return getSharedUid("content");
 }
+function getSerializeGuard(reason, optional) {
+  return !reason ? import_compiler13.types.numericLiteral(0) : reason === true || reason.state ? optional ? void 0 : reason === true ? import_compiler13.types.numericLiteral(1) : withLeadingComment(
+    import_compiler13.types.numericLiteral(1),
+    `state: ${mapToString(reason.state, ", ", getDebugName)}`
+  ) : getInputSerializeReasonGuard(reason.input);
+}
+function getSerializeGuardForAny(reasons, optional) {
+  if (!reasons || reasons === true) {
+    return getSerializeGuard(reasons, optional);
+  }
+  if (reasons.length === 1) {
+    return getSerializeGuard(reasons[0], optional);
+  }
+  let expr;
+  for (const reason of reasons) {
+    if (reason.state) {
+      return optional ? void 0 : withLeadingComment(
+        import_compiler13.types.numericLiteral(1),
+        `state: ${mapToString(reason.state, ", ", getDebugName)}`
+      );
+    }
+    const guard = getSerializeGuard(reason, false);
+    expr = expr ? import_compiler13.types.logicalExpression("||", expr, guard) : guard;
+  }
+  return expr;
+}
 function getExprIfSerialized(reason, expr) {
-  return reason ? reason === true ? expr : import_compiler13.types.logicalExpression(
+  return reason ? reason === true || reason.state ? expr : import_compiler13.types.logicalExpression(
     "&&",
     callRuntime(
       "serializeIf",
       import_compiler13.types.identifier(getSharedUid("serialize")),
-      import_compiler13.types.numericLiteral(
-        resolveSerializeReasonId(
-          (0, import_babel_utils12.getProgram)().node.extra.inputSerializeReasons,
-          reason
-        )
+      withLeadingComment(
+        import_compiler13.types.numericLiteral(
+          resolveSerializeReasonId(
+            (0, import_babel_utils12.getProgram)().node.extra.inputSerializeReasons,
+            reason.input
+          )
+        ),
+        mapToString(reason.input, ", ", getInputDebugName)
       )
     ),
     expr
   ) : void 0;
 }
-function getSerializeGuard(reason) {
+function getInputSerializeReasonGuard(reason) {
   return callRuntime(
     "serializeGuard",
     import_compiler13.types.identifier(getSharedUid("serialize")),
-    import_compiler13.types.numericLiteral(
-      resolveSerializeReasonId(
-        (0, import_babel_utils12.getProgram)().node.extra.inputSerializeReasons,
-        reason
-      )
+    withLeadingComment(
+      import_compiler13.types.numericLiteral(
+        resolveSerializeReasonId(
+          (0, import_babel_utils12.getProgram)().node.extra.inputSerializeReasons,
+          reason
+        )
+      ),
+      mapToString(reason, ",", getDebugName)
     )
   );
 }
@@ -2700,12 +2749,7 @@ function getWalkString(section) {
   const walks = getWalks(section);
   const walkLiteral = normalizeStringExpression([prefix2, ...walks, postfix]);
   if (walkLiteral && walkLiteral.value !== "") {
-    walkLiteral.leadingComments = [
-      {
-        type: "CommentBlock",
-        value: " " + getWalkComment(section).join(", ") + " "
-      }
-    ];
+    withLeadingComment(walkLiteral, getWalkComment(section).join(", "));
   }
   return walkLiteral;
 }
@@ -2790,7 +2834,7 @@ function markNode(path5, nodeBinding, reason) {
         "markResumeNode",
         getScopeIdIdentifier(section),
         getScopeAccessorLiteral(nodeBinding),
-        reason === true ? void 0 : getSerializeGuard(reason)
+        getSerializeGuard(reason, true)
       )}`;
     }
   }
@@ -3734,7 +3778,7 @@ function writeHTMLResumeStatements(path5) {
     serializedProperties.push(
       toObjectProperty(
         accessor,
-        sectionSerializeReason && (sectionSerializeReason === reason || sectionSerializeReason !== true && reason !== true && compareSerializeReasons(sectionSerializeReason, reason) === 0) ? getDeclaredBindingExpression(binding) : getExprIfSerialized(reason, getDeclaredBindingExpression(binding))
+        sectionSerializeReason && (sectionSerializeReason === reason || sectionSerializeReason !== true && reason !== true && compareSources(sectionSerializeReason, reason) === 0) ? getDeclaredBindingExpression(binding) : getExprIfSerialized(reason, getDeclaredBindingExpression(binding))
       )
     );
   });
@@ -3750,7 +3794,7 @@ function writeHTMLResumeStatements(path5) {
       serializedProperties.push(
         toObjectProperty(
           ownerAccessor,
-          sectionSerializeReason && (sectionSerializeReason === ownerReason || sectionSerializeReason !== true && ownerReason !== true && compareSerializeReasons(sectionSerializeReason, ownerReason) === 0) ? getOwnerExpr : getExprIfSerialized(ownerReason, getOwnerExpr)
+          sectionSerializeReason && (sectionSerializeReason === ownerReason || sectionSerializeReason !== true && ownerReason !== true && compareSources(sectionSerializeReason, ownerReason) === 0) ? getOwnerExpr : getExprIfSerialized(ownerReason, getOwnerExpr)
         )
       );
     }
@@ -3777,14 +3821,7 @@ function writeHTMLResumeStatements(path5) {
         if (binding.type === 0 /* dom */) return;
         const serializeReason = getBindingSerializeReason(section, binding);
         if (!serializeReason) return;
-        let root = binding;
-        let access = "";
-        while (!(root.loc || root.declared) && root.upstreamAlias) {
-          if (root.property !== void 0) {
-            access = toAccess(root.property) + access;
-          }
-          root = root.upstreamAlias;
-        }
+        const { root, access } = getDebugScopeAccess(binding);
         const locExpr = root.loc && import_compiler20.types.stringLiteral(
           `${root.loc.start.line}:${root.loc.start.column + 1}`
         );
@@ -3808,10 +3845,10 @@ function writeHTMLResumeStatements(path5) {
       }
     }
     let writeScopeCall = writeScopeBuilder ? writeScopeBuilder(callRuntime("writeScope", ...writeScopeArgs)) : callRuntime("writeScope", ...writeScopeArgs);
-    if (sectionSerializeReason !== true) {
+    if (sectionSerializeReason !== true && !sectionSerializeReason.state) {
       writeScopeCall = import_compiler20.types.logicalExpression(
         "&&",
-        getSerializeGuard(sectionSerializeReason),
+        getSerializeGuard(sectionSerializeReason, false),
         writeScopeCall
       );
     }
@@ -4223,11 +4260,7 @@ var program_default = {
   }
 };
 function resolveSerializeReasonId(inputSerializeReasons, reason) {
-  const id = findIndexSorted(
-    compareSerializeReasons,
-    inputSerializeReasons,
-    reason
-  );
+  const id = findIndexSorted(compareReferences, inputSerializeReasons, reason);
   if (id === -1) {
     throw new Error("Unable to resolve serialize reason against input");
   }
@@ -4340,7 +4373,6 @@ function createBinding(name2, type, section, upstreamAlias, property, loc = null
     closureSections: void 0,
     assignmentSections: void 0,
     excludeProperties: void 0,
-    serializeSources: void 0,
     sources: void 0,
     aliases: /* @__PURE__ */ new Set(),
     hoists: /* @__PURE__ */ new Map(),
@@ -4649,8 +4681,8 @@ function mergeReferences(section, target, nodes) {
   getMergedReferences().set(target, nodes);
   return targetExtra;
 }
-function compareSerializeReasons(a, b) {
-  return Array.isArray(a) ? Array.isArray(b) ? compareIntersections(a, b) : -1 : Array.isArray(b) ? 1 : bindingUtil.compare(a, b);
+function compareReferences(a, b) {
+  return a === b ? 0 : Array.isArray(a) ? Array.isArray(b) ? compareIntersections(a, b) : -1 : Array.isArray(b) ? 1 : bindingUtil.compare(a, b);
 }
 function compareIntersections(a, b) {
   const len = a.length;
@@ -4753,7 +4785,7 @@ function finalizeReferences() {
         addOwnersSerializeReason(
           section2,
           binding.section,
-          binding.serializeSources,
+          binding.sources,
           getAccessorProp().Owner
         );
       }
@@ -4804,18 +4836,44 @@ function finalizeReferences() {
           for (let j = i + 1; j < numReferences; j++) {
             const binding1 = intersection[i];
             const binding2 = intersection[j];
-            if (!isBindingForceSerialized(section, binding1) && !bindingUtil.isSuperset(binding1.sources, binding2.sources)) {
+            if (!isBindingForceSerialized(section, binding1) && !isSupersetSources(binding1, binding2)) {
+              if (!isSameOrChildSection(section, binding1.section)) {
+                addOwnersSerializeReason(
+                  section,
+                  binding1.section,
+                  mergeSerializeReasons(
+                    // TODO should check for an actual intersection, not just stateful
+                    binding1.sources,
+                    binding2.sources
+                  ),
+                  getAccessorProp().Owner
+                );
+              }
               addBindingSerializeReason(
-                section,
+                binding1.section,
                 binding1,
-                binding2.serializeSources
+                binding2.sources
+                // TODO should check for an actual intersection, not just binding2.sources stateful
               );
             }
-            if (!isBindingForceSerialized(section, binding2) && !bindingUtil.isSuperset(binding2.sources, binding1.sources)) {
+            if (!isBindingForceSerialized(section, binding2) && !isSupersetSources(binding2, binding1)) {
+              if (!isSameOrChildSection(section, binding2.section)) {
+                addOwnersSerializeReason(
+                  section,
+                  binding2.section,
+                  mergeSerializeReasons(
+                    // TODO should check for an actual intersection, not just stateful
+                    binding1.sources,
+                    binding2.sources
+                  ),
+                  getAccessorProp().Owner
+                );
+              }
               addBindingSerializeReason(
-                section,
+                binding2.section,
                 binding2,
-                binding1.serializeSources
+                binding1.sources
+                // TODO should check for an actual intersection, not just binding1.sources stateful
               );
             }
           }
@@ -4847,17 +4905,17 @@ function finalizeReferences() {
           getBindingSerializeReason(closure.section, closure)
         );
       }
-      if (closure.serializeSources && isDynamicClosure(section, closure)) {
+      if (closure.sources && isDynamicClosure(section, closure)) {
         addBindingSerializeReason(
           closure.section,
           closure,
-          closure.serializeSources,
+          closure.sources,
           getAccessorPrefix().ClosureScopes
         );
         addBindingSerializeReason(
           section,
           closure,
-          closure.serializeSources,
+          closure.sources,
           getAccessorPrefix().ClosureSignalIndex
         );
       }
@@ -4866,21 +4924,28 @@ function finalizeReferences() {
   let inputSerializeReasons;
   forEachSection((section) => {
     finalizeSectionSerializeReasons(section);
-    if (section.serializeReason && section.serializeReason !== true) {
+    if (section.serializeReason && section.serializeReason !== true && section.serializeReason.input) {
       inputSerializeReasons = inputSerializeReasons ? addSorted(
-        compareSerializeReasons,
+        compareReferences,
         inputSerializeReasons,
-        section.serializeReason
-      ) : [section.serializeReason];
+        section.serializeReason.input
+      ) : [section.serializeReason.input];
     }
     for (const [, reason] of section.serializeReasons) {
-      if (reason !== true) {
-        inputSerializeReasons = inputSerializeReasons ? addSorted(compareSerializeReasons, inputSerializeReasons, reason) : [reason];
+      if (reason !== true && reason.input) {
+        inputSerializeReasons = inputSerializeReasons ? addSorted(compareReferences, inputSerializeReasons, reason.input) : [reason.input];
       }
     }
   });
   const programExtra = (0, import_babel_utils17.getProgram)().node.extra;
-  programExtra.returnSerializeReason = programExtra.returnValueExpr && getSerializeSourcesForExpr(programExtra.returnValueExpr);
+  if (programExtra.returnValueExpr) {
+    const returnSources = getSerializeSourcesForExpr(
+      programExtra.returnValueExpr
+    );
+    if (returnSources) {
+      programExtra.returnSerializeReason = returnSources.state ? true : returnSources.input;
+    }
+  }
   programExtra.inputSerializeReasons = inputSerializeReasons;
   forEachSection((section) => {
     let intersectionIndex = 0;
@@ -4913,12 +4978,14 @@ function finalizeReferences() {
 function getMaxOwnSourceOffset(intersection, section) {
   let scopeOffset;
   for (const binding of intersection) {
-    if (binding.section === section) {
-      forEach(binding.sources, (source) => {
+    if (binding.section === section && binding.sources) {
+      const trackScopeOffset = (source) => {
         if (source.scopeOffset && (!scopeOffset || scopeOffset.id < source.scopeOffset.id)) {
           scopeOffset = source.scopeOffset;
         }
-      });
+      };
+      forEach(binding.sources.state, trackScopeOffset);
+      forEach(binding.sources.input, trackScopeOffset);
     }
   }
   return scopeOffset;
@@ -4934,60 +5001,82 @@ function resolveBindingSources(binding) {
   resolvedSources.add(binding);
   switch (binding.type) {
     case 1 /* let */:
-      binding.sources = binding;
-      binding.serializeSources = true;
+      binding.sources = createSources(binding, void 0);
       return;
     case 2 /* input */:
-      binding.sources = binding;
-      binding.serializeSources = binding;
+      binding.sources = createSources(void 0, binding);
       return;
   }
-  let alias;
-  let source = binding;
-  while (alias = source.upstreamAlias) {
-    source = alias;
-  }
-  if (source === binding) {
+  if (binding.upstreamAlias) {
+    let alias;
+    let source = binding;
+    while (alias = source.upstreamAlias) {
+      source = alias;
+    }
+    if (!resolvedSources.has(source)) {
+      resolvedSources.add(source);
+      resolveDerivedSources(source);
+    }
+    binding.sources = source.sources;
+  } else {
     resolveDerivedSources(binding);
-    return;
-  }
-  if (!resolvedSources.has(source)) {
-    resolvedSources.add(source);
-    resolveDerivedSources(source);
   }
-  binding.sources = source.sources;
-  binding.serializeSources = source.serializeSources;
 }
 function resolveDerivedSources(binding) {
   const exprs = bindingValueExprs.get(binding);
   bindingValueExprs.delete(binding);
   if (exprs === void 0 || exprs === true) {
-    binding.serializeSources = true;
-    binding.sources = binding;
+    binding.sources = createSources(binding, void 0);
   } else if (exprs) {
     const seen = /* @__PURE__ */ new Set();
-    let onlyInputSources = true;
-    let sources;
     forEach(exprs, (expr) => {
       if (isReferencedExtra(expr)) {
         forEach(expr.referencedBindings, (ref) => {
           if (!seen.has(ref)) {
             seen.add(ref);
             resolveBindingSources(ref);
-            sources = bindingUtil.union(sources, ref.sources);
-            onlyInputSources &&= ref.serializeSources !== true;
+            binding.sources = mergeSources(binding.sources, ref.sources);
           }
         });
       }
     });
-    if (sources) {
-      binding.sources = sources;
-      binding.serializeSources = onlyInputSources ? sources : true;
-    }
   }
 }
+function createSources(state, input) {
+  if (!(state || input)) {
+    throw new Error(
+      "Cannot create a serialize reason that does not reference state or input."
+    );
+  }
+  return { state, input };
+}
+function compareSources(a, b) {
+  let delta = 0;
+  if (a.input) {
+    if (!b.input) return 1;
+    if (delta = compareReferences(a.input, b.input)) return delta;
+  } else if (b.input) {
+    return -1;
+  }
+  if (a.state) {
+    if (!b.state) return 1;
+    if (delta = compareReferences(a.state, b.state)) return delta;
+  } else if (b.state) {
+    return -1;
+  }
+  return 0;
+}
+function mergeSources(a, b) {
+  if (!a) return b;
+  if (!b) return a;
+  if (a.state === b.state && a.input === b.input) return a;
+  return createSources(
+    bindingUtil.union(a.state, b.state),
+    bindingUtil.union(a.input, b.input)
+  );
+}
 var bindingUtil = new Sorted(function compareBindings(a, b) {
-  return a.section.id - b.section.id || a.type !== b.type && (a.type === 0 /* dom */ || b.type === 0 /* dom */) ? a.type - b.type || a.id - b.id : a.id - b.id;
+  return a === b ? 0 : a.section.id - b.section.id || a.type !== b.type && (a.type === 0 /* dom */ || b.type === 0 /* dom */) ? a.type - b.type || a.id - b.id : a.id - b.id;
 });
 var [getReadsByExpression] = createProgramState(
   () => /* @__PURE__ */ new Map()
@@ -5054,6 +5143,35 @@ function getScopeAccessor(binding, includeId) {
   }
   return binding.name + (includeId || binding.type === 0 /* dom */ ? `/${binding.id}` : "");
 }
+function getDebugScopeAccess(binding) {
+  let root = binding;
+  let access = "";
+  while (!(root.loc || root.declared) && root.upstreamAlias) {
+    if (root.property !== void 0) {
+      access = toAccess(root.property) + access;
+    }
+    root = root.upstreamAlias;
+  }
+  return {
+    root,
+    access
+  };
+}
+function getDebugName(binding) {
+  const { root, access } = getDebugScopeAccess(binding);
+  return root.name + access;
+}
+function getInputDebugName(binding) {
+  let root = binding;
+  let access = "";
+  while (root.upstreamAlias !== root.section.params) {
+    if (root.property !== void 0) {
+      access = toAccess(root.property) + access;
+    }
+    root = root.upstreamAlias;
+  }
+  return root.name + access;
+}
 function getSectionInstancesAccessor(section) {
   return section.sectionAccessor ? section.sectionAccessor.prefix + getScopeAccessor(section.sectionAccessor.binding) : getAccessorPrefix().ClosureScopes + section.id;
 }
@@ -5177,6 +5295,11 @@ function resolveExpressionReference(reads, readBinding, readProps) {
   }
   return createRead(readBinding, readProps);
 }
+function isSupersetSources(a, b) {
+  if (!b.sources) return true;
+  if (!a.sources) return false;
+  return bindingUtil.isSuperset(a.sources.state, b.sources.state) && bindingUtil.isSuperset(a.sources.input, b.sources.input);
+}
 function getCanonicalProperty(binding) {
   return binding.property ?? binding.upstreamAlias?.property;
 }
@@ -5266,7 +5389,6 @@ var await_default = {
         const tagBody = tag.get("body");
         const section = getSection(tag);
         const bodySection = getSectionForBody(tagBody);
-        const serializeReason = bodySection && getSectionSerializeReason(bodySection);
         flushInto(tag);
         writeHTMLResumeStatements(tagBody);
         tag.replaceWith(
@@ -5280,7 +5402,10 @@ var await_default = {
                 node.body.params,
                 toFirstExpressionOrBlock(node.body.body)
               ),
-              !serializeReason ? import_compiler25.types.numericLiteral(0) : serializeReason === true ? void 0 : getSerializeGuard(serializeReason)
+              getSerializeGuard(
+                bodySection && getSectionSerializeReason(bodySection),
+                true
+              )
             )
           )
         )[0].skip();
@@ -5626,66 +5751,6 @@ var import_babel_utils24 = require("@marko/compiler/babel-utils");
 // src/translator/visitors/tag/native-tag.ts
 var import_compiler31 = require("@marko/compiler");
 var import_babel_utils23 = require("@marko/compiler/babel-utils");
-
-// src/translator/util/css-px-props.ts
-var css_px_props_default = /* @__PURE__ */ new Set([
-  "background-size",
-  "baseline-shift",
-  "border-bottom-left-radius",
-  "border-bottom-right-radius",
-  "border-bottom-width",
-  "border-left-width",
-  "border-right-width",
-  "border-top-left-radius",
-  "border-top-right-radius",
-  "border-top-width",
-  "bottom",
-  "column-gap",
-  "column-rule-width",
-  "column-width",
-  "cx",
-  "cy",
-  "flex-basis",
-  "font-size",
-  "grid-auto-columns",
-  "grid-auto-rows",
-  "height",
-  "left",
-  "letter-spacing",
-  "margin-bottom",
-  "margin-left",
-  "margin-right",
-  "margin-top",
-  "max-height",
-  "max-width",
-  "min-height",
-  "min-width",
-  "offset-distance",
-  "outline-offset",
-  "outline-width",
-  "padding-bottom",
-  "padding-left",
-  "padding-right",
-  "padding-top",
-  "perspective",
-  "r",
-  "right",
-  "row-gap",
-  "rx",
-  "ry",
-  "shape-margin",
-  "stroke-dashoffset",
-  "stroke-width",
-  "text-indent",
-  "top",
-  "vertical-align",
-  "width",
-  "word-spacing",
-  "x",
-  "y"
-]);
-
-// src/translator/visitors/tag/native-tag.ts
 var kNativeTagBinding = Symbol("native tag binding");
 var kSkipMark = Symbol("skip native tag mark");
 var kGetterId = Symbol("node getter id");
@@ -6152,7 +6217,7 @@ var native_tag_default = {
                   );
                 } else {
                   if (meta.staticItems) {
-                    write2`${getHTMLRuntime()[helper](computed)}`;
+                    write2`${getHTMLRuntime()[helper](meta.staticItems)}`;
                   }
                   if (meta.dynamicValues) {
                     const keys = Object.keys(meta.dynamicValues);
@@ -6164,7 +6229,7 @@ var native_tag_default = {
                           `${name2}Item`,
                           nodeExpr,
                           import_compiler31.types.stringLiteral(key),
-                          name2 === "style" && css_px_props_default.has(name2) ? callRuntime("styleItemValue", value2) : value2
+                          value2
                         )
                       );
                     } else {
@@ -6172,10 +6237,7 @@ var native_tag_default = {
                       for (const key of keys) {
                         const value2 = meta.dynamicValues[key];
                         props.push(
-                          import_compiler31.types.objectProperty(
-                            toPropertyName(key),
-                            name2 === "style" && css_px_props_default.has(name2) ? callRuntime("styleItemValue", value2) : value2
-                          )
+                          import_compiler31.types.objectProperty(toPropertyName(key), value2)
                         );
                       }
                       stmt = import_compiler31.types.expressionStatement(
@@ -6662,12 +6724,16 @@ var for_default = {
           if (markerSerializeReason && onlyChildInParentOptimization) {
             getParentTag(tag).node.extra[kSkipMark] = true;
           }
+          const markerSerializeArg = getSerializeGuard(
+            markerSerializeReason,
+            !onlyChildInParentOptimization
+          );
           forTagArgs.push(
             forAttrs.by || import_compiler33.types.numericLiteral(0),
             getScopeIdIdentifier(tagSection),
             getScopeAccessorLiteral(nodeBinding),
-            branchSerializeReason === true ? markerSerializeReason === true && !onlyChildInParentOptimization ? void 0 : import_compiler33.types.numericLiteral(1) : getSerializeGuard(branchSerializeReason),
-            !markerSerializeReason ? import_compiler33.types.numericLiteral(0) : markerSerializeReason === true ? onlyChildInParentOptimization ? import_compiler33.types.numericLiteral(1) : void 0 : getSerializeGuard(markerSerializeReason)
+            getSerializeGuard(branchSerializeReason, !markerSerializeArg),
+            markerSerializeArg
           );
           if (onlyChildInParentOptimization) {
             forTagArgs.push(import_compiler33.types.numericLiteral(1));
@@ -7845,7 +7911,6 @@ var html_script_default = {
       const tagExtra = tag.node.extra;
       const nodeBinding = tagExtra[kNodeBinding2];
       const write2 = writeTo(tag);
-      const visitAccessor = getScopeAccessorLiteral(nodeBinding);
       if (isOutputHTML()) {
         for (const child of tag.node.body.body) {
           if (import_compiler38.types.isMarkoText(child)) {
@@ -7880,7 +7945,11 @@ var html_script_default = {
             import_compiler38.types.expressionStatement(
               callRuntime(
                 "textContent",
-                import_compiler38.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                import_compiler38.types.memberExpression(
+                  scopeIdentifier,
+                  getScopeAccessorLiteral(nodeBinding),
+                  true
+                ),
                 import_compiler38.types.templateLiteral(templateQuasis, templateExpressions)
               )
             )
@@ -8257,7 +8326,6 @@ var html_style_default = {
       const tagExtra = tag.node.extra;
       const nodeBinding = tagExtra[kNodeBinding3];
       const write2 = writeTo(tag);
-      const visitAccessor = getScopeAccessorLiteral(nodeBinding);
       if (isOutputHTML()) {
         for (const child of tag.node.body.body) {
           if (import_compiler39.types.isMarkoText(child)) {
@@ -8292,7 +8360,11 @@ var html_style_default = {
             import_compiler39.types.expressionStatement(
               callRuntime(
                 "textContent",
-                import_compiler39.types.memberExpression(scopeIdentifier, visitAccessor, true),
+                import_compiler39.types.memberExpression(
+                  scopeIdentifier,
+                  getScopeAccessorLiteral(nodeBinding),
+                  true
+                ),
                 import_compiler39.types.templateLiteral(templateQuasis, templateExpressions)
               )
             )
@@ -8520,11 +8592,11 @@ var IfTag = {
               );
               if (branchSerializeReason) {
                 if (branchSerializeReasons !== true) {
-                  if (branchSerializeReason === true) {
+                  if (branchSerializeReason === true || branchSerializeReason.state) {
                     branchSerializeReasons = true;
                   } else if (branchSerializeReasons) {
                     branchSerializeReasons = addSorted(
-                      compareSerializeReasons,
+                      compareSources,
                       branchSerializeReasons,
                       branchSerializeReason
                     );
@@ -8558,24 +8630,44 @@ var IfTag = {
               [],
               import_compiler42.types.blockStatement([statement])
             );
-            statement = import_compiler42.types.expressionStatement(
-              singleNodeOptimization ? callRuntime(
-                "resumeSingleNodeConditional",
-                cbNode,
-                getScopeIdIdentifier(ifTagSection),
-                getScopeAccessorLiteral(nodeBinding),
-                branchSerializeReasons === true ? markerSerializeReason === true && !onlyChildInParentOptimization ? void 0 : import_compiler42.types.numericLiteral(1) : getSerializeGuardForAny(branchSerializeReasons),
-                !markerSerializeReason ? import_compiler42.types.numericLiteral(0) : markerSerializeReason === true ? onlyChildInParentOptimization ? import_compiler42.types.numericLiteral(1) : void 0 : getSerializeGuard(markerSerializeReason),
-                onlyChildInParentOptimization && import_compiler42.types.numericLiteral(1)
-              ) : callRuntime(
-                "resumeConditional",
-                cbNode,
-                getScopeIdIdentifier(ifTagSection),
-                getScopeAccessorLiteral(nodeBinding),
-                branchSerializeReasons === true ? markerSerializeReason === true ? void 0 : import_compiler42.types.numericLiteral(1) : getSerializeGuardForAny(branchSerializeReasons),
-                !markerSerializeReason ? import_compiler42.types.numericLiteral(0) : markerSerializeReason === true ? void 0 : getSerializeGuard(markerSerializeReason)
-              )
-            );
+            if (singleNodeOptimization) {
+              const markerSerializeArg = getSerializeGuard(
+                markerSerializeReason,
+                !onlyChildInParentOptimization
+              );
+              statement = import_compiler42.types.expressionStatement(
+                callRuntime(
+                  "resumeSingleNodeConditional",
+                  cbNode,
+                  getScopeIdIdentifier(ifTagSection),
+                  getScopeAccessorLiteral(nodeBinding),
+                  getSerializeGuardForAny(
+                    branchSerializeReasons,
+                    !markerSerializeArg
+                  ),
+                  markerSerializeArg,
+                  onlyChildInParentOptimization && import_compiler42.types.numericLiteral(1)
+                )
+              );
+            } else {
+              const markerSerializeArg = getSerializeGuard(
+                markerSerializeReason,
+                true
+              );
+              statement = import_compiler42.types.expressionStatement(
+                callRuntime(
+                  "resumeConditional",
+                  cbNode,
+                  getScopeIdIdentifier(ifTagSection),
+                  getScopeAccessorLiteral(nodeBinding),
+                  getSerializeGuardForAny(
+                    branchSerializeReasons,
+                    !markerSerializeArg
+                  ),
+                  markerSerializeArg
+                )
+              );
+            }
           }
           nextTag.insertBefore(statement);
         }
@@ -8755,13 +8847,6 @@ function getBranches(tag) {
   }
   return branches;
 }
-function getSerializeGuardForAny(reasons) {
-  let expr = getSerializeGuard(reasons[0]);
-  for (let i = 1; i < reasons.length; i++) {
-    expr = import_compiler42.types.logicalExpression("||", expr, getSerializeGuard(reasons[i]));
-  }
-  return expr;
-}
 function isLastBranch(tag) {
   const branches = getBranches(tag);
   return branches[branches.length - 1][0] === tag;
@@ -9687,10 +9772,10 @@ var placeholder_default = {
       } else {
         if (siblingText === 1 /* Before */) {
           if (isHTML && markerSerializeReason) {
-            if (markerSerializeReason === true) {
+            if (markerSerializeReason === true || markerSerializeReason.state) {
               write2`<!>`;
             } else {
-              write2`${callRuntime("commentSeparator", getSerializeGuard(markerSerializeReason))}`;
+              write2`${callRuntime("commentSeparator", getSerializeGuard(markerSerializeReason, true))}`;
             }
           }
           visit(placeholder, 37 /* Replace */);
@@ -10096,7 +10181,7 @@ function translateHTML(tag) {
         childScopeBinding,
         childSerializeReasonIds[0]
       );
-      childSerializeReasonExpr = !reason ? void 0 : reason == true ? import_compiler56.types.numericLiteral(1) : getSerializeGuard(reason);
+      childSerializeReasonExpr = !reason ? void 0 : reason == true || reason.state ? import_compiler56.types.numericLiteral(1) : getSerializeGuard(reason, true);
     } else {
       const props = [];
       let hasDynamicReasons = false;
@@ -10108,11 +10193,15 @@ function translateHTML(tag) {
           childSerializeReasonIds[i]
         );
         if (reason) {
-          hasDynamicReasons ||= reason !== true;
+          hasDynamicReasons ||= reason !== true && !reason.state;
+          const childReason = childExtra.inputSerializeReasons[i];
           props.push(
             import_compiler56.types.objectProperty(
-              import_compiler56.types.numericLiteral(i),
-              reason === true ? import_compiler56.types.numericLiteral(1) : getSerializeGuard(reason)
+              withLeadingComment(
+                import_compiler56.types.numericLiteral(i),
+                mapToString(childReason, ", ", getInputDebugName)
+              ),
+              reason === true || reason.state ? import_compiler56.types.numericLiteral(1) : getSerializeGuard(reason, false)
             )
           );
         } else {
@@ -10853,11 +10942,10 @@ var dynamic_tag_default = {
       if (isOutputHTML()) {
         flushInto(tag);
         writeHTMLResumeStatements(tag.get("body"));
-        const serializeReason = getBindingSerializeReason(
-          tagSection,
-          nodeBinding
+        const serializeArg = getSerializeGuard(
+          getBindingSerializeReason(tagSection, nodeBinding),
+          true
         );
-        const serializeArg = !serializeReason ? import_compiler57.types.numericLiteral(0) : serializeReason === true ? void 0 : getSerializeGuard(serializeReason);
         const dynamicTagExpr = hasTagArgs ? callRuntime(
           "dynamicTag",
           getScopeIdIdentifier(tagSection),