@jant/core 0.7.0 → 0.7.1

package/src/services/export-theme/layouts/_default/list.html

@@ -8,45 +8,7 @@
     fallback for unknown section types.
   */ -}}
   {{- if eq .Type "collection" -}}
-    {{- $collectionSlug := .Params.slug | default .Slug -}}
-    {{- /* Thread collection membership is stored only on root bundles. */ -}}
-    {{- $allPosts := where (where .Site.Pages "Type" "post") "Kind" "section" -}}
-    {{- $members := slice -}}
-    {{- range $allPosts -}}
-      {{- $post := . -}}
-      {{- with $post.Params.collections -}}
-        {{- range . -}}
-          {{- if eq .slug $collectionSlug -}}
-            {{- $members = $members | append (dict "post" $post "entry" .) -}}
-          {{- end -}}
-        {{- end -}}
-      {{- end -}}
-    {{- end -}}
-
-    {{- /* Split into pinned + unpinned, sort each, then concat. */ -}}
-    {{- $pinned := slice -}}
-    {{- $unpinned := slice -}}
-    {{- range $members -}}
-      {{- if .entry.pinned_at -}}
-        {{- $pinned = $pinned | append . -}}
-      {{- else -}}
-        {{- $unpinned = $unpinned | append . -}}
-      {{- end -}}
-    {{- end -}}
-    {{- if $pinned -}}
-      {{- $pinned = sort $pinned "entry.pinned_at" "desc" -}}
-    {{- end -}}
-    {{- $sortOrder := .Params.sort_order | default "position" -}}
-    {{- if $unpinned -}}
-      {{- if eq $sortOrder "collected_at_desc" -}}
-        {{- $unpinned = sort $unpinned "entry.collected_at" "desc" -}}
-      {{- else -}}
-        {{- $unpinned = sort $unpinned "entry.position" "asc" -}}
-      {{- end -}}
-    {{- end -}}
-    {{- $ordered := $pinned | append $unpinned -}}
-    {{- $posts := slice -}}
-    {{- range $ordered -}}{{- $posts = $posts | append .post -}}{{- end -}}
+    {{- $posts := partial "collection-members.html" (dict "page" . "feed" false) -}}
 
     {{- $pageSize := .Site.Params.page_size | default 10 -}}
     {{- $paginator := .Paginate $posts $pageSize -}}
@@ -62,30 +24,7 @@
         {{- end -}}
         {{ .Content }}
       </header>
-      {{- if $paginator.Pages -}}
-        <div class="post-list">
-          {{- range $i, $p := $paginator.Pages -}}
-            {{- if gt $i 0 -}}<hr class="feed-divider" aria-hidden="true" />{{- end -}}
-            {{- $replies := $p.Pages.ByDate -}}
-            {{- $hasReplies := gt (len $replies) 0 -}}
-            <div class="thread thread-full{{ if $hasReplies }} thread-has-replies{{ end }}" data-slug="{{ $p.Params.slug | default $p.Slug }}">
-              <div class="thread-item thread-item-root">
-                {{ partial "post-card.html" $p }}
-              </div>
-              {{- if $hasReplies -}}
-                <section class="thread-replies" aria-label="Replies">
-                  {{- range $replies -}}
-                    {{ partial "reply.html" . }}
-                  {{- end -}}
-                </section>
-              {{- end -}}
-            </div>
-          {{- end -}}
-        </div>
-        {{ partial "pagination.html" $paginator }}
-      {{- else -}}
-        <p class="empty-state">This collection doesn't contain any threads.</p>
-      {{- end -}}
+      {{ partial "collection-threads.html" (dict "paginator" $paginator "empty" "This collection doesn't contain any threads.") }}
     </section>
   {{- else -}}
     <section class="section">

package/src/services/export-theme/layouts/_default/rss.xml

@@ -2,18 +2,23 @@
   Atom 2005 feed template — mirrors the main site's `lib/feed.ts`.
 
   One template covers every page that opts into the custom `RSS` output
-  format (home, featured, archive, and each collection section). Root-post
-  sections do NOT opt in, so no `/{slug}/index.xml` gets emitted.
+  format (home, featured, archive, and each collection and smart collection
+  section). Root-post sections do NOT opt in, so no `/{slug}/index.xml` gets
+  emitted.
 
