Expose whole contentModel to every render target

- Expose relevant model as a separate data field instead of spreading into it
- Make sure post templates don't break because of it. Spread the model object just for post/content inside the template. So templates can refer to post as ctx
- Side effect: post.tags shadows contentModel.tags - but only inside post.content template, probably not a big miss and curable if needed
- Remove unnecessary categoryPosts field from category template data

Author: scriptype

packages/theme-default/partials/pages/post/photo/index.hbs

@@ -5,7 +5,7 @@
     </header>
 
     <main {{region "main"}}>
-      {{>pages/post/photo/content}}
+      {{>pages/post/photo/content ...post}}
     </main>
   {{/layouts/single-column}}
 {{/base}}

src/compiler/rendering/views/category-page.js

@@ -2,20 +2,16 @@ const { join } = require('path')
 const Settings = require('../../../settings')
 const Debug = require('../../../debug')
 
-const renderCategoryPages = (Renderer, { homepage, categories, posts, subpages }) => {
+const renderCategoryPages = (Renderer, contentModel) => {
   const settings = Settings.getSettings()
-  const compilation = categories.map(category => {
+  const compilation = contentModel.categories.map(category => {
     return Renderer.render({
       template: `pages/category/${category.type}`,
       outputPath: join(settings.out, category.slug, 'index.html'),
       content: category.content,
       data: {
-        homepage,
+        ...contentModel,
         category,
-        categories,
-        subpages,
-        posts,
-        categoryPosts: category.posts,
         settings,
         debug: Debug.getDebug()
       }

src/compiler/rendering/views/homepage.js

@@ -3,8 +3,9 @@ const Debug = require('../../../debug')
 const { paginate } = require('../helpers/pagination')
 const { filterPosts } = require('../helpers/filterPosts')
 
-const renderHomepage = async (Renderer, { homepage, categories, posts, subpages }) => {
+const renderHomepage = async (Renderer, contentModel) => {
   const settings = Settings.getSettings()
+  const { homepage, posts } = contentModel
   return paginate({
     page: homepage,
     posts: filterPosts(homepage, posts),
@@ -16,11 +17,10 @@ const renderHomepage = async (Renderer, { homepage, categories, posts, subpages
         outputPath,
         content: homepage.content,
         data: {
-          ...homepage,
+          ...contentModel,
+          homepage,
           pagination: paginationData,
           posts: pageOfPosts,
-          categories,
-          subpages,
           settings,
           debug: Debug.getDebug()
         }

src/compiler/rendering/views/posts.js

@@ -2,9 +2,9 @@ const { join } = require('path')
 const Settings = require('../../../settings')
 const Debug = require('../../../debug')
 
-const renderPosts = (Renderer, { homepage, categories, posts, subpages }) => {
+const renderPosts = (Renderer, contentModel) => {
   const settings = Settings.getSettings()
-  const compilation = posts.map(post => {
+  const compilation = contentModel.posts.map(post => {
     const outputPath = join(
       settings.out,
       post.permalink,
@@ -15,11 +15,8 @@ const renderPosts = (Renderer, { homepage, categories, posts, subpages }) => {
       outputPath,
       content: post.content,
       data: {
-        ...post,
-        homepage,
-        posts,
-        categories,
-        subpages,
+        ...contentModel,
+        post,
         settings,
         debug: Debug.getDebug()
       }

src/compiler/rendering/views/subpages.js

@@ -2,9 +2,9 @@ const { join } = require('path')
 const Settings = require('../../../settings')
 const Debug = require('../../../debug')
 
-const renderSubpages = (Renderer, { homepage, categories, posts, subpages }) => {
+const renderSubpages = (Renderer, contentModel) => {
   const settings = Settings.getSettings()
-  const compilation = subpages.map(subpage => {
+  const compilation = contentModel.subpages.map(subpage => {
     const outputPath = join(
       settings.out,
       subpage.permalink,
@@ -15,11 +15,8 @@ const renderSubpages = (Renderer, { homepage, categories, posts, subpages }) =>
       outputPath,
       content: subpage.content,
       data: {
-        ...subpage,
-        homepage,
-        posts,
-        categories,
-        subpages,
+        ...contentModel,
+        subpage,
         settings,
         debug: Debug.getDebug()
       }

src/theme/common/partials/pages/category/basic.hbs

@@ -6,7 +6,7 @@
 
     <main {{region "main"}}>
       {{> @partial-block }}
-      {{>components/posts posts=categoryPosts}}
+      {{>components/posts posts=category.posts}}
     </main>
   {{/layouts/single-column}}
 {{/base}}

src/theme/common/partials/pages/post/audio/index.hbs

@@ -5,7 +5,7 @@
     </header>
 
     <main {{region "main"}}>
-      {{>pages/post/audio/content}}
+      {{>pages/post/audio/content ...post}}
     </main>
   {{/layouts/single-column}}
 {{/base}}

src/theme/common/partials/pages/post/text/index.hbs

@@ -5,7 +5,7 @@
     </header>
 
     <main {{region "main"}}>
-      {{>pages/post/text/content}}
+      {{>pages/post/text/content ...post}}
     </main>
   {{/layouts/single-column}}
 {{/base}}

src/theme/common/template-helpers.js

@@ -45,7 +45,7 @@ module.exports = {
 
   pageTitle() {
     if (this.page === 'post' || this.page === 'subpage') {
-      return `${this.title} / ${this.settings.site.title}`
+      return `${this.post.title} / ${this.settings.site.title}`
     }
     if (this.page === 'category') {
       return `${this.category.name} / ${this.settings.site.title}`