@janga/norna 0.7.18 → 0.7.23

package/scripts/dev-local.mjs

@@ -1,23 +1,32 @@
-import { execFile, spawn } from 'node:child_process';
+import { execFile } from 'node:child_process';
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
 import net from 'node:net';
 import { networkInterfaces } from 'node:os';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import { getAstroArgs, runAstroInherit } from './lib/astro-command.mjs';
-import projectConfig from './lib/project-config.mjs';
 import { astroCacheDir, engineRoot, siteProjectRoot } from './lib/site-paths.mjs';
 
 const execFileAsync = promisify(execFile);
 
-const port = 4321;
+const port = Number.parseInt(process.env.NORNA_DEV_PORT ?? '4321', 10);
+if (!Number.isInteger(port) || port < 1 || port > 65_535) {
+	throw new Error('NORNA_DEV_PORT must be an integer from 1 through 65535.');
+}
+let projectConfig;
+try {
+	({ default: projectConfig } = await import('./lib/project-config.mjs'));
+} catch (error) {
+	console.error(error instanceof Error ? error.message : String(error));
+	process.exit(1);
+}
 const localHost = '127.0.0.1';
 const localUrl = `http://${localHost}:${port}${projectConfig.site.basePath}`;
 const probeUrls = [
 	localUrl,
 	`http://localhost:${port}${projectConfig.site.basePath}`,
 ];
-const skipOpen = process.env.WALDE_NO_OPEN === '1';
+const skipOpen = process.env.NORNA_NO_OPEN === '1';
 const statePath = path.join(astroCacheDir, 'dev-local.json');
 const logPath = path.join(astroCacheDir, 'dev.log');
 const args = process.argv.slice(2);
