@janga/norna 0.7.16 → 0.7.17

package/starters/project/site/content.md

@@ -1,10 +1,11 @@
 ---
-title: Your project
-description: A compact project site starter for an open source developer tool.
-navigation:
-  label: Home
+page:
+  description: A compact project site starter for an open source developer tool.
 ---
 
+# Your project
+
+
 ## `<Your project> - <short value proposition>` {#intro}
 
 Describe the project in one short, concrete phrase. Focus on what it helps the

package/starters/project/site/{routes → pages}/010-guide/content.md

@@ -1,10 +1,11 @@
 ---
-title: Guide
-description: Adapt this compact guide for normal project use.
-navigation:
-  label: Guide
+page:
+  description: Adapt this compact guide for normal project use.
 ---
 
+# Guide
+
+
 ## Quickstart {#quickstart}
 
 Show the shortest path from installation to a useful result.

package/starters/project/site/sitewide-content.yaml

@@ -1,12 +1,3 @@
-navigation:
-  label: Project Name
 footer:
   copyrightMessage: (c) Project contributors.
-  buildInfo:
-    enabled: true
-    text: Built
-    dateTimeFormat:
-      locale: en-GB
-      timeZone: UTC
-      dateStyle: short
-      timeStyle: short
+  buildInfo: true

package/docs/routes.md

@@ -1,121 +0,0 @@
-# Routes
-
-`site/content.md` is the homepage and builds to `/`. Optional route pages live
-under `site/routes/<NNN-route-id>/content.md` and build to first-level
-URLs.
-
-Routes use the same page frontmatter, optional section metadata, Norna-managed
-Norna blocks, and Markdown section model as the homepage. See [Content](content.md)
-for the page and section model.
-
-Route directories can contain route content, route-local images, and
-an optional route-local `theme.yaml`. The route theme replaces the root visual
-theme for that route and can select any complete top-level theme preset. Route
-directories cannot contain `config.yaml` or `sitewide-content.yaml`; technical
-configuration and shared identity remain at the selected site's top level.
-
-## Route Directory Format
-
-Route directories must use:
-
-```text
-NNN-route-id
-```
-
-`NNN` is a three-digit presentation order from `001` through `999`.
-`route-id` becomes the route identity and URL segment.
-
-Valid examples:
-
-```text
-010-getting-started
-020-concepts
-120-api-reference
-```
-
-Invalid examples:
-
-```text
-10-about
-000-home
-010_About
-010-About
-010-about-
-010-about--team
-```
-
-The route id may contain only lowercase `a-z`, numbers, and single hyphens
-between alphanumeric groups. The numeric prefix is not part of the route id or
-URL.
-
-Renaming `030-contact/` to `015-contact/` changes navigation order but keeps
-the route id `contact` and URL `/contact/`.
-
-## Route File
-
-Add a first-level route by creating:
-
-```text
-site/routes/010-about/content.md
-```
-
-Minimal route page:
-
-```md
----
-title: About
-description: About this site.
-navigation:
-  label: About
----
-
-## Intro {#intro}
-
-Text...
-```
-
-The example above builds to `/about/`.
-
-## Navigation
-
-`navigation` may contain:
-
-- `include`: optional boolean. Defaults to `true`.
-- `label`: optional string. Defaults to `title`.
-
-Route order comes from the directory prefix. The homepage is always first.
-
-Current route navigation is intended for small sites. This guidance may change
-as route support matures, but the present model is:
-
-- A single-page site should normally use only page navigation between sections.
-- A small multi-page site may use site navigation between routes plus page
-  navigation between sections on the current page.
-- If a site needs many routes, deeply nested routes, or several navigation
-  levels, it has probably outgrown the current sticky-navigation model and may
-  need a different site structure or navigation system.
-
-## Route Images
-
-Route images live under the physical route directory:
-
-```text
-site/routes/010-about/images/intro/image.jpg
-```
-
-Image references in route content still use only the filename:
-
-````md
-```norna-image-stack
-- image: image.jpg
-  alt: Intro image.
-```
-````
-
-The image directory segment after `images/` should match the section id.
-If the section id or route folder changes, run `norna content:check` to find
-misplaced images and `norna content:sync` to move unambiguous files into the
-expected section folder. `content:sync` can move images between route image
-roots when the filename is unambiguous across the site and the move will not
-break another reference; these cross-route writes require a clean Git working
-tree.

package/examples/feature-demos/sitewide-content/site/routes/010-identity/content.md

