@tideworthy/tidysites 0.1.16 → 0.1.18

package/bin/tidysites.mjs

@@ -356,6 +356,7 @@ async function push(ctx) {
 		if (removeKeys.length) { const rem = readRemoved(ctx.dir); for (const k of removeKeys) rem.delete(k); writeRemoved(ctx.dir, rem); }
 		if (r.missing?.length) say(`Not found to remove: ${r.missing.map((m) => `${m.collection}/${m.slug}`).join(', ')}`);
 	}
+	const menuProblems = [];
 	for (const name of menus) {
 		const m = s.menus[name];
 		let items;
@@ -364,9 +365,22 @@ async function push(ctx) {
 		} catch (e) {
 			fail(`menus/${name}.json: ${e.message}`);
 		}
-		await tool(ctx.cfg, 'call_website_site_tool', { site_id: ctx.cfg.site, tool: 'menu_set_items', arguments: { name, items } });
-		say(`Menu ${name}: ${items.length} item${items.length === 1 ? '' : 's'} written.`);
+		try {
+			try {
+				await tool(ctx.cfg, 'call_website_site_tool', { site_id: ctx.cfg.site, tool: 'menu_set_items', arguments: { name, items } });
+			} catch (e) {
+				// A menu the website does not have yet (a phone drawer, a footer column) is created from the file, then filled.
+				if (!/not.?found/i.test(e.message ?? '')) throw e;
+				await tool(ctx.cfg, 'call_website_site_tool', { site_id: ctx.cfg.site, tool: 'menu_create', arguments: { name, label: m.label || name } });
+				await tool(ctx.cfg, 'call_website_site_tool', { site_id: ctx.cfg.site, tool: 'menu_set_items', arguments: { name, items } });
+				say(`Menu ${name}: created.`);
+			}
+			say(`Menu ${name}: ${items.length} item${items.length === 1 ? '' : 's'} written.`);
+		} catch (e) {
+			menuProblems.push(`menus/${name}.json: ${e.message}`);
+		}
 	}
+	if (menuProblems.length) fail(menuProblems.join('\n'));
 	// Refresh only what went, and take the website's version of exactly those entries; every other file stays as it is.
 	const pushed = new Set([...keys, ...menus.map((m) => `menus/${m}`)]);
 	if (touched.length) await pull(ctx, touched, { overwrite: pushed, menus: menus.length > 0 });

package/lib/folder.mjs

@@ -145,9 +145,20 @@ export function pushDocument(local, snapshot, { keys, removeKeys = [], settings
 		// so the names the snapshot had and the file no longer has go as null.
 		const data = { ...e.data };
 		if (was?.data) for (const k of Object.keys(was.data)) if (!(k in data) && !emptyValue(was.data[k])) data[k] = null;
-		(content[collection] ??= []).push({ id: e.id, slug, status: e.status, data });
+		// A new entry's seed key is its slug, so "$ref:<slug>" from another file resolves to it once it is created.
+		(content[collection] ??= []).push({ id: e.id || slug, slug, status: e.status, data });
 		if (was?.updated_at) expect[key] = was.updated_at;
 	}
+	// "$ref:<slug>" (or "$ref:<collection>/<slug>") to an entry the folder already knows the website's id for becomes that id; a reference to an entry created by this same push stays for the website to resolve.
+	const ids = new Map();
+	for (const [k, e] of Object.entries(local)) if (e?.id) { const [, slug] = splitKey(k); ids.set(slug, e.id); ids.set(k, e.id); }
+	const resolveRefs = (v) => {
+		if (typeof v === 'string' && v.startsWith('$ref:')) { const target = v.slice(5).trim(); const id = ids.get(target) ?? ids.get(target.split('/').pop()); return id ?? `$ref:${target.split('/').pop()}`; }
+		if (Array.isArray(v)) return v.map(resolveRefs);
+		if (v && typeof v === 'object') return Object.fromEntries(Object.entries(v).map(([k, x]) => [k, resolveRefs(x)]));
+		return v;
+	};
+	for (const entries of Object.values(content)) for (const e of entries) e.data = resolveRefs(e.data);
 	const remove = {};
 	for (const key of removeKeys) {
 		const [collection, slug] = splitKey(key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tideworthy/tidysites",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Pull a Tidysites website to files, edit, validate against its content model, push it back, screenshot the result.",
   "type": "module",
   "bin": {