@@ -42,19 +51,6 @@ const generateImages = async () => execFileAsync(process.execPath, [path.join(en
 	maxBuffer: 1024 * 1024 * 10,
 });
 
-const getPortPids = async () => {
-	try {
-		const { stdout } = await execFileAsync('lsof', ['-nP', `-iTCP:${port}`, '-sTCP:LISTEN', '-t']);
-		return [...new Set(stdout.trim().split(/\s+/).map(Number).filter(Number.isInteger))];
-	} catch (error) {
-		if (error.code === 1 || error.code === 'ENOENT') {
-			return [];
-		}
-
-		throw error;
-	}
-};
-
 const readState = async () => {
 	try {
 		return JSON.parse(await readFile(statePath, 'utf8'));
@@ -72,10 +68,9 @@ const getLanUrls = () => Object.values(networkInterfaces())
 	.filter((network) => network?.family === 'IPv4' && !network.internal)
 	.map((network) => `http://${network.address}:${port}${projectConfig.site.basePath}`);
 
-const writeState = async (pid, host) => {
+const writeState = async (host) => {
 	await mkdir(path.dirname(statePath), { recursive: true });
 	await writeFile(statePath, `${JSON.stringify({
-		pid,
 		port,
 		host,
 		mode: host === '0.0.0.0' ? 'lan' : 'local',
@@ -88,6 +83,26 @@ const removeState = async () => {
 	await rm(statePath, { force: true });
 };
 
+const readDevLog = async () => {
+	try {
+		return await readFile(logPath, 'utf8');
+	} catch (error) {
+		if (error.code === 'ENOENT') return '';
+		throw error;
+	}
+};
+
+const getLogExcerpt = (source) => {
+	const lines = source.trim().split('\n');
+	if (lines.length === 1 && lines[0] === '') return '';
+
+	const structuredErrorIndex = lines.findLastIndex((line) => /^\[[^\]]*Error\]/u.test(line.trim()));
+	const genericErrorIndex = lines.findLastIndex((line) => /^Error(?::|\s+(?!reference\b))/u.test(line.trim()));
+	const errorIndex = structuredErrorIndex >= 0 ? structuredErrorIndex : genericErrorIndex;
+	const firstLine = errorIndex >= 0 ? errorIndex : Math.max(0, lines.length - 30);
+	return lines.slice(firstLine, firstLine + 30).join('\n');
+};
+
 const isPortFreeOnHost = (loopbackHost) => new Promise((resolve, reject) => {
 	const server = net.createServer();
 
@@ -110,14 +125,36 @@ const isPortFreeOnHost = (loopbackHost) => new Promise((resolve, reject) => {
 	server.listen({ port, host: loopbackHost, ipv6Only: loopbackHost === '::1' });
 });
 
-const isPortFree = async () => {
-	for (const loopbackHost of ['127.0.0.1']) {
-		if (!(await isPortFreeOnHost(loopbackHost))) {
+const isPortListeningOnHost = (host) => new Promise((resolve, reject) => {
+	const socket = net.createConnection({ port, host });
+	let settled = false;
+	const settle = (result) => {
+		if (settled) return;
+		settled = true;
+		socket.destroy();
+		resolve(result);
+	};
+
+	socket.once('connect', () => settle(true));
+	socket.once('error', (error) => {
+		if (['ECONNREFUSED', 'EHOSTUNREACH', 'ENETUNREACH', 'EADDRNOTAVAIL'].includes(error.code)) {
+			settle(false);
+			return;
+		}
+
+		if (!settled) reject(error);
+	});
+	socket.setTimeout(500, () => settle(false));
+});
+
+const isPortFree = async (host = localHost) => {
+	for (const probeHost of ['127.0.0.1', '::1']) {
+		if (await isPortListeningOnHost(probeHost)) {
 			return false;
 		}
 	}
 
-	return true;
+	return isPortFreeOnHost(host);
 };
 
 const sleep = (milliseconds) => new Promise((resolve) => {
@@ -153,12 +190,12 @@ const waitForServer = async () => {
 	throw new Error(`Timed out waiting for ${localUrl}`);
 };
 
-const waitForPidToStopListening = async (pid) => {
+const waitForPortToBeFree = async (host = localHost) => {
 	const startedAt = Date.now();
 	const timeoutMs = 5_000;
 
 	while (Date.now() - startedAt < timeoutMs) {
-		if (!(await getPortPids()).includes(pid)) {
+		if (await isPortFree(host)) {
 			return true;
 		}
 
@@ -168,32 +205,71 @@ const waitForPidToStopListening = async (pid) => {
 	return false;
 };
 
-const killPortPids = async (pids) => {
+const parseWindowsPortPids = (stdout) => [...new Set(
+	stdout
+		.trim()
+		.split(/\r?\n/u)
+		.map((line) => Number.parseInt(line.trim(), 10))
+		.filter(Number.isInteger),
+)];
+
+const getPortPids = async () => {
+	try {
+		if (process.platform === 'win32') {
+			const { stdout } = await execFileAsync('powershell.exe', [
+				'-NoProfile',
+				'-Command',
+				`(Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue).OwningProcess`,
+			]);
+			return parseWindowsPortPids(stdout);
+		}
+
+		const { stdout } = await execFileAsync('lsof', [
+			'-nP',
+			`-iTCP:${port}`,
+			'-sTCP:LISTEN',
+			'-t',
+		]);
+		return [...new Set(stdout.trim().split(/\s+/u).map(Number).filter(Number.isInteger))];
+	} catch (error) {
+		if (error.code === 1) return [];
+		if (error.code === 'ENOENT') {
+			const commandName = process.platform === 'win32' ? 'PowerShell' : 'lsof';
+			throw new Error(`Cannot use --kill because ${commandName} is not available. Stop the process on port ${port} manually, then rerun the command.`);
+		}
+
+		throw error;
+	}
+};
+
+const terminatePortProcesses = async (host) => {
+	const pids = await getPortPids();
+	if (pids.length === 0) {
+		throw new Error(`Port ${port} is occupied, but Norna could not identify its listening process. Stop that process manually, then rerun the command.`);
+	}
+
 	for (const pid of pids) {
 		console.log(`Stopping process ${pid} on port ${port}.`);
 		try {
 			process.kill(pid, 'SIGTERM');
 		} catch (error) {
-			if (error.code !== 'ESRCH') {
-				throw error;
-			}
+			if (error.code !== 'ESRCH') throw error;
 		}
 	}
 
-	for (const pid of pids) {
-		if (await waitForPidToStopListening(pid)) {
-			continue;
-		}
+	if (await waitForPortToBeFree(host)) return;
 
+	for (const pid of pids) {
 		console.log(`Process ${pid} did not stop; sending SIGKILL.`);
 		try {
 			process.kill(pid, 'SIGKILL');
 		} catch (error) {
-			if (error.code !== 'ESRCH') {
-				throw error;
-			}
+			if (error.code !== 'ESRCH') throw error;
 		}
-		await waitForPidToStopListening(pid);
+	}
+
+	if (!(await waitForPortToBeFree(host))) {
+		throw new Error(`Port ${port} is still in use after stopping ${pids.join(', ')}.`);
 	}
 };
 
@@ -218,65 +294,49 @@ const openBrowser = async () => {
 
 const stopServer = async ({ quiet = false } = {}) => {
 	const state = await readState();
-
-	await runAstro(['dev', 'stop']).catch(() => {});
-
-	if (!state?.pid) {
-		if (!quiet) {
-			console.log('No dev:local server is tracked.');
-		}
-		return;
-	}
-
-	const listeningPids = await getPortPids();
-
-	if (!listeningPids.includes(state.pid)) {
-		await removeState();
-		if (!quiet) {
-			console.log('No tracked dev:local server is running.');
-		}
-		return;
-	}
-
-	process.kill(state.pid, 'SIGTERM');
-
-	if (!(await waitForPidToStopListening(state.pid))) {
-		process.kill(state.pid, 'SIGKILL');
-		await waitForPidToStopListening(state.pid);
-	}
-
+	const { stdout = '', stderr = '' } = await runAstro(['dev', 'stop']);
+	const stopped = `${stdout}\n${stderr}`.includes('Stopped dev server');
+	if (stopped) await waitForPortToBeFree(state?.host ?? localHost);
 	await removeState();
 
 	if (!quiet) {
-		console.log(`Stopped dev server on ${localUrl}.`);
+		console.log(stopped
+			? `Stopped dev server on ${localUrl}.`
+			: 'No dev server is tracked for this site.');
 	}
 };
 
 const startServer = async ({ host = localHost, open = true, killBlockingPort = false } = {}) => {
 	await stopServer({ quiet: true });
 
-	let existingPids = await getPortPids();
-	if (existingPids.length > 0 || !(await isPortFree())) {
-		if (!killBlockingPort || existingPids.length === 0) {
-			throw new Error(`Port ${port} is already in use. Stop the process using it, then rerun the dev command, or pass --kill.`);
+	if (!(await isPortFree(host))) {
+		if (!killBlockingPort) {
+			throw new Error(`Port ${port} is already in use. Stop the process using it, choose another port with NORNA_DEV_PORT, or rerun the command with --kill.`);
 		}
 
-		await killPortPids(existingPids);
-		await removeState();
-		existingPids = await getPortPids();
-
-		if (existingPids.length > 0 || !(await isPortFree())) {
-			throw new Error(`Port ${port} is still in use after trying to stop ${existingPids.join(', ')}.`);
-		}
+		await terminatePortProcesses(host);
 	}
 
 	await syncSitePublic();
 	await generateImages();
-	await runAstroInherit(['dev', '--background', '--host', host, '--port', String(port)]);
+	const previousLog = await readDevLog();
+	try {
+		await runAstroInherit(['dev', '--background', '--host', host, '--port', String(port)]);
+	} catch (error) {
+		const currentLog = await readDevLog();
+		const newLog = currentLog.startsWith(previousLog)
+			? currentLog.slice(previousLog.length)
+			: currentLog;
+		const excerpt = getLogExcerpt(newLog || currentLog);
+		throw new Error([
+			`Could not start the dev server at ${localUrl}.`,
+			excerpt ? `Astro reported:\n${excerpt}` : 'Astro did not write a detailed startup error.',
+			`Full log: ${logPath}`,
+		].join('\n\n'), { cause: error });
+	}
 	await waitForServer();
 
-	const startedPids = await getPortPids();
-	await writeState(startedPids[0] ?? null, host);
+	await writeState(host);
 	if (open) {
 		await openBrowser();
 	} else {
@@ -295,13 +355,14 @@ const startServer = async ({ host = localHost, open = true, killBlockingPort = f
 
 const showStatus = async () => {
 	const state = await readState();
-	const listeningPids = await getPortPids();
+	const { stdout = '', stderr = '' } = await runAstro(['dev', 'status']);
+	const tracked = `${stdout}\n${stderr}`.includes('Dev server running at');
 	const reachable = await isServerReachable();
 
-	if (state?.pid && listeningPids.includes(state.pid)) {
-		const reachability = reachable ? '' : ' The listener is active, but the URL probe did not respond.';
-		console.log(`dev:${state.mode ?? 'local'} is running at ${localUrl} (pid ${state.pid}).${reachability}`);
-		if (state.host === '0.0.0.0') {
+	if (tracked) {
+		const reachability = reachable ? '' : ' The server is tracked, but the site URL probe did not respond.';
+		console.log(`dev:${state?.mode ?? 'local'} is running at ${localUrl}.${reachability}`);
+		if (state?.host === '0.0.0.0') {
 			const lanUrls = getLanUrls();
 			if (lanUrls.length > 0) console.log(`On this local network: ${lanUrls.join(', ')}`);
 		}
@@ -309,10 +370,7 @@ const showStatus = async () => {
 	}
 
 	if (reachable) {
-		const detail = state?.pid
-			? `the tracked pid ${state.pid} is not listening`
-			: 'no dev:local state file was found';
-		console.log(`A server is responding at ${localUrl}, but ${detail}.`);
+		console.log(`A server is responding at ${localUrl}, but Astro does not track it for this site.`);
 		return;
 	}
 
@@ -325,11 +383,7 @@ const showStatus = async () => {
 
 const showLogs = async () => {
 	if (shouldFollowLogs) {
-		const tail = spawn('tail', ['-n', '80', '-f', logPath], { stdio: 'inherit' });
-		await new Promise((resolve, reject) => {
-			tail.once('exit', resolve);
-			tail.once('error', reject);
-		});
+		await runAstroInherit(['dev', 'logs', '--follow']);
 		return;
 	}
 
@@ -346,23 +400,32 @@ const showLogs = async () => {
 	}
 };
 
-if (command === 'start') {
-	await startServer({ open: !skipOpen, killBlockingPort: shouldKillBlockingPort });
-} else if (command === 'lan') {
-	await startServer({ host: '0.0.0.0', open: !skipOpen, killBlockingPort: shouldKillBlockingPort });
-} else if (command === 'status') {
-	await showStatus();
-} else if (command === 'logs') {
-	await showLogs();
-} else if (command === 'restart') {
-	const state = await readState();
-	await startServer({
-		host: state?.host === '0.0.0.0' ? '0.0.0.0' : localHost,
-		open: false,
-		killBlockingPort: shouldKillBlockingPort,
-	});
-} else if (command === 'stop') {
-	await stopServer();
-} else {
-	throw new Error(`Unknown dev-local command: ${command}`);
+const runCommand = async () => {
+	if (command === 'start') {
+		await startServer({ open: !skipOpen, killBlockingPort: shouldKillBlockingPort });
+	} else if (command === 'lan') {
+		await startServer({ host: '0.0.0.0', open: !skipOpen, killBlockingPort: shouldKillBlockingPort });
+	} else if (command === 'status') {
+		await showStatus();
+	} else if (command === 'logs') {
+		await showLogs();
+	} else if (command === 'restart') {
+		const state = await readState();
+		await startServer({
+			host: state?.host === '0.0.0.0' ? '0.0.0.0' : localHost,
+			open: false,
+			killBlockingPort: shouldKillBlockingPort,
+		});
+	} else if (command === 'stop') {
+		await stopServer();
+	} else {
+		throw new Error(`Unknown dev-local command: ${command}`);
+	}
+};
+
+try {
+	await runCommand();
+} catch (error) {
+	console.error(error instanceof Error ? error.message : String(error));
+	process.exit(1);
 }

package/scripts/generate-images.mjs

@@ -4,7 +4,6 @@ import { copyFile, mkdir, readdir, readFile, rm, stat, writeFile } from 'node:fs
 import path from 'node:path';
 import { promisify } from 'node:util';
 import {
-	getBodySections,
 	getContentFiles,
 	readSiteFile,
 	rasterImageExtensions,
@@ -13,10 +12,7 @@ import {
 	toPosixPath,
 } from './lib/site-content.mjs';
 import { readImageDimensions } from './lib/image-dimensions.mjs';
-import {
-	extractNornaMarkdownBlocks,
-	getNornaBlockImageReferences,
-} from './lib/norna-markdown-blocks.mjs';
+import { parsePageMarkdown } from './lib/page-markdown.mjs';
 import {
 	astroPublicDir,
 	generatedImagesDir,
@@ -105,18 +101,18 @@ const getImageSourceKey = (contentFile, image) => `pages/${contentFile.pageDirec
 
 const getReferencedImages = async (contentFile) => {
 	const { body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
-	const { sections } = await getBodySections(body);
+	const page = await parsePageMarkdown(body, { label: contentFile.contentLabel });
 	const references = [];
 
-	for (const section of sections) {
-		const blocks = extractNornaMarkdownBlocks(section.text, { label: contentFile.contentLabel });
-		for (const { image, line, blockDisplayType } of getNornaBlockImageReferences(blocks)) {
+	for (const region of page.regions) {
+		if (region.blockErrors.length > 0) throw new Error(region.blockErrors[0].message);
+		for (const { image, line, blockDisplayType } of region.managedImages) {
 			references.push({
 				contentFile,
 				image,
 				line,
 				blockDisplayType,
-				sectionLabel: section.id ?? 'page title',
+				sectionLabel: region.id ?? 'page title',
 				sourceKey: getImageSourceKey(contentFile, image),
 			});
 		}
@@ -182,11 +178,11 @@ const validateCarouselOrientations = async (manifest) => {
 
 	for (const contentFile of contentFiles) {
 		const { body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
-		const { sections } = await getBodySections(body);
+		const page = await parsePageMarkdown(body, { label: contentFile.contentLabel });
 
-		for (const section of sections) {
-			const blocks = extractNornaMarkdownBlocks(section.text, { label: contentFile.contentLabel });
-			for (const block of blocks.filter((candidate) => candidate.type === 'image-carousel')) {
+		for (const region of page.regions) {
+			if (region.blockErrors.length > 0) throw new Error(region.blockErrors[0].message);
+			for (const block of region.blocks.filter((candidate) => candidate.type === 'image-carousel')) {
 				const orientations = new Set(
 					block.images
 						.map((image) => manifest[getImageSourceKey(contentFile, image.image)])
@@ -198,7 +194,7 @@ const validateCarouselOrientations = async (manifest) => {
 				orientations.delete('square');
 				if (orientations.size > 1) {
 					throw new Error(
-						`Carousel in ${section.id ? `section "${section.id}"` : 'the page introduction'} on line ${block.line} mixes landscape and portrait images. Use landscape images with optional square images, or portrait images with optional square images.`,
+						`Carousel in ${region.id ? `section "${region.id}"` : 'the page introduction'} on line ${block.line} mixes landscape and portrait images. Use landscape images with optional square images, or portrait images with optional square images.`,
 					);
 				}
 			}

package/scripts/generate-schemas.mjs

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { z } from 'astro/zod';
 import {
+	categorySchema,
 	configSchema,
 	pageThemeSchema,
 	siteSchema,
@@ -14,6 +15,7 @@ import { applySchemaEditorMetadata } from './lib/schema-editor-metadata.mjs';
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const schemaDirectory = path.join(root, 'schemas');
 const definitions = [
+	['category.schema.json', 'Norna page category', categorySchema],
 	['config.schema.json', 'Norna site configuration', configSchema],
 	['theme.schema.json', 'Norna visual theme', themeVisualSchema],
 	['page-theme.schema.json', 'Norna page theme', pageThemeSchema],
@@ -32,8 +34,9 @@ for (const [filename, title, schema] of definitions) {
 
 schemaFiles.set('manifest.json', `${JSON.stringify({
 	editorApiVersion: 1,
-	schemaVersion: 2,
+	schemaVersion: 3,
 	files: {
+		category: 'category.schema.json',
 		config: 'config.schema.json',
 		contentFrontmatter: 'content-frontmatter.schema.json',
 		sitewideContent: 'sitewide-content.schema.json',

package/scripts/init-site.mjs

@@ -9,6 +9,38 @@ import {
 
 const packageName = '@janga/norna';
 const cliExecutableName = 'norna';
+const standaloneGitignore = `# build output
+dist/
+
+# legacy generated public output
+/public/
+
+# generated site state
+**/.norna/public/
+**/.norna/.astro/
+
+# legacy Astro cache location
+.astro/
+
+# dependencies
+node_modules/
+
+# logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# environment variables
+.env
+.env.production
+
+# macOS-specific files
+.DS_Store
+`;
+const siteGitignore = `.norna/public/
+.norna/.astro/
+`;
 
 const usage = `
 Usage: norna init <target-dir> [--type standalone|embedded] [--site-dir <path>]
@@ -203,6 +235,8 @@ if (type === 'standalone') {
 	if (siteDirectory !== 'site') targetPackageJson.scripts = {};
 	addNornaScripts(targetPackageJson, nornaScripts, { includeStandaloneAliases: true });
 	await writeFile(targetPackageJsonPath, `${JSON.stringify(targetPackageJson, null, 2)}\n`);
+	await writeFile(path.join(targetRoot, '.gitignore'), standaloneGitignore);
+	await writeFile(path.join(targetSiteDir, '.gitignore'), siteGitignore);
 } else {
 	if (!existingEntries) {
 		throw new Error(`Target directory must exist for --type embedded: ${targetRoot}`);
@@ -228,6 +262,7 @@ if (type === 'standalone') {
 		filter: (source) => path.basename(source) !== '.DS_Store',
 		recursive: true,
 	});
+	await writeFile(path.join(targetSiteDir, '.gitignore'), siteGitignore);
 	await writeFile(targetPackageJsonPath, `${JSON.stringify(targetPackageJson, null, 2)}\n`);
 }
 

package/scripts/lib/astro-command.mjs

@@ -1,6 +1,8 @@
 import path from 'node:path';
 import { createRequire } from 'node:module';
+import { mkdirSync } from 'node:fs';
 import {
+	astroRootDir,
 	engineRoot,
 	siteProjectRoot,
 } from './site-paths.mjs';
@@ -11,18 +13,21 @@ const astroPackagePath = require.resolve('astro/package.json');
 const astroPackage = require(astroPackagePath);
 
 export const astroBinPath = path.join(path.dirname(astroPackagePath), astroPackage.bin.astro);
-export const astroConfigPath = path.relative(siteProjectRoot, path.join(engineRoot, 'astro.config.mjs'))
+export const astroConfigPath = path.relative(astroRootDir, path.join(engineRoot, 'astro.config.mjs'))
 	.split(path.sep)
 	.join('/');
 
-export const getAstroArgs = (args) => [
-	astroBinPath,
-	'--root',
-	siteProjectRoot,
-	'--config',
-	astroConfigPath,
-	...args,
-];
+export const getAstroArgs = (args) => {
+	mkdirSync(astroRootDir, { recursive: true });
+	return [
+		astroBinPath,
+		'--root',
+		astroRootDir,
+		'--config',
+		astroConfigPath,
+		...args,
+	];
+};
 
 export const runAstroInherit = (args, options = {}) => runInherit(
 	process.execPath,

package/scripts/lib/content-sync-apply.mjs

@@ -0,0 +1,34 @@
+import { mkdir, rename } from 'node:fs/promises';
+import path from 'node:path';
+
+export const applyImageSyncPlan = async (
+	moves,
+	{
+		makeDirectory = (directoryPath) => mkdir(directoryPath, { recursive: true }),
+		moveFile = rename,
+	} = {},
+) => {
+	const completedMoves = [];
+
+	for (const [index, move] of moves.entries()) {
+		try {
+			await makeDirectory(path.dirname(move.to));
+			await moveFile(move.from, move.to);
+			completedMoves.push(move);
+		} catch (error) {
+			return {
+				completedMoves,
+				error,
+				failedMove: move,
+				remainingMoves: moves.slice(index),
+			};
+		}
+	}
+
+	return {
+		completedMoves,
+		error: null,
+		failedMove: null,
+		remainingMoves: [],
+	};
+};