@tideworthy/tidysites 0.1.15 → 0.1.17

package/bin/tidysites.mjs

@@ -87,11 +87,15 @@ function writeFiles(dir, files) {
 function readLocal(dir, only = null) {
 	const local = {};
 	const problems = [];
+	// Only the website's own collections are entries; a folder of the person's own (notes, assets, source) is left alone.
+	const schema = readJson(join(dir, META, 'schema.json'));
+	const known = schema ? new Set((schema.collections?.items ?? schema.collections ?? []).map((c) => c.slug).filter(Boolean)) : null;
 	for (const name of readdirSync(dir)) {
 		if (name.startsWith('.') || name === 'node_modules') continue;
 		const colDir = join(dir, name);
 		if (!statSync(colDir).isDirectory()) continue;
 		if (!/^[a-z][a-z0-9_]*$/.test(name) || name === 'menus') continue;
+		if (known && known.size && !known.has(name)) continue;
 		if (only && !only.includes(name)) continue;
 		const sidecarExts = Object.keys(SIDECARS[name] ?? SIDECARS.default);
 		for (const file of readdirSync(colDir)) {
@@ -352,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;
@@ -360,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 });
@@ -678,7 +696,15 @@ async function main() {
 			writeFileSync(join(dir, META, 'key'), `${key}\n`, { mode: 0o600 });
 			writeFileSync(join(dir, META, '.gitignore'), 'key\nshots/\nsource/\npages/\n');
 			say(`Connected ${relative(process.cwd(), dir) || '.'} to ${site} on ${host}.`);
-			await pull(config());
+			// A website that is still being set up answers 404 on its content model for a few minutes; the first pull waits for it.
+			for (let attempt = 1; ; attempt++) {
+				try { await pull(config()); break; }
+				catch (e) {
+					if (e?.code !== 'website_unreachable' || attempt >= 20) throw e;
+					say(`The website is still being set up (${e.message.slice(0, 120)}); trying again in 30 seconds (${attempt}/20).`);
+					await new Promise((r) => setTimeout(r, 30_000));
+				}
+			}
 			return;
 		}
 		case 'pull':

package/lib/validate.mjs

@@ -54,8 +54,8 @@ function checkScalar(type, value, at, errors) {
 		case 'file':
 			if (!isMedia(value)) errors.push(`${at}: an image is the stored value (from the pull or add_website_image) or { "$media": { "url": "https://..." | "file": "assets/x.png", "alt": "..." } }`);
 			else if (value.$media && typeof value.$media.file === 'string') {
-				const ok = field.type === 'file' ? /\.(png|jpe?g|gif|webp|avif|svg|ico|mp4|webm|m4v|mov|woff2?|ttf|otf|pdf)$/i : /\.(png|jpe?g|gif|webp|avif|svg|ico)$/i;
-				if (!ok.test(value.$media.file) || value.$media.file.startsWith('/') || value.$media.file.includes('..')) errors.push(`${at}: $media.file must be a file inside the folder (${field.type === 'file' ? 'a picture, a video (mp4, webm), a font (woff2) or a pdf' : 'a picture: png, jpg, gif, webp, avif, svg, ico'})`);
+				const ok = type === 'file' ? /\.(png|jpe?g|gif|webp|avif|svg|ico|mp4|webm|m4v|mov|woff2?|ttf|otf|pdf)$/i : /\.(png|jpe?g|gif|webp|avif|svg|ico)$/i;
+				if (!ok.test(value.$media.file) || value.$media.file.startsWith('/') || value.$media.file.includes('..')) errors.push(`${at}: $media.file must be a file inside the folder (${type === 'file' ? 'a picture, a video (mp4, webm), a font (woff2) or a pdf' : 'a picture: png, jpg, gif, webp, avif, svg, ico'})`);
 			}
 			else if (value.$media && (typeof value.$media.url !== 'string' || !/^https?:\/\//.test(value.$media.url))) errors.push(`${at}: $media.url must be an http(s) address (or $media.file for a picture in the folder)`);
 			else if (value.$media && typeof value.$media.alt !== 'string') errors.push(`${at}: $media.alt is required (what the image shows; "" for a decorative one)`);

package/package.json

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