@jant/core 0.7.0 → 0.7.1

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

@@ -0,0 +1,129 @@
+{{- /*
+  The Thread roots a smart collection's conditions select, in its order.
+
+  The same set and order Jant shows a signed-out reader on the smart
+  collection's page (`smartCollections.toPostFilters` handed to
+  `posts.list`), computed from the exported front matter so the page keeps
+  up with the posts in this repository. Every condition reads the root:
+
+    format      `format`
+    title       `title`; for a quote, `source_name`, which is what Jant
+                stores in the title column
+    year        `date`, the publication time, in UTC
+    media       the root's own `media` entries: `any`, `none`, or a list of
+                kinds, any one of which matches
+    replies     whether the root has published replies
+    visibility  `public` and `latest_hidden` match `visibility`; `featured`
+                matches a root with `featured_at`
+    collection  a `collections` entry with that slug
+
+  Drafts and private roots are exported as Hugo drafts and never reach here;
+  they are checked again so a `--buildDrafts` preview agrees with Jant.
+
+  Takes a dict: `page`, the smart collection's section page, and `feed`,
+  true for its Atom feed.
+
+  Orders, each ending on the post ID so no two roots tie:
+    newest       Thread activity (`last_activity_at`, else `date`), newest first
+    oldest       publication, oldest first
+    rating_desc  rated before unrated, higher rating first, then as newest.
+                 On the page, fewer than two rated roots fall back to
+                 newest, as Jant's page does; the feed keeps the stored
+                 order, as Jant's feed does.
+
+  `src/__tests__/export-smart-collection.test.ts` builds a site with Hugo
+  and compares every condition and order against Jant's own list.
+*/ -}}
+{{- $page := .page -}}
+{{- $feed := .feed -}}
+{{- $selection := $page.Params.selection | default dict -}}
+{{- $roots := where (where site.Pages "Type" "post") "Kind" "section" -}}
+{{- $members := slice -}}
+{{- range $roots -}}
+  {{- $post := . -}}
+  {{- $params := .Params -}}
+  {{- $matches := and (eq ($params.status | default "published") "published") (ne $params.visibility "private") -}}
+  {{- if and $matches (isset $selection "format") -}}
+    {{- $matches = eq $params.format $selection.format -}}
+  {{- end -}}
+  {{- if and $matches (isset $selection "title") -}}
+    {{- $title := $params.title -}}
+    {{- if eq $params.format "quote" -}}{{- $title = $params.source_name -}}{{- end -}}
+    {{- $matches = eq (gt (len (string ($title | default ""))) 0) $selection.title -}}
+  {{- end -}}
+  {{- if and $matches (isset $selection "year") -}}
+    {{- $matches = eq $post.Date.UTC.Year (int $selection.year) -}}
+  {{- end -}}
+  {{- if and $matches (isset $selection "media") -}}
+    {{- $media := $params.media | default slice -}}
+    {{- $wanted := $selection.media -}}
+    {{- if reflect.IsSlice $wanted -}}
+      {{- $found := false -}}
+      {{- range $media -}}{{- if in $wanted .kind -}}{{- $found = true -}}{{- end -}}{{- end -}}
+      {{- $matches = $found -}}
+    {{- else if eq $wanted "any" -}}
+      {{- $matches = gt (len $media) 0 -}}
+    {{- else -}}
+      {{- $matches = eq (len $media) 0 -}}
+    {{- end -}}
+  {{- end -}}
+  {{- if and $matches (isset $selection "replies") -}}
+    {{- $matches = eq (gt (len $post.Pages) 0) $selection.replies -}}
+  {{- end -}}
+  {{- if and $matches (isset $selection "visibility") -}}
+    {{- if eq $selection.visibility "featured" -}}
+      {{- $matches = ne ($params.featured_at | default "") "" -}}
+    {{- else -}}
+      {{- $matches = eq $params.visibility $selection.visibility -}}
+    {{- end -}}
+  {{- end -}}
+  {{- if and $matches (isset $selection "collection") -}}
+    {{- $inCollection := false -}}
+    {{- range $params.collections -}}
+      {{- if eq .slug $selection.collection -}}{{- $inCollection = true -}}{{- end -}}
+    {{- end -}}
+    {{- $matches = $inCollection -}}
+  {{- end -}}
+
+  {{- if $matches -}}
+    {{- $activity := $post.Date.Unix -}}
+    {{- with $params.last_activity_at -}}{{- $activity = (time.AsTime .).Unix -}}{{- end -}}
+    {{- $rated := ne $params.rating nil -}}
+    {{- $rating := 0 -}}
+    {{- if $rated -}}{{- $rating = int $params.rating -}}{{- end -}}
+    {{- $members = $members | append (dict
+      "post" $post
+      "id" $params.id
+      "published" $post.Date.Unix
+      "activity" $activity
+      "rated" $rated
+      "rating" $rating
+    ) -}}
+  {{- end -}}
+{{- end -}}
+
+{{- $order := $page.Params.sort_order | default "newest" -}}
+{{- if and (not $feed) (eq $order "rating_desc") (le (len (where $members "rated" true)) 1) -}}
+  {{- $order = "newest" -}}
+{{- end -}}
+
+{{- /* One string key per root, fixed-width numbers first, so a single sort
+     orders by every key in turn. */ -}}
+{{- $keyed := slice -}}
+{{- range $members -}}
+  {{- $key := printf "%020d %s" .activity .id -}}
+  {{- if eq $order "oldest" -}}
+    {{- $key = printf "%020d %s" .published .id -}}
+  {{- else if eq $order "rating_desc" -}}
+    {{- $key = printf "%d %02d %020d %s" (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/thread-preview.html

@@ -20,7 +20,7 @@
 */ -}}
 {{- $root := . -}}
 {{- $replies := where $root.Pages "Params.visibility" "public" -}}
-{{- $replies = $replies.ByDate -}}
+{{- $replies = $replies.ByWeight -}}
 {{- $replyCount := len $replies -}}
 {{- if eq $replyCount 0 -}}
   {{ partial "post-card.html" $root }}

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

@@ -5,7 +5,7 @@
   {{- $media := $root.Params.media | default slice -}}
   {{- $collections := $root.Params.collections | default slice -}}
   {{- $linkUrl := $root.Params.link_url -}}
-  {{- $replies := $root.Pages.ByDate -}}
+  {{- $replies := $root.Pages.ByWeight -}}
   {{- $hasReplies := gt (len $replies) 0 -}}
   <article class="thread thread-{{ $format }}{{ if $hasReplies }} thread-has-replies{{ end }}" id="{{ $slug }}" data-format="{{ $format }}" data-slug="{{ $slug }}"
     {{- if $root.Params.pinned_at }} data-post-pinned{{ end -}}

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

@@ -0,0 +1,24 @@
+{{ define "main" }}
+  {{- /*
+    A smart collection's page (`type: smart_collection`). The members come
+    from its conditions, applied to the posts in this site by the
+    `smart-collection-members` partial.
+  */ -}}
+  {{- $posts := partial "smart-collection-members.html" (dict "page" . "feed" false) -}}
+  {{- $pageSize := .Site.Params.page_size | default 10 -}}
+  {{- $paginator := .Paginate $posts $pageSize -}}
+
+  <section class="section section-collection section-smart-collection">
+    <header class="section-header">
+      <h1 class="section-title">{{ .Title }}</h1>
+      {{- with .Params.summary_text -}}
+        <p class="section-summary">{{ . }}</p>
+      {{- end -}}
+      {{- with len $posts -}}
+        <p class="section-meta">{{ . }} {{ if eq . 1 }}thread{{ else }}threads{{ end }}</p>
+      {{- end -}}
+      {{ .Content }}
+    </header>
+    {{ partial "collection-threads.html" (dict "paginator" $paginator "empty" "Nothing matches these conditions yet.") }}
+  </section>
+{{ end }}

package/src/services/export-theme/styles/main.css

@@ -693,7 +693,6 @@ time {
 .home-branding-credit {
   margin-top: var(--space-xl);
   padding-bottom: var(--space-xl);
-  text-align: center;
   color: var(--site-text-secondary);
   font-size: var(--type-base);
 }

package/src/services/export-theme/theme.toml

@@ -5,7 +5,7 @@ description = "Default theme packaged with Jant exports."
 homepage = "https://jant.so"
 tags = ["blog", "microblog", "minimal"]
 features = ["pagination", "aliases"]
-min_version = "0.160.1"
+min_version = "0.147.7"
 
 [author]
   name = "Jant"