-  Feed filter parity with the corresponding HTML list view:
-    - home   (`.Kind == "home"`): visibility == "public" (drops latest_hidden)
-    - featured (`.Type == "featured"`): one Root per Thread whose derived
-        featured projection is non-empty, ordered by selected Post publication
+  Each feed carries what the matching Jant feed carries, in its order:
+    - home (`.Kind == "home"`): `/latest/feed`, public roots by Thread
+        activity, pins ignored (`latest-members`)
+    - featured (`.Type == "featured"`): one root per Thread with a featured
+        post, by that post's publication (`featured-members`)
     - archive  (`.Type == "archive"`): all published (includes latest_hidden)
-    - collection (`.Type == "collection"`): Params.collections.slug match,
-        ordered per `sort_order`; pinning is ignored for RSS
+    - collection (`.Type == "collection"`): its Threads by activity, newest
+        first, pins and `sort_order` ignored (`collection-members`)
+    - smart collection (`.Type == "smart_collection"`): the roots its
+        conditions select, in its stored order (`smart-collection-members`)
 
   Per-entry payload mirrors `buildSinglePostContent` + `buildFeedContent`:
+    - Id: `feed_id` from front matter, the id Jant's feed used; see below
     - Title: empty for quote posts, else .Title
     - Link rel=alternate: external URL for `link` format, else permalink;
       link-format posts also get a <link rel="related"> back to the
@@ -33,7 +38,6 @@
 {{- $page := . -}}
 {{- $limit := int (.Site.Params.rss_feed_limit | default 50) -}}
 {{- $allPosts := where .Site.Pages "Type" "post" -}}
-{{- $rootPosts := where $allPosts "Kind" "section" -}}
 
 {{- /* ------------------------------------------------------------------
      Post selection per feed kind
@@ -42,36 +46,15 @@
 {{- $isFeatured := eq $page.Type "featured" -}}
 
 {{- if eq $page.Kind "home" -}}
-  {{- $public := where $allPosts "Params.visibility" "public" -}}
-  {{- $posts = $public.ByDate.Reverse -}}
+  {{- $posts = partial "latest-members.html" (dict "feed" true) -}}
 {{- else if $isFeatured -}}
-  {{- $featured := where $rootPosts "Params.featured_sort_at" "ne" nil -}}
-  {{- $posts = sort $featured "Params.featured_sort_at" "desc" -}}
+  {{- $posts = partial "featured-members.html" . -}}
 {{- else if eq $page.Type "archive" -}}
   {{- $posts = $allPosts.ByDate.Reverse -}}
 {{- else if eq $page.Type "collection" -}}
-  {{- $collectionSlug := $page.Params.slug | default $page.Slug -}}
-  {{- $members := slice -}}
-  {{- range $rootPosts -}}
-    {{- $post := . -}}
-    {{- with $post.Params.collections -}}
-      {{- range . -}}
-        {{- if eq .slug $collectionSlug -}}
-          {{- $members = $members | append (dict "post" $post "entry" .) -}}
-        {{- end -}}
-      {{- end -}}
-    {{- end -}}
-  {{- end -}}
-  {{- $sortOrder := $page.Params.sort_order | default "position" -}}
-  {{- $ordered := $members -}}
-  {{- if $ordered -}}
-    {{- if eq $sortOrder "collected_at_desc" -}}
-      {{- $ordered = sort $ordered "entry.collected_at" "desc" -}}
-    {{- else -}}
-      {{- $ordered = sort $ordered "entry.position" "asc" -}}
-    {{- end -}}
-  {{- end -}}
-  {{- range $ordered -}}{{- $posts = $posts | append .post -}}{{- end -}}
+  {{- $posts = partial "collection-members.html" (dict "page" $page "feed" true) -}}
+{{- else if eq $page.Type "smart_collection" -}}
+  {{- $posts = partial "smart-collection-members.html" (dict "page" $page "feed" true) -}}
 {{- end -}}
 
 {{- if gt (len $posts) $limit -}}
@@ -88,7 +71,7 @@
   {{- $feedTitle = printf "%s - Featured posts" .Site.Title -}}
 {{- else if eq $page.Type "archive" -}}
   {{- $feedTitle = printf "%s - Archive" .Site.Title -}}
-{{- else if eq $page.Type "collection" -}}
+{{- else if in (slice "collection" "smart_collection") $page.Type -}}
   {{- $feedTitle = printf "%s - %s" .Site.Title $page.Title -}}
 {{- end -}}
 
@@ -117,6 +100,12 @@
   {{- $post := . -}}
   {{- $format := .Params.format | default "note" -}}
   {{- $permalink := .Permalink -}}
+  {{- /* <id>: the string Jant's feeds gave this entry, which the exporter
+       writes as `feed_id`. Readers recognise an entry by it alone, and
+       `.Permalink` differs from it (trailing slash; slug in place of a custom
+       path), so using the page URL would show every post again after a move.
+       A post written in Hugo has no `feed_id` and takes its page URL. */ -}}
+  {{- $entryId := string (.Params.feed_id | default $permalink) -}}
   {{- $isLink := and (eq $format "link") .Params.link_url -}}
   {{- $alternate := cond $isLink (string .Params.link_url) $permalink -}}
   {{- /* Atom <title>: empty for quotes (matches main site's getAtomTitle). */ -}}
