diff --git a/shared/static/scripts/sx-browser.js b/shared/static/scripts/sx-browser.js index 812b8e2..6ca3b4d 100644 --- a/shared/static/scripts/sx-browser.js +++ b/shared/static/scripts/sx-browser.js @@ -14,7 +14,7 @@ // ========================================================================= var NIL = Object.freeze({ _nil: true, toString: function() { return "nil"; } }); - var SX_VERSION = "2026-03-08T15:15:32Z"; + var SX_VERSION = "2026-03-08T16:03:46Z"; function isNil(x) { return x === NIL || x === null || x === undefined; } function isSxTruthy(x) { return x !== false && !isNil(x); } @@ -1492,7 +1492,7 @@ return result; }, args); return (isSxTruthy(skip) ? assoc(state, "skip", false, "i", (get(state, "i") + 1)) : (isSxTruthy((isSxTruthy((typeOf(arg) == "keyword")) && ((get(state, "i") + 1) < len(args)))) ? (function() { var attrName = keywordName(arg); var attrVal = trampoline(evalExpr(nth(args, (get(state, "i") + 1)), env)); - (isSxTruthy(sxOr(isNil(attrVal), (attrVal == false))) ? NIL : (isSxTruthy((isSxTruthy(startsWith(attrName, "on-")) && isCallable(attrVal))) ? domListen(el, slice(attrName, 3), attrVal) : (isSxTruthy(contains(BOOLEAN_ATTRS, attrName)) ? (isSxTruthy(attrVal) ? domSetAttr(el, attrName, "") : NIL) : (isSxTruthy((attrVal == true)) ? domSetAttr(el, attrName, "") : domSetAttr(el, attrName, (String(attrVal))))))); + (isSxTruthy(sxOr(isNil(attrVal), (attrVal == false))) ? NIL : (isSxTruthy((isSxTruthy(startsWith(attrName, "on-")) && isCallable(attrVal))) ? domListen(el, slice(attrName, 3), attrVal) : (isSxTruthy((isSxTruthy((attrName == "bind")) && isSignal(attrVal))) ? bindInput(el, attrVal) : (isSxTruthy(contains(BOOLEAN_ATTRS, attrName)) ? (isSxTruthy(attrVal) ? domSetAttr(el, attrName, "") : NIL) : (isSxTruthy((attrVal == true)) ? domSetAttr(el, attrName, "") : domSetAttr(el, attrName, (String(attrVal)))))))); return assoc(state, "skip", true, "i", (get(state, "i") + 1)); })() : ((isSxTruthy(!isSxTruthy(contains(VOID_ELEMENTS, tag))) ? domAppend(el, renderToDom(arg, env, newNs)) : NIL), assoc(state, "i", (get(state, "i") + 1))))); })(); }, {["i"]: 0, ["skip"]: false}, args); @@ -1572,6 +1572,20 @@ return result; }, args); { var _c = range(1, len(expr)); for (var _i = 0; _i < _c.length; _i++) { var i = _c[_i]; domAppend(frag, renderToDom(nth(expr, i), env, ns)); } } return frag; })() : (isSxTruthy(isDefinitionForm(name)) ? (trampoline(evalExpr(expr, env)), createFragment()) : (isSxTruthy((name == "map")) ? (function() { + var collExpr = nth(expr, 2); + return (isSxTruthy((isSxTruthy(_islandScope) && isSxTruthy((typeOf(collExpr) == "list")) && isSxTruthy((len(collExpr) > 1)) && (first(collExpr) == "deref"))) ? (function() { + var f = trampoline(evalExpr(nth(expr, 1), env)); + var sig = trampoline(evalExpr(nth(collExpr, 1), env)); + return (isSxTruthy(isSignal(sig)) ? reactiveList(f, sig, env, ns) : (function() { + var coll = deref(sig); + var frag = createFragment(); + { var _c = coll; for (var _i = 0; _i < _c.length; _i++) { var item = _c[_i]; (function() { + var val = (isSxTruthy(isLambda(f)) ? renderLambdaDom(f, [item], env, ns) : renderToDom(apply(f, [item]), env, ns)); + return domAppend(frag, val); +})(); } } + return frag; +})()); +})() : (function() { var f = trampoline(evalExpr(nth(expr, 1), env)); var coll = trampoline(evalExpr(nth(expr, 2), env)); var frag = createFragment(); @@ -1580,6 +1594,7 @@ return result; }, args); return domAppend(frag, val); })(); } } return frag; +})()); })() : (isSxTruthy((name == "map-indexed")) ? (function() { var f = trampoline(evalExpr(nth(expr, 1), env)); var coll = trampoline(evalExpr(nth(expr, 2), env)); @@ -1680,15 +1695,29 @@ return (isSxTruthy(testFn()) ? (function() { var parent = domParent(marker); return (isSxTruthy(parent) ? (domRemoveChildrenAfter(marker), (function() { var items = deref(itemsSig); - return forEach(function(item) { return (function() { + var frag = createFragment(); + { var _c = items; for (var _i = 0; _i < _c.length; _i++) { var item = _c[_i]; (function() { var rendered = (isSxTruthy(isLambda(mapFn)) ? renderLambdaDom(mapFn, [item], env, ns) : renderToDom(apply(mapFn, [item]), env, ns)); - return domInsertAfter(marker, rendered); -})(); }, reverse(items)); + return domAppend(frag, rendered); +})(); } } + return domInsertAfter(marker, frag); })()) : NIL); })(); }); return container; })(); }; + // bind-input + var bindInput = function(el, sig) { return (function() { + var inputType = lower(sxOr(domGetAttr(el, "type"), "")); + var isCheckbox = sxOr((inputType == "checkbox"), (inputType == "radio")); + (isSxTruthy(isCheckbox) ? domSetProp(el, "checked", deref(sig)) : domSetProp(el, "value", (String(deref(sig))))); + effect(function() { return (isSxTruthy(isCheckbox) ? domSetProp(el, "checked", deref(sig)) : (function() { + var v = (String(deref(sig))); + return (isSxTruthy((domGetProp(el, "value") != v)) ? domSetProp(el, "value", v) : NIL); +})()); }); + return domListen(el, (isSxTruthy(isCheckbox) ? "change" : "input"), function(e) { return (isSxTruthy(isCheckbox) ? reset_b(sig, domGetProp(el, "checked")) : reset_b(sig, domGetProp(el, "value"))); }); +})(); }; + // === Transpiled from engine === @@ -2049,12 +2078,14 @@ return forEach(function(attr) { return (isSxTruthy(!isSxTruthy(domHasAttr(newEl, var rendered = sxRender(trimmed); var container = domCreateElement("div", NIL); domAppend(container, rendered); - processOobSwaps(container, function(t, oob, s) { swapDomNodes(t, oob, s); + processOobSwaps(container, function(t, oob, s) { disposeIslandsIn(t); +swapDomNodes(t, oob, s); sxHydrate(t); return processElements(t); }); return (function() { var selectSel = domGetAttr(el, "sx-select"); var content = (isSxTruthy(selectSel) ? selectFromContainer(container, selectSel) : childrenToFragment(container)); + disposeIslandsIn(target); return withTransition(useTransition, function() { swapDomNodes(target, content, swapStyle); return postSwap(target); }); })(); @@ -2068,6 +2099,7 @@ return postSwap(target); }); var doc = domParseHtmlDocument(text); return (isSxTruthy(doc) ? (function() { var selectSel = domGetAttr(el, "sx-select"); + disposeIslandsIn(target); return (isSxTruthy(selectSel) ? (function() { var html = selectHtmlFromDoc(doc, selectSel); return withTransition(useTransition, function() { swapHtmlString(target, html, swapStyle); @@ -2075,7 +2107,8 @@ return postSwap(target); }); })() : (function() { var container = domCreateElement("div", NIL); domSetInnerHtml(container, domBodyInnerHtml(doc)); - processOobSwaps(container, function(t, oob, s) { swapDomNodes(t, oob, s); + processOobSwaps(container, function(t, oob, s) { disposeIslandsIn(t); +swapDomNodes(t, oob, s); return postSwap(t); }); hoistHeadElements(container); return withTransition(useTransition, function() { swapDomNodes(target, childrenToFragment(container), swapStyle); @@ -2363,7 +2396,7 @@ return logWarn((String("sx:offline sync failed ") + String(get(entry, "action")) })(); }; // swap-rendered-content - var swapRenderedContent = function(target, rendered, pathname) { return (domSetTextContent(target, ""), domAppend(target, rendered), hoistHeadElementsFull(target), processElements(target), sxHydrateElements(target), domDispatch(target, "sx:clientRoute", {["pathname"]: pathname}), logInfo((String("sx:route client ") + String(pathname)))); }; + var swapRenderedContent = function(target, rendered, pathname) { return (disposeIslandsIn(target), domSetTextContent(target, ""), domAppend(target, rendered), hoistHeadElementsFull(target), processElements(target), sxHydrateElements(target), domDispatch(target, "sx:clientRoute", {["pathname"]: pathname}), logInfo((String("sx:route client ") + String(pathname)))); }; // resolve-route-target var resolveRouteTarget = function(targetSel) { return (isSxTruthy((isSxTruthy(targetSel) && !isSxTruthy((targetSel == "true")))) ? domQuery(targetSel) : NIL); }; @@ -2453,14 +2486,14 @@ return (function() { var swapStyle = get(swapSpec, "style"); var useTransition = get(swapSpec, "transition"); var trimmed = trim(data); - return (isSxTruthy(!isSxTruthy(isEmpty(trimmed))) ? (isSxTruthy(startsWith(trimmed, "(")) ? (function() { + return (isSxTruthy(!isSxTruthy(isEmpty(trimmed))) ? (disposeIslandsIn(target), (isSxTruthy(startsWith(trimmed, "(")) ? (function() { var rendered = sxRender(trimmed); var container = domCreateElement("div", NIL); domAppend(container, rendered); return withTransition(useTransition, function() { swapDomNodes(target, childrenToFragment(container), swapStyle); return postSwap(target); }); })() : withTransition(useTransition, function() { swapHtmlString(target, trimmed, swapStyle); -return postSwap(target); })) : NIL); +return postSwap(target); }))) : NIL); })(); }; // bind-inline-handlers @@ -2722,6 +2755,12 @@ callExpr.push(dictGet(kwargs, k)); } } return (isSxTruthy(disposers) ? (forEach(function(d) { return (isSxTruthy(isCallable(d)) ? d() : NIL); }, disposers), domSetData(el, "sx-disposers", NIL)) : NIL); })(); }; + // dispose-islands-in + var disposeIslandsIn = function(root) { return (isSxTruthy(root) ? (function() { + var islands = domQueryAll(root, "[data-sx-island]"); + return (isSxTruthy((isSxTruthy(islands) && !isSxTruthy(isEmpty(islands)))) ? (logInfo((String("disposing ") + String(len(islands)) + String(" island(s)"))), forEach(disposeIsland, islands)) : NIL); +})() : NIL); }; + // boot-init var bootInit = function() { return (logInfo((String("sx-browser ") + String(SX_VERSION))), initCssTracking(), processPageScripts(), processSxScripts(NIL), sxHydrateElements(NIL), sxHydrateIslands(NIL), processElements(NIL)); }; @@ -2850,6 +2889,7 @@ return (function() { })(); })(); }; recompute(); + registerInScope(function() { return disposeComputed(s); }); return s; })(); })(); }; @@ -2874,12 +2914,16 @@ return (function() { })(); })()) : NIL); }; runEffect(); - return function() { disposed = true; + return (function() { + var disposeFn = function() { disposed = true; if (isSxTruthy(cleanupFn)) { invoke(cleanupFn); } { var _c = deps; for (var _i = 0; _i < _c.length; _i++) { var dep = _c[_i]; signalRemoveSub(dep, runEffect); } } return (deps = []); }; + registerInScope(disposeFn); + return disposeFn; +})(); })(); })(); }; diff --git a/shared/static/scripts/sx-ref.js b/shared/static/scripts/sx-ref.js index 812b8e2..6ca3b4d 100644 --- a/shared/static/scripts/sx-ref.js +++ b/shared/static/scripts/sx-ref.js @@ -14,7 +14,7 @@ // ========================================================================= var NIL = Object.freeze({ _nil: true, toString: function() { return "nil"; } }); - var SX_VERSION = "2026-03-08T15:15:32Z"; + var SX_VERSION = "2026-03-08T16:03:46Z"; function isNil(x) { return x === NIL || x === null || x === undefined; } function isSxTruthy(x) { return x !== false && !isNil(x); } @@ -1492,7 +1492,7 @@ return result; }, args); return (isSxTruthy(skip) ? assoc(state, "skip", false, "i", (get(state, "i") + 1)) : (isSxTruthy((isSxTruthy((typeOf(arg) == "keyword")) && ((get(state, "i") + 1) < len(args)))) ? (function() { var attrName = keywordName(arg); var attrVal = trampoline(evalExpr(nth(args, (get(state, "i") + 1)), env)); - (isSxTruthy(sxOr(isNil(attrVal), (attrVal == false))) ? NIL : (isSxTruthy((isSxTruthy(startsWith(attrName, "on-")) && isCallable(attrVal))) ? domListen(el, slice(attrName, 3), attrVal) : (isSxTruthy(contains(BOOLEAN_ATTRS, attrName)) ? (isSxTruthy(attrVal) ? domSetAttr(el, attrName, "") : NIL) : (isSxTruthy((attrVal == true)) ? domSetAttr(el, attrName, "") : domSetAttr(el, attrName, (String(attrVal))))))); + (isSxTruthy(sxOr(isNil(attrVal), (attrVal == false))) ? NIL : (isSxTruthy((isSxTruthy(startsWith(attrName, "on-")) && isCallable(attrVal))) ? domListen(el, slice(attrName, 3), attrVal) : (isSxTruthy((isSxTruthy((attrName == "bind")) && isSignal(attrVal))) ? bindInput(el, attrVal) : (isSxTruthy(contains(BOOLEAN_ATTRS, attrName)) ? (isSxTruthy(attrVal) ? domSetAttr(el, attrName, "") : NIL) : (isSxTruthy((attrVal == true)) ? domSetAttr(el, attrName, "") : domSetAttr(el, attrName, (String(attrVal)))))))); return assoc(state, "skip", true, "i", (get(state, "i") + 1)); })() : ((isSxTruthy(!isSxTruthy(contains(VOID_ELEMENTS, tag))) ? domAppend(el, renderToDom(arg, env, newNs)) : NIL), assoc(state, "i", (get(state, "i") + 1))))); })(); }, {["i"]: 0, ["skip"]: false}, args); @@ -1572,6 +1572,20 @@ return result; }, args); { var _c = range(1, len(expr)); for (var _i = 0; _i < _c.length; _i++) { var i = _c[_i]; domAppend(frag, renderToDom(nth(expr, i), env, ns)); } } return frag; })() : (isSxTruthy(isDefinitionForm(name)) ? (trampoline(evalExpr(expr, env)), createFragment()) : (isSxTruthy((name == "map")) ? (function() { + var collExpr = nth(expr, 2); + return (isSxTruthy((isSxTruthy(_islandScope) && isSxTruthy((typeOf(collExpr) == "list")) && isSxTruthy((len(collExpr) > 1)) && (first(collExpr) == "deref"))) ? (function() { + var f = trampoline(evalExpr(nth(expr, 1), env)); + var sig = trampoline(evalExpr(nth(collExpr, 1), env)); + return (isSxTruthy(isSignal(sig)) ? reactiveList(f, sig, env, ns) : (function() { + var coll = deref(sig); + var frag = createFragment(); + { var _c = coll; for (var _i = 0; _i < _c.length; _i++) { var item = _c[_i]; (function() { + var val = (isSxTruthy(isLambda(f)) ? renderLambdaDom(f, [item], env, ns) : renderToDom(apply(f, [item]), env, ns)); + return domAppend(frag, val); +})(); } } + return frag; +})()); +})() : (function() { var f = trampoline(evalExpr(nth(expr, 1), env)); var coll = trampoline(evalExpr(nth(expr, 2), env)); var frag = createFragment(); @@ -1580,6 +1594,7 @@ return result; }, args); return domAppend(frag, val); })(); } } return frag; +})()); })() : (isSxTruthy((name == "map-indexed")) ? (function() { var f = trampoline(evalExpr(nth(expr, 1), env)); var coll = trampoline(evalExpr(nth(expr, 2), env)); @@ -1680,15 +1695,29 @@ return (isSxTruthy(testFn()) ? (function() { var parent = domParent(marker); return (isSxTruthy(parent) ? (domRemoveChildrenAfter(marker), (function() { var items = deref(itemsSig); - return forEach(function(item) { return (function() { + var frag = createFragment(); + { var _c = items; for (var _i = 0; _i < _c.length; _i++) { var item = _c[_i]; (function() { var rendered = (isSxTruthy(isLambda(mapFn)) ? renderLambdaDom(mapFn, [item], env, ns) : renderToDom(apply(mapFn, [item]), env, ns)); - return domInsertAfter(marker, rendered); -})(); }, reverse(items)); + return domAppend(frag, rendered); +})(); } } + return domInsertAfter(marker, frag); })()) : NIL); })(); }); return container; })(); }; + // bind-input + var bindInput = function(el, sig) { return (function() { + var inputType = lower(sxOr(domGetAttr(el, "type"), "")); + var isCheckbox = sxOr((inputType == "checkbox"), (inputType == "radio")); + (isSxTruthy(isCheckbox) ? domSetProp(el, "checked", deref(sig)) : domSetProp(el, "value", (String(deref(sig))))); + effect(function() { return (isSxTruthy(isCheckbox) ? domSetProp(el, "checked", deref(sig)) : (function() { + var v = (String(deref(sig))); + return (isSxTruthy((domGetProp(el, "value") != v)) ? domSetProp(el, "value", v) : NIL); +})()); }); + return domListen(el, (isSxTruthy(isCheckbox) ? "change" : "input"), function(e) { return (isSxTruthy(isCheckbox) ? reset_b(sig, domGetProp(el, "checked")) : reset_b(sig, domGetProp(el, "value"))); }); +})(); }; + // === Transpiled from engine === @@ -2049,12 +2078,14 @@ return forEach(function(attr) { return (isSxTruthy(!isSxTruthy(domHasAttr(newEl, var rendered = sxRender(trimmed); var container = domCreateElement("div", NIL); domAppend(container, rendered); - processOobSwaps(container, function(t, oob, s) { swapDomNodes(t, oob, s); + processOobSwaps(container, function(t, oob, s) { disposeIslandsIn(t); +swapDomNodes(t, oob, s); sxHydrate(t); return processElements(t); }); return (function() { var selectSel = domGetAttr(el, "sx-select"); var content = (isSxTruthy(selectSel) ? selectFromContainer(container, selectSel) : childrenToFragment(container)); + disposeIslandsIn(target); return withTransition(useTransition, function() { swapDomNodes(target, content, swapStyle); return postSwap(target); }); })(); @@ -2068,6 +2099,7 @@ return postSwap(target); }); var doc = domParseHtmlDocument(text); return (isSxTruthy(doc) ? (function() { var selectSel = domGetAttr(el, "sx-select"); + disposeIslandsIn(target); return (isSxTruthy(selectSel) ? (function() { var html = selectHtmlFromDoc(doc, selectSel); return withTransition(useTransition, function() { swapHtmlString(target, html, swapStyle); @@ -2075,7 +2107,8 @@ return postSwap(target); }); })() : (function() { var container = domCreateElement("div", NIL); domSetInnerHtml(container, domBodyInnerHtml(doc)); - processOobSwaps(container, function(t, oob, s) { swapDomNodes(t, oob, s); + processOobSwaps(container, function(t, oob, s) { disposeIslandsIn(t); +swapDomNodes(t, oob, s); return postSwap(t); }); hoistHeadElements(container); return withTransition(useTransition, function() { swapDomNodes(target, childrenToFragment(container), swapStyle); @@ -2363,7 +2396,7 @@ return logWarn((String("sx:offline sync failed ") + String(get(entry, "action")) })(); }; // swap-rendered-content - var swapRenderedContent = function(target, rendered, pathname) { return (domSetTextContent(target, ""), domAppend(target, rendered), hoistHeadElementsFull(target), processElements(target), sxHydrateElements(target), domDispatch(target, "sx:clientRoute", {["pathname"]: pathname}), logInfo((String("sx:route client ") + String(pathname)))); }; + var swapRenderedContent = function(target, rendered, pathname) { return (disposeIslandsIn(target), domSetTextContent(target, ""), domAppend(target, rendered), hoistHeadElementsFull(target), processElements(target), sxHydrateElements(target), domDispatch(target, "sx:clientRoute", {["pathname"]: pathname}), logInfo((String("sx:route client ") + String(pathname)))); }; // resolve-route-target var resolveRouteTarget = function(targetSel) { return (isSxTruthy((isSxTruthy(targetSel) && !isSxTruthy((targetSel == "true")))) ? domQuery(targetSel) : NIL); }; @@ -2453,14 +2486,14 @@ return (function() { var swapStyle = get(swapSpec, "style"); var useTransition = get(swapSpec, "transition"); var trimmed = trim(data); - return (isSxTruthy(!isSxTruthy(isEmpty(trimmed))) ? (isSxTruthy(startsWith(trimmed, "(")) ? (function() { + return (isSxTruthy(!isSxTruthy(isEmpty(trimmed))) ? (disposeIslandsIn(target), (isSxTruthy(startsWith(trimmed, "(")) ? (function() { var rendered = sxRender(trimmed); var container = domCreateElement("div", NIL); domAppend(container, rendered); return withTransition(useTransition, function() { swapDomNodes(target, childrenToFragment(container), swapStyle); return postSwap(target); }); })() : withTransition(useTransition, function() { swapHtmlString(target, trimmed, swapStyle); -return postSwap(target); })) : NIL); +return postSwap(target); }))) : NIL); })(); }; // bind-inline-handlers @@ -2722,6 +2755,12 @@ callExpr.push(dictGet(kwargs, k)); } } return (isSxTruthy(disposers) ? (forEach(function(d) { return (isSxTruthy(isCallable(d)) ? d() : NIL); }, disposers), domSetData(el, "sx-disposers", NIL)) : NIL); })(); }; + // dispose-islands-in + var disposeIslandsIn = function(root) { return (isSxTruthy(root) ? (function() { + var islands = domQueryAll(root, "[data-sx-island]"); + return (isSxTruthy((isSxTruthy(islands) && !isSxTruthy(isEmpty(islands)))) ? (logInfo((String("disposing ") + String(len(islands)) + String(" island(s)"))), forEach(disposeIsland, islands)) : NIL); +})() : NIL); }; + // boot-init var bootInit = function() { return (logInfo((String("sx-browser ") + String(SX_VERSION))), initCssTracking(), processPageScripts(), processSxScripts(NIL), sxHydrateElements(NIL), sxHydrateIslands(NIL), processElements(NIL)); }; @@ -2850,6 +2889,7 @@ return (function() { })(); })(); }; recompute(); + registerInScope(function() { return disposeComputed(s); }); return s; })(); })(); }; @@ -2874,12 +2914,16 @@ return (function() { })(); })()) : NIL); }; runEffect(); - return function() { disposed = true; + return (function() { + var disposeFn = function() { disposed = true; if (isSxTruthy(cleanupFn)) { invoke(cleanupFn); } { var _c = deps; for (var _i = 0; _i < _c.length; _i++) { var dep = _c[_i]; signalRemoveSub(dep, runEffect); } } return (deps = []); }; + registerInScope(disposeFn); + return disposeFn; +})(); })(); })(); }; diff --git a/shared/sx/ref/adapter-dom.sx b/shared/sx/ref/adapter-dom.sx index 86a5b22..84156c8 100644 --- a/shared/sx/ref/adapter-dom.sx +++ b/shared/sx/ref/adapter-dom.sx @@ -182,6 +182,9 @@ (and (starts-with? attr-name "on-") (callable? attr-val)) (dom-listen el (slice attr-name 3) attr-val) + ;; Two-way input binding: :bind signal + (and (= attr-name "bind") (signal? attr-val)) + (bind-input el attr-val) ;; Boolean attr (contains? BOOLEAN_ATTRS attr-name) (when attr-val (dom-set-attr el attr-name "")) @@ -366,19 +369,41 @@ (definition-form? name) (do (trampoline (eval-expr expr env)) (create-fragment)) - ;; map + ;; map — reactive-list when mapping over a signal inside an island (= name "map") - (let ((f (trampoline (eval-expr (nth expr 1) env))) - (coll (trampoline (eval-expr (nth expr 2) env))) - (frag (create-fragment))) - (for-each - (fn (item) - (let ((val (if (lambda? f) - (render-lambda-dom f (list item) env ns) - (render-to-dom (apply f (list item)) env ns)))) - (dom-append frag val))) - coll) - frag) + (let ((coll-expr (nth expr 2))) + (if (and *island-scope* + (= (type-of coll-expr) "list") + (> (len coll-expr) 1) + (= (first coll-expr) "deref")) + ;; Reactive path: pass signal to reactive-list + (let ((f (trampoline (eval-expr (nth expr 1) env))) + (sig (trampoline (eval-expr (nth coll-expr 1) env)))) + (if (signal? sig) + (reactive-list f sig env ns) + ;; deref on non-signal: fall through to static + (let ((coll (deref sig)) + (frag (create-fragment))) + (for-each + (fn (item) + (let ((val (if (lambda? f) + (render-lambda-dom f (list item) env ns) + (render-to-dom (apply f (list item)) env ns)))) + (dom-append frag val))) + coll) + frag))) + ;; Static path: no island scope or no deref + (let ((f (trampoline (eval-expr (nth expr 1) env))) + (coll (trampoline (eval-expr (nth expr 2) env))) + (frag (create-fragment))) + (for-each + (fn (item) + (let ((val (if (lambda? f) + (render-lambda-dom f (list item) env ns) + (render-to-dom (apply f (list item)) env ns)))) + (dom-append frag val))) + coll) + frag))) ;; map-indexed (= name "map-indexed") @@ -567,18 +592,54 @@ (when parent ;; Remove all nodes after marker until next sibling marker (dom-remove-children-after marker) - ;; Render new items - (let ((items (deref items-sig))) + ;; Render new items into a fragment, then insert after marker + (let ((items (deref items-sig)) + (frag (create-fragment))) (for-each (fn (item) (let ((rendered (if (lambda? map-fn) (render-lambda-dom map-fn (list item) env ns) (render-to-dom (apply map-fn (list item)) env ns)))) - (dom-insert-after marker rendered))) - (reverse items))))))) + (dom-append frag rendered))) + items) + (dom-insert-after marker frag)))))) container))) +;; -------------------------------------------------------------------------- +;; bind-input — two-way signal binding for form elements +;; -------------------------------------------------------------------------- +;; +;; (bind-input el sig) creates a bidirectional link: +;; Signal → element: effect updates el.value (or el.checked) when sig changes +;; Element → signal: input/change listener updates sig when user types +;; +;; Handles: input[text/number/email/...], textarea, select, checkbox, radio + +(define bind-input + (fn (el sig) + (let ((input-type (lower (or (dom-get-attr el "type") ""))) + (is-checkbox (or (= input-type "checkbox") + (= input-type "radio")))) + ;; Set initial value from signal + (if is-checkbox + (dom-set-prop el "checked" (deref sig)) + (dom-set-prop el "value" (str (deref sig)))) + ;; Signal → element (reactive effect) + (effect (fn () + (if is-checkbox + (dom-set-prop el "checked" (deref sig)) + (let ((v (str (deref sig)))) + (when (!= (dom-get-prop el "value") v) + (dom-set-prop el "value" v)))))) + ;; Element → signal (event listener) + (dom-listen el (if is-checkbox "change" "input") + (fn (e) + (if is-checkbox + (reset! sig (dom-get-prop el "checked")) + (reset! sig (dom-get-prop el "value")))))))) + + ;; -------------------------------------------------------------------------- ;; Platform interface — DOM adapter ;; -------------------------------------------------------------------------- diff --git a/shared/sx/ref/boot.sx b/shared/sx/ref/boot.sx index a27980a..d3d96d4 100644 --- a/shared/sx/ref/boot.sx +++ b/shared/sx/ref/boot.sx @@ -391,6 +391,15 @@ disposers) (dom-set-data el "sx-disposers" nil))))) +(define dispose-islands-in + (fn (root) + ;; Dispose all islands within root before a swap replaces them. + (when root + (let ((islands (dom-query-all root "[data-sx-island]"))) + (when (and islands (not (empty? islands))) + (log-info (str "disposing " (len islands) " island(s)")) + (for-each dispose-island islands)))))) + ;; -------------------------------------------------------------------------- ;; Full boot sequence diff --git a/shared/sx/ref/orchestration.sx b/shared/sx/ref/orchestration.sx index 778d9f0..fa601e7 100644 --- a/shared/sx/ref/orchestration.sx +++ b/shared/sx/ref/orchestration.sx @@ -261,6 +261,7 @@ ;; Process OOB swaps (process-oob-swaps container (fn (t oob s) + (dispose-islands-in t) (swap-dom-nodes t oob s) (sx-hydrate t) (process-elements t))) @@ -269,6 +270,8 @@ (content (if select-sel (select-from-container container select-sel) (children-to-fragment container)))) + ;; Dispose old islands before swap + (dispose-islands-in target) ;; Swap (with-transition use-transition (fn () @@ -282,6 +285,8 @@ (let ((doc (dom-parse-html-document text))) (when doc (let ((select-sel (dom-get-attr el "sx-select"))) + ;; Dispose old islands before swap + (dispose-islands-in target) (if select-sel ;; Select from parsed document (let ((html (select-html-from-doc doc select-sel))) @@ -295,6 +300,7 @@ ;; Process OOB swaps (process-oob-swaps container (fn (t oob s) + (dispose-islands-in t) (swap-dom-nodes t oob s) (post-swap t))) ;; Hoist head elements @@ -816,6 +822,7 @@ ;; Swap rendered DOM content into target and run post-processing. ;; Shared by pure and data page client routes. (do + (dispose-islands-in target) (dom-set-text-content target "") (dom-append target rendered) (hoist-head-elements-full target) @@ -1003,6 +1010,7 @@ (use-transition (get swap-spec "transition")) (trimmed (trim data))) (when (not (empty? trimmed)) + (dispose-islands-in target) (if (starts-with? trimmed "(") ;; SX response (let ((rendered (sx-render trimmed)) diff --git a/shared/sx/ref/signals.sx b/shared/sx/ref/signals.sx index cee16e2..9595f9e 100644 --- a/shared/sx/ref/signals.sx +++ b/shared/sx/ref/signals.sx @@ -133,6 +133,8 @@ ;; Initial computation (recompute) + ;; Auto-register disposal with island scope + (register-in-scope (fn () (dispose-computed s))) s)))) @@ -176,13 +178,17 @@ (run-effect) ;; Return dispose function - (fn () - (set! disposed true) - (when cleanup-fn (invoke cleanup-fn)) - (for-each - (fn (dep) (signal-remove-sub! dep run-effect)) - deps) - (set! deps (list))))))) + (let ((dispose-fn + (fn () + (set! disposed true) + (when cleanup-fn (invoke cleanup-fn)) + (for-each + (fn (dep) (signal-remove-sub! dep run-effect)) + deps) + (set! deps (list))))) + ;; Auto-register with island scope so disposal happens on swap + (register-in-scope dispose-fn) + dispose-fn))))) ;; -------------------------------------------------------------------------- diff --git a/shared/sx/ref/sx_ref.py b/shared/sx/ref/sx_ref.py index 2c43bb8..3a0f7ce 100644 --- a/shared/sx/ref/sx_ref.py +++ b/shared/sx/ref/sx_ref.py @@ -1339,7 +1339,7 @@ reset_b = lambda s, value: ((lambda old: (_sx_begin(signal_set_value(s, value), swap_b = lambda s, f, *args: ((lambda old: (lambda new_val: (_sx_begin(signal_set_value(s, new_val), notify_subscribers(s)) if sx_truthy((not sx_truthy(is_identical(old, new_val)))) else NIL))(apply(f, cons(old, args))))(signal_value(s)) if sx_truthy(is_signal(s)) else NIL) # computed -computed = lambda compute_fn: (lambda s: (lambda deps: (lambda compute_ctx: (lambda recompute: _sx_begin(recompute(), s))(_sx_fn(lambda : ( +computed = lambda compute_fn: (lambda s: (lambda deps: (lambda compute_ctx: (lambda recompute: _sx_begin(recompute(), register_in_scope(lambda : dispose_computed(s)), s))(_sx_fn(lambda : ( for_each(lambda dep: signal_remove_sub(dep, recompute), signal_deps(s)), signal_set_deps(s, []), (lambda ctx: (lambda prev: _sx_begin(set_tracking_context(ctx), (lambda new_val: _sx_begin(set_tracking_context(prev), signal_set_deps(s, tracking_context_deps(ctx)), (lambda old: _sx_begin(signal_set_value(s, new_val), (notify_subscribers(s) if sx_truthy((not sx_truthy(is_identical(old, new_val)))) else NIL)))(signal_value(s))))(invoke(compute_fn))))(get_tracking_context()))(make_tracking_context(recompute)) @@ -1353,12 +1353,14 @@ def effect(effect_fn): _cells['cleanup_fn'] = NIL run_effect = lambda : (_sx_begin((invoke(_cells['cleanup_fn']) if sx_truthy(_cells['cleanup_fn']) else NIL), for_each(lambda dep: signal_remove_sub(dep, run_effect), _cells['deps']), _sx_cell_set(_cells, 'deps', []), (lambda ctx: (lambda prev: _sx_begin(set_tracking_context(ctx), (lambda result: _sx_begin(set_tracking_context(prev), _sx_cell_set(_cells, 'deps', tracking_context_deps(ctx)), (_sx_cell_set(_cells, 'cleanup_fn', result) if sx_truthy(is_callable(result)) else NIL)))(invoke(effect_fn))))(get_tracking_context()))(make_tracking_context(run_effect))) if sx_truthy((not sx_truthy(_cells['disposed']))) else NIL) run_effect() - return _sx_fn(lambda : ( + dispose_fn = _sx_fn(lambda : ( _sx_cell_set(_cells, 'disposed', True), (invoke(_cells['cleanup_fn']) if sx_truthy(_cells['cleanup_fn']) else NIL), for_each(lambda dep: signal_remove_sub(dep, run_effect), _cells['deps']), _sx_cell_set(_cells, 'deps', []) )[-1]) + register_in_scope(dispose_fn) + return dispose_fn # *batch-depth* _batch_depth = 0 diff --git a/sx/sx/nav-data.sx b/sx/sx/nav-data.sx index 2869c31..b8b72f5 100644 --- a/sx/sx/nav-data.sx +++ b/sx/sx/nav-data.sx @@ -180,7 +180,9 @@ (dict :label "Named Stores" :href "/reactive-islands/named-stores" :summary "Page-level signal containers via def-store/use-store — persist across island destruction/recreation.") (dict :label "Plan" :href "/reactive-islands/plan" - :summary "The full design document — rendering boundary, state flow, signal primitives, island lifecycle."))) + :summary "The full design document — rendering boundary, state flow, signal primitives, island lifecycle.") + (dict :label "Phase 2" :href "/reactive-islands/phase2" + :summary "Input binding, keyed lists, reactive class/style, refs, portals, error boundaries, suspense, transitions."))) (define bootstrappers-nav-items (list (dict :label "Overview" :href "/bootstrappers/") diff --git a/sx/sx/reactive-islands.sx b/sx/sx/reactive-islands.sx index 6743efc..38f3547 100644 --- a/sx/sx/reactive-islands.sx +++ b/sx/sx/reactive-islands.sx @@ -121,11 +121,19 @@ (td :class "px-3 py-2 text-stone-700" "data-sx-emit processing") (td :class "px-3 py-2 text-green-700 font-medium" "Spec'd") (td :class "px-3 py-2 font-mono text-xs text-stone-500" "orchestration.sx: process-emit-elements")) + (tr :class "border-b border-stone-100" + (td :class "px-3 py-2 text-stone-700" "Island disposal") + (td :class "px-3 py-2 text-green-700 font-medium" "Done") + (td :class "px-3 py-2 font-mono text-xs text-stone-500" "boot.sx, orchestration.sx: dispose-islands-in pre-swap")) + (tr :class "border-b border-stone-100" + (td :class "px-3 py-2 text-stone-700" "Reactive list") + (td :class "px-3 py-2 text-green-700 font-medium" "Done") + (td :class "px-3 py-2 font-mono text-xs text-stone-500" "adapter-dom.sx: map + deref auto-upgrades")) (tr - (td :class "px-3 py-2 text-stone-700" "Keyed list reconciliation") - (td :class "px-3 py-2 text-amber-600 font-medium" "TODO") - (td :class "px-3 py-2 font-mono text-xs text-stone-500" "reactive-list morph")))))))) - + (td :class "px-3 py-2 text-stone-700" "Phase 2") + (td :class "px-3 py-2 text-amber-600 font-medium" "Planned") + (td :class "px-3 py-2 font-mono text-xs text-stone-500" + (a :href "/reactive-islands/phase2" :sx-get "/reactive-islands/phase2" :sx-target "#main-panel" :sx-select "#main-panel" :sx-swap "outerHTML" :sx-push-url "true" :class "text-violet-700 underline" "Input binding, keyed lists, refs, portals, ..."))))))))) ;; --------------------------------------------------------------------------- ;; Live demo islands @@ -216,11 +224,61 @@ btn-text) (button :class "px-3 py-1 rounded bg-stone-300 text-stone-700 text-sm hover:bg-stone-400" :on-click (fn (e) - (reset! running false) - (reset! elapsed 0)) + (do (reset! running false) + (reset! elapsed 0))) "Reset"))))) +;; 5. Reactive list — map over a signal, auto-updates when signal changes +(defisland ~demo-reactive-list () + (let ((next-id (signal 1)) + (items (signal (list))) + (add-item (fn (e) + (batch (fn () + (swap! items (fn (old) + (append old (dict "id" (deref next-id) + "text" (str "Item " (deref next-id)))))) + (swap! next-id inc))))) + (remove-item (fn (id) + (swap! items (fn (old) + (filter (fn (item) (not (= (get item "id") id))) old)))))) + (div :class "rounded border border-violet-200 bg-violet-50 p-4 my-4" + (div :class "flex items-center gap-3 mb-3" + (button :class "px-3 py-1 rounded bg-violet-600 text-white text-sm font-medium hover:bg-violet-700" + :on-click add-item + "Add Item") + (span :class "text-sm text-stone-500" + (deref (computed (fn () (len (deref items))))) " items")) + (ul :class "space-y-1" + (map (fn (item) + (li :class "flex items-center justify-between bg-white rounded px-3 py-2 text-sm" + (span (get item "text")) + (button :class "text-stone-400 hover:text-red-500 text-xs" + :on-click (fn (e) (remove-item (get item "id"))) + "✕"))) + (deref items)))))) + +;; 6. Input binding — two-way signal binding for form elements +(defisland ~demo-input-binding () + (let ((name (signal "")) + (agreed (signal false))) + (div :class "rounded border border-violet-200 bg-violet-50 p-4 my-4 space-y-3" + (div :class "flex items-center gap-3" + (input :type "text" :bind name + :placeholder "Type your name..." + :class "px-3 py-1.5 rounded border border-stone-300 text-sm focus:outline-none focus:border-violet-400 w-48") + (span :class "text-sm text-stone-600" + "Hello, " + (strong (deref name)) + "!")) + (div :class "flex items-center gap-2" + (input :type "checkbox" :bind agreed :id "agree-cb" + :class "rounded border-stone-300") + (label :for "agree-cb" :class "text-sm text-stone-600" "I agree to the terms")) + (when (deref agreed) + (p :class "text-sm text-green-700" "Thanks for agreeing!"))))) + + ;; --------------------------------------------------------------------------- ;; Demo page — shows what's been implemented ;; --------------------------------------------------------------------------- @@ -256,12 +314,24 @@ (~doc-code :code (highlight "(defisland ~demo-imperative ()\n (let ((count (signal 0))\n (text-node (create-text-node \"0\")))\n ;; Explicit effect: re-runs when count changes\n (effect (fn ()\n (dom-set-text-content text-node (str (deref count)))))\n (div :class \"...\"\n (span text-node)\n (button :on-click (fn (e) (swap! count inc)) \"+\"))))" "lisp")) (p "Two patterns exist: " (strong "declarative") " (" (code "(span (deref sig))") " — auto-reactive via " (code "reactive-text") ") and " (strong "imperative") " (" (code "create-text-node") " + " (code "effect") " — explicit, full control). Use declarative for simple text, imperative for dynamic classes, conditional DOM, or complex updates.")) - (~doc-section :title "5. How defisland Works" :id "demo-island" + (~doc-section :title "5. Reactive List" :id "demo-reactive-list" + (p "When " (code "map") " is used with " (code "(deref signal)") " inside an island, it auto-upgrades to a reactive list. Adding or removing items updates only the affected DOM — no full re-render.") + (~demo-reactive-list) + (~doc-code :code (highlight "(defisland ~demo-reactive-list ()\n (let ((next-id (signal 1))\n (items (signal (list)))\n (add-item (fn (e)\n (batch (fn ()\n (swap! items (fn (old)\n (append old (dict \"id\" (deref next-id)\n \"text\" (str \"Item \" (deref next-id))))))\n (swap! next-id inc)))))\n (remove-item (fn (id)\n (swap! items (fn (old)\n (filter (fn (item) (not (= (get item \"id\") id))) old))))))\n (div\n (button :on-click add-item \"Add Item\")\n (span (deref (computed (fn () (len (deref items))))) \" items\")\n (ul\n (map (fn (item)\n (li (span (get item \"text\"))\n (button :on-click (fn (e) (remove-item (get item \"id\"))) \"✕\")))\n (deref items))))))" "lisp")) + (p "The " (code "map") " form detects " (code "(deref items)") " is a signal and creates an effect that re-renders the list when items change. " (code "batch") " groups the two signal writes (items + next-id) into one update pass.")) + + (~doc-section :title "6. Input Binding" :id "demo-input-binding" + (p "The " (code ":bind") " attribute creates a two-way link between a signal and a form element. Type in the input — the signal updates. Change the signal — the input updates. Works with text inputs, checkboxes, radios, textareas, and selects.") + (~demo-input-binding) + (~doc-code :code (highlight "(defisland ~demo-input-binding ()\n (let ((name (signal \"\"))\n (agreed (signal false)))\n (div\n (input :type \"text\" :bind name\n :placeholder \"Type your name...\")\n (span \"Hello, \" (strong (deref name)) \"!\")\n (input :type \"checkbox\" :bind agreed)\n (when (deref agreed)\n (p \"Thanks for agreeing!\")))))" "lisp")) + (p (code ":bind") " detects the element type automatically — text inputs use " (code "value") " + " (code "input") " event, checkboxes use " (code "checked") " + " (code "change") " event. The effect only updates the DOM when the value actually changed, preventing cursor jump.")) + + (~doc-section :title "7. How defisland Works" :id "how-defisland" (p (code "defisland") " creates a reactive component. Same calling convention as " (code "defcomp") " — keyword args, rest children — but with a reactive boundary. Inside an island, " (code "deref") " subscribes DOM nodes to signals.") (~doc-code :code (highlight ";; Definition — same syntax as defcomp\n(defisland ~counter (&key initial)\n (let ((count (signal (or initial 0))))\n (div\n (span (deref count)) ;; reactive text node\n (button :on-click (fn (e) (swap! count inc)) ;; event handler\n \"+\"))))\n\n;; Usage — same as any component\n(~counter :initial 42)\n\n;; Server-side rendering:\n;;