smoodly 0.0.9 → 0.0.10

package/dist/admin/ui/theme.js

@@ -74,7 +74,7 @@ const SCALE = `
 
   --radius-xs:1px; --radius-sm:3px; --radius-md:4px; --radius-round:999px;
   --control-h:28px; --control-h-lg:36px; --row-h:38px; --topbar-h:48px;
-  --nav-w:200px; --inspector-w:300px;
+  --nav-w:200px; --inspector-w:380px;
   --border:1px solid var(--line);
   --outline-selection:1.5px solid var(--selection);
 `;
@@ -231,6 +231,32 @@ body:has(.sm-admin){margin:0}
 .sm-inputwrap>.sm-input:hover,.sm-inputwrap>.sm-input:focus{background:transparent;box-shadow:none}
 .sm-prefix{color:var(--text-muted);font-family:var(--font-mono);font-size:var(--text-sm);flex:none}
 .sm-error{color:var(--danger);font-size:var(--text-sm)}
+/* ── richtext ──────────────────────────────────────────────────────── */
+.sm-richtext{display:flex;flex-direction:column;gap:6px;min-width:0}
+.sm-richtext__bar{display:flex;flex-wrap:wrap;align-items:center;gap:2px}
+.sm-richtext__sep{width:1px;height:16px;margin:0 4px;background:var(--line)}
+.sm-richtext__bar .sm-iconbtn[aria-pressed="true"]{background:var(--press);color:var(--text)}
+.sm-richtext__link{display:flex;align-items:center;gap:6px}
+.sm-richtext__content{
+  min-height:110px;padding:8px 10px;border:1.5px solid transparent;border-radius:var(--radius-md);
+  background:var(--surface-inset);color:var(--text);font-size:var(--text-md);line-height:1.5;outline:0;
+}
+.sm-richtext__content:hover{background:var(--control-hover)}
+.sm-richtext__content:focus{background:var(--input-bg);border-color:var(--selection);box-shadow:var(--focus-ring)}
+.sm-richtext__content>*+*{margin-top:.5em}
+.sm-richtext__content p,.sm-richtext__content h1,.sm-richtext__content h2,.sm-richtext__content h3,
+.sm-richtext__content h4,.sm-richtext__content h5,.sm-richtext__content h6,
+.sm-richtext__content ul,.sm-richtext__content ol,.sm-richtext__content blockquote{margin:0}
+.sm-richtext__content h1,.sm-richtext__content h2,.sm-richtext__content h3,
+.sm-richtext__content h4,.sm-richtext__content h5,.sm-richtext__content h6{font-weight:600;line-height:1.25}
+.sm-richtext__content h1{font-size:var(--text-3xl)}
+.sm-richtext__content h2{font-size:var(--text-2xl)}
+.sm-richtext__content h3{font-size:var(--text-xl)}
+.sm-richtext__content h4,.sm-richtext__content h5,.sm-richtext__content h6{font-size:var(--text-lg)}
+.sm-richtext__content ul,.sm-richtext__content ol{padding-left:18px}
+.sm-richtext__content li+li{margin-top:.25em}
+.sm-richtext__content blockquote{padding-left:10px;border-left:2px solid var(--line);color:var(--text-muted)}
+.sm-richtext__content a{color:var(--accent);text-decoration:underline}
 
 .sm-group{display:flex;flex-direction:column;gap:10px;padding:2px 0 0 10px;border-left:2px solid var(--line)}
 .sm-list{display:flex;flex-direction:column;gap:6px;align-items:stretch}

package/dist/admin/validate.js

@@ -1,3 +1,8 @@
+// MVP validation, keyed by inert descriptor data (the design rule: logic
+// lives admin/server-side). Entry saves validate; page drafts do NOT
+// (drafts must save freely) — publish validates every node. Objects and
+// lists recurse; error paths are dotted (`cta.href`, `points.2.heading`).
+import { hasText } from "./richtext-doc.js";
 const subfields = (d) => d.fields && typeof d.fields === "object" ? d.fields : {};
 const itemOf = (d) => d.item && typeof d.item === "object" ? d.item : undefined;
 const isEmpty = (v) => v === undefined || v === null || v === "" || (Array.isArray(v) && v.length === 0);
@@ -11,6 +16,11 @@ function validateValue(path, value, d, errors) {
             errors.push({ field: path, message: "Required." });
         return;
     }
