caracms 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caracms",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A visual CMS for Astro sites, with content in git.",
   "license": "MIT",
   "type": "module",

package/src/editor/client/documents/actions.ts

@@ -11,7 +11,7 @@
  * offers, a collection's singular word, a document's public address.
  */
 import { titleCase } from '../../../fields.ts';
-import { slugify } from '../../../slug.ts';
+import { RESERVED_SLUG, slugify } from '../../../slug.ts';
 import type { Editor } from '../editor.ts';
 import { docId, ENDPOINTS, MEDIA_ENDPOINTS, TAB_HEADER, sameDoc, type CreateDeleteRefusal, type CreateRequest, type CreateResponse, type DeleteResponse, type DocRef, type MoveResponse, type EditorAnyCollection, type ListedDocument, type ReplaceFileResponse } from '../../types.ts';
 
@@ -155,8 +155,9 @@ export interface InsideOption {
 }
 
 /**
- * New page's "Inside" (Decision 11): the top level, then every folder that holds pages
- * (a group, or a page with pages under it), at any depth, in tree order.
+ * New page's "Inside" (Decision 11): the top level, then every group and every page, at
+ * any depth, in tree order. A page with nothing under it yet is offered too, so a page can
+ * go under it (Urban Return, 2026-10-24); Home isn't, since no address goes under `/index/`.
  */
 export function insideOptions(collection: Pick<EditorAnyCollection, 'name' | 'urlBase'>, documents: readonly ListedDocument[]): InsideOption[] {
 	const base = collection.urlBase ?? '/';
@@ -164,8 +165,9 @@ export function insideOptions(collection: Pick<EditorAnyCollection, 'name' | 'ur
 	const folders = new Set<string>();
 	for (const d of docs) {
 		const parts = d.path.split('/');
-		for (let i = 1; i < parts.length; i++) folders.add(parts.slice(0, i).join('/'));
+		for (let i = 1; i <= parts.length; i++) folders.add(parts.slice(0, i).join('/'));
 	}
+	for (const f of folders) if (f.split('/').includes(RESERVED_SLUG)) folders.delete(f);
 	const labelOf = (path: string) => docs.find((d) => d.path === path)?.label ?? titleCase(path.split('/').pop()!);
 	const options = [...folders]
 		.sort((a, b) => a.localeCompare(b))

package/src/editor/client/documents/dialogs.tsx

@@ -311,7 +311,8 @@ function MoveDocument({ docRef }: { docRef: DocRef }) {
 	const [part, setPart] = useState(docRef.path.slice(slash + 1));
 	const [error, setError] = useState<string | null>(null);
 	const [busy, setBusy] = useState(false);
-	const options = useMemo(() => (collection?.nested ? insideOptions(collection, documents) : []), [collection, documents]);
+	// Every page but this one: a page can't go under itself.
+	const options = useMemo(() => (collection?.nested ? insideOptions(collection, documents).filter((o) => o.path !== docRef.path) : []), [collection, documents, docRef.path]);
 	if (!doc || !collection || !doc.url) return null;
 	const nested = collection.nested;
 	const newGroup = nested && inside === NEW_GROUP;