@@ -148,7 +137,7 @@
        newest included — as `lib/thread-fold.ts` defines it. A thread of five
        replies or fewer is shown whole; `first` and `last` clamp to the slice,
        so the two windows simply overlap there. */ -}}
-  {{- $replies := (where $post.Pages "Params.visibility" "public").ByDate -}}
+  {{- $replies := (where $post.Pages "Params.visibility" "public").ByWeight -}}
   {{- $truncated := $post.Params.truncated | default false -}}
   {{- range first 2 $replies -}}
     {{- if .Params.truncated -}}{{- $truncated = true -}}{{- end -}}
@@ -184,7 +173,7 @@
     <link rel="enclosure" type="{{ (string ($m.mime_type | default "application/octet-stream")) | transform.XMLEscape }}" href="{{ (string $m.src) | absURL | transform.XMLEscape }}"{{ with $m.size }} length="{{ . }}"{{ end }}{{ with $m.original_name }} title="{{ . | transform.XMLEscape }}"{{ end }}/>
     {{- end }}
     {{- end }}
-    <id>{{ $permalink | transform.XMLEscape }}</id>
+    <id>{{ $entryId | transform.XMLEscape }}</id>
     <published>{{ $published }}</published>
     <updated>{{ $updated }}</updated>
     <jant:format>{{ $format | transform.XMLEscape }}</jant:format>

package/src/services/export-theme/layouts/collections/list.html

@@ -1,9 +1,9 @@
 {{ define "main" }}
   {{- $items := slice -}}
-  {{- with hugo.Data.jant -}}{{- with .directory -}}{{- $items = . -}}{{- end -}}{{- end -}}
+  {{- with partial "jant-data.html" . -}}{{- with .directory -}}{{- $items = . -}}{{- end -}}{{- end -}}
   {{- $collectionCount := 0 -}}
   {{- range $items -}}
-    {{- if eq .type "collection" -}}{{- $collectionCount = add $collectionCount 1 -}}{{- end -}}
+    {{- if in (slice "collection" "smart_collection") .type -}}{{- $collectionCount = add $collectionCount 1 -}}{{- end -}}
   {{- end -}}
 
   <div class="section section-collections" data-page="collections">
@@ -68,7 +68,7 @@
                   {{- end -}}
                 </div>
               </div>
-            {{- else if eq .type "collection" -}}
+            {{- else if in (slice "collection" "smart_collection") .type -}}
               {{- $entryCount := .entry_count -}}
               {{- $activityLabel := .recent_activity_label -}}
               {{- $activityIso := .recent_activity_iso -}}

package/src/services/export-theme/layouts/featured/list.html

@@ -1,9 +1,6 @@
 {{ define "main" }}
   {{- /* Root bundles carry a derived projection of every Featured Post in the Thread. */ -}}
-  {{- $posts := where .Site.Pages "Type" "post" -}}
-  {{- $roots := where $posts "Kind" "section" -}}
-  {{- $featured := where $roots "Params.featured_sort_at" "ne" nil -}}
-  {{- $featured = sort $featured "Params.featured_sort_at" "desc" -}}
+  {{- $featured := partial "featured-members.html" . -}}
   {{- $pageSize := .Site.Params.page_size | default 10 -}}
   {{- $paginator := .Paginate $featured $pageSize -}}
 

package/src/services/export-theme/layouts/index.html

