@janga/norna 0.7.16 → 0.7.17

package/examples/feature-demos/theme-presets/site/.norna/generated-images.json

@@ -1,288 +1,288 @@
 {
-  "routes/010-portfolio/images/portfolio/puppy-portrait.jpg": {
+  "pages/010-portfolio/images/puppy-portrait.jpg": {
     "outputVersion": 2,
     "sourceHash": "0cb5126b86660785da62903393e43df7b6e361d3bd1a0492cc6f371159c5afb8",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/puppy-portrait-0cb5126b-480.webp",
+        "src": "/images/generated/pages/010-portfolio/images/puppy-portrait-0cb5126b-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/puppy-portrait-0cb5126b-768.webp",
+        "src": "/images/generated/pages/010-portfolio/images/puppy-portrait-0cb5126b-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/puppy-portrait-0cb5126b-1080.webp",
+        "src": "/images/generated/pages/010-portfolio/images/puppy-portrait-0cb5126b-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/puppy-portrait-0cb5126b-1200.webp",
+        "src": "/images/generated/pages/010-portfolio/images/puppy-portrait-0cb5126b-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/010-portfolio/images/portfolio/shepherd-portrait.jpg": {
+  "pages/010-portfolio/images/shepherd-portrait.jpg": {
     "outputVersion": 2,
     "sourceHash": "604099036852fa40c2fecf8620a138405c8edcb0b92f120bb603742f9ee91154",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/shepherd-portrait-60409903-480.webp",
+        "src": "/images/generated/pages/010-portfolio/images/shepherd-portrait-60409903-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/shepherd-portrait-60409903-768.webp",
+        "src": "/images/generated/pages/010-portfolio/images/shepherd-portrait-60409903-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/shepherd-portrait-60409903-1080.webp",
+        "src": "/images/generated/pages/010-portfolio/images/shepherd-portrait-60409903-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/shepherd-portrait-60409903-1200.webp",
+        "src": "/images/generated/pages/010-portfolio/images/shepherd-portrait-60409903-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/010-portfolio/images/portfolio/white-puppy.jpg": {
+  "pages/010-portfolio/images/white-puppy.jpg": {
     "outputVersion": 2,
     "sourceHash": "bcb834d00bb9b520dac475c32906f8578a03bd922c1639c7d86252ae1f1c433a",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/white-puppy-bcb834d0-480.webp",
+        "src": "/images/generated/pages/010-portfolio/images/white-puppy-bcb834d0-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/white-puppy-bcb834d0-768.webp",
+        "src": "/images/generated/pages/010-portfolio/images/white-puppy-bcb834d0-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/white-puppy-bcb834d0-1080.webp",
+        "src": "/images/generated/pages/010-portfolio/images/white-puppy-bcb834d0-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/010-portfolio/images/portfolio/white-puppy-bcb834d0-1200.webp",
+        "src": "/images/generated/pages/010-portfolio/images/white-puppy-bcb834d0-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/020-documentation/images/documentation/black-schnauzer.jpg": {
+  "pages/020-documentation/images/black-schnauzer.jpg": {
     "outputVersion": 2,
     "sourceHash": "569922b4aa71096cc8e3a245f0ddccf74f941881b823084723854580078b50b0",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/black-schnauzer-569922b4-480.webp",
+        "src": "/images/generated/pages/020-documentation/images/black-schnauzer-569922b4-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/black-schnauzer-569922b4-768.webp",
+        "src": "/images/generated/pages/020-documentation/images/black-schnauzer-569922b4-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/black-schnauzer-569922b4-1080.webp",
+        "src": "/images/generated/pages/020-documentation/images/black-schnauzer-569922b4-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/black-schnauzer-569922b4-1200.webp",
+        "src": "/images/generated/pages/020-documentation/images/black-schnauzer-569922b4-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/020-documentation/images/documentation/retriever-portrait.jpg": {
+  "pages/020-documentation/images/retriever-portrait.jpg": {
     "outputVersion": 2,
     "sourceHash": "c441ca2935debeb008a43e2a7fd510bfd6776682f84160151fd5c8605bfb8cae",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/retriever-portrait-c441ca29-480.webp",
+        "src": "/images/generated/pages/020-documentation/images/retriever-portrait-c441ca29-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/retriever-portrait-c441ca29-768.webp",
+        "src": "/images/generated/pages/020-documentation/images/retriever-portrait-c441ca29-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/retriever-portrait-c441ca29-1080.webp",
+        "src": "/images/generated/pages/020-documentation/images/retriever-portrait-c441ca29-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/retriever-portrait-c441ca29-1200.webp",
+        "src": "/images/generated/pages/020-documentation/images/retriever-portrait-c441ca29-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/020-documentation/images/documentation/schnauzer-portrait.jpg": {
+  "pages/020-documentation/images/schnauzer-portrait.jpg": {
     "outputVersion": 2,
     "sourceHash": "545b0427b8e15846fe73656758da6eb3b8612dabf2b2879c31197986f8deb9b5",
     "width": 1200,
     "height": 900,
     "variants": [
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/schnauzer-portrait-545b0427-480.webp",
+        "src": "/images/generated/pages/020-documentation/images/schnauzer-portrait-545b0427-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/schnauzer-portrait-545b0427-768.webp",
+        "src": "/images/generated/pages/020-documentation/images/schnauzer-portrait-545b0427-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/schnauzer-portrait-545b0427-1080.webp",
+        "src": "/images/generated/pages/020-documentation/images/schnauzer-portrait-545b0427-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/020-documentation/images/documentation/schnauzer-portrait-545b0427-1200.webp",
+        "src": "/images/generated/pages/020-documentation/images/schnauzer-portrait-545b0427-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/030-project/images/project/boxer-portrait.jpg": {
+  "pages/030-project/images/boxer-portrait.jpg": {
     "outputVersion": 2,
     "sourceHash": "da764a5b71f2bfa610ae4978cad4660cd6ecfdcd5b7fcbd788b92c3f9ada42b1",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/030-project/images/project/boxer-portrait-da764a5b-480.webp",
+        "src": "/images/generated/pages/030-project/images/boxer-portrait-da764a5b-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/030-project/images/project/boxer-portrait-da764a5b-768.webp",
+        "src": "/images/generated/pages/030-project/images/boxer-portrait-da764a5b-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/030-project/images/project/boxer-portrait-da764a5b-1080.webp",
+        "src": "/images/generated/pages/030-project/images/boxer-portrait-da764a5b-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/030-project/images/project/boxer-portrait-da764a5b-1200.webp",
+        "src": "/images/generated/pages/030-project/images/boxer-portrait-da764a5b-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/030-project/images/project/grass-puppy.jpg": {
+  "pages/030-project/images/grass-puppy.jpg": {
     "outputVersion": 2,
     "sourceHash": "519d663971223bdb1948db9087c637f1ed8b4d21d81c08e1fc10d5e2d904f230",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/030-project/images/project/grass-puppy-519d6639-480.webp",
+        "src": "/images/generated/pages/030-project/images/grass-puppy-519d6639-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/030-project/images/project/grass-puppy-519d6639-768.webp",
+        "src": "/images/generated/pages/030-project/images/grass-puppy-519d6639-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/030-project/images/project/grass-puppy-519d6639-1080.webp",
+        "src": "/images/generated/pages/030-project/images/grass-puppy-519d6639-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/030-project/images/project/grass-puppy-519d6639-1200.webp",
+        "src": "/images/generated/pages/030-project/images/grass-puppy-519d6639-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/030-project/images/project/grey-street-dog.jpg": {
+  "pages/030-project/images/grey-street-dog.jpg": {
     "outputVersion": 2,
     "sourceHash": "08cab93ba9a2d1c3a72c471dd8724efa7d820f43dad447221b445c32ebe9ab28",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/030-project/images/project/grey-street-dog-08cab93b-480.webp",
+        "src": "/images/generated/pages/030-project/images/grey-street-dog-08cab93b-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/030-project/images/project/grey-street-dog-08cab93b-768.webp",
+        "src": "/images/generated/pages/030-project/images/grey-street-dog-08cab93b-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/030-project/images/project/grey-street-dog-08cab93b-1080.webp",
+        "src": "/images/generated/pages/030-project/images/grey-street-dog-08cab93b-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/030-project/images/project/grey-street-dog-08cab93b-1200.webp",
+        "src": "/images/generated/pages/030-project/images/grey-street-dog-08cab93b-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/040-statement/images/statement/black-pedigree.jpg": {
+  "pages/040-statement/images/black-pedigree.jpg": {
     "outputVersion": 2,
     "sourceHash": "7d5e0be21d7889cb440b9dd6bab74d8f656e4f5159fdcd6cbe937fc7b9d4bd44",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/040-statement/images/statement/black-pedigree-7d5e0be2-480.webp",
+        "src": "/images/generated/pages/040-statement/images/black-pedigree-7d5e0be2-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/040-statement/images/statement/black-pedigree-7d5e0be2-768.webp",
+        "src": "/images/generated/pages/040-statement/images/black-pedigree-7d5e0be2-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/040-statement/images/statement/black-pedigree-7d5e0be2-1080.webp",
+        "src": "/images/generated/pages/040-statement/images/black-pedigree-7d5e0be2-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/040-statement/images/statement/black-pedigree-7d5e0be2-1200.webp",
+        "src": "/images/generated/pages/040-statement/images/black-pedigree-7d5e0be2-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/040-statement/images/statement/sheepdog-grass.jpg": {
+  "pages/040-statement/images/sheepdog-grass.jpg": {
     "outputVersion": 2,
     "sourceHash": "b9396e00227dac3b290d6e29cc82758a4cf98f08bc9154c24c8fbf598563b69a",
     "width": 1200,
     "height": 800,
     "variants": [
       {
-        "src": "/images/generated/routes/040-statement/images/statement/sheepdog-grass-b9396e00-480.webp",
+        "src": "/images/generated/pages/040-statement/images/sheepdog-grass-b9396e00-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/040-statement/images/statement/sheepdog-grass-b9396e00-768.webp",
+        "src": "/images/generated/pages/040-statement/images/sheepdog-grass-b9396e00-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/040-statement/images/statement/sheepdog-grass-b9396e00-1080.webp",
+        "src": "/images/generated/pages/040-statement/images/sheepdog-grass-b9396e00-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/040-statement/images/statement/sheepdog-grass-b9396e00-1200.webp",
+        "src": "/images/generated/pages/040-statement/images/sheepdog-grass-b9396e00-1200.webp",
         "width": 1200
       }
     ]
   },
-  "routes/040-statement/images/statement/sheepdog-wide.jpg": {
+  "pages/040-statement/images/sheepdog-wide.jpg": {
     "outputVersion": 2,
     "sourceHash": "5c8a6878d3d38549d41f8161b92ffb555f3bf5c2d3defbade15932c4d11b6dea",
     "width": 1200,
     "height": 667,
     "variants": [
       {
-        "src": "/images/generated/routes/040-statement/images/statement/sheepdog-wide-5c8a6878-480.webp",
+        "src": "/images/generated/pages/040-statement/images/sheepdog-wide-5c8a6878-480.webp",
         "width": 480
       },
       {
-        "src": "/images/generated/routes/040-statement/images/statement/sheepdog-wide-5c8a6878-768.webp",
+        "src": "/images/generated/pages/040-statement/images/sheepdog-wide-5c8a6878-768.webp",
         "width": 768
       },
       {
-        "src": "/images/generated/routes/040-statement/images/statement/sheepdog-wide-5c8a6878-1080.webp",
+        "src": "/images/generated/pages/040-statement/images/sheepdog-wide-5c8a6878-1080.webp",
         "width": 1080
       },
       {
-        "src": "/images/generated/routes/040-statement/images/statement/sheepdog-wide-5c8a6878-1200.webp",
+        "src": "/images/generated/pages/040-statement/images/sheepdog-wide-5c8a6878-1200.webp",
         "width": 1200
       }
     ]

package/examples/feature-demos/theme-presets/site/content.md

@@ -1,13 +1,10 @@
 ---
-title: Theme Presets
-description: Compare Norna's complete built-in theme presets without overrides.
-navigation:
-  label: Presets
+page:
+  description: Compare Norna's complete built-in theme presets without overrides.
 ---
 
-## Theme presets {#theme-presets}
-
-Each route selects one complete theme preset without overrides. The comparison
+# Theme Presets
+Each page selects one complete theme preset without overrides. The comparison
 therefore includes layout, typography, palette, section surfaces and managed
 image presentation:
 

package/examples/feature-demos/theme-presets/site/{routes → pages}/010-portfolio/content.md

@@ -1,13 +1,10 @@
 ---
-title: Portfolio
-description: A complete theme preset for image-led portfolios and presentations.
-navigation:
-  label: Portfolio
+page:
+  description: A complete theme preset for image-led portfolios and presentations.
 ---
 
-## Portfolio {#portfolio}
-
-This route uses the complete `portfolio` preset without overrides. It gives
+# Portfolio
+This page uses the complete `portfolio` preset without overrides. It gives
 images a broad stage, keeps typography restrained and uses a dark palette for
 an image-led presentation.
 

package/examples/feature-demos/theme-presets/site/{routes → pages}/020-documentation/content.md

@@ -1,13 +1,10 @@
 ---
-title: Documentation
-description: A complete theme preset for guides and explanatory writing.
-navigation:
-  label: Documentation
+page:
+  description: A complete theme preset for guides and explanatory writing.
 ---
 
-## Documentation {#documentation}
-
-This route uses the complete `documentation` preset without overrides. It
+# Documentation
+This page uses the complete `documentation` preset without overrides. It
 favours readable explanatory text, compact vertical rhythm and restrained
 surface changes for longer guides.
 

package/examples/feature-demos/theme-presets/site/{routes → pages}/030-project/content.md

@@ -1,13 +1,10 @@
 ---
-title: Project
-description: A complete theme preset for project and product websites.
-navigation:
-  label: Project
+page:
+  description: A complete theme preset for project and product websites.
 ---
 
-## Project {#project}
-
-This route uses the complete `project` preset without overrides. It provides a
+# Project
+This page uses the complete `project` preset without overrides. It provides a
 compact, neutral presentation for project overviews, feature descriptions and
 practical documentation.
 

package/examples/feature-demos/theme-presets/site/{routes → pages}/040-statement/content.md

@@ -1,13 +1,10 @@
 ---
-title: Statement
-description: A stronger typography profile for short declarative content.
-navigation:
-  label: Statement
+page:
+  description: A stronger typography profile for short declarative content.
 ---
 
-## Statement {#statement}
-
-This route uses the complete `statement` preset without overrides. Its airy
+# Statement
+This page uses the complete `statement` preset without overrides. Its airy
 layout, stronger typography and alternating surfaces suit short, declarative
 content with a more editorial voice.
 

package/examples/feature-demos/theme-presets/site/sitewide-content.yaml

@@ -1,12 +1,3 @@
-navigation:
-  label: Theme Presets
 footer:
   copyrightMessage: Dog photos by Bicanski, CC0, via Pixnio.
-  buildInfo:
-    enabled: true
-    text: Built
-    dateTimeFormat:
-      locale: en-GB
-      timeZone: UTC
-      dateStyle: short
-      timeStyle: short
+  buildInfo: true

package/fixtures/basic/site/content.md

@@ -1,11 +1,10 @@
 ---
-title: Fixture Site
-description: Minimal Norna fixture site.
-sections:
-  intro: {}
-  work: {}
-
+page:
+  description: Minimal Norna fixture site.
 ---
+
+# Fixture Site
+
 ## Intro {#intro}
 
 This fixture validates the Norna engine against a stable page without managed images.

package/fixtures/basic/site/sitewide-content.yaml

@@ -1,10 +1,3 @@
 footer:
   copyrightMessage: (c) Fixture Artist.
-  buildInfo:
-    enabled: true
-    text: Built
-    dateTimeFormat:
-      locale: en-GB
-      timeZone: UTC
-      dateStyle: short
-      timeStyle: short
+  buildInfo: true

package/fixtures/content-model-v2/site/content.md

@@ -1,18 +1,15 @@
 ---
-title: Content Model v2 Fixture
-description: Internal fixture for Markdown-authoritative Norna content.
-sections:
-  intro: {}
-  timed:
-    visible:
-      from: "2026-01-01"
-      until: "2027-01-01"
+page:
+  description: Internal fixture for Markdown-authoritative Norna content.
 ---
 
+# Content Model v2 Fixture
+
+
 ## Intro {#intro}
 
-This fixture validates that Markdown defines sections and that section metadata
-is optional. It also checks **inline emphasis**.
+This fixture validates that Markdown defines sections. It also checks **inline
+emphasis**.
 
 ```norna-image-stack
 - image: hero.jpg
@@ -33,9 +30,10 @@ Text can continue after a Norna-managed image.
   caption: Dog portrait three: a white and brown border collie-type dog.
 ```
 
-## Timed section {#timed}
+## Carousel section {#timed}
 
-This section uses frontmatter metadata without duplicating section order.
+This section demonstrates an image carousel without duplicating section order
+in frontmatter.
 
 ```norna-image-carousel
 - image: slide-one.jpg
@@ -51,7 +49,7 @@ This section uses frontmatter metadata without duplicating section order.
 
 ## Plain section {#plain}
 
-This section has no frontmatter metadata.
+This section is defined entirely by Markdown.
 
 ```norna-image-stack
 - image: image.jpg

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

@@ -0,0 +1,18 @@
+---
+page:
+  description: Internal page fixture for content model v2.
+---
+
+# Guide
+
+
+## Intro {#intro}
+
+Pages 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 page-local duplicated filename.
+  caption: This file is resolved in the page image root.
+```

package/fixtures/nested-pages/site/.norna/generated-images.json

@@ -0,0 +1,10 @@
+{
+  "pages/010-guides/pages/010-installation/images/diagram.svg": {
+    "kind": "static",
+    "outputVersion": 2,
+    "sourceHash": "5bf0dfcf8d4933ff5175143edfe95371bce44fb3b2e05db077dceb128500b948",
+    "src": "/images/original/pages/010-guides/pages/010-installation/images/diagram-5bf0dfcf.svg",
+    "width": 900,
+    "height": 240
+  }
+}

package/fixtures/nested-pages/site/config.yaml

@@ -0,0 +1 @@
+url: http://localhost:4321/

package/fixtures/nested-pages/site/content.md

@@ -0,0 +1,15 @@
+---
+page:
+  description: A focused fixture for nested Norna pages.
+---
+
+# Nested pages
+
+## Start here
+
+This fixture shows how parent and child pages form paths and navigation.
+
+## What to inspect
+
+Open Guides, Installation and macOS in sequence. Reference contains another
+Installation page to verify that page ids only need to be unique among siblings.

package/fixtures/nested-pages/site/pages/010-guides/content.md

@@ -0,0 +1,15 @@
+---
+page:
+  description: The parent page for nested guides.
+---
+
+# Guides
+
+## Guide overview
+
+Guides is a top-level page and the parent of Installation and Workflows.
+
+## Inherited presentation
+
+This page defines a local theme. Its descendants inherit that theme unless they
+define their own.

package/fixtures/nested-pages/site/pages/010-guides/pages/010-installation/content.md

@@ -0,0 +1,21 @@
+---
+page:
+  description: A nested installation guide.
+---
+
+# Installation
+
+## Installation details
+
+This page should be available at `/guides/installation/` and inherit the Guides
+theme.
+
+## Examples
+
+The managed image belongs to this nested page and section.
+
+```norna-image-stack
+- image: diagram.svg
+  alt: Three nested page levels connected in sequence.
+  caption: A managed SVG resolved from the nested page image directory.
+```