B
C
A
") + +;; ── reparent: move a top-level block INTO a section ── +(define + nd + (doc-append + (doc-append (doc-empty "d") (mk-text "p" "P")) + (mk-section "s" (list (mk-text "x" "X"))))) +(content-test + "move-into: block leaves top level" + (doc-ids (content/move-into nd "p" "s" 1)) + (list "s")) +(content-test + "move-into: block lands in section at index" + (doc-tree-ids (content/move-into nd "p" "s" 1)) + (list "s" "x" "p")) +(content-test + "move-into at front of section" + (doc-tree-ids (content/move-into nd "p" "s" 0)) + (list "s" "p" "x")) +(content-test "move-into immutable" (doc-tree-ids nd) (list "p" "s" "x")) + +;; ── reparent: move a NESTED block to a different section ── +(define + two + (doc-append + (doc-append (doc-empty "d") (mk-section "s1" (list (mk-text "n" "N")))) + (mk-section "s2" (list (mk-text "y" "Y"))))) +(content-test + "move-into across sections" + (doc-tree-ids (content/move-into two "n" "s2" 1)) + (list "s1" "s2" "y" "n")) + +;; ── promote: nested block out to top level (appended last) ── +(content-test + "promote nested to top level" + (doc-tree-ids (content/promote two "n")) + (list "s1" "s2" "y" "n")) +(content-test + "promote leaves section empty shell" + (doc-ids (content/promote two "n")) + (list "s1" "s2" "n")) +(content-test + "promote a whole section keeps its subtree" + (doc-tree-ids + (content/promote + (doc-append + (doc-empty "d") + (mk-section "o" (list (mk-section "i" (list (mk-text "z" "Z")))))) + "i")) + (list "o" "i" "z")) + +;; ── cycle guard: cannot move a section into its own descendant ── +(define + nest + (doc-append + (doc-empty "d") + (mk-section + "outer" + (list (mk-section "inner" (list (mk-text "t" "T"))))))) +(content-test + "move section into its own child is a no-op" + (doc-tree-ids (content/move-into nest "outer" "inner" 0)) + (list "outer" "inner" "t")) +(content-test + "move block into itself is a no-op" + (doc-tree-ids (content/move-into nest "inner" "inner" 0)) + (list "outer" "inner" "t")) + +;; ── reparent no-ops on missing ids ── +(content-test + "move-into missing block no-op" + (doc-tree-ids (content/move-into nd "zzz" "s" 0)) + (list "p" "s" "x")) +(content-test + "move-into missing section no-op" + (doc-tree-ids (content/move-into nd "p" "zzz" 0)) + (list "p" "s" "x")) +(content-test + "promote missing no-op" + (doc-tree-ids (content/promote nd "zzz")) + (list "p" "s" "x")) diff --git a/plans/content-on-sx.md b/plans/content-on-sx.md index 66a0fa58..587992e9 100644 --- a/plans/content-on-sx.md +++ b/plans/content-on-sx.md @@ -19,7 +19,7 @@ injected adapter, not core. ## Status (rolling) -`bash lib/content/conformance.sh` → **799/799** (Phases 1–4 COMPLETE + ~34 extensions, hardened: HTML/SX escaping, Markdown render + import/export incl. tables & frontmatter (full round-trip), CvRDT flat + nested-tree + durable replication, tree-aware validation, snapshot cache, doc metadata, plain-text render, nested block trees + deep editing + flatten + relative reorder, doc stats + summary + multi-doc index, table + callout + media blocks, HTML page wrapper + SEO page, doc composition + id-remap, portable data + wire serialization, block query + transforms + find/replace, TOC + anchored headings + outline, normalization) +`bash lib/content/conformance.sh` → **812/812** (Phases 1–4 COMPLETE + ~34 extensions, hardened: HTML/SX escaping, Markdown render + import/export incl. tables & frontmatter (full round-trip), CvRDT flat + nested-tree + durable replication, tree-aware validation, snapshot cache, doc metadata, plain-text render, nested block trees + deep editing + flatten + relative reorder, doc stats + summary + multi-doc index, table + callout + media blocks, HTML page wrapper + SEO page, doc composition + id-remap, portable data + wire serialization, block query + transforms + find/replace, TOC + anchored headings + outline, normalization) ## Ground rules @@ -106,6 +106,7 @@ lib/content/api.sx ── (content/edit) (content/render) (content/history) ─ - [x] document outline (`outline.sx`: content/outline, nested heading tree) - [x] document flatten (`flatten.sx`: content/flatten, un-nest sections; inverse of wrap-section) - [x] relative reorder (`move.sx`: content/move-before/after/to-front/to-back by id) +- [x] tree reparent (`move.sx`: content/move-into a section + content/promote out to top level; tree-wide, cycle-safe) - [x] document normalization (`normalize.sx`: content/normalize, drop empty blocks/sections) - [x] document sanitization (`sanitize.sx`: content/sanitize, drop invalid blocks tree-wide; validate's enforcement partner) - [x] global find/replace (`find-replace.sx`: content/find-replace across text-bearing blocks) @@ -136,6 +137,19 @@ lib/content/api.sx ── (content/edit) (content/render) (content/history) ─ ## Progress log +- 2026-06-07 — Feature: tree reparent in move.sx. Until now insert/move were + positional and top-level only, so a block could never be moved *into* a section + or *out* of one — a real gap for editing nested documents. Added + `content/move-into doc id section-id i` (relocate a block, from anywhere in the + tree, to be a child of a section at index i) and `content/promote doc id` + (lift a nested block out to the end of the top level; a moved section keeps its + whole subtree). Both are pure tree transforms (consistent with the existing + move family — not new op-log ops) built on doc-find-deep / ct-find-id / + ct-remove-id / ct-replace-id. **Cycle-safe**: move-into no-ops when target is + the block itself or sits inside the block's own subtree, so a section can never + become its own ancestor. +13 move tests (into/promote/across-sections/empty- + shell/whole-section-subtree/cycle-guard/missing-id no-ops). 812/812. + - 2026-06-07 — Feature: `content/sanitize` — the enforcement counterpart to `validate`. validate *reports* id/field issues; sanitize *removes* the offending blocks (tree-wide) so federated/imported input that failed