+    if (d.type === "richtext" && !hasText(value)) {
+        if (!mayBeAbsent(d))
+            errors.push({ field: path, message: "Required." });
+        return;
+    }
     if (d.type === "list") {
         if (!Array.isArray(value)) {
             errors.push({ field: path, message: "Must be a list." });

package/dist/collections.d.ts

@@ -53,17 +53,3 @@ export declare function collection<F extends BuilderMap>(input: {
     };
     versions?: boolean;
 }): CollectionSchema<F>;
-export type Toolset = {
-    marks?: string[];
-    nodes?: string[];
-    elements?: string[];
-};
-export declare function toolset(input: {
-    marks?: string[];
-    nodes?: string[];
-    elements?: {
-        schema: {
-            name: string;
-        };
-    }[];
-}): Toolset;

package/dist/collections.js

@@ -45,13 +45,3 @@ export function collection(input) {
         admin: input.admin,
     };
 }
-export function toolset(input) {
-    const out = {};
-    if (input.marks)
-        out.marks = input.marks;
-    if (input.nodes)
-        out.nodes = input.nodes;
-    if (input.elements)
-        out.elements = input.elements.map((e) => e.schema.name);
-    return out;
-}

package/dist/fields.d.ts

@@ -1,3 +1,4 @@
+import { type Toolset } from "./toolset.ts";
 export type Descriptor = {
     type: string;
     [key: string]: unknown;
@@ -59,7 +60,7 @@ export declare const f: {
         url: string;
     }, {}>;
     richtext: (opts?: {
-        toolset?: unknown;
+        toolset?: Toolset;
     }) => FieldBuilder<unknown, {}>;
     dataAttributes: () => FieldBuilder<Record<string, string>, {}>;
     select: <const O extends readonly string[]>(options: O) => FieldBuilder<O[number], {}>;

package/dist/fields.js

@@ -1,6 +1,7 @@
 // Field builders — inert descriptors by design rule (see DESIGN.md §3):
 // f.text().max(40) is plain data; validation logic lives server/admin-side,
 // keyed by descriptor type. Chaining is immutable.
+import { DEFAULT_TOOLSET } from "./toolset.js";
 function builder(descriptor) {
     const chain = (patch) => builder({ ...descriptor, ...patch });
     return {
@@ -58,7 +59,7 @@ export const f = {
     image: () => builder({ type: "image" }),
     video: () => builder({ type: "video" }),
     file: () => builder({ type: "file" }),
-    richtext: (opts) => builder({ type: "richtext", ...(opts?.toolset !== undefined ? { toolset: opts.toolset } : {}) }),
+    richtext: (opts) => builder({ type: "richtext", toolset: opts?.toolset ?? DEFAULT_TOOLSET }),
     dataAttributes: () => builder({ type: "dataAttributes" }),
     select: (options) => builder({ type: "select", options: [...options] }),
     object: (shape) => {

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { section, element } from "./pairing.tsx";
-import { collection, toolset } from "./collections.ts";
+import { collection } from "./collections.ts";
+import { toolset } from "./toolset.ts";
 import { Section } from "./section-wrapper.tsx";
 import { page } from "./render.tsx";
 import { entryPage } from "./entry-page.tsx";
@@ -39,7 +40,8 @@ export type { SmoodlyConfig, ResolvedConfig } from "./config.ts";
 export type { FieldBuilder, Descriptor, ValueOf } from "./fields.ts";
 export type { SectionSchema, ElementSchema, BuilderMap } from "./schema.ts";
 export type { Props, PairedComponent } from "./pairing.tsx";
-export type { CollectionSchema, Toolset, EntryOrder } from "./collections.ts";
+export type { CollectionSchema, EntryOrder } from "./collections.ts";
+export { DEFAULT_TOOLSET, type Toolset, type ToolsetMark, type ToolsetNode } from "./toolset.ts";
 export { collectionOrder, collectionDepth, DEFAULT_ORDER } from "./collections.ts";
 export type { ZonePolicy } from "./zones.ts";
 export { SHARED_NODE_TYPE, STYLES_KEY, sharedLink } from "./shared.ts";

package/dist/index.js

@@ -1,6 +1,7 @@
 import { schema } from "./schema.js";
 import { section, element } from "./pairing.js";
-import { collection, toolset } from "./collections.js";
+import { collection } from "./collections.js";
+import { toolset } from "./toolset.js";
 import { Section } from "./section-wrapper.js";
 import { page } from "./render.js";
 import { entryPage } from "./entry-page.js";
@@ -26,6 +27,7 @@ export { resolveTree, resolveFields } from "./resolve.js";
 export { SEGMENT_RE, isSegment, assertSegment, joinPath, splitPath, segmentFor, isHomeNode, pagePathIn, chainOf, assertDepth, pagePath, pagePathRows, entryPathRows, collectionSegment, buildPageTree, perLocaleSegments, assertSupportedLocale, unsupportedLocale, } from "./paths.js";
 export { fixedPathFor } from "./localize.js";
 export { pathOptions, pageErrors, localeRow, pageRefEdges, DEFAULT_LOCALES } from "./store.js";
+export { DEFAULT_TOOLSET } from "./toolset.js";
 export { collectionOrder, collectionDepth, DEFAULT_ORDER } from "./collections.js";
 export { SHARED_NODE_TYPE, STYLES_KEY, sharedLink } from "./shared.js";
 export { sharedEntryId } from "./shared-id.js";

package/dist/toolset.d.ts

@@ -0,0 +1,30 @@
+export declare const TOOLSET_MARKS: readonly ["bold", "italic", "link"];
+export declare const TOOLSET_NODES: readonly ["h1", "h2", "h3", "h4", "h5", "h6", "bulletList", "orderedList", "blockquote"];
+export type ToolsetMark = (typeof TOOLSET_MARKS)[number];
+export type ToolsetNode = (typeof TOOLSET_NODES)[number];
+export type Toolset = {
+    marks?: ToolsetMark[];
+    nodes?: ToolsetNode[];
+    elements?: string[];
+};
+/** What a richtext field gets when it declares nothing. `h1` is left out:
+ *  the section or page shape owns the page's first heading. */
+export declare const DEFAULT_TOOLSET: Toolset;
+export declare function toolset(input: {
+    marks?: readonly ToolsetMark[];
+    nodes?: readonly ToolsetNode[];
+    elements?: {
+        schema: {
+            name: string;
+        };
+    }[];
+}): Toolset;
+/** The resolved toolset the widget reads: which marks and nodes an editor
+ *  may CREATE. The schema itself is always the full one (spec §2). */
+export type Allowed = {
+    marks: ReadonlySet<ToolsetMark>;
+    nodes: ReadonlySet<ToolsetNode>;
+    /** The allowed heading levels, ascending. */
+    headingLevels: number[];
+};
+export declare function allowedOf(input: unknown): Allowed;

package/dist/toolset.js

@@ -0,0 +1,49 @@
+// Toolsets are plain shared values, not registrations (DESIGN.md §3): a
+// richtext field imports one by value and it travels inside the field
+// descriptor to the admin. The vocabulary is typed and checked at
+// registration; a field without a toolset carries the default. `Allowed`
+// is the resolved form the widget reads (spec 2026-09-08 §1).
+export const TOOLSET_MARKS = ["bold", "italic", "link"];
+export const TOOLSET_NODES = ["h1", "h2", "h3", "h4", "h5", "h6", "bulletList", "orderedList", "blockquote"];
+/** What a richtext field gets when it declares nothing. `h1` is left out:
+ *  the section or page shape owns the page's first heading. */
+export const DEFAULT_TOOLSET = {
+    marks: ["bold", "italic", "link"],
+    nodes: ["h2", "h3", "h4", "bulletList", "orderedList", "blockquote"],
+};
+const isMark = (s) => TOOLSET_MARKS.includes(s);
+const isNode = (s) => TOOLSET_NODES.includes(s);
+export function toolset(input) {
+    const out = {};
+    if (input.marks) {
+        for (const m of input.marks) {
+            if (!isMark(m))
+                throw new Error(`smoodly: toolset mark "${m}" is not one of ${TOOLSET_MARKS.join(", ")}.`);
+        }
+        out.marks = [...input.marks];
+    }
+    if (input.nodes) {
+        for (const n of input.nodes) {
+            if (!isNode(n))
+                throw new Error(`smoodly: toolset node "${n}" is not one of ${TOOLSET_NODES.join(", ")}.`);
+        }
+        out.nodes = [...input.nodes];
+    }
+    if (input.elements)
+        out.elements = input.elements.map((e) => e.schema.name);
+    return out;
+}
+const HEADING = /^h([1-6])$/;
+export function allowedOf(input) {
+    // A missing or malformed toolset is the default; a declared one is exact,
+    // so a group it leaves out allows nothing (a marks-only toolset has no headings).
+    const t = input && typeof input === "object" ? input : DEFAULT_TOOLSET;
+    const marks = Array.isArray(t.marks) ? t.marks.filter((m) => typeof m === "string" && isMark(m)) : [];
+    const nodes = Array.isArray(t.nodes) ? t.nodes.filter((n) => typeof n === "string" && isNode(n)) : [];
+    const headingLevels = nodes
+        .map((n) => HEADING.exec(n)?.[1])
+        .filter((l) => l !== undefined)
+        .map(Number)
+        .sort((a, b) => a - b);
+    return { marks: new Set(marks), nodes: new Set(nodes), headingLevels };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smoodly",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Open-source, code-first CMS for Next.js on Supabase: define a component once, it becomes a typed, editable building block.",
   "license": "MIT",
   "repository": {
@@ -65,6 +65,16 @@
   },
   "dependencies": {
     "@supabase/supabase-js": "^2.113.0",
+    "@tiptap/core": "3.31.3",
+    "@tiptap/extension-blockquote": "3.31.3",
+    "@tiptap/extension-bold": "3.31.3",
+    "@tiptap/extension-heading": "3.31.3",
+    "@tiptap/extension-italic": "3.31.3",
+    "@tiptap/extension-link": "3.31.3",
+    "@tiptap/extension-list": "3.31.3",
+    "@tiptap/pm": "3.31.3",
+    "@tiptap/react": "3.31.3",
+    "@tiptap/starter-kit": "3.31.3",
     "lucide-react": "^1.41.0"
   }
 }

package/dist/admin/richtext.d.ts

@@ -1,16 +0,0 @@
-export type RichtextNode = {
-    type: string;
-    attrs?: Record<string, unknown>;
-    content?: RichtextNode[];
-    text?: string;
-    marks?: {
-        type: string;
-        attrs?: Record<string, unknown>;
-    }[];
-};
-export type RichtextDoc = {
-    type: "doc";
-    content: RichtextNode[];
-};
-export declare function plainToRichtext(text: string): RichtextDoc;
-export declare function richtextToPlain(doc: unknown): string;

package/dist/admin/richtext.js

@@ -1,98 +0,0 @@
-const textOf = (s) => (s ? [{ type: "text", text: s }] : []);
-function paragraph(lines) {
-    const content = [];
-    lines.forEach((line, i) => {
-        if (i > 0)
-            content.push({ type: "hardBreak" });
-        content.push(...textOf(line));
-    });
-    return content.length > 0 ? { type: "paragraph", content } : { type: "paragraph" };
-}
-const listItem = (s) => ({ type: "listItem", content: [paragraph([s])] });
-const HEADING = /^(#{1,6}) (.*)$/;
-const BULLET = /^- /;
-const ORDERED = /^\d+\. /;
-const QUOTE = /^> ?/;
-export function plainToRichtext(text) {
-    const lines = text.replace(/\r\n?/g, "\n").split("\n");
-    const content = [];
-    let para = [];
-    const flush = () => {
-        if (para.length > 0)
-            content.push(paragraph(para));
-        para = [];
-    };
-    let i = 0;
-    while (i < lines.length) {
-        const line = lines[i];
-        if (line.trim() === "") {
-            flush();
-            i++;
-            continue;
-        }
-        const heading = HEADING.exec(line);
-        if (heading) {
-            flush();
-            content.push({ type: "heading", attrs: { level: heading[1].length }, content: textOf(heading[2]) });
-            i++;
-            continue;
-        }
-        if (BULLET.test(line) || ORDERED.test(line)) {
-            flush();
-            const ordered = ORDERED.test(line);
-            const re = ordered ? ORDERED : BULLET;
-            const items = [];
-            while (i < lines.length && re.test(lines[i])) {
-                items.push(listItem(lines[i].replace(re, "")));
-                i++;
-            }
-            content.push({ type: ordered ? "orderedList" : "bulletList", content: items });
-            continue;
-        }
-        if (QUOTE.test(line)) {
-            flush();
-            const paras = [];
-            while (i < lines.length && QUOTE.test(lines[i])) {
-                paras.push(paragraph([lines[i].replace(QUOTE, "")]));
-                i++;
-            }
-            content.push({ type: "blockquote", content: paras });
-            continue;
-        }
-        para.push(line);
-        i++;
-    }
-    flush();
-    return { type: "doc", content };
-}
-/** Inline text of a node: text runs joined, a hard break as a newline, marks ignored. */
-function inline(node) {
-    if (node.type === "text")
-        return node.text ?? "";
-    if (node.type === "hardBreak")
-        return "\n";
-    return (node.content ?? []).map(inline).join("");
-}
-/** Inline text of a node, with hard breaks flattened to spaces so the line syntax stays intact. A hard break cannot survive inside a prefixed line (list item, blockquote, or heading), so it flattens to a space (DESIGN.md §3 Richtext records the loss). */
-function oneLine(node) {
-    return inline(node).replace(/\n/g, " ");
-}
-const itemText = (li) => (li.content ?? []).map(oneLine).join(" ");
-function block(node) {
-    switch (node.type) {
-        case "heading": {
-            const level = Math.min(6, Math.max(1, Math.round(Number(node.attrs?.level ?? 1) || 1)));
-            return `${"#".repeat(level)} ${oneLine(node)}`;
-        }
-        case "bulletList": return (node.content ?? []).map((li) => `- ${itemText(li)}`).join("\n");
-        case "orderedList": return (node.content ?? []).map((li, i) => `${i + 1}. ${itemText(li)}`).join("\n");
-        case "blockquote": return (node.content ?? []).map((p) => `> ${oneLine(p)}`).join("\n");
-        default: return inline(node);
-    }
-}
-export function richtextToPlain(doc) {
-    const d = doc;
-    if (!d || typeof d !== "object" || d.type !== "doc" || !Array.isArray(d.content))
-        return "";
-    return d.content.map(block).filter((b) => b !== "").join("\n\n");
-}