Resolve merge conflict in generated sx-browser.js

shared/static/scripts/sx-browser.js

@@ -337,8 +337,196 @@
     if (!s) return [];
     return String(s).split(",").map(function(x) { return x.trim(); }).filter(function(x) { return x; });
   };
+  // =========================================================================
+  // CSSX Style Dictionary (on-demand Tailwind-like CSS)
+  // =========================================================================
+
+  var _styleAtoms = {};
+  var _pseudoVariants = {};
+  var _responsiveBreakpoints = {};
+  var _styleKeyframes = {};
+  var _arbitraryPatterns = [];
+  var _childSelectorPrefixes = [];
+  var _styleCache = {};
+  var _injectedStyles = {};
+
+  function _loadStyleDict(data) {
+    _styleAtoms = data.a || {};
+    _pseudoVariants = data.v || {};
+    _responsiveBreakpoints = data.b || {};
+    _styleKeyframes = data.k || {};
+    _childSelectorPrefixes = data.c || [];
+    _arbitraryPatterns = [];
+    var pats = data.p || [];
+    for (var i = 0; i < pats.length; i++) {
+      _arbitraryPatterns.push({ re: new RegExp("^" + pats[i][0] + "$"), tmpl: pats[i][1] });
+    }
+    _styleCache = {};
+  }
+
+  function _splitVariant(atom) {
+    for (var bp in _responsiveBreakpoints) {
+      var prefix = bp + ":";
+      if (atom.indexOf(prefix) === 0) {
+        var rest = atom.substring(prefix.length);
+        for (var pv in _pseudoVariants) {
+          var inner = pv + ":";
+          if (rest.indexOf(inner) === 0) return [bp + ":" + pv, rest.substring(inner.length)];
+        }
+        return [bp, rest];
+      }
+    }
+    for (var pv2 in _pseudoVariants) {
+      var prefix2 = pv2 + ":";
+      if (atom.indexOf(prefix2) === 0) return [pv2, atom.substring(prefix2.length)];
+    }
+    return [null, atom];
+  }
+
+  function _resolveAtom(atom) {
+    var decls = _styleAtoms[atom];
+    if (decls !== undefined) return decls;
+    if (atom.indexOf("animate-") === 0) {
+      var kfName = atom.substring(8);
+      if (_styleKeyframes[kfName]) return "animation-name:" + kfName;
+    }
+    for (var i = 0; i < _arbitraryPatterns.length; i++) {
+      var m = atom.match(_arbitraryPatterns[i].re);
+      if (m) {
+        var result = _arbitraryPatterns[i].tmpl;
+        for (var j = 1; j < m.length; j++) result = result.replace("{" + (j - 1) + "}", m[j]);
+        return result;
+      }
+    }
+    return null;
+  }
+
+  function _isChildSelectorAtom(atom) {
+    for (var i = 0; i < _childSelectorPrefixes.length; i++) {
+      if (atom.indexOf(_childSelectorPrefixes[i]) === 0) return true;
+    }
+    return false;
+  }
+
+  function _hashStyle(input) {
+    var h = 0x811c9dc5;
+    for (var i = 0; i < input.length; i++) {
+      h ^= input.charCodeAt(i);
+      h = (h * 0x01000193) >>> 0;
+    }
+    return h.toString(16).padStart(8, "0").substring(0, 6);
+  }
+
+  function _resolveStyle(atoms) {
+    var key = atoms.join("\0");
+    if (_styleCache[key]) return _styleCache[key];
+
+    var baseDecls = [], mediaRules = [], pseudoRules = [], kfNeeded = [];
+    for (var i = 0; i < atoms.length; i++) {
+      var a = atoms[i];
+      if (!a) continue;
+      if (a.charAt(0) === ":") a = a.substring(1);
+
+      var parts = _splitVariant(a);
+      var variant = parts[0], base = parts[1];
+      var decls = _resolveAtom(base);
+      if (!decls) continue;
+
+      if (base.indexOf("animate-") === 0) {
+        var kfName = base.substring(8);
+        if (_styleKeyframes[kfName]) kfNeeded.push([kfName, _styleKeyframes[kfName]]);
+      }
+
+      if (variant === null) {
+        baseDecls.push(decls);
+      } else if (_responsiveBreakpoints[variant]) {
+        mediaRules.push([_responsiveBreakpoints[variant], decls]);
+      } else if (_pseudoVariants[variant]) {
+        pseudoRules.push([_pseudoVariants[variant], decls]);
+      } else {
+        var vparts = variant.split(":");
+        var mediaPart = null, pseudoPart = null;
+        for (var vi = 0; vi < vparts.length; vi++) {
+          if (_responsiveBreakpoints[vparts[vi]]) mediaPart = _responsiveBreakpoints[vparts[vi]];
+          else if (_pseudoVariants[vparts[vi]]) pseudoPart = _pseudoVariants[vparts[vi]];
+        }
+        if (mediaPart) mediaRules.push([mediaPart, decls]);
+        if (pseudoPart) pseudoRules.push([pseudoPart, decls]);
+        if (!mediaPart && !pseudoPart) baseDecls.push(decls);
+      }
+    }
+
+    var hashInput = baseDecls.join(";");
+    for (var mi = 0; mi < mediaRules.length; mi++) hashInput += "@" + mediaRules[mi][0] + "{" + mediaRules[mi][1] + "}";
+    for (var pi = 0; pi < pseudoRules.length; pi++) hashInput += pseudoRules[pi][0] + "{" + pseudoRules[pi][1] + "}";
+    for (var ki = 0; ki < kfNeeded.length; ki++) hashInput += kfNeeded[ki][1];
+
+    var cn = "sx-" + _hashStyle(hashInput);
+    var sv = new StyleValue(cn, baseDecls.join(";"), mediaRules, pseudoRules, kfNeeded);
+    _styleCache[key] = sv;
+    _injectStyleValue(sv, atoms);
+    return sv;
+  }
+
+  function _injectStyleValue(sv, atoms) {
+    if (_injectedStyles[sv.className]) return;
+    _injectedStyles[sv.className] = true;
+
+    var cssTarget = _hasDom ? document.getElementById("sx-css") : null;
+    if (!cssTarget) return;
+
+    var rules = [];
+    if (sv.declarations) {
+      var hasChild = false;
+      if (atoms) {
+        for (var ai = 0; ai < atoms.length; ai++) {
+          if (_isChildSelectorAtom(atoms[ai])) { hasChild = true; break; }
+        }
+      }
+      if (hasChild) {
+        rules.push("." + sv.className + ">:not(:first-child){" + sv.declarations + "}");
+      } else {
+        rules.push("." + sv.className + "{" + sv.declarations + "}");
+      }
+    }
+    for (var pi = 0; pi < sv.pseudoRules.length; pi++) {
+      var sel = sv.pseudoRules[pi][0], decls = sv.pseudoRules[pi][1];
+      if (sel.indexOf("&") >= 0) {
+        rules.push(sel.replace(/&/g, "." + sv.className) + "{" + decls + "}");
+      } else {
+        rules.push("." + sv.className + sel + "{" + decls + "}");
+      }
+    }
+    for (var mi = 0; mi < sv.mediaRules.length; mi++) {
+      rules.push("@media " + sv.mediaRules[mi][0] + "{." + sv.className + "{" + sv.mediaRules[mi][1] + "}}");
+    }
+    for (var ki = 0; ki < sv.keyframes.length; ki++) {
+      rules.push(sv.keyframes[ki][1]);
+    }
+    cssTarget.textContent += rules.join("");
+  }
+
+  function _mergeStyleValues(styles) {
+    if (styles.length === 1) return styles[0];
+    var allDecls = [], allMedia = [], allPseudo = [], allKf = [];
+    for (var i = 0; i < styles.length; i++) {
+      var sv = styles[i];
+      if (sv.declarations) allDecls.push(sv.declarations);
+      allMedia = allMedia.concat(sv.mediaRules);
+      allPseudo = allPseudo.concat(sv.pseudoRules);
+      allKf = allKf.concat(sv.keyframes);
+    }
+    var hashInput = allDecls.join(";");
+    for (var mi = 0; mi < allMedia.length; mi++) hashInput += "@" + allMedia[mi][0] + "{" + allMedia[mi][1] + "}";
+    for (var pi = 0; pi < allPseudo.length; pi++) hashInput += allPseudo[pi][0] + "{" + allPseudo[pi][1] + "}";
+    for (var ki = 0; ki < allKf.length; ki++) hashInput += allKf[ki][1];
+    var cn = "sx-" + _hashStyle(hashInput);
+    var merged = new StyleValue(cn, allDecls.join(";"), allMedia, allPseudo, allKf);
+    _injectStyleValue(merged, []);
+    return merged;
+  }
+
   PRIMITIVES["css"] = function() {
-    // Stub — CSSX requires style dictionary which is browser-only
     var atoms = [];
     for (var i = 0; i < arguments.length; i++) {
       var a = arguments[i];
@@ -346,8 +534,9 @@
       atoms.push(isKw(a) ? a.name : String(a));
     }
     if (!atoms.length) return NIL;
-    return new StyleValue("sx-" + atoms.join("-"), atoms.join(";"), [], [], []);
+    return _resolveStyle(atoms);
   };
