mnfst 0.5.232 → 0.5.234

package/lib/manifest.appwrite.data.js

@@ -2,7 +2,7 @@
 
 (function () {
 
-const MANIFEST_BUILD_VERSION = '0.5.232';
+const MANIFEST_BUILD_VERSION = '0.5.234';
 
 /* Manifest Data Sources - Appwrite Integration */
 

package/lib/manifest.d.ts

@@ -433,11 +433,13 @@ export interface ManifestEdit {
     /** Set an attribute: a string sets it, `true` sets it empty, `null`/`false` removes it. */
     attr(name: string, value: string | boolean | null, el?: Element): boolean;
     classes: ManifestEditClasses;
-    /** Component scope of the target's area: read with no value, set 'instance' or 'main'.
+    /** Component scope of `el`'s area (default `$edit.target`): `scope(el)` reads it.
      *  Instance overrides apply to an area that wraps exactly one component with no x-edit region
      *  of its own; a component among other content is a host piece of a static area instead, and
      *  a component's own region is edited in its own file. */
-    scope(value?: 'instance' | 'main', el?: Element): 'instance' | 'main' | null | boolean;
+    scope(el?: Element | null): 'instance' | 'main' | null;
+    /** Set the component scope of `el`'s area (default `$edit.target`); false if it has none. */
+    scope(value: 'instance' | 'main', el?: Element | null): boolean;
     /** Revert a component element's instance overrides (the area element reverts all). */
     revert(el?: Element): boolean;
 }

package/lib/manifest.data.js

@@ -2,7 +2,7 @@
 
 (function () {
 
-const MANIFEST_BUILD_VERSION = '0.5.232';
+const MANIFEST_BUILD_VERSION = '0.5.234';
 
 /* Manifest Data Sources - Configuration */
 

package/lib/manifest.edit.js

@@ -186,6 +186,14 @@
     }
     const sanitizeFor = (el, html) => !window.ManifestRichText ? sanitizeHTML(html)
         : authoredRich(el) ? window.ManifestRichText.sanitize(html, true, true) : leafClean(html, el);
+    // Text written into an element. A leaf shows exactly what is logged; a rich field owns its markup:
+    // it is written only when it differs as logged, then settles (keeping its editing affordances)
+    function writeText(el, html) {
+        const safe = sanitizeFor(el, html);
+        if (el.innerHTML === safe || (authoredRich(el) && sanitizeFor(el, el.innerHTML.trim()) === safe)) return;
+        el.innerHTML = safe;
+        if (el._rt && typeof el._rt.settle === 'function') el._rt.settle();
+    }
 
     function sanitizeHTML(html) {
         const t = document.createElement('template'); t.innerHTML = String(html == null ? '' : html);
@@ -529,7 +537,7 @@
                 const base = area._baseText || {}, baseC = area._baseClass || {}, baseS = area._baseStyle || {};
                 const pick = (prop, fallback) => iv[prop] !== undefined ? iv[prop] : (mv[prop] !== undefined ? mv[prop] : fallback);
                 const text = pick('text', base[p]), cls = pick('class', baseC[p]), sty = pick('style', baseS[p]);
-                if (text !== undefined) { const safe = sanitizeFor(el, text); if (el.innerHTML !== safe) el.innerHTML = safe; }
+                if (text !== undefined) writeText(el, text);
                 if (cls !== undefined) writeClass(el, cls);
                 if (sty !== undefined && el.getAttribute('style') !== sty) { if (sty === '') el.removeAttribute('style'); else el.setAttribute('style', sty); }
             });
@@ -540,7 +548,7 @@
         if (path == null) return false;
         if (prop === 'text') value = sanitizeFor(el, value);
         if (before === undefined) before = prop === 'text' ? el._preEdit : prop === 'style' ? el._preStyle : el._preClass;
-        if (before === value) return false;
+        if (before === value || (prop === 'text' && before != null && sanitizeFor(el, before) === value)) return false;
         const sig = nodeSig(el);
         pushDelta(scope === 'main' ? { kind: 'cmp-main', component, path, prop, value, before, sig, region } : { kind: 'cmp-inst', component, region, path, prop, value, before, sig });
         applyComponentState();
@@ -640,7 +648,7 @@
 
     function applyStaticProp(el, prop, v) {
         if (v === undefined) return;
-        if (prop === 'text') { const safe = sanitizeFor(el, v); if (el.innerHTML !== safe) el.innerHTML = safe; return; }
+        if (prop === 'text') return writeText(el, v);
         if (attrRefusal(prop, v, el.tagName)) return;
         if (prop === 'class') return writeClass(el, v);
         if (prop === 'style') return writeStyle(el, v);
@@ -862,8 +870,9 @@
             const pre = prop === 'text' ? el._preEdit : prop === 'class' ? el._preClass : prop === 'style' ? el._preStyle : undefined;
             before = pre !== undefined ? pre : fallback;
         }
-        if (before === value) return false;
-        if (prop === 'text' && document.activeElement !== el && el.innerHTML.trim() !== value) el.innerHTML = value;
+        if (before === value || (prop === 'text' && before != null && sanitizeFor(el, before) === value)) return false;
+        // A rich field owns its markup: the logged value is never written back into it
+        if (prop === 'text' && document.activeElement !== el && !authoredRich(el)) writeText(el, value);
         const last = log[cursor - 1];
         if (opts.coalesce && last && cursor === log.length && last.kind === 'st-node' && last.region === region && last.path === path && last.prop === prop && Date.now() - (stamps.get(last) || 0) < COALESCE_MS) {
             if (last.before === value) { log.pop(); cursor--; } else { last.value = value; stamps.set(last, Date.now()); }
@@ -901,7 +910,7 @@
         value = String(value);
         if (el && el._editRich) value = sanitizeFor(el, value);
         const before = el ? el._preEdit : undefined;
-        if (before === value) return false;
+        if (before === value || (el && el._editRich && before != null && sanitizeFor(el, before) === value)) return false;
         pushDelta({ kind: 'data-val', region: key(area), source, id, field, value, before });
         applyDataValues();
         return true;
@@ -1163,7 +1172,8 @@
         if (kind === 'component') return false;
         const block = asPiece(el);
         if (!block) return false;
-        if (action === 'copy' || action === 'cut') return !isHostEl(block);
+        if (action === 'copy') return !isHostEl(block);
+        if (action === 'cut') return canDo('copy', block) && canDo('remove', block);   // a cut is a copy and a remove
         if (action === 'move') return movable(block);
         const lockAs = action === 'duplicate' ? 'duplicate' : 'remove';
         return capOf(block.parentElement, 'move') && !lockedFor(block, lockAs);
@@ -1408,6 +1418,8 @@
         const region = s.crossOK ? dropArea(x, y, s.area) : s.area;
         if (!region) return null;
         const hit = document.elementFromPoint ? document.elementFromPoint(x, y) : null;
+        // Over the stand-in itself: it stays where it is
+        if (hit && s.ghost && (hit === s.ghost || s.ghost.contains(hit))) return null;
         if (hit && hit !== region && region.contains(hit)) {
             // Inside a component host: the host is what is hit (its markup is another file's)
             let from = hit;
@@ -1417,6 +1429,9 @@
                 const parent = el.parentElement;
                 if (!isContainer(parent)) continue;
                 if (isHostEl(el)) { if (accepts(parent) && fits(s.item, parent) && !s.item.contains(parent)) return beside(el, x, y, parent); continue; }
+                // Over the container the piece came from, or one holding the stand-in (a gap, its padding):
+                // it stays in, placed by reading order; it leaves only when the pointer does
+                if (s.ghost && (el === s.home || el.contains(s.ghost)) && accepts(el) && fits(s.item, el)) return { container: el, ref: afterElement(el, x, y) };
                 if (isContainer(el) && accepts(el) && fits(s.item, el) && inMiddle(el, x, y, parent)) {
                     if (s.ghost && s.ghost.parentElement !== el) s.nested = { el, rect: el.getBoundingClientRect(), horiz: flowAxis(parent) === 'x' };
                     return { container: el, ref: afterElement(el, x, y) };
@@ -1429,9 +1444,12 @@
     }
     // Reading-order insertion: the first sibling past the pointer.
     function afterElement(c, x, y) {
+        const column = flowAxis(c) === 'y';
         for (const el of sortableChildren(c)) {
             if (el === dragged || el.hasAttribute('data-edit-dragging') || lockedFor(el, 'move')) continue;
             const b = el.getBoundingClientRect(), cx = b.left + b.width / 2, cy = b.top + b.height / 2;
+            // Stacked rows: past a row once the pointer is past its middle (wherever it is across)
+            if (column && !/inline/.test(getComputedStyle(el).display)) { if (cy > y) return el; continue; }
             const sameRow = Math.abs(cy - y) < b.height / 2;
             if (cy - y > b.height / 2 || (sameRow && cx > x)) return el;
         }
@@ -2041,7 +2059,7 @@
         area.querySelectorAll('[data-rich-text]:not([data-rich-text-bound])').forEach(el => {
             if (el._editRt || !capOf(el, 'text') || !/^[@~]/.test(el.getAttribute('data-edit-key') || '')) return;
             if (el._richBound) return; el._richBound = true;
-            el.addEventListener('focusin', () => { el._preEdit = el.innerHTML.trim(); });
+            el.addEventListener('focusin', () => { el._preEdit = leafText(el); });
             el.addEventListener('blur', () => {
                 const a = regionOf(el) || area;   // the region the element sits in NOW, not where it was armed
                 const commit = classify(a) === 'component' ? commitComponentNode : commitStaticNode;
@@ -2298,12 +2316,25 @@
         el._cssvar.persist = !!(modifiers && modifiers.includes('persist'));
         cssvarControls.add(el);
     }
+    // A colour input takes #rrggbb only: any CSS colour (a theme's oklch(), var() resolved) is read off a canvas pixel
+    let colorCanvas = null;
+    function hexColor(v) {
+        if (/^#[0-9a-f]{6}$/i.test(v)) return v.toLowerCase();
+        try {
+            colorCanvas = colorCanvas || document.createElement('canvas');
+            const g = colorCanvas.getContext && colorCanvas.getContext('2d', { willReadFrequently: true });
+            if (!g) return null;
+            const probe = document.createElement('i'); probe.style.color = v; if (!probe.style.color) return null;
+            g.clearRect(0, 0, 1, 1); g.fillStyle = '#000'; g.fillStyle = v; g.fillRect(0, 0, 1, 1);
+            return '#' + [...g.getImageData(0, 0, 1, 1).data.slice(0, 3)].map(x => x.toString(16).padStart(2, '0')).join('');
+        } catch { return null; }
+    }
     function syncCssVarInput(el) {
         const cv = el._cssvar; if (!cv || !('value' in el)) return;
         const cur = getComputedStyle(themeTargetEl(cv.scope)).getPropertyValue(cv.var).trim();
         if (!cur) return;
-        const next = el.dataset.unit ? String(parseFloat(cur)) : cur;
-        if (el.value !== next) el.value = next;
+        const next = el.type === 'color' ? hexColor(cur) : el.dataset.unit ? String(parseFloat(cur)) : cur;
+        if (next != null && el.value !== next) el.value = next;
     }
     function armCssVar(el) {
         const cv = el._cssvar; if (!cv || !cv.var) return;
@@ -2332,10 +2363,24 @@
         });
         cssvarControls.forEach(syncCssVarInput);
     }
-    function rebaseTheme() {
-        Object.keys(themeBaseline).forEach(kk => { const sep = kk.indexOf('|'); themeBaseline[kk] = themeTargetEl(kk.slice(0, sep) || null).style.getPropertyValue(kk.slice(sep + 1)); });
-        themeTouched.clear();
-    }
+    function rebaseTheme(keep) {
+        Object.keys(themeBaseline).forEach(kk => { if (keep && keep.has('theme|' + kk)) return; const sep = kk.indexOf('|'); themeBaseline[kk] = themeTargetEl(kk.slice(0, sep) || null).style.getPropertyValue(kk.slice(sep + 1)); });
+        [...themeTouched].forEach(kk => { if (!(keep && keep.has('theme|' + kk))) themeTouched.delete(kk); });
+    }
+    // A scoped value lives in its scope element's inline style, and is written there, never to a
+    // stylesheet: with its x-edit area's tree when the element is a static piece of one ('area'),
+    // else found by its own x-edit.theme name ('own'). Inside generated content it can't be (null).
+    function inlineScope(scope) {
+        const el = scope && themeScopes[scope]; if (!el || generatedBy(el)) return null;
+        const a = regionOf(el), k = el.getAttribute('data-edit-key');
+        if (a && classify(a) === 'static' && !sharedKey(a) && k && /^[@~]/.test(k)) return 'area';
+        if (a && a !== el) return null;
+        const named = areaByKey(scope);
+        return !named || named === el ? 'own' : null;
+    }
+    const inlineScoped = () => new Set(Object.values(themeState()).filter(d => d.scope && inlineScope(d.scope) === 'area').map(d => themeScopes[d.scope]));
+    // The component file a scope element is authored in, if any.
+    const scopeComponent = (el) => { for (let n = el; n; n = n.parentElement) if (n._manifestComponent) return n._manifestComponent; return null; };
     // A custom-property value must stay inside its declaration (same tokenizer as the
     // source writer): strings and url(...) are opaque; script schemes in url() and
     // expression() are refused anywhere; data: urls only as images.
@@ -2383,12 +2428,16 @@
         const cur = themeState()[kk]; if (cur && cur.value === value) return;   // dedupe
         pushDelta({ kind: 'theme', scope: scope || null, var: v, value }, !!persist);
     }
-    // Each var → its scope's data-edit-theme-file, else the server's theme file.
+    // Global vars → the page's theme stylesheet (the server's choice); scoped ones inline
     function themePatches() {
-        return Object.values(themeState()).map(d => {
-            const el = d.scope ? themeScopes[d.scope] : null;
-            return { kind: 'theme', scope: d.scope || null, var: d.var, value: d.value, file: el ? el.getAttribute('data-edit-theme-file') || null : null };
+        const st = Object.values(themeState()), out = [];
+        st.filter(d => !inlineScope(d.scope)).forEach(d => out.push({ kind: 'theme', scope: d.scope || null, var: d.var, value: d.value, file: null }));
+        // A scope element of its own: its style attribute, as the page has it now
+        new Set(st.filter(d => d.scope && inlineScope(d.scope) === 'own').map(d => d.scope)).forEach(scope => {
+            const el = themeScopes[scope], comp = scopeComponent(el), tree = { key: '', edits: { style: ownStyle(el) || null } };
+            out.push(comp ? { kind: 'static-tree', region: scope, component: comp, tree } : { kind: 'static-tree', region: scope, tree });
         });
+        return out;
     }
 
 
@@ -2448,8 +2497,21 @@
         };
         walk(area, '');
     }
-    const warnedRendered = new Set(), renderedRegions = new Set();
+    const warnedRendered = new Set(), renderedRegions = new Set(), unwritableWhy = new Map();
+    // A list whose records mnfst-run can't write: inline x-data, or a source manifest.json does not declare as a file.
+    function dataUnwritable(area) {
+        if (classify(area) !== 'data') return null;
+        const m = (dataSourceExpr(area) || '').match(/\$x\.([\w$]+)/);
+        if (!m) return 'inline x-data list: mnfst-run writes data only to CSV/JSON/YAML sources declared in manifest.json';
+        const mf = window.ManifestComponentsRegistry && window.ManifestComponentsRegistry.manifest;
+        if (!mf) return null;
+        const src = (mf.data || {})[m[1]];
+        if (src == null) return `data source '${m[1]}' is not declared in manifest.json: mnfst-run writes data only to CSV/JSON/YAML files declared there`;
+        return typeof src === 'string' ? null : `data source '${m[1]}' is not a file (a cloud or remote source): save it with $x.${m[1]}.$update, not mnfst-run`;
+    }
     function armArea(area) {
+        const dw = dataUnwritable(area);
+        if (dw) { renderedRegions.add(key(area)); unwritableWhy.set(key(area), dw); if (!warnedRendered.has(key(area))) { warnedRendered.add(key(area)); console.warn(`[edit] x-edit="${key(area)}": ${dw}; its edits stay on the page (and reach onPublish)`); } }
         if (area._edit.rendered) renderedRegions.add(key(area));
         if (area._edit.rendered && !warnedRendered.has(key(area))) { warnedRendered.add(key(area)); console.warn(`[edit] x-edit="${key(area)}" is inside content ${area._edit.rendered} renders: it edits on the page (and reaches onPublish), but mnfst-run cannot write it to a source file`); }
         uneditIn(null);
@@ -2545,7 +2607,7 @@
             return Object.keys(e).length ? e : null;
         };
         const nontrivial = (n) => n.edits || n.children || n.key[0] === '~';
-        const live = keyMap(staticAreas());
+        const live = keyMap(staticAreas()), scoped = inlineScoped();
         staticAreas().forEach(area => {
             const region = key(area), comp = sourceComponent(area);
             const ids = new Proxy({}, { get: (_, k) => { const o = originOf(String(k)), a = areaByKey(decodeURIComponent(o.slice(1, o.indexOf('@', 1)))); const m = baseIds && a && baseIds[sourceFile(a)]; return m ? m[o] : undefined; } });
@@ -2565,6 +2627,7 @@
                 const at = originAt.get(originOf(id)); if (at != null) n.at = at;
                 if (ids && ids[originOf(id)]) n.fp = ids[originOf(id)];
                 const e = editsFor(id); if (e) n.edits = e;
+                if (scoped.has(el)) n.edits = Object.assign({}, n.edits, { style: ownStyle(el) || null });
                 if (!(e && 'text' in e) && !isRendered(el) && !el.hasAttribute('data-rich-text')) {
                     const kids = treeKids(el).map(c => build(c)).filter(Boolean);
                     const structural = ss.touched.has(isRoot ? '#' + region : id);
@@ -2606,7 +2669,8 @@
             return e;
         };
         const dv = dataValueState();
-        Object.entries(dv).forEach(([source, recs]) => Object.entries(recs).forEach(([id, fields]) => Object.entries(fields).forEach(([field, value]) => patches.push({ kind: 'data-val', source, id, field, value }))));
+        const dvRegion = {}; log.slice(0, cursor).forEach(d => { if (d.kind === 'data-val') dvRegion[d.source] = d.region; });
+        Object.entries(dv).forEach(([source, recs]) => Object.entries(recs).forEach(([id, fields]) => Object.entries(fields).forEach(([field, value]) => patches.push({ kind: 'data-val', region: dvRegion[source], source, id, field, value }))));
         const { main, inst, reverts } = componentState();
         Object.entries(main).forEach(([component, paths]) => { const edits = toEdits(paths); if (edits.length) patches.push({ kind: 'component', scope: 'main', component, edits }); });
         new Set([...Object.keys(inst), ...Object.keys(reverts)]).forEach(region => {
@@ -2623,7 +2687,7 @@
     // `keep` (areas a publish left out), whose identities are left as they are.
     function rebase(keep) {
         const mounted = (r) => r == null || (!!areaByKey(r) && !(keep && keep.has(r)));
-        const pending = (d) => (d.kind === 'st-move' ? [d.from, d.to] : [d.region]).some(r => !mounted(r));
+        const pending = (d) => d.kind === 'theme' ? !!keep && (keep.has('theme|' + (d.scope || '') + '|' + d.var) || keep.has(d.scope)) : (d.kind === 'st-move' ? [d.from, d.to] : [d.region]).some(r => !mounted(r));
         // Runtime locks are app state, not source: carried over by element.
         const locks = [];
         const lockState = lockStateNow();
@@ -2657,7 +2721,7 @@
             if (kind === 'component' && a._armed) armComponent(a);
             lastSnap[key(a)] = snapshot(a, kind);
         });
-        rebaseTheme();
+        rebaseTheme(keep);
         relock();
         saveState(); refresh();
     }
@@ -2783,7 +2847,7 @@
     // fingerprints of keys with twins there (which may not be the elements this page shows).
     let overNewer = false;
     function publishNow(opts) {
-        const done = (r, keep) => {
+        const done = (r, keep, heldRes) => {
             if (r && r.base && baseFiles) Object.entries(r.base).forEach(([f, h]) => { if (!overNewer || !/\.html?$/i.test(f)) baseFiles[f] = h; });
             if (r && r.ids && baseIds) {
                 if (!overNewer) baseIds = r.ids;
@@ -2792,7 +2856,7 @@
             const stale = r && Array.isArray(r.stale) ? r.stale : [];
             if (estore) estore.stale = stale;
             if (stale.length) document.dispatchEvent(new CustomEvent('edit:stale', { detail: { files: stale } }));
-            if (published(keep ? { results: r.results.filter(x => !(x && keep.has(x.region))) } : r)) rebase(keep);
+            if (published(keep ? { results: r.results.filter(x => !(x && (keep.has(x.region) || (heldRes && heldRes.has(x))))) } : r)) rebase(keep);
             takeHeldReload();
             return r;
         };
@@ -2801,14 +2865,19 @@
         const leftOut = (r, patches) => {
             if (!r || !Array.isArray(r.results) || (Array.isArray(r.stale) && r.stale.length)) return null;
             const failed = new Set(r.results.filter(x => x && x.failed != null).map(x => x.failed));
-            if (!failed.size || r.results.some((x, i) => x && x.status === 'error' && !failed.has(patches[i] && patches[i].region))) return null;
+            const own = new Set(patches.filter((p, i) => r.results[i] && r.results[i].status === 'error' && r.results[i].failed == null && p.kind !== 'static-tree'));
+            if ((!failed.size && !own.size) || r.results.some((x, i) => x && x.status === 'error' && !failed.has(patches[i] && patches[i].region) && !own.has(patches[i]))) return null;
             tie(failed);
-            return patches.some(p => !failed.has(p.region)) ? failed : null;
+            const out = (p) => own.has(p) || (p.region != null && failed.has(p.region));
+            if (!patches.some(p => !out(p))) return null;
+            return Object.assign(failed, { own, out });
         };
+        // What a held-back patch keeps in the log: its region's edits, or its theme value.
+        const keepOf = (p) => p.kind === 'theme' ? 'theme|' + (p.scope || '') + '|' + p.var : p.region;
         // An area inside generated content (x-markdown output and the like) edits on the page,
         // but its markup is in no file mnfst-run can write: it is refused by name, not sent.
         const renderedBy = (region) => { const a = areaByKey(region); return a && a._edit.rendered; };
-        const unwritable = (p) => (p.kind === 'static-tree' || (p.kind === 'component' && p.scope === 'instance')) && !!renderedBy(p.region);
+        const unwritable = (p) => p.region != null && p.kind !== 'theme' && renderedRegions.has(p.region);
         const send = () => {
             commitFocused(true);   // typing under way publishes with the rest (identities are re-derived from the page after)
             const patches = buildPatches();
@@ -2816,24 +2885,25 @@
             if (!patches.length) { takeHeldReload(); return Promise.resolve({ results: [] }); }   // nothing to send: a held reload goes now
             const post = (ps) => { inFlight++; return fetch('/__edit/save', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ patches: ps, base: baseFiles }) }).then(r => r.json()).catch(err => { settled(null); throw err; }); };
             const off = tie(new Set(patches.filter(unwritable).map(p => p.region)));
-            const offResult = (p) => ({ region: p.region, status: 'error', reason: renderedBy(p.region) && unwritable(p)
-                ? `x-edit="${p.region}" is inside content ${renderedBy(p.region)} renders, so mnfst-run can't write it to a source file`
+            const offResult = (p) => ({ region: p.region, status: 'error', reason: unwritableWhy.has(p.region) && unwritable(p) ? `x-edit="${p.region}": ${unwritableWhy.get(p.region)}`
+                : renderedBy(p.region) && unwritable(p) ? `x-edit="${p.region}" is inside content ${renderedBy(p.region)} renders, so mnfst-run can't write it to a source file`
                 : `not published: tied by a move to x-edit="${off.via.get(p.region)}", which mnfst-run can't write` });
             const sendable = patches.filter(p => !off.has(p.region));
             // The sent part's answer, merged with what was held back, as one result per patch.
             const finish = (r, held, sent) => {
-                const keep = new Set([...off, ...(held || [])]);
-                const results = patches.map(p => off.has(p.region) ? offResult(p) : r.results[sent.indexOf(p)]);
-                const o = done(Object.assign({}, r, { results }), keep.size ? keep : undefined); settled(r, !!(opts && opts.rebase)); return o;
+                const keep = new Set([...off, ...(held || []), ...(held ? sent.filter(held.out).map(keepOf) : [])]);
+                const heldRes = new Set();
+                const results = patches.map(p => { if (off.has(p.region)) { const x = offResult(p); heldRes.add(x); return x; } const x = r.results[sent.indexOf(p)]; if (held && held.out(p)) heldRes.add(x); return x; });
+                const o = done(Object.assign({}, r, { results }), keep.size ? keep : undefined, heldRes); settled(r, !!(opts && opts.rebase)); return o;
             };
             if (!sendable.length) { const o = done({ results: patches.map(offResult) }, off); return Promise.resolve(o); }
             return post(sendable).then(r => {
                 const out = leftOut(r, sendable);
                 if (!out) return finish(r, null, sendable);
                 settled(r, false);
-                const rest = sendable.filter(p => !out.has(p.region));
+                const rest = sendable.filter(p => !out.out(p));
                 return post(rest).then(r2 => {
-                    const results = sendable.map((p, i) => out.has(p.region)
+                    const results = sendable.map((p, i) => out.out(p)
                         ? (r.results[i] && r.results[i].status === 'error' ? r.results[i] : { region: p.region, status: 'error', reason: `not published: tied by a move to x-edit="${out.via.get(p.region) || [...out].find(x => !out.via.has(x))}", which failed` })
                         : r2.results[rest.indexOf(p)]);
                     return finish(Object.assign({}, r2, { results }), out, sendable);
@@ -2874,7 +2944,8 @@
        ancestor opts it out. Text that is still being typed keeps the browser's own
        undo until it commits on blur; fields and x-rich-text keep theirs always. A leaf
        on Rich Text uses Rich Text's history while it has steps (richHistoryKey). */
-    const leafText = (el) => el._editField && !el._editRich ? el.textContent : el._editRt ? sanitizeFor(el, el.innerHTML.trim()) : el.innerHTML.trim();
+    // Text as it would be logged: every baseline and comparison goes through the same sanitizer
+    const leafText = (el) => el._editField && !el._editRich ? el.textContent : sanitizeFor(el, el.innerHTML.trim());
     const hotkeysOff = (el) => !!el.closest('[data-edit-hotkeys="off"]');
     // A focused leaf's baseline follows history rewrites under the caret.
     function rebaseFocused() {
@@ -2935,8 +3006,10 @@
         refresh();
     }
     function waitForData(area, cb) { const expr = dataSourceExpr(area), tpl = listTpl(area); let n = 0; const t = setInterval(() => { let r = false; try { r = Array.isArray(window.Alpine.evaluate(tpl, expr)); } catch { } if (r) { clearInterval(t); cb(); } else if (++n > 100) clearInterval(t); }, 50); }
+    let inited = false;
     function init() {
-        if (!window.Alpine || !Alpine.directive) return;
+        if (inited || !window.Alpine || !Alpine.directive) return;
+        inited = true;
         // Alpine walks only x-data trees: a page with none still gets its areas
         if (document.body && !document.body.hasAttribute('x-data')) document.body.setAttribute('x-data', '{}');
         Alpine.directive('edit', (el, { modifiers, expression }, { cleanup }) => {
@@ -2968,14 +3041,20 @@
             block(node) { return pieceOf(node); },
             attr(name, value, el) { return setAttr(name, value, el); },
             classes: classesApi,
-            scope(value, el) { void this.version; return value === undefined ? scopeOf(el) : setScope(value, el); },
+            scope(value, el) { void this.version; if (value && value.nodeType === 1) return scopeOf(value); return value == null ? scopeOf(el) : setScope(value, el); },
             revert(el) { return revert(el); },
             clearConflicts() { conflicts = []; this.conflicts = []; saveState(); }
         });
         estore = Alpine.store('edit');
-        Alpine.magic('edit', () => Alpine.store('edit'));
+        const editMagic = () => Alpine.store('edit');
+        Alpine.magic('edit', editMagic);
+        // The loader's stand-in answered $edit until now: it hands over, and effects that read it run again
+        window.__manifestEditMagic = editMagic;
+        const kept = window.__manifestEditStubWrites;   // writes made on the stand-in ($edit.onPublish = …)
+        if (kept) Object.keys(kept).forEach(k => { try { estore[k] = kept[k]; } catch { } delete kept[k]; });
+        if (window.__manifestEditStub) setTimeout(() => { window.__manifestEditStub.v++; }, 0);
         loadState();
-        loadBase();
+        if (window.__mnfstEdit) loadBase();   // only mnfst-run --edit serves the base
         setTimeout(() => { armAll(); restore(); }, 450);
         document.addEventListener('keydown', onHistoryKey);
         window.addEventListener('click', onAreaLinkClick, true);
@@ -2984,6 +3063,16 @@
         document.addEventListener('dropdown:context', onContextCapture, true);
         // SPA navigation: the state so far is saved under the page it was made on.
         window.addEventListener('manifest:route-change', () => { if (lsPath !== location.pathname) { lsPath = location.pathname; saveState(); } });
+        adopt();
+    }
+    // Loaded after Alpine started: x-edit elements its walk passed get their attributes re-set
+    // (Alpine runs them as new directives); those it never walked (no x-data above) are walked now.
+    function adopt() {
+        if (!window.__manifestAlpineStarted && ![...document.querySelectorAll('[x-data]')].some(e => e._x_marker)) return;
+        const isEdit = (n) => /^x-edit(\.|$)/.test(n);
+        const found = [...document.querySelectorAll('*')].filter(el => !el._edit && [...el.attributes].some(a => isEdit(a.name)));
+        found.forEach(el => { if (el._x_marker) [...el.attributes].filter(a => isEdit(a.name)).forEach(a => el.setAttribute(a.name, a.value)); });
+        if (found.some(el => !el._x_marker)) Alpine.initTree(document.body);
     }
     document.addEventListener('alpine:init', init);
     if (window.Alpine && Alpine.directive) setTimeout(init, 0);

package/lib/manifest.integrity.json

@@ -1,6 +1,6 @@
 {
   "manifest.appwrite.auth.js": "sha384-dsIWnH0qCAGSzAXMGrd8fvOrVl4tOIE6j5tC35JPTrQXZ56qLD36ARyvhR7vi3Id",
-  "manifest.appwrite.data.js": "sha384-enlQBS4B79OAlkgYX0qon8pnr3Twc7O1iGtiQ+L+Hqgoi+rCKA3FOUFrTBuhprxV",
+  "manifest.appwrite.data.js": "sha384-pj/2ZCUMXz3zTWPZyICJHfCPnz5srho9URrw0Sl0nfWuvh5KqvoT/g3Kg4uyv7yl",
   "manifest.appwrite.presences.js": "sha384-JyVDWFT69b7Svq8J8p9tNWe2v9PZNQBY5UyhtOl1vnuHFAX0CRQ3MA9SiKq5wzNh",
   "manifest.bindings.js": "sha384-lPtMf8Ykaic9gNVZKq8Scia1881ZeMAyxer3WCIkUNwwrgzGBWto1OXADUwjvORF",
   "manifest.charts.js": "sha384-gEAv/98+29RbhvNkiNWTNyBPbLTFr2Ld15wLu29FLCL57j1cwGChRrL9Pfk7dBtT",
@@ -11,24 +11,24 @@
   "manifest.combobox.js": "sha384-MILTkrgsTzsYUjGo4ZuADqV85Xs4GmfB4xexfe9vbJMIoQTZ42W4zs+DTaVSPEsx",
   "manifest.components.js": "sha384-JalISaBBWNFl3ggx92Hb3B52EpwwG3gzgra6Q+js0OgZ8vrFKMD48CuBox2N9A5T",
   "manifest.computed.js": "sha384-GYML/e81gQfN+iDbqhPUgny8bINCyL+SrbTofoGk4hlCnLLjv51mCv42JMqq+ku5",
-  "manifest.data.js": "sha384-szQophuvtkatLyTtVALy63mbKPGQZQ/lP2v27QExQnS7HMuCbuhxgKdTITZQ1JQq",
+  "manifest.data.js": "sha384-+wRqEd8FFPqaSX5gZhb66OgkAHTiSQDFK6W1agFMceKtd5nVL7OLh6p5gC96AJ3Z",
   "manifest.datepicker.js": "sha384-XnbeURni2X91ozVzatQcSjYYIS4MoW12dBRJnYAGBr0nCQ624heH5s+xtQSpLZX6",
   "manifest.defer.js": "sha384-pMRGqQKiEoJhpUcD40QeM4jEHau7sz9Xn/YCpiUamT1T4xJBZDSiYX+xnVrSWoq+",
   "manifest.device.js": "sha384-g+txmrEszYtuOvRelTp/c1wSNR2AtllVI9rx5NPPD7DzhVUnMNughonZykv2xlBW",
   "manifest.dropdowns.js": "sha384-acufUps7R9WjqB4XXW5JLACqniuHJGM4CNTb2rF4B2Q/jv7ZRmsAwfr2McanOz3s",
-  "manifest.edit.js": "sha384-UsKV6oSwdF+yFtpZKr8KD62VajynYVsBcVN3+dAUI4nh2pOOf3/2lyybXbEG/pvT",
+  "manifest.edit.js": "sha384-XUtJ+EXXYh+5afgYuVpXurjvylSP/o72Y4mQR5wxdkIFQ/NDFBVvRFAfbPXMInZc",
   "manifest.export.js": "sha384-Rx6XvqBZc4apzP/FwcDr6yIln4/zNa08Q4ZqBZcEqUz1aNZQfl4h0+Ae7mqCQyuG",
   "manifest.icons.js": "sha384-kKOINpX70YzNO3FvkV6umrmO3f0KIu0DNbwB+ej55a7y/lhU7v/myQtXL0bwCTbt",
   "manifest.localization.js": "sha384-EImsIw8Z3l13V5eH9ZJF/yfsOfIvR1oPRNSArANkPji7V8O3IRf6zMwsNiAGj3Hk",
   "manifest.markdown.js": "sha384-heyDR40LXHaAmAuA+fa381uFwShk1oAqpFFY6E2Qq4T3VN0TQfRqyc++MF40K5Hj",
   "manifest.native.js": "sha384-g+txmrEszYtuOvRelTp/c1wSNR2AtllVI9rx5NPPD7DzhVUnMNughonZykv2xlBW",
   "manifest.payments.js": "sha384-8pofk2zhxtapPMpwnFyTelPMrYhShNhDCE722uQh/EYFvZFuPLmSdgunqsarVQjv",
-  "manifest.rich.text.js": "sha384-CBScTgPU6y96e481M7Ba1/YqPBkeQNLvMKpGc9LQLALOdyj8wlv7Faez+MXjT9yn",
+  "manifest.rich.text.js": "sha384-yJNb+EIumFIJx2KiKmLojwyHLCKwIn+48noxh3gUuZ10YZOvJJoanzAU7NLIBF1s",
   "manifest.router.js": "sha384-QkKhRaCbdXEOxhj+ojT4jeLUCtQepBnqP+QWTIWdb6kUWD+mVzPN8hf6jhgschpW",
   "manifest.slides.js": "sha384-3uRTkyK9XPLmnxI2+igZlpi4EyPlU/7IHj5j3BZJJ2KN455vXyk99fiXV3feO/XY",
   "manifest.status.js": "sha384-MBO345ab7H6Uq1X2dZLt4Ge1Gcra+Z2qYApvlAeIV8CJhDDJrz2FPXpp+Kcp8zcM",
   "manifest.svg.js": "sha384-qr/8H9+2cIhSXNbRWRtIdrDlTOxKlNJqwEefHvCYoiBNW/kKhPTFa109Orv/EBnb",
-  "manifest.sw.js": "sha384-FiEZfwCVI2lKcp4xaRE6nJhjGIbphg6BREeTGvRsIMpqqJ+5AzxFQKE1o84fGfGE",
+  "manifest.sw.js": "sha384-alPjmWaugQV/aCb6l7hVITwZ6Z5k47SJ9jHXmNUN093iUu8ikbVggwLSGNb84Ib1",
   "manifest.tabs.js": "sha384-OIIcyaQnGS0eNYk4zgAFEDboNYect7THvUd9D0V6nqCeDOxQcoiqLrBEmmWVTTet",
   "manifest.tailwind.js": "sha384-r/Jvqb+Piz21jUts10BbVAJoKkShOdJRVFpywyi4HPIi/OfOJq5CtPyWAPbdkMgt",
   "manifest.toasts.js": "sha384-3zkWxzw693pxg3QDFsoYCA3CqYaLKmBaMArULXODD66Utolpewl0OAeTB92aWUVv",
@@ -36,5 +36,5 @@
   "manifest.url.parameters.js": "sha384-J2aSVBOPsoqsbafHndrWLHEDpKb4AKJAoQnVmKA4gZh5P/8HHjFWHO/lkusmG84l",
   "manifest.utilities.js": "sha384-L5uXMLFBIF6LUM1haRjd4eGjHSWuqsCYSpPZRPYosNfJsMC5U5TnmjBxIhrZRe2d",
   "manifest.virtual.js": "sha384-ZDNoF9QVhVcVpkjIK6NH15S6I5c6OBshiJpXSOYjNsIB+298I0a7g3aFO+jyq4Vb",
-  "manifest.js": "sha384-G+ctciC90o/zSB/sRbmX7ANE/7rYvnepyzIsvNbD6N5ynlO5oludSDfzYVCdzU/g"
+  "manifest.js": "sha384-m5WiqHv+23ZnBvvIt9NtUGE2Gupaw9jDpKuonIH9HZCHc+LR8wbitDImJoNPH9CI"
 }

package/lib/manifest.js

@@ -597,14 +597,55 @@
 			const A = window.Alpine;
 			if (window.ManifestRichText || !A || !A.magic || !A.reactive || window.__manifestRichStub) return;
 			const state = window.__manifestRichStub = A.reactive({ v: 0 });
-			const idle = new Proxy({ value: '', link: '', selection: null, all: {}, active: () => false, can: () => false, markdown: () => '', html: () => '' },
-				{ get: (t, k) => k in t ? t[k] : (typeof k === 'string' ? () => { } : undefined), set: () => true });
-			A.magic('rich', (el, u) => { void state.v; return window.__manifestRichMagic ? window.__manifestRichMagic(el, u) : idle; });
+			// Writes ($rich.value = …, $rich.all = …) are kept per element and applied to its field at handover
+			const writes = window.__manifestRichStubWrites = [], perEl = new WeakMap();
+			const deref = (r) => r && typeof r.deref === 'function' ? r.deref() : r;
+			const base = { value: '', link: '', selection: null, all: {}, active: () => false, can: () => false, markdown: () => '', html: () => '' };
+			const idleFor = (el) => {
+				if (!perEl.has(el)) perEl.set(el, new Proxy(base, {
+					get: (t, k) => { const w = writes.find(x => deref(x[0]) === el && x[1] === k); return w ? w[2] : k in t ? t[k] : (typeof k === 'string' ? () => { } : undefined); },
+					// The latest write per element and key; elements gone from the page are let go
+					set: (t, k, v) => {
+						for (let i = writes.length - 1; i >= 0; i--) { const e = deref(writes[i][0]); if (!e || !e.isConnected || (e === el && writes[i][1] === k)) writes.splice(i, 1); }
+						writes.push([typeof WeakRef === 'function' ? new WeakRef(el) : el, k, v]);
+						return true;
+					}
+				}));
+				return perEl.get(el);
+			};
+			A.magic('rich', (el, u) => { void state.v; return window.__manifestRichMagic ? window.__manifestRichMagic(el, u) : idleFor(el); });
 		};
 		document.addEventListener('alpine:init', install, { once: true });
 		if (window.Alpine && window.Alpine.magic) install();
 	}
 	stubRichMagic();
+	// $edit likewise: Edit loads behind a gate (data-plugins or Manifest.loadPlugin('edit')), so until
+	// it registers, $edit is an idle stand-in; Edit bumps `v` and the stand-in delegates to it.
+	let editStubArmed = false;
+	function stubEditMagic() {
+		if (typeof window === 'undefined' || typeof document === 'undefined' || editStubArmed) return;
+		editStubArmed = true;
+		const install = () => {
+			const A = window.Alpine;
+			if (window.__manifestEditMagic || !A || !A.magic || !A.reactive || window.__manifestEditStub) return;
+			const state = window.__manifestEditStub = A.reactive({ v: 0 });
+			const none = () => false;
+			// Writes ($edit.onPublish = …) are kept and applied to the store at handover
+			const writes = window.__manifestEditStubWrites = {};
+			const idle = new Proxy({
+				active: false, canUndo: false, canRedo: false, version: 0, stale: [], conflicts: [], onPublish: null, target: null,
+				can: none, scope: () => null, block: () => null, patches: () => [], export: () => ({ log: [], cursor: 0 }),
+				publish: () => Promise.resolve({ results: [] }), undo: () => Promise.resolve(false), redo: () => Promise.resolve(false),
+				classes: new Proxy({}, { get: () => none })
+			}, { get: (t, k) => k in writes ? writes[k] : k in t ? t[k] : (typeof k === 'string' ? none : undefined), set: (t, k, v) => { writes[k] = v; return true; } });
+			A.magic('edit', (el, u) => { void state.v; return window.__manifestEditMagic ? window.__manifestEditMagic(el, u) : idle; });
+		};
+		document.addEventListener('alpine:init', install, { once: true });
+		if (window.Alpine && window.Alpine.magic) install();
+	}
+	stubEditMagic();
+	// Plugins loaded after Alpine started adopt what its first walk already passed
+	if (typeof document !== 'undefined') document.addEventListener('alpine:initialized', () => { window.__manifestAlpineStarted = true; }, { once: true });
 	// Framework web components — <x-*> tags that are NOT project components.
 	const FRAMEWORK_TAG_RE = /^x-(code|code-group)$/;
 	function detectUsagePlugins(alreadyLoaded, root = typeof document === 'undefined' ? null : document) {