@@ -1,28 +1,42 @@
-{{ define "main" }} {{- $pageSize := .Site.Params.page_size | default 10 -}} {{-
-/* Root posts are branch bundles (kind=section), so we iterate .Site.Pages, not
-.Site.RegularPages. */ -}} {{- $allPosts := where .Site.Pages "Type" "post" -}}
-{{- $pinned := where $allPosts "Params.pinned_at" "ne" nil -}} {{- $pinned =
-$pinned.ByDate.Reverse -}} {{- $public := where $allPosts "Params.visibility"
-"public" -}} {{- $public = where $public "Params.pinned_at" nil -}} {{- $main :=
-$public.ByDate.Reverse -}} {{- $paginator := .Paginate $main $pageSize -}}
-
-<section class="home">
-  {{- if and (eq $paginator.PageNumber 1) $pinned -}}
-  <div class="post-list post-list-pinned" aria-label="Pinned posts">
-    {{- range $i, $p := $pinned -}} {{- if gt $i 0 -}}
-    <hr class="feed-divider" aria-hidden="true" />
-    {{- end -}} {{ partial "thread-preview.html" $p }} {{- end -}}
-  </div>
-  {{- end -}} {{- if $paginator.Pages -}}
-  <div class="post-list post-list-main">
-    {{- range $i, $p := $paginator.Pages -}} {{- if gt $i 0 -}}
-    <hr class="feed-divider" aria-hidden="true" />
-    {{- end -}} {{ partial "thread-preview.html" $p }} {{- end -}}
-  </div>
-  {{ partial "pagination.html" $paginator }} {{- else if not $pinned -}}
-  <p class="empty-state">
-    Nothing published yet. Write your first post to get started.
-  </p>
+{{ define "main" }}
+  {{- /*
+    The home page lists Latest the way Jant's does: one list, pinned roots
+    first, paginated as a whole (`latest-members`). The pinned roots on a
+    page, which only lead the list, keep a block of their own.
+  */ -}}
+  {{- $pageSize := .Site.Params.page_size | default 10 -}}
+  {{- $paginator := .Paginate (partial "latest-members.html" (dict "feed" false)) $pageSize -}}
+  {{- $pinned := slice -}}
+  {{- $main := slice -}}
+  {{- range $paginator.Pages -}}
+    {{- if .Params.pinned_at -}}
+      {{- $pinned = $pinned | append . -}}
+    {{- else -}}
+      {{- $main = $main | append . -}}
+    {{- end -}}
   {{- end -}}
-</section>
+
+  <section class="home">
+    {{- if $pinned -}}
+      <div class="post-list post-list-pinned" aria-label="Pinned posts">
+        {{- range $i, $p := $pinned -}}
+          {{- if gt $i 0 -}}<hr class="feed-divider" aria-hidden="true" />{{- end -}}
+          {{ partial "thread-preview.html" $p }}
+        {{- end -}}
+      </div>
+    {{- end -}}
+    {{- if $main -}}
+      <div class="post-list post-list-main">
+        {{- range $i, $p := $main -}}
+          {{- if gt $i 0 -}}<hr class="feed-divider" aria-hidden="true" />{{- end -}}
+          {{ partial "thread-preview.html" $p }}
+        {{- end -}}
+      </div>
+    {{- end -}}
+    {{- if $paginator.Pages -}}
+      {{ partial "pagination.html" $paginator }}
+    {{- else -}}
+      <p class="empty-state">Nothing published yet. Write your first post to get started.</p>
+    {{- end -}}
+  </section>
 {{ end }}

package/src/services/export-theme/layouts/partials/collection-members.html