+
   PRIMITIVES["merge-styles"] = function() {
     var valid = [];
     for (var i = 0; i < arguments.length; i++) {
@@ -355,8 +544,7 @@
     }
     if (!valid.length) return NIL;
     if (valid.length === 1) return valid[0];
-    var allDecls = valid.map(function(v) { return v.declarations; }).join(";");
+    return _mergeStyleValues(valid);
-    return new StyleValue("sx-merged", allDecls, [], [], []);
   };
 
   function isPrimitive(name) { return name in PRIMITIVES; }
@@ -1252,9 +1440,6 @@
   // parse-sse-swap
   var parseSseSwap = function(el) { return sxOr(domGetAttr(el, "sx-sse-swap"), "message"); };
 
-
-  // === Transpiled from orchestration ===
-
   // _preload-cache
   var _preloadCache = {};
 
@@ -1264,15 +1449,15 @@
   // dispatch-trigger-events
   var dispatchTriggerEvents = function(el, headerVal) { return (isSxTruthy(headerVal) ? (function() {
   var parsed = tryParseJson(headerVal);
-  return (isSxTruthy(parsed) ? forEach(function(key) { return domDispatch(el, key, get(parsed, key)); }, keys(parsed)) : forEach(function(name) { return (function() {
+  return (isSxTruthy((isSxTruthy(parsed) && isDict(parsed))) ? forEach(function(key) { return domDispatch(el, key, dictGet(parsed, key)); }, keys(parsed)) : forEach(function(name) { return (function() {
-  var trimmed = trim(name);
+  var n = trim(name);
-  return (isSxTruthy(!isEmpty(trimmed)) ? domDispatch(el, trimmed, {}) : NIL);
+  return (isSxTruthy(!(n == "")) ? domDispatch(el, n, {}) : NIL);
 })(); }, split(headerVal, ",")));
 })() : NIL); };
 
   // init-css-tracking
   var initCssTracking = function() { return (function() {
-  var meta = domQuery("meta[name=\"sx-css-hash\"]");
+  var meta = domQuery("meta[name=\"sx-css-classes\"]");
   return (isSxTruthy(meta) ? (function() {
   var content = domGetAttr(meta, "content");
   return (isSxTruthy(content) ? (_cssHash = content) : NIL);
@@ -1281,58 +1466,65 @@
 
   // execute-request
   var executeRequest = function(el, verbInfo, extraParams) { return (function() {
-  var info = sxOr(verbInfo, getVerbInfo(el));
+  var currentVerb = getVerbInfo(el);
-  return (isSxTruthy(isNil(info)) ? promiseResolve(NIL) : (function() {
+  var verb = (isSxTruthy(currentVerb) ? currentVerb : verbInfo);
-  var verb = get(info, "method");
+  var method = get(verb, "method");
-  var url = get(info, "url");
+  var url = get(verb, "url");
+  if (isSxTruthy(!domHasClass(el, "sx-error"))) {
+  domRemoveAttr(el, "data-sx-retry-ms");
+}
   return (isSxTruthy((function() {
   var media = domGetAttr(el, "sx-media");
   return (isSxTruthy(media) && !browserMediaMatches(media));
 })()) ? promiseResolve(NIL) : (isSxTruthy((function() {
-  var confirmMsg = domGetAttr(el, "sx-confirm");
+  var msg = domGetAttr(el, "sx-confirm");
-  return (isSxTruthy(confirmMsg) && !browserConfirm(confirmMsg));
+  return (isSxTruthy(msg) && !browserConfirm(msg));
 })()) ? promiseResolve(NIL) : (function() {
   var promptMsg = domGetAttr(el, "sx-prompt");
-  var promptVal = (isSxTruthy(promptMsg) ? browserPrompt(promptMsg) : NIL);
+  var params = extraParams;
-  return (isSxTruthy((isSxTruthy(promptMsg) && isNil(promptVal))) ? promiseResolve(NIL) : (isSxTruthy(!validateForRequest(el)) ? promiseResolve(NIL) : doFetch(el, verb, verb, url, (isSxTruthy(promptVal) ? assoc(sxOr(extraParams, {}), "SX-Prompt", promptVal) : extraParams))));
+  return (isSxTruthy(promptMsg) ? (function() {
+  var promptVal = browserPrompt(promptMsg);
+  return (isSxTruthy(isNil(promptVal)) ? promiseResolve(NIL) : ((params = sxOr(params, {})), dictSet(params, "promptValue", promptVal), doFetch(el, verb, method, url, params)));
+})() : doFetch(el, verb, method, url, params));
 })()));
-})());
 })(); };
 
   // do-fetch
   var doFetch = function(el, verb, method, url, extraParams) { return (function() {
-  var sync = domGetAttr(el, "sx-sync");
+  var syncAttr = domGetAttr(el, "sx-sync");
-  if (isSxTruthy((sync == "replace"))) {
+  if (isSxTruthy((isSxTruthy(syncAttr) && contains(syncAttr, "replace")))) {
   abortPrevious(el);
 }
   return (function() {
   var ctrl = newAbortController();
   trackController(el, ctrl);
   return (function() {
-  var bodyInfo = buildRequestBody(el, method, url);
-  var finalUrl = get(bodyInfo, "url");
-  var body = get(bodyInfo, "body");
-  var ct = get(bodyInfo, "content-type");
   var headers = buildRequestHeaders(el, loadedComponentNames(), _cssHash);
-  var csrf = csrfToken();
+  if (isSxTruthy((isSxTruthy(extraParams) && dictHas(extraParams, "promptValue")))) {
-  if (isSxTruthy(extraParams)) {
+  headers["SX-Prompt"] = get(extraParams, "promptValue");
-  { var _c = keys(extraParams); for (var _i = 0; _i < _c.length; _i++) { var k = _c[_i]; headers[k] = get(extraParams, k); } }
 }
+  if (isSxTruthy((isSxTruthy(!(method == "GET")) && browserSameOrigin(url)))) {
+  (function() {
+  var csrf = csrfToken();
+  return (isSxTruthy(csrf) ? dictSet(headers, "X-CSRFToken", csrf) : NIL);
+})();
+}
+  return (function() {
+  var bodyInfo = buildRequestBody(el, method, url);
+  return (function() {
+  var body = get(bodyInfo, "body");
+  var finalUrl = get(bodyInfo, "url");
+  var ct = get(bodyInfo, "content-type");
   if (isSxTruthy(ct)) {
   headers["Content-Type"] = ct;
 }
-  if (isSxTruthy(csrf)) {
+  return (isSxTruthy(!domDispatch(el, "sx:beforeRequest", {["method"]: method, ["url"]: finalUrl})) ? promiseResolve(NIL) : (domAddClass(el, "sx-request"), domSetAttr(el, "aria-busy", "true"), (function() {
-  headers["X-CSRFToken"] = csrf;
-}
-  return (function() {
-  var cached = preloadCacheGet(_preloadCache, finalUrl);
-  var optimisticState = applyOptimistic(el);
   var indicator = showIndicator(el);
   var disabledElts = disableElements(el);
-  domAddClass(el, "sx-request");
+  var preloaded = (isSxTruthy((method == "GET")) ? preloadCacheGet(_preloadCache, finalUrl) : NIL);
-  domSetAttr(el, "aria-busy", "true");
+  return fetchRequest({["url"]: finalUrl, ["method"]: method, ["headers"]: headers, ["body"]: body, ["signal"]: controllerSignal(ctrl), ["preloaded"]: preloaded, ["cross-origin"]: isCrossOrigin(finalUrl)}, function(respOk, status, getHeader, text) { return (clearLoadingState(el, indicator, disabledElts), (isSxTruthy(!respOk) ? (domDispatch(el, "sx:responseError", {["status"]: status}), handleRetry(el, verb, extraParams)) : (domDispatch(el, "sx:afterRequest", {}), handleFetchSuccess(el, finalUrl, verb, extraParams, getHeader, text)))); }, function(err) { return (clearLoadingState(el, indicator, disabledElts), (isSxTruthy(!isAbortError(err)) ? (domDispatch(el, "sx:sendError", {["error"]: err}), handleRetry(el, verb, extraParams)) : NIL)); });
-  domDispatch(el, "sx:beforeRequest", {["url"]: finalUrl, ["method"]: method});
+})()));
-  return fetchRequest({["url"]: finalUrl, ["method"]: method, ["headers"]: headers, ["body"]: body, ["signal"]: controllerSignal(ctrl), ["cross-origin"]: isCrossOrigin(finalUrl), ["preloaded"]: cached}, function(respOk, status, getHeader, text) { return (clearLoadingState(el, indicator, disabledElts), revertOptimistic(optimisticState), (isSxTruthy(!respOk) ? (domDispatch(el, "sx:responseError", {["status"]: status, ["text"]: text}), handleRetry(el, verb, method, finalUrl, extraParams)) : (domDispatch(el, "sx:afterRequest", {["status"]: status}), handleFetchSuccess(el, finalUrl, verb, extraParams, getHeader, text)))); }, function(err) { return (clearLoadingState(el, indicator, disabledElts), revertOptimistic(optimisticState), (isSxTruthy(!isAbortError(err)) ? domDispatch(el, "sx:requestError", {["error"]: err}) : NIL)); });
+})();
 })();
 })();
 })();
@@ -1340,225 +1532,258 @@
 
   // handle-fetch-success
   var handleFetchSuccess = function(el, url, verb, extraParams, getHeader, text) { return (function() {
-  var respHeaders = processResponseHeaders(getHeader);
+  var headers = processResponseHeaders(getHeader);
-  (function() {
+  if (isSxTruthy(get(headers, "css-hash"))) { _cssHash = get(headers, "css-hash"); }
-  var newHash = get(respHeaders, "css-hash");
+  return (isSxTruthy(get(headers, "redirect")) ? browserNavigate(get(headers, "redirect")) : (isSxTruthy((get(headers, "refresh") == "true")) ? browserReload() : (dispatchTriggerEvents(el, get(headers, "trigger")), (function() {
-  return (isSxTruthy(newHash) ? (_cssHash = newHash) : NIL);
+  var rawSwap = sxOr(domGetAttr(el, "sx-swap"), DEFAULT_SWAP);
-})();
+  var target = resolveTarget(el);
-  dispatchTriggerEvents(el, get(respHeaders, "trigger"));
+  var selectSel = domGetAttr(el, "sx-select");
-  return (isSxTruthy(get(respHeaders, "redirect")) ? browserNavigate(get(respHeaders, "redirect")) : (isSxTruthy(get(respHeaders, "refresh")) ? browserReload() : (isSxTruthy(get(respHeaders, "location")) ? fetchLocation(get(respHeaders, "location")) : (function() {
+  if (isSxTruthy(get(headers, "retarget"))) {
-  var targetEl = (isSxTruthy(get(respHeaders, "retarget")) ? domQuery(get(respHeaders, "retarget")) : resolveTarget(el));
+  target = sxOr(domQuery(get(headers, "retarget")), target);
-  var swapSpec = parseSwapSpec(sxOr(get(respHeaders, "reswap"), domGetAttr(el, "sx-swap")), domHasClass(domBody(), "sx-transitions"));
-  var swapStyle = get(swapSpec, "style");
-  var useTransition = get(swapSpec, "transition");
-  var ct = sxOr(get(respHeaders, "content-type"), "");
-  (isSxTruthy(contains(ct, "text/sx")) ? handleSxResponse(el, targetEl, text, swapStyle, useTransition) : handleHtmlResponse(el, targetEl, text, swapStyle, useTransition));
-  dispatchTriggerEvents(el, get(respHeaders, "trigger-swap"));
-  handleHistory(el, url, respHeaders);
-  if (isSxTruthy(get(respHeaders, "trigger-settle"))) {
-  setTimeout_(function() { return dispatchTriggerEvents(el, get(respHeaders, "trigger-settle")); }, 20);
 }
-  return domDispatch(el, "sx:afterSwap", {["target"]: targetEl, ["swap"]: swapStyle});
+  if (isSxTruthy(get(headers, "reswap"))) {
+  rawSwap = get(headers, "reswap");
+}
+  return (function() {
+  var swap = parseSwapSpec(rawSwap, false);
+  var ct = sxOr(get(headers, "content-type"), "");
+  (isSxTruthy(contains(ct, "text/sx")) ? handleSxResponse(el, target, swap, selectSel, text) : handleHtmlResponse(el, target, swap, selectSel, text));
+  if (isSxTruthy(get(headers, "location"))) {
+  fetchLocation(get(headers, "location"));
+}
+  handleHistory(el, url, headers);
+  domDispatch(el, "sx:afterSwap", {["target"]: target});
+  dispatchTriggerEvents(el, get(headers, "trigger-swap"));
+  return requestAnimationFrame_(function() { return (domDispatch(el, "sx:afterSettle", {["target"]: target}), dispatchTriggerEvents(el, get(headers, "trigger-settle"))); });
+})();
 })())));
 })(); };
 
   // handle-sx-response
-  var handleSxResponse = function(el, target, text, swapStyle, useTransition) { return (function() {
+  var handleSxResponse = function(el, target, swap, selectSel, text) { return (function() {
   var cleaned = stripComponentScripts(text);
+  var cleaned2 = extractResponseCss(cleaned);
   return (function() {
-  var final = extractResponseCss(cleaned);
+  var source = trim(cleaned2);
-  return (function() {
+  return (isSxTruthy((isSxTruthy(source) && !(source == ""))) ? (function() {
-  var trimmed = trim(final);
+  var dom = sxRender(source);
-  return (isSxTruthy(!isEmpty(trimmed)) ? (function() {
-  var rendered = sxRender(trimmed);
   var container = domCreateElement("div", NIL);
-  domAppend(container, rendered);
+  domAppend(container, dom);
   processOobSwaps(container, function(t, oob, s) { return swapDomNodes(t, oob, s); });
   return (function() {
-  var selectSel = domGetAttr(el, "sx-select");
+  var selected = (isSxTruthy(selectSel) ? selectFromContainer(container, selectSel) : childrenToFragment(container));
-  var content = (isSxTruthy(selectSel) ? selectFromContainer(container, selectSel) : childrenToFragment(container));
+  return (isSxTruthy((isSxTruthy(!(get(swap, "style") == "none")) && target)) ? withTransition(get(swap, "transition"), function() { return (swapDomNodes(target, selected, get(swap, "style")), hoistHeadElements(target)); }) : NIL);
-  return withTransition(useTransition, function() { return swapDomNodes(target, content, swapStyle); });
 })();
 })() : NIL);
 })();
-})();
 })(); };
 
   // handle-html-response
-  var handleHtmlResponse = function(el, target, text, swapStyle, useTransition) { return (function() {
+  var handleHtmlResponse = function(el, target, swap, selectSel, text) { return (function() {
   var doc = domParseHtmlDocument(text);
-  return (isSxTruthy(doc) ? (function() {
+  sxProcessScripts(doc);
-  var selectSel = domGetAttr(el, "sx-select");
+  processOobSwaps(doc, function(t, oob, s) { return swapHtmlString(t, domOuterHtml(oob), s); });
-  return (isSxTruthy(selectSel) ? (function() {
+  return (function() {
-  var html = selectHtmlFromDoc(doc, selectSel);
+  var content = (isSxTruthy(selectSel) ? selectHtmlFromDoc(doc, selectSel) : sxOr(domBodyInnerHtml(doc), text));
-  return withTransition(useTransition, function() { return swapHtmlString(target, html, swapStyle); });
+  return (isSxTruthy((isSxTruthy(!(get(swap, "style") == "none")) && target)) ? withTransition(get(swap, "transition"), function() { return (swapHtmlString(target, content, get(swap, "style")), hoistHeadElements(target)); }) : NIL);
-})() : (function() {
+})();
-  var container = domCreateElement("div", NIL);
-  domSetInnerHtml(container, domBodyInnerHtml(doc));
-  processOobSwaps(container, function(t, oob, s) { return swapDomNodes(t, oob, s); });
-  hoistHeadElements(container);
-  return withTransition(useTransition, function() { return swapDomNodes(target, childrenToFragment(container), swapStyle); });
-})());
-})() : NIL);
 })(); };
 
   // handle-retry
-  var handleRetry = function(el, verb, method, url, extraParams) { return (function() {
+  var handleRetry = function(el, verbInfo, extraParams) { return (function() {
   var retryAttr = domGetAttr(el, "sx-retry");
+  return (isSxTruthy(retryAttr) ? (function() {
   var spec = parseRetrySpec(retryAttr);
-  return (isSxTruthy(spec) ? (function() {
+  var currentMs = sxOr(parseInt_(domGetAttr(el, "data-sx-retry-ms"), 0), get(spec, "start-ms"));
-  var currentMs = sxOr(domGetAttr(el, "data-sx-retry-ms"), get(spec, "start-ms"));
+  domAddClass(el, "sx-error");
-  return (function() {
+  domRemoveClass(el, "sx-loading");
-  var ms = parseInt_(currentMs, get(spec, "start-ms"));
+  return setTimeout_(function() { return (domRemoveClass(el, "sx-error"), domAddClass(el, "sx-loading"), domSetAttr(el, "data-sx-retry-ms", (String(nextRetryMs(currentMs, get(spec, "cap-ms"))))), executeRequest(el, verbInfo, extraParams)); }, currentMs);
-  domSetAttr(el, "data-sx-retry-ms", (String(nextRetryMs(ms, get(spec, "cap-ms")))));
-  return setTimeout_(function() { return doFetch(el, verb, method, url, extraParams); }, ms);
-})();
 })() : NIL);
 })(); };
 
   // bind-triggers
   var bindTriggers = function(el, verbInfo) { return (function() {
-  var triggers = sxOr(parseTriggerSpec(domGetAttr(el, "sx-trigger")), defaultTrigger(domTagName(el)));
+  var triggerSpec = domGetAttr(el, "sx-trigger");
-  return forEach(function(trigger) { return (function() {
+  var triggers = (isSxTruthy(triggerSpec) ? parseTriggerSpec(triggerSpec) : defaultTrigger(domTagName(el)));
-  var kind = classifyTrigger(trigger);
+  return forEach(function(trig) { return (function() {
-  var mods = get(trigger, "modifiers");
+  var kind = classifyTrigger(trig);
-  return (isSxTruthy((kind == "poll")) ? setInterval_(function() { return executeRequest(el, NIL, NIL); }, get(mods, "interval")) : (isSxTruthy((kind == "intersect")) ? observeIntersection(el, function() { return executeRequest(el, NIL, NIL); }, false, get(mods, "delay")) : (isSxTruthy((kind == "load")) ? setTimeout_(function() { return executeRequest(el, NIL, NIL); }, sxOr(get(mods, "delay"), 0)) : (isSxTruthy((kind == "revealed")) ? observeIntersection(el, function() { return executeRequest(el, NIL, NIL); }, true, get(mods, "delay")) : (isSxTruthy((kind == "event")) ? bindEvent(el, get(trigger, "event"), mods, verbInfo) : NIL)))));
+  return (isSxTruthy((kind == "poll")) ? setInterval_(function() { return executeRequest(el, verbInfo, NIL); }, sxOr(get(get(trig, "modifiers"), "interval"), 1000)) : (isSxTruthy((kind == "intersect")) ? observeIntersection(el, function() { return executeRequest(el, verbInfo, NIL); }, get(get(trig, "modifiers"), "once"), get(get(trig, "modifiers"), "delay")) : (isSxTruthy((kind == "load")) ? setTimeout_(function() { return executeRequest(el, verbInfo, NIL); }, 0) : (isSxTruthy((kind == "revealed")) ? observeIntersection(el, function() { return executeRequest(el, verbInfo, NIL); }, true, NIL) : bindEvent(el, verbInfo, trig)))));
 })(); }, triggers);
 })(); };
 
   // bind-event
-  var bindEvent = function(el, eventName, mods, verbInfo) { return (function() {
+  var bindEvent = function(el, verbInfo, trig) { return (function() {
+  var eventName = get(trig, "event");
+  var mods = get(trig, "modifiers");
+  var listenTarget = (isSxTruthy(get(mods, "from")) ? sxOr(domQuery(get(mods, "from")), el) : el);
   var timer = NIL;
   var lastVal = NIL;
-  var listenTarget = (isSxTruthy(get(mods, "from")) ? domQuery(get(mods, "from")) : el);
+  return domAddListener(listenTarget, eventName, function(e) { return ((isSxTruthy((eventName == "submit")) ? preventDefault_(e) : NIL), (isSxTruthy((isSxTruthy((eventName == "click")) && (domTagName(el) == "A"))) ? preventDefault_(e) : NIL), (isSxTruthy(!validateForRequest(el)) ? domDispatch(el, "sx:validationFailed", {}) : (isSxTruthy((isSxTruthy(get(mods, "changed")) && isSxTruthy(!isNil(elementValue(el))) && (elementValue(el) == lastVal))) ? NIL : ((isSxTruthy(get(mods, "changed")) ? (lastVal = elementValue(el)) : NIL), (function() {
-  return (isSxTruthy(listenTarget) ? domAddListener(listenTarget, eventName, function(e) { return (function() {
+  var optState = applyOptimistic(el);
-  var shouldFire = true;
+  var execFn = function() { return (function() {
-  if (isSxTruthy(get(mods, "changed"))) {
+  var p = executeRequest(el, verbInfo, NIL);
-  (function() {
+  return (isSxTruthy((isSxTruthy(optState) && p)) ? promiseCatch(p, function(_) { return revertOptimistic(optState); }) : NIL);
-  var val = elementValue(el);
+})(); };
-  return (isSxTruthy((val == lastVal)) ? (shouldFire = false) : (lastVal = val));
+  return (isSxTruthy(get(mods, "delay")) ? (clearTimeout_(timer), (timer = setTimeout_(execFn, get(mods, "delay")))) : execFn());
-})();
+})())))); }, {["once"]: get(mods, "once")});
-}
-  return (isSxTruthy(shouldFire) ? ((isSxTruthy(sxOr((eventName == "submit"), (isSxTruthy((eventName == "click")) && domHasAttr(el, "href")))) ? preventDefault_(e) : NIL), (isSxTruthy(get(mods, "delay")) ? (clearTimeout_(timer), (timer = setTimeout_(function() { return executeRequest(el, verbInfo, NIL); }, get(mods, "delay")))) : executeRequest(el, verbInfo, NIL))) : NIL);
-})(); }, (isSxTruthy(get(mods, "once")) ? {["once"]: true} : NIL)) : NIL);
 })(); };
 
   // post-swap
-  var postSwap = function(root) { return activateScripts(root); };
+  var postSwap = function(root) { return (activateScripts(root), sxProcessScripts(root), sxHydrate(root), processElements(root)); };
 
   // activate-scripts
-  var activateScripts = function(root) { return (isSxTruthy(root) ? (function() {
+  var activateScripts = function(root) { return (function() {
-  var scripts = domQueryAll(root, "script");
+  var dead = domQueryAll(root, "script:not([type]), script[type='text/javascript']");
-  return forEach(function(dead) { return (isSxTruthy((isSxTruthy(!domHasAttr(dead, "data-components")) && !domHasAttr(dead, "data-sx-activated"))) ? (function() {
+  return forEach(function(d) { return (function() {
-  var live = createScriptClone(dead);
+  var live = createScriptClone(d);
-  domSetAttr(live, "data-sx-activated", "true");
+  return domReplaceChild(domParent(d), live, d);
-  return domReplaceChild(domParent(dead), live, dead);
+})(); }, dead);
-})() : NIL); }, scripts);
-})() : NIL); };
-
-  // process-oob-swaps
-  var processOobSwaps = function(container, swapFn) { return (function() {
-  var oobs = findOobSwaps(container);
-  return forEach(function(oob) { return (function() {
-  var targetId = get(oob, "target-id");
-  var target = domQueryById(targetId);
-  var oobEl = get(oob, "element");
-  var swapType = get(oob, "swap-type");
-  if (isSxTruthy(domParent(oobEl))) {
-  domRemoveChild(domParent(oobEl), oobEl);
-}
-  return (isSxTruthy(target) ? swapFn(target, oobEl, swapType) : NIL);
-})(); }, oobs);
 })(); };
 
+  // process-oob-swaps
+  var processOobSwaps = function(container, swapFn) { return forEach(function(attr) { return (function() {
+  var oobEls = domQueryAll(container, (String("[") + String(attr) + String("]")));
+  return forEach(function(oob) { return (function() {
+  var swapType = sxOr(domGetAttr(oob, attr), "outerHTML");
+  var targetId = domId(oob);
+  domRemoveAttr(oob, attr);
+  if (isSxTruthy(domParent(oob))) {
+  domRemoveChild(domParent(oob), oob);
+}
+  return (isSxTruthy(targetId) ? (function() {
+  var target = domQueryById(targetId);
+  return (isSxTruthy(target) ? swapFn(target, oob, swapType) : NIL);
+})() : NIL);
+})(); }, oobEls);
+})(); }, ["sx-swap-oob", "hx-swap-oob"]); };
+
   // hoist-head-elements
-  var hoistHeadElements = function(container) { return forEach(function(style) { return (isSxTruthy(domParent(style)) ? domRemoveChild(domParent(style), style) : NIL); }, domQueryAll(container, "style[data-sx-css]")); };
+  var hoistHeadElements = function(root) { return (function() {
+  var styles = domQueryAll(root, "style[data-sx-css]");
+  var links = domQueryAll(root, "link[rel='stylesheet']");
+  { var _c = styles; for (var _i = 0; _i < _c.length; _i++) { var el = _c[_i]; if (isSxTruthy(domParent(el))) {
+  domRemoveChild(domParent(el), el);
+} } }
+  return forEach(function(el) { return (isSxTruthy(domParent(el)) ? domRemoveChild(domParent(el), el) : NIL); }, links);
+})(); };
 
   // process-boosted
-  var processBoosted = function(root) { return forEach(function(container) { return boostDescendants(container); }, domQueryAll(sxOr(root, domBody()), "[sx-boost]")); };
+  var processBoosted = function(root) { return (function() {
+  var containers = domQueryAll(root, "[sx-boost]");
+  if (isSxTruthy(domMatches(root, "[sx-boost]"))) {
+  boostDescendants(root);
+}
+  return forEach(boostDescendants, containers);
+})(); };
 
   // boost-descendants
-  var boostDescendants = function(container) { return forEach(function(link) { return (isSxTruthy((isSxTruthy(!isProcessed(link, "boost")) && shouldBoostLink(link))) ? (markProcessed(link, "boost"), (isSxTruthy(!domHasAttr(link, "sx-target")) ? domSetAttr(link, "sx-target", "#main-panel") : NIL), (isSxTruthy(!domHasAttr(link, "sx-swap")) ? domSetAttr(link, "sx-swap", "innerHTML") : NIL), (isSxTruthy(!domHasAttr(link, "sx-push-url")) ? domSetAttr(link, "sx-push-url", "true") : NIL), bindBoostLink(link, domGetAttr(link, "href"))) : NIL); }, domQueryAll(container, "a[href]")); };
+  var boostDescendants = function(container) { return ((function() {
+  var links = domQueryAll(container, "a[href]");
+  return forEach(function(link) { return (isSxTruthy((isSxTruthy(!isProcessed(link, "boost")) && shouldBoostLink(link))) ? (markProcessed(link, "boost"), bindBoostLink(link, domGetAttr(link, "href")), (isSxTruthy(!domHasAttr(link, "sx-target")) ? domSetAttr(link, "sx-target", "#main-panel") : NIL), (isSxTruthy(!domHasAttr(link, "sx-swap")) ? domSetAttr(link, "sx-swap", "innerHTML") : NIL), (isSxTruthy(!domHasAttr(link, "sx-select")) ? domSetAttr(link, "sx-select", "#main-panel") : NIL)) : NIL); }, links);
+})(), (function() {
+  var forms = domQueryAll(container, "form");
+  return forEach(function(form) { return (isSxTruthy((isSxTruthy(!isProcessed(form, "boost")) && shouldBoostForm(form))) ? (markProcessed(form, "boost"), bindBoostForm(form, sxOr(upper(domGetAttr(form, "method")), "GET"), sxOr(domGetAttr(form, "action"), browserLocationHref())), (isSxTruthy(!domHasAttr(form, "sx-target")) ? domSetAttr(form, "sx-target", "#main-panel") : NIL), (isSxTruthy(!domHasAttr(form, "sx-swap")) ? domSetAttr(form, "sx-swap", "innerHTML") : NIL)) : NIL); }, forms);
+})()); };
 
   // process-sse
-  var processSse = function(root) { return forEach(function(el) { return (isSxTruthy(!isProcessed(el, "sse")) ? (markProcessed(el, "sse"), bindSse(el)) : NIL); }, domQueryAll(sxOr(root, domBody()), "[sx-sse]")); };
+  var processSse = function(root) { return (function() {
+  var sseEls = domQueryAll(root, "[sx-sse]");
+  if (isSxTruthy(domMatches(root, "[sx-sse]"))) {
+  bindSse(root);
+}
+  return forEach(bindSse, sseEls);
+})(); };
 
   // bind-sse
-  var bindSse = function(el) { return (function() {
+  var bindSse = function(el) { return (isSxTruthy(!isProcessed(el, "sse")) ? (markProcessed(el, "sse"), (function() {
   var url = domGetAttr(el, "sx-sse");
   return (isSxTruthy(url) ? (function() {
   var source = eventSourceConnect(url, el);
-  var eventName = parseSseSwap(el);
+  return (function() {
-  return eventSourceListen(source, eventName, function(data) { return bindSseSwap(el, data); });
+  var swapEls = domQueryAll(el, "[sx-sse-swap]");
+  if (isSxTruthy(domHasAttr(el, "sx-sse-swap"))) {
+  bindSseSwap(el, source);
+}
+  return forEach(function(child) { return bindSseSwap(child, source); }, swapEls);
+})();
 })() : NIL);
-})(); };
+})()) : NIL); };
 
   // bind-sse-swap
-  var bindSseSwap = function(el, data) { return (function() {
+  var bindSseSwap = function(el, source) { return (function() {
-  var target = resolveTarget(el);
+  var eventName = parseSseSwap(el);
-  var swapSpec = parseSwapSpec(domGetAttr(el, "sx-swap"), domHasClass(domBody(), "sx-transitions"));
+  return eventSourceListen(source, eventName, function(data) { return (function() {
-  var swapStyle = get(swapSpec, "style");
+  var target = sxOr(resolveTarget(el), el);
-  var useTransition = get(swapSpec, "transition");
+  var swapStyle = sxOr(domGetAttr(el, "sx-swap"), "innerHTML");
-  var trimmed = trim(data);
+  (isSxTruthy(startsWith(trim(data), "(")) ? (function() {
-  return (isSxTruthy(!isEmpty(trimmed)) ? (isSxTruthy(startsWith(trimmed, "(")) ? (function() {
+  var dom = sxRender(data);
-  var rendered = sxRender(trimmed);
+  return swapDomNodes(target, dom, swapStyle);
-  var container = domCreateElement("div", NIL);
+})() : swapHtmlString(target, data, swapStyle));
-  domAppend(container, rendered);
+  postSwap(target);
-  return withTransition(useTransition, function() { return swapDomNodes(target, childrenToFragment(container), swapStyle); });
+  return domDispatch(el, "sx:sseMessage", {["data"]: data, ["event"]: eventName});
-})() : withTransition(useTransition, function() { return swapHtmlString(target, trimmed, swapStyle); })) : NIL);
+})(); });
 })(); };
 
   // bind-inline-handlers
-  var bindInlineHandlers = function(root) { return forEach(function(el) { return forEach(function(attr) { return (function() {
+  var bindInlineHandlers = function(el) { return (isSxTruthy(!isProcessed(el, "on")) ? (markProcessed(el, "on"), (function() {
+  var attrs = domAttrList(el);
+  return forEach(function(attr) { return (function() {
   var name = first(attr);
-  var body = nth(attr, 1);
+  var val = nth(attr, 1);
-  return (isSxTruthy(startsWith(name, "sx-on:")) ? (function() {
+  return (isSxTruthy(startsWith(name, "sx-on:")) ? bindInlineHandler(el, slice(name, 6), val) : NIL);
-  var eventName = slice(name, 6);
+})(); }, attrs);
-  return (isSxTruthy(!isProcessed(el, (String("on:") + String(eventName)))) ? (markProcessed(el, (String("on:") + String(eventName))), bindInlineHandler(el, eventName, body)) : NIL);
+})()) : NIL); };
-})() : NIL);
-})(); }, domAttrList(el)); }, domQueryAll(sxOr(root, domBody()), "[sx-on\\:beforeRequest],[sx-on\\:afterRequest],[sx-on\\:afterSwap],[sx-on\\:afterSettle],[sx-on\\:load]")); };
 
   // bind-preload-for
-  var bindPreloadFor = function(el) { return (function() {
+  var bindPreloadFor = function(el) { return (isSxTruthy(domHasAttr(el, "sx-preload")) ? (function() {
-  var preloadAttr = domGetAttr(el, "sx-preload");
+  var mode = sxOr(domGetAttr(el, "sx-preload"), "mousedown");
-  return (isSxTruthy(preloadAttr) ? (function() {
+  var events = (isSxTruthy((mode == "mouseover")) ? ["mouseenter", "focusin"] : ["mousedown", "focusin"]);
-  var info = getVerbInfo(el);
+  var debounceMs = (isSxTruthy((mode == "mouseover")) ? 100 : 0);
-  return (isSxTruthy(info) ? (function() {
+  return bindPreload(el, events, debounceMs, function() { return (function() {
-  var url = get(info, "url");
+  var verb = getVerbInfo(el);
-  var headers = buildRequestHeaders(el, loadedComponentNames(), _cssHash);
+  return (isSxTruthy(verb) ? (function() {
-  var events = (isSxTruthy((preloadAttr == "mousedown")) ? ["mousedown", "touchstart"] : ["mouseover"]);
+  var url = get(verb, "url");
-  var debounceMs = (isSxTruthy((preloadAttr == "mousedown")) ? 0 : 100);
+  return (isSxTruthy(isNil(preloadCacheGet(_preloadCache, url))) ? doPreload(url) : NIL);
-  return bindPreload(el, events, debounceMs, function() { return doPreload(url, headers); });
 })() : NIL);
-})() : NIL);
+})(); });
-})(); };
+})() : NIL); };
 
   // do-preload
-  var doPreload = function(url, headers) { return (isSxTruthy(isNil(preloadCacheGet(_preloadCache, url))) ? fetchPreload(url, headers, _preloadCache) : NIL); };
+  var doPreload = function(url) { return (function() {
+  var headers = buildRequestHeaders(NIL, loadedComponentNames(), _cssHash);
+  return fetchPreload(url, headers, _preloadCache);
+})(); };
 
   // VERB_SELECTOR
-  var VERB_SELECTOR = (String("[sx-get],[sx-post],[sx-put],[sx-delete],[sx-patch]"));
+  var VERB_SELECTOR = "[sx-get],[sx-post],[sx-put],[sx-delete],[sx-patch]";
 
   // process-elements
   var processElements = function(root) { return (function() {
-  var els = domQueryAll(sxOr(root, domBody()), VERB_SELECTOR);
+  var root = sxOr(root, domBody());
-  return forEach(function(el) { return (isSxTruthy(!isProcessed(el, "verb")) ? (markProcessed(el, "verb"), processOne(el)) : NIL); }, els);
+  return (isSxTruthy(root) ? ((isSxTruthy(domMatches(root, VERB_SELECTOR)) ? processOne(root) : NIL), (function() {
+  var elements = domQueryAll(root, VERB_SELECTOR);
+  return forEach(processOne, elements);
+})(), processBoosted(root), processSse(root), (function() {
+  var onEls = domQueryAll(root, "[sx-on\\:beforeRequest],[sx-on\\:afterRequest],[sx-on\\:afterSwap],[sx-on\\:afterSettle],[sx-on\\:responseError]");
+  return forEach(bindInlineHandlers, onEls);
+})()) : NIL);
 })(); };
 
   // process-one
-  var processOne = function(el) { return (function() {
+  var processOne = function(el) { return (isSxTruthy(!isProcessed(el, "bound")) ? (isSxTruthy(!sxOr(domHasAttr(el, "sx-disable"), domClosest(el, "[sx-disable]"))) ? (markProcessed(el, "bound"), (function() {
   var verbInfo = getVerbInfo(el);
-  return (isSxTruthy(verbInfo) ? (isSxTruthy(!domHasAttr(el, "sx-disable")) ? (bindTriggers(el, verbInfo), bindPreloadFor(el)) : NIL) : NIL);
+  return (isSxTruthy(verbInfo) ? (bindTriggers(el, verbInfo), bindPreloadFor(el)) : NIL);
-})(); };
+})()) : NIL) : NIL); };
 
   // handle-popstate
   var handlePopstate = function(scrollY) { return (function() {
-  var main = domQueryById("main-panel");
   var url = browserLocationHref();
-  return (isSxTruthy(main) ? (function() {
+  var main = domQueryById("main-panel");
-  var headers = buildRequestHeaders(main, loadedComponentNames(), _cssHash);
+  return (isSxTruthy(!main) ? browserReload() : (function() {
+  var headers = buildRequestHeaders(NIL, loadedComponentNames(), _cssHash);
+  headers["SX-History-Restore"] = "true";
   return fetchAndRestore(main, url, headers, scrollY);
-})() : NIL);
+})());
 })(); };
 
   // engine-init
@@ -1720,9 +1945,11 @@
 
 
   // =========================================================================
-  // Platform interface — Engine pure logic (browser + node compatible)
+  // Platform interface — Engine (browser-only)
   // =========================================================================
 
+  // --- Browser/Network ---
+
   function browserLocationHref() {
     return typeof location !== "undefined" ? location.href : "";
   }
@@ -1746,23 +1973,6 @@
     }
   }
 
-  function nowMs() { return Date.now(); }
-
-  function parseHeaderValue(s) {
-    if (!s) return null;
-    try {
-      if (s.charAt(0) === "{" && s.charAt(1) === ":") return parse(s);
-      return JSON.parse(s);
-    } catch (e) { return null; }
-  }
-
-
-  // =========================================================================
-  // Platform interface — Orchestration (browser-only)
-  // =========================================================================
-
-  // --- Browser/Network ---
-
   function browserNavigate(url) {
     if (typeof location !== "undefined") location.assign(url);
   }
@@ -1791,6 +2001,16 @@
     return r === null ? NIL : r;
   }
 
+  function nowMs() { return Date.now(); }
+
+  function parseHeaderValue(s) {
+    if (!s) return null;
+    try {
+      if (s.charAt(0) === "{" && s.charAt(1) === ":") return parse(s);
+      return JSON.parse(s);
+    } catch (e) { return null; }
+  }
+
   function csrfToken() {
     if (!_hasDom) return NIL;
     var m = document.querySelector('meta[name="csrf-token"]');
@@ -2473,7 +2693,7 @@
     executeRequest: typeof executeRequest === "function" ? executeRequest : null,
     postSwap: typeof postSwap === "function" ? postSwap : null,
     init: typeof engineInit === "function" ? engineInit : null,
-    _version: "ref-2.0 (dom+engine+orchestration, bootstrap-compiled)"
+    _version: "ref-2.0 (dom+engine, bootstrap-compiled)"
   };