hexo-theme-stellar 1.44.0 → 2.0.0-rc.2

package/layout/_partial/widgets/tree.ejs

@@ -1,5 +1,7 @@
 <%
-var proj = theme.wiki.tree[page.wiki]
+var wikiViewModel = typeof viewModel !== 'undefined' && viewModel?.collection?.profile === 'wiki'
+  ? viewModel
+  : null
 
 function layoutSectionHeader(title) {
   if (!title || title.length === 0) {
@@ -10,15 +12,15 @@ function layoutSectionHeader(title) {
 
 function layoutDocTree(pages) {
   var entries = []
+  var totalPages = wikiViewModel.collection.navigation.tree.reduce(function(sum, section) { return sum + (section.items || []).length }, 0)
   for (var docPage of pages) {
-    if (docPage.title == null || docPage.title.length === 0 || proj.pages.length <= 1) {
+    if (docPage.title == null || docPage.title.length === 0 || totalPages <= 1) {
       continue
     }
     entries.push({
       href: pretty_url(docPage.path),
       title: docPage.title,
-      active: docPage.path === page.path,
-      gradientRef: 'leftbar-active-icon-grad'
+      active: docPage.path === wikiViewModel.item.route.path
     })
   }
   return partial('_partial/components/collection', {options: {
@@ -30,15 +32,12 @@ function layoutDocTree(pages) {
 }
 
 function layoutDiv() {
-  if (proj == null || proj.pages == null || proj.pages.length === 0 || proj.sections == null || proj.sections.length === 0) {
-    return ''
-  }
+  if (!wikiViewModel) return ''
+  var sections = wikiViewModel.collection.navigation.tree
+  if (!Array.isArray(sections) || sections.length === 0) return ''
   var body = ''
-  for (var section of proj.sections) {
-    if (section.pages.length === 0) {
-      continue
-    }
-    var collection = (layoutDocTree(section.pages) || '').trim()
+  for (var section of sections) {
+    var collection = (layoutDocTree(section.items || []) || '').trim()
     if (collection.length > 0) {
       body += '<section class="widget-section">'
       body += layoutSectionHeader(section.title)
@@ -49,7 +48,7 @@ function layoutDiv() {
   return partial('_partial/components/widget-frame', {
     className: 'doc-tree-widget',
     body: body,
-    attrs: {'data-wiki': page.wiki},
+    attrs: {'data-wiki': wikiViewModel.collection.id},
     reveal: false
   })
 }

package/layout/archive.ejs

@@ -1,32 +1,39 @@
 <%
 page.robots = 'noindex,follow';
-if (page.menu_id == undefined) {
-  page.menu_id = 'post';
-}
-if (page.author) {
-  page.header = false;
+page.navigation ||= {}
+if (page.navigation.menu == undefined) {
+  page.navigation.menu = stellar_config('profiles.blogIndex.activeMenu');
 }
 function layoutArchiveList() {
   var el = ''
   var cls = ''
   if (page.author) {
     page.title = page.author.name
-    page.banner = page.author.banner
-    page.banner_info = {
+    page.banner = {
+      image: page.author.banner,
       avatar: page.author.avatar,
-      subtitle: page.author.description
+      tagline: page.author.description
     }
     el += partial('_partial/main/navbar/article_banner')
     cls += ' author'
   } else {
     page.title = __('btn.archives')
-    el += partial('_partial/main/navbar/nav_tabs_blog')
+    el += partial('_partial/main/listing_nav/blog')
   }
   el += `<div class="post-list${cls} archives">`
   var years = []
-  var posts = page.author != null ? site.posts.filter(function(post) {
-    return (post.author || theme.default_author.id) == page.author.id
-  }) : site.posts
+  function requirePostViewModel(post) {
+    var viewModel = post_view_model(post)
+    if (!['post', 'topic'].includes(viewModel?.collection?.profile) || !viewModel.render?.listing) {
+      throw new Error(`Stellar v2: Post ${post?.source || post?.path || '<unknown>'} 缺少归档列表 ViewModel`)
+    }
+    return viewModel
+  }
+  var posts = site.posts.filter(function(post) {
+    var listing = requirePostViewModel(post).render.listing
+    if (!listing.listed) return false
+    return page.author == null || listing.authorId == page.author.id
+  })
   posts.sort('date', -1).each(function(post) {
     post.year = date(post.date, 'YYYY')
     if (post.year && (years.includes(post.year) == false) && (post.title || post.date)) {
@@ -40,7 +47,7 @@ function layoutArchiveList() {
       post.year = date(post.date, 'YYYY')
       return post.year == year
     }).each(function(post) {
-      el += partial('_partial/main/post_list/archive_item', {post: post})
+      el += partial('_partial/main/post_list/archive_item', {viewModel: requirePostViewModel(post)})
     })
     el += `</article>`
   }

package/layout/categories.ejs

@@ -1,13 +1,14 @@
 <%
 page.robots = 'noindex,follow';
-if (page.menu_id == undefined) {
-  page.menu_id = 'post';
+page.navigation ||= {}
+if (page.navigation.menu == undefined) {
+  page.navigation.menu = stellar_config('profiles.blogIndex.activeMenu');
 }
 %>
 <% if (site.categories.length) { %>
   <% page.title = __('btn.categories'); %>
   <% page.layout = 'categories'; %>
-  <%- partial('_partial/main/navbar/nav_tabs_blog') %>
+  <%- partial('_partial/main/listing_nav/blog') %>
   <div class='post-list'>
     <article class='<%- scrollreveal("") %>' id='cats'>
       <%

package/layout/collection-preview.ejs

@@ -11,7 +11,7 @@ function renderWidget(title, options) {
   })
 }
 
-function renderSurface(name, surface, width) {
+function renderPreview(name, width) {
   var navItems = [
     {href: '#active', title: '当前页面', icon: 'default:documents', active: true},
     {href: '#long', title: '这是一个用于检查单行省略和容器适应性的很长标题', icon: 'default:rightbar'},
@@ -24,7 +24,7 @@ function renderSurface(name, surface, width) {
     {href: '#four', title: '项目四', icon: 'default:rss'}
   ]
   var summaryItems = [
-    {href: '#summary-one', title: '摘要条目', description: '两行说明用于检查文字层级、截断和不同 surface 下的卡片填充。'},
+    {href: '#summary-one', title: '摘要条目', description: '两行说明用于检查文字层级、截断和当前 Appearance 下的卡片填充。'},
     {href: '#summary-two', title: '第二个摘要条目', description: '正文宽度下仍复用同一 DOM 与状态变量。'}
   ]
   var treeItems = [
@@ -32,8 +32,8 @@ function renderSurface(name, surface, width) {
     {href: '#child', title: '二级节点', depth: 1, indicator: false},
     {href: '#leaf', title: '三级节点', depth: 2, indicator: false}
   ]
-  var html = '<section class="collection-preview__surface" data-ui-surface="' + surface + '" data-preview-width="' + width + '">'
-  html += '<header><strong>' + escape_html(name) + '</strong><code>' + escape_html(surface) + ' · ' + width + 'px</code></header>'
+  var html = '<section class="collection-preview__surface ui-surface" data-preview-width="' + width + '">'
+  html += '<header><strong>' + escape_html(name) + '</strong><code>' + width + 'px</code></header>'
   html += renderWidget('紧凑列表', {layout: 'list', variant: 'nav', density: 'compact', items: navItems})
   html += renderWidget('响应式网格', {layout: 'grid', variant: 'nav', columns: 2, items: gridItems})
   html += renderWidget('摘要列表', {layout: 'list', variant: 'summary', items: summaryItems})
@@ -44,7 +44,7 @@ function renderSurface(name, surface, width) {
 %>
 <article class="md-text collection-preview">
   <h1>侧边栏集合组件预览</h1>
-  <p>此开发页面用于同时检查列表、网格和摘要条目在四种 surface、不同容器宽度及明暗主题下的表现。</p>
+  <p>此开发页面用于检查列表、网格和摘要条目在当前构建 Appearance、不同容器宽度及明暗主题下的表现。</p>
   <div class="collection-preview__theme" aria-label="预览主题">
     <span>预览主题</span>
     <button type="button" onclick="document.documentElement.setAttribute('data-theme','light')">Light</button>
@@ -52,9 +52,8 @@ function renderSurface(name, surface, width) {
     <button type="button" onclick="document.documentElement.removeAttribute('data-theme')">Auto</button>
   </div>
   <div class="collection-preview__grid">
-    <%- renderSurface('左栏 Glass', 'glass', 240) %>
-    <%- renderSurface('左栏 Card', 'card', 240) %>
-    <%- renderSurface('右侧栏', 'sidebar', 320) %>
-    <%- renderSurface('正文区域', 'content', 720) %>
+    <%- renderPreview('窄栏', 240) %>
+    <%- renderPreview('侧栏', 320) %>
+    <%- renderPreview('正文区域', 720) %>
   </div>
 </article>

package/layout/index.ejs

@@ -1,51 +1,39 @@
 <%
-if (page.menu_id == undefined) {
-  page.menu_id = 'post';
+page.navigation ||= {}
+if (page.navigation.menu == undefined) {
+  page.navigation.menu = stellar_config('profiles.home.activeMenu');
 }
-if (page.title && page.wiki) {
-  page.robots = 'noindex,follow';
-}
-// 首页评论区：仅首页第一页，默认不显示，可通过 site_tree.home.comments 开启/覆盖
-var homeCmt = theme.site_tree?.home?.comments
+// 首页评论区：仅首页第一页，默认不显示，可通过 layout.profiles.home.comments 开启/覆盖
+var homeCmt = stellar_config('profiles.home.comments')
+var homeComments = null
 if (homeCmt && homeCmt !== false && is_home_first_page()) {
-  page.comments = true;
-  if (typeof homeCmt === 'object') {
-    if (homeCmt.service) {
-      page.comments_service = homeCmt.service;
-    }
-    if (homeCmt.comment_title != null) {
-      page.comment_title = homeCmt.comment_title;
-    }
-    if (homeCmt.comment_id != null) {
-      page.comment_id = homeCmt.comment_id;
-    }
-    var homeCommentServices = ['beaudar', 'utterances', 'giscus', 'twikoo', 'waline', 'artalk'];
-    for (var i = 0; i < homeCommentServices.length; i++) {
-      var key = homeCommentServices[i];
-      if (homeCmt[key]) {
-        page[key] = homeCmt[key];
-      }
-    }
-  }
+  homeComments = comments_model(page, typeof homeCmt === 'object' ? homeCmt : {enabled: true})
 }
 
 // 置顶文章样式：carousel = 轮播（默认），flat = 平铺（首页列表靠前展示）
-var pinStyle = theme.article?.pin_style || 'carousel'
+var articleDefaults = stellar_config('article')
+var pinStyle = articleDefaults.listing.pinnedLayout
 var pinFlat = pinStyle === 'flat'
 
 // 与 pin_slider.ejs 保持一致的置顶判定与排序权重
 function pinValue(post) {
-  return post.pin != null ? post.pin : post.sticky
+  return postListing(post).priority
+}
+function requirePostViewModel(post) {
+  var viewModel = post_view_model(post)
+  if (!['post', 'topic'].includes(viewModel?.collection?.profile) || !viewModel.render?.listing) {
+    throw new Error(`Stellar v2: Post ${post?.source || post?.path || '<unknown>'} 缺少列表 ViewModel`)
+  }
+  return viewModel
+}
+function postListing(post) {
+  return requirePostViewModel(post).render.listing
 }
 function isPinned(post) {
-  var v = pinValue(post)
-  return v !== false && v != null
+  return pinValue(post) > 0
 }
 function pinWeight(post) {
   var v = pinValue(post)
-  if (v === true) {
-    return 1
-  }
   var n = Number(v)
   return isNaN(n) ? 0 : n
 }
@@ -59,7 +47,7 @@ if (pinFlat && is_home_first_page()) {
   var allPosts = site.posts.toArray() || []
   for (var fi = 0; fi < allPosts.length; fi++) {
     var fpost = allPosts[fi]
-    if (fpost.indexing === false) {
+    if (!postListing(fpost).listed) {
       continue
     }
     if (isPinned(fpost)) {
@@ -77,7 +65,8 @@ function layout_post_card(layout, post, content) {
   var el = '';
   var layout = layout;
   var hero = false;
-  if (layout == 'post' && post.cover != undefined && theme.article.card_style == 'hero') {
+  var listing = postListing(post)
+  if (layout == 'post' && listing.cover && listing.cardStyle == 'hero') {
     layout += ' photo';
     hero = true;
   }
@@ -85,9 +74,9 @@ function layout_post_card(layout, post, content) {
   if (hero) {
     // hero 封面卡片：背景图由 .post-card 自身背景承载（跟随 corner-shape 圆角裁剪），
     // 子图保留用于 hover 变暗/放大滤镜
-    el += `<a class="post-card ${layout} card-hover card-hover--spotlight card-hover--tilt" style="--cover-url:url('${escape_html(post.cover.replace(/'/g, '%27'))}')" href="${pretty_url(post.link || post.path)}">`
+    el += `<a class="${ui_classes('post-card ' + layout, 'hoverCard')}" style="--cover-url:url('${escape_html(listing.cover.replace(/'/g, '%27'))}')" href="${pretty_url(listing.href)}">`
   } else {
-    el += `<a class="post-card ${layout} card-hover card-hover--spotlight card-hover--tilt" href="${pretty_url(post.link || post.path)}">`
+    el += `<a class="${ui_classes('post-card ' + layout, 'hoverCard')}" href="${pretty_url(listing.href)}">`
   }
   el += content;
   el += '</a>';
@@ -107,16 +96,16 @@ function layout_post_list(partial) {
       el += layout_post_card('post', item.post, partial(item.post));
     })
     page.posts.each(function(post){
-      if (post.indexing != false && !pinnedPaths[post.path]) {
+      if (postListing(post).listed && !pinnedPaths[post.path]) {
         el += layout_post_card('post', post, partial(post));
       }
     })
   } else {
     page.posts.each(function(post){
-      if (post.indexing != false) {
+      if (postListing(post).listed) {
         if (pinSliderActive) {
           var pinVal = pinValue(post)
-          if (pinVal !== false && pinVal != null) {
+          if (pinVal > 0) {
             return
           }
         }
@@ -130,11 +119,11 @@ function layout_post_list(partial) {
 
 %>
 
-<%- partial('_partial/main/navbar/nav_tabs_blog') %>
+<%- partial('_partial/main/listing_nav/blog') %>
 <%- layout_post_list(function(post){
-  return partial('_partial/main/post_list/post_card', {post: post})
+  return partial('_partial/main/post_list/post_card', {viewModel: requirePostViewModel(post)})
 }) %>
 <%- partial('_partial/main/post_list/paginator') %>
 <% if (homeCmt && homeCmt !== false && is_home_first_page()) { %>
-  <%- partial('_partial/comments/layout') %>
+  <%- partial('_partial/comments/layout', {comments: homeComments}) %>
 <% } %>

package/layout/index_topic.ejs

@@ -1,17 +1,10 @@
 <%
 function layout_topic_list(partial) {
   var el = ''
-  var publish_list = theme.topic.publish_list
-  var tree = theme.topic.tree
-  var topics = publish_list.map(function(id) {
-    return tree[id]
-  }).filter(function(topic) {
-    return topic != null
-  }).sort(function(a, b) {
-    var aDate = a.homepage && a.homepage.date ? new Date(a.homepage.date).getTime() : 0
-    var bDate = b.homepage && b.homepage.date ? new Date(b.homepage.date).getTime() : 0
-    return bDate - aDate
-  })
+  if (!Array.isArray(page.topicIndex?.items)) {
+    throw new Error('Stellar v2: Topic 索引缺少显式 listing 投影')
+  }
+  var topics = page.topicIndex.items
   for (var topic of topics) {
     el += `<div class="post-card-wrap${scrollreveal(' ')}">`
     el += `<div class="post-card topic">`
@@ -23,10 +16,10 @@ function layout_topic_list(partial) {
 }
 function layoutDiv() {
   var el = ''
-  el += partial('_partial/main/navbar/nav_tabs_blog')
+  el += partial('_partial/main/listing_nav/blog')
   el += `<div class="post-list topic">`;
   el += layout_topic_list(function(topic) {
-    return partial('_partial/main/post_list/topic_card', {topic: topic})
+    return partial('_partial/main/post_list/topic_card', {viewModel: {render: {listing: topic}}})
   })
     el += `</div>`
   return el

package/layout/index_wiki.ejs

@@ -1,48 +1,31 @@
 <%
 function layout_wiki_list(partial) {
   var el = ''
-  const { shelf, tree } = theme.wiki
-  for (let pid of shelf) {
-    let proj = tree[pid]
-    if (proj == null) {
-      continue
-    }
-    if (proj.pages == undefined || proj.pages.length === 0) {
-      continue
-    }
-    if (page.filter === false) {
-      // wikiList
-      el += `<div class="post-card-wrap${scrollreveal(' ')}">`
-      var coverStyle = ''
-      if (proj.cover) {
-        coverStyle = ` style="--cover-url:url('${escape_html(proj.cover.replace(/'/g, '%27'))}')"`
-      }
-      el += `<a class="wiki-card card-hover card-hover--spotlight card-hover--tilt${proj.cover ? '' : ' no-cover'}"${coverStyle} href="${pretty_url(proj.homepage?.path || '/')}">`
-      el += partial(proj)
-      el += `</a>`
-      el += `</div>`
-    } else if (proj.tags && proj.tags.includes(page.tagName) === true) {
-      // filtered wikiList
-      el += `<div class="post-card-wrap${scrollreveal(' ')} filter">`
-      var coverStyle = ''
-      if (proj.cover) {
-        coverStyle = ` style="--cover-url:url('${escape_html(proj.cover.replace(/'/g, '%27'))}')"`
-      }
-      el += `<a class="wiki-card card-hover card-hover--spotlight card-hover--tilt${proj.cover ? '' : ' no-cover'}"${coverStyle} href="${pretty_url(proj.homepage?.path || '/')}">`
-      el += partial(proj)
-      el += `</a>`
-      el += `</div>`
+  var wikiIndex = page.wikiIndex
+  if (!wikiIndex || !Array.isArray(wikiIndex.items)) {
+    throw new Error('Stellar v2: Wiki 索引模板缺少显式 listing 数据')
+  }
+  for (var listing of wikiIndex.items) {
+    el += `<div class="post-card-wrap${scrollreveal(' ')}${wikiIndex.filter ? ' filter' : ''}">`
+    var coverStyle = ''
+    var cover = listing.cover
+    if (cover) {
+      coverStyle = ` style="--cover-url:url('${escape_html(cover.replace(/'/g, '%27'))}')"`
     }
+    el += `<a class="${ui_classes('wiki-card', 'hoverCard', cover ? '' : 'no-cover')}"${coverStyle} href="${pretty_url(listing.href || '/')}">`
+    el += partial(listing)
+    el += `</a>`
+    el += `</div>`
   }
   return el
 }
 
 function layoutDiv() {
   var el = ''
-  el += partial('_partial/main/navbar/nav_tabs_wiki')
+  el += partial('_partial/main/listing_nav/wiki', {wikiIndex: page.wikiIndex})
   el += `<div class="post-list wiki">`;
-  el += layout_wiki_list(function(proj) {
-    return partial('_partial/main/post_list/wiki_card', {proj: proj})
+  el += layout_wiki_list(function(listing) {
+    return partial('_partial/main/post_list/wiki_card', {listing: listing})
   })
   el += `</div>`
   return el