@@ -0,0 +1,100 @@
+{{- /*
+  The Thread roots in a collection, in the order Jant lists them: the page
+  (`listCollectionThreadRootIdsForCollections` in `services/post.ts`) or the
+  feed (`listCollectionFeedEntriesForCollections`).
+
+  Takes a dict: `page`, the collection's section page, and `feed`, true for
+  its Atom feed.
+
+  A Thread belongs when its root lists the collection in `collections`.
+  Drafts and private roots are exported as Hugo drafts and never reach here;
+  they are checked again so a `--buildDrafts` preview agrees with Jant.
+
+  The page puts Threads pinned in this collection first, most recently
+  pinned first, then orders by `sort_order`, each order ending on the root
+  ID so no two Threads tie:
+    newest       Thread activity (`last_activity_at`, else `date`), newest first
+    oldest       the Thread's earliest published post, oldest first
+    rating_desc  Threads with a rating before those without, by the highest
+                 rating on any published post in the Thread, then as newest.
+                 With fewer than two rated Threads it falls back to newest,
+                 as Jant's page does.
+  The feed ignores pins and `sort_order`: Thread activity, newest first.
+
+  `src/__tests__/export-collection-order.test.ts` builds a site with Hugo
+  and compares the page and the feed with Jant's.
+*/ -}}
+{{- $page := .page -}}
+{{- $feed := .feed -}}
+{{- $slug := $page.Params.slug | default $page.Slug -}}
+{{- $roots := where (where site.Pages "Type" "post") "Kind" "section" -}}
+{{- $members := slice -}}
+{{- range $roots -}}
+  {{- $post := . -}}
+  {{- $params := .Params -}}
+  {{- $entry := false -}}
+  {{- range $params.collections -}}
+    {{- if eq .slug $slug -}}{{- $entry = . -}}{{- end -}}
+  {{- end -}}
+  {{- $visible := and (eq ($params.status | default "published") "published") (ne $params.visibility "private") -}}
+  {{- if and $entry $visible -}}
+    {{- $pinned := 0 -}}
+    {{- with $entry.pinned_at -}}{{- $pinned = (time.AsTime .).Unix -}}{{- end -}}
+    {{- $activity := $post.Date.Unix -}}
+    {{- with $params.last_activity_at -}}{{- $activity = (time.AsTime .).Unix -}}{{- end -}}
+    {{- $first := $post.Date.Unix -}}
+    {{- $rated := ne $params.rating nil -}}
+    {{- $rating := 0 -}}
+    {{- if $rated -}}{{- $rating = int $params.rating -}}{{- end -}}
+    {{- range $post.Pages -}}
+      {{- if eq (.Params.status | default "published") "published" -}}
+        {{- if lt .Date.Unix $first -}}{{- $first = .Date.Unix -}}{{- end -}}
+        {{- if ne .Params.rating nil -}}
+          {{- $rated = true -}}
+          {{- if gt (int .Params.rating) $rating -}}{{- $rating = int .Params.rating -}}{{- end -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+    {{- $members = $members | append (dict
+      "post" $post
+      "id" $params.id
+      "pinned" (cond $feed 0 $pinned)
+      "first" $first
+      "activity" $activity
+      "rated" $rated
+      "rating" $rating
+    ) -}}
+  {{- end -}}
+{{- end -}}
+
+{{- $order := "newest" -}}
+{{- if not $feed -}}
+  {{- $order = $page.Params.sort_order | default "newest" -}}
+  {{- if and (eq $order "rating_desc") (le (len (where $members "rated" true)) 1) -}}
+    {{- $order = "newest" -}}
+  {{- end -}}
+{{- end -}}
+
+{{- /* One string key per Thread, fixed-width numbers first, so a single sort
+     orders by every key in turn. `oldest` sorts ascending, so its pin rank
+     counts down: the most recently pinned Thread gets the smallest. */ -}}
+{{- $unpinnedRank := 99999999999 -}}
+{{- $keyed := slice -}}
+{{- range $members -}}
+  {{- $key := printf "%020d %020d %s" .pinned .activity .id -}}
+  {{- if eq $order "oldest" -}}
+    {{- $pinRank := cond (gt .pinned 0) (sub $unpinnedRank .pinned) $unpinnedRank -}}
+    {{- $key = printf "%020d %020d %s" $pinRank .first .id -}}
+  {{- else if eq $order "rating_desc" -}}
+    {{- $key = printf "%020d %d %02d %020d %s" .pinned (cond .rated 1 0) .rating .activity .id -}}
+  {{- end -}}
+  {{- $keyed = $keyed | append (dict "key" $key "post" .post) -}}
+{{- end -}}
+
+{{- $ordered := slice -}}
+{{- if $keyed -}}
+  {{- range sort $keyed "key" (cond (eq $order "oldest") "asc" "desc") -}}
+    {{- $ordered = $ordered | append .post -}}
+  {{- end -}}
+{{- end -}}
+{{- return $ordered -}}

package/src/services/export-theme/layouts/partials/collection-threads.html

@@ -0,0 +1,33 @@
+{{- /*
+  A collection page's Threads, each root with its replies in full, then the
+  pagination. Shared by manual and smart collections, which look the same to
+  a reader.
+
+  Takes a dict: `paginator`, and `empty`, the text shown when there are no
+  Threads.
+*/ -}}
+{{- $paginator := .paginator -}}
+{{- if $paginator.Pages -}}
+  <div class="post-list">
+    {{- range $i, $p := $paginator.Pages -}}
+      {{- if gt $i 0 -}}<hr class="feed-divider" aria-hidden="true" />{{- end -}}
+      {{- $replies := $p.Pages.ByWeight -}}
+      {{- $hasReplies := gt (len $replies) 0 -}}
+      <div class="thread thread-full{{ if $hasReplies }} thread-has-replies{{ end }}" data-slug="{{ $p.Params.slug | default $p.Slug }}">
+        <div class="thread-item thread-item-root">
+          {{ partial "post-card.html" $p }}
+        </div>
+        {{- if $hasReplies -}}
+          <section class="thread-replies" aria-label="Replies">
+            {{- range $replies -}}
+              {{ partial "reply.html" . }}
+            {{- end -}}
+          </section>
+        {{- end -}}
+      </div>
+    {{- end -}}
+  </div>
+  {{ partial "pagination.html" $paginator }}
+{{- else -}}
+  <p class="empty-state">{{ .empty }}</p>
+{{- end -}}

package/src/services/export-theme/layouts/partials/featured-members.html

@@ -0,0 +1,35 @@
+{{- /*
+  The Threads on Featured, in the order Jant lists them on the Featured page
+  and in `/featured/feed` (`listFeaturedThreadRootIds`): a Thread belongs
+  when any published post in it is featured and it is not private. Hidden
+  from Latest is no bar here.
+
+  Order: the newest publication among the Thread's featured posts
+  (`featured_sort_at`, which the export derives exactly that way), newest
+  first, then the root ID, newest first, so Threads whose featured posts
+  share a second don't tie.
+
+  `src/__tests__/export-feed-order.test.ts` builds a site with Hugo and
+  compares the page and the feed with Jant's.
+*/ -}}
+{{- $roots := where (where site.Pages "Type" "post") "Kind" "section" -}}
+{{- $keyed := slice -}}
+{{- range $roots -}}
+  {{- $post := . -}}
+  {{- $params := .Params -}}
+  {{- $visible := and (eq ($params.status | default "published") "published") (ne $params.visibility "private") -}}
+  {{- if and $visible $params.featured_sort_at -}}
+    {{- $keyed = $keyed | append (dict
+      "key" (printf "%020d %s" (time.AsTime $params.featured_sort_at).Unix $params.id)
+      "post" $post
+    ) -}}
+  {{- end -}}
+{{- end -}}
+
+{{- $ordered := slice -}}
+{{- if $keyed -}}
+  {{- range sort $keyed "key" "desc" -}}
+    {{- $ordered = $ordered | append .post -}}
+  {{- end -}}
+{{- end -}}
+{{- return $ordered -}}

package/src/services/export-theme/layouts/partials/featured-thread.html

@@ -8,7 +8,7 @@
 {{- $root := . -}}
 {{- $featuredIds := $root.Params.featured_post_ids | default slice -}}
 {{- $posts := slice $root -}}
-{{- range $root.Pages.ByDate -}}
+{{- range $root.Pages.ByWeight -}}
   {{- $posts = $posts | append . -}}
 {{- end -}}
 {{- $lastIndex := sub (len $posts) 1 -}}

package/src/services/export-theme/layouts/partials/footer.html

@@ -1,4 +1,4 @@
-{{- $jant := hugo.Data.jant -}}
+{{- $jant := partial "jant-data.html" . -}}
 {{- $footerHtml := "" -}}
 {{- with $jant -}}{{- with .site_footer_html -}}{{- $footerHtml = . -}}{{- end -}}{{- end -}}
 {{- $showBranding := false -}}

package/src/services/export-theme/layouts/partials/head.html

@@ -1,4 +1,4 @@
-{{- $jant := hugo.Data.jant -}}
+{{- $jant := partial "jant-data.html" . -}}
 {{- $siteTitle := .Site.Title -}}
 {{- $pageTitle := "" -}}
 {{- if .IsHome -}}

package/src/services/export-theme/layouts/partials/header.html

@@ -1,14 +1,16 @@
-{{- $jant := hugo.Data.jant -}}
+{{- $jant := partial "jant-data.html" . -}}
 {{- $showAvatar := false -}}
 {{- with $jant -}}{{- if eq .show_header_avatar true -}}{{- $showAvatar = true -}}{{- end -}}{{- end -}}
 {{- $avatarUrl := "" -}}
 {{- with $jant -}}{{- with .site_avatar_url -}}{{- $avatarUrl = . -}}{{- end -}}{{- end -}}
 
-{{- /* Split nav items by placement: "header" (inline) vs "more" (supplemental dropdown). */ -}}
+{{- /* Split nav items by placement: "header" (inline) vs "more" (supplemental dropdown).
+     `settings` is exported for an import back into Jant; the static site has no page for it. */ -}}
 {{- $headerItems := slice -}}
 {{- $moreItems := slice -}}
 {{- with $jant -}}{{- range .nav -}}
-  {{- if eq .placement "more" -}}
+  {{- if eq .system_key "settings" -}}
+  {{- else if eq .placement "more" -}}
     {{- $moreItems = $moreItems | append . -}}
   {{- else -}}
     {{- $headerItems = $headerItems | append . -}}

package/src/services/export-theme/layouts/partials/jant-data.html

@@ -0,0 +1,23 @@
+{{- /*
+  Returns the `jant` table from `data/jant.toml` — nav, branding, and the
+  collections directory.
+
+  Hugo moved site data to `hugo.Data` in v0.160.0 and deprecated `site.Data`
+  in v0.156.0, so neither accessor works everywhere: `hugo.Data` is a render
+  error before it existed, and `site.Data` is a deprecation warning today and
+  a removal tomorrow. Only the taken branch of an `if` is evaluated, so
+  branching on the running version reads whichever one that version has.
+  `hugo.Version` compares semantically, not as a string.
+
+  Hugo rewrites a single `return` per template, hence the assignment rather
+  than a `return` in each branch. Every template reads the data through this
+  partial, so the day the old branch stops being worth carrying there is one
+  place to change.
+*/ -}}
+{{- $data := dict -}}
+{{- if ge hugo.Version "0.160.0" -}}
+  {{- $data = hugo.Data -}}
+{{- else -}}
+  {{- $data = site.Data -}}
+{{- end -}}
+{{- return (index $data "jant") -}}

package/src/services/export-theme/layouts/partials/latest-members.html

@@ -0,0 +1,48 @@
+{{- /*
+  The Thread roots on Latest, in the order Jant lists them: the home page
+  (`assembleTimeline`, `posts.list`) or `/latest/feed`
+  (`latestFeedSelection` with `ignorePinnedSort`).
+
+  Takes a dict: `feed`, true for the Atom feed.
+
+  A root is on Latest when it is published and public: Hidden from Latest
+  and private roots are left out, as are drafts, which are exported as Hugo
+  drafts and never reach here; status and visibility are checked again so a
+  `--buildDrafts` preview agrees with Jant.
+
+  Order, each key after the one before it:
+    pinned       page only: pinned roots first, most recently pinned first
+    activity     Thread activity (`last_activity_at`, else `date`), newest
+                 first, so a Thread that gains a reply comes back up; a quiet
+                 reply doesn't move it, because Jant doesn't count it
+    ID           newest first, so no two roots tie
+
+  `src/__tests__/export-feed-order.test.ts` builds a site with Hugo and
+  compares the page and the feed with Jant's.
+*/ -}}
+{{- $feed := .feed -}}
+{{- $roots := where (where site.Pages "Type" "post") "Kind" "section" -}}
+{{- $keyed := slice -}}
+{{- range $roots -}}
+  {{- $params := .Params -}}
+  {{- if and (eq ($params.status | default "published") "published") (eq $params.visibility "public") -}}
+    {{- $pinned := 0 -}}
+    {{- if not $feed -}}
+      {{- with $params.pinned_at -}}{{- $pinned = (time.AsTime .).Unix -}}{{- end -}}
+    {{- end -}}
+    {{- $activity := .Date.Unix -}}
+    {{- with $params.last_activity_at -}}{{- $activity = (time.AsTime .).Unix -}}{{- end -}}
+    {{- $keyed = $keyed | append (dict
+      "key" (printf "%020d %020d %s" $pinned $activity $params.id)
+      "post" .
+    ) -}}
+  {{- end -}}
+{{- end -}}
+
+{{- $ordered := slice -}}
+{{- if $keyed -}}
+  {{- range sort $keyed "key" "desc" -}}
+    {{- $ordered = $ordered | append .post -}}
+  {{- end -}}
+{{- end -}}
+{{- return $ordered -}}