@@ -1,20 +0,0 @@
----
-title: Identity
-description: See how a convention-based logo and shared identity work across a Norna site.
-navigation:
-  label: Identity
----
-
-## One identity across routes {#identity}
-
-The logo in the navigation is discovered from `public/logo.svg`. Its alt text
-and display height belong to `sitewide-content.yaml`, because the identity is
-shared by every route.
-
-If a site has no logo file, Norna shows the navigation label as text instead. A
-route cannot replace the shared navigation identity.
-
-## Navigation context {#navigation}
-
-The route links come from the site's page structure. The shared logo returns to
-Home, while the active route is indicated in the same navigation row.

package/fixtures/content-model-v2/site/routes/010-guide/content.md

@@ -1,17 +0,0 @@
----
-title: Guide
-description: Internal route fixture for content model v2.
-navigation:
-  label: Guide
----
-
-## Intro {#intro}
-
-Routes may use the same section id and image filename as other pages without
-making the site invalid.
-
-```norna-image-stack
-- image: duplicate.jpg
-  alt: A route-local duplicated filename.
-  caption: This file is resolved in the route image root.
-```

package/scripts/lib/route-model.mjs

@@ -1,17 +0,0 @@
-export const routeDirectoryPattern = /^(?!000)(\d{3})-([a-z0-9]+(?:-[a-z0-9]+)*)$/;
-
-export const parseRouteDirectory = (routeDirectory, label = 'route directory') => {
-	const match = routeDirectory.match(routeDirectoryPattern);
-
-	if (!match) {
-		throw new Error(
-			`Invalid ${label} "${routeDirectory}". Route directories must use the form NNN-route-id, for example 010-getting-started. The prefix must be 001-999 and route-id may contain only lowercase letters, numbers, and single hyphens.`,
-		);
-	}
-
-	return {
-		routeDirectory,
-		routeOrder: Number.parseInt(match[1], 10),
-		routeId: match[2],
-	};
-};

package/scripts/test-route-model.mjs

@@ -1,32 +0,0 @@
-import assert from 'node:assert/strict';
-import { parseRouteDirectory } from './lib/route-model.mjs';
-
-assert.deepEqual(parseRouteDirectory('010-getting-started'), {
-	routeDirectory: '010-getting-started',
-	routeOrder: 10,
-	routeId: 'getting-started',
-});
-
-assert.deepEqual(parseRouteDirectory('120-api-reference'), {
-	routeDirectory: '120-api-reference',
-	routeOrder: 120,
-	routeId: 'api-reference',
-});
-
-for (const routeDirectory of [
-	'000-home',
-	'10-about',
-	'010_About',
-	'010-About',
-	'010-about-',
-	'010-about--team',
-	'010-om-oss!',
-]) {
-	assert.throws(
-		() => parseRouteDirectory(routeDirectory),
-		/Route directories must use the form NNN-route-id/,
-		`${routeDirectory} should be rejected`,
-	);
-}
-
-console.log('Route model test passed.');

package/src/lib/routeThemes.ts

@@ -1,41 +0,0 @@
-import { readFile } from 'node:fs/promises';
-import path from 'node:path';
-import {
-	validateRouteThemeYamlStructure,
-} from '../../scripts/lib/site-content.mjs';
-import { siteRoutesDir, siteRoutesLabel, sitewideContentLabel } from '../../scripts/lib/site-paths.mjs';
-import { parseYamlConfig } from '../../scripts/lib/yaml-config.mjs';
-
-type RouteTheme = {
-	id: string;
-	data: Record<string, unknown>;
-};
-
-export const getRouteTheme = async (routeDirectory: string | null): Promise<RouteTheme | null> => {
-	if (!routeDirectory) return null;
-
-	const segments = routeDirectory.split(/[\\/]/).filter(Boolean);
-	for (let length = segments.length; length > 0; length -= 1) {
-		const themeSegments = segments.slice(0, length);
-		const themePath = path.join(siteRoutesDir, ...themeSegments, 'theme.yaml');
-		const source = await readFile(themePath, 'utf8').catch((error) => {
-			if (error?.code === 'ENOENT') return null;
-			throw error;
-		});
-		if (!source) continue;
-		const themeLabel = `${siteRoutesLabel}/${themeSegments.join('/')}/theme.yaml`;
-
-		const data = parseYamlConfig(source, themeLabel, {
-			validateStructure: validateRouteThemeYamlStructure,
-		});
-		if (Object.hasOwn(data, 'navigation')) {
-			throw new Error(`${themeLabel} may not define navigation. The site label and logo settings belong in ${sitewideContentLabel}.`);
-		}
-		return {
-			id: `routes/${themeSegments.join('/')}/theme`,
-			data,
-		};
-	}
-
-	return null;
-};