[CM2] WIP rendering2

- Bring back outputPath to models right next to permalinks
- Copy rendering as rendering2 and make rough edits (WIP)
- Render each entry with a set of preferred partials involving the entry's 'template' field, 'contentType' field and a fallback
- Should copy attachments as part of their context entry
- Should render category, tags and posts as part of rendering collection
- Introduce a temporary flag 'compilerVersion' to be able to test the new setup (not tested yet)

Author: scriptype

src/compiler/contentModel2/models/asset.js

@@ -1,5 +1,23 @@
+const { join } = require('path')
+const settings = require('../../../settings').getSettings()
+
 function asset(node) {
-  return node
+  const permalink = (
+    settings.permalinkPrefix +
+    [settings.assetsDirectory, node.name].join('/')
+  )
+
+  const outputPath = join(
+    settings.out,
+    settings.assetsDirectory,
+    node.name
+  )
+
+  return {
+    ...node,
+    permalink,
+    outputPath
+  }
 }
 
 module.exports = asset

src/compiler/contentModel2/models/attachment.js

@@ -1,3 +1,4 @@
+const { join } = require('path')
 const settings = require('../../../settings').getSettings()
 
 function attachment(node, context) {
@@ -12,10 +13,20 @@ function attachment(node, context) {
     ].filter(Boolean).join('/')
   )
 
+  const outputPath = join(...[
+    settings.out,
+    context.collection?.slug,
+    context.category?.isDefaultCategory ? '' : context.category.slug,
+    context.post?.slug,
+    context.page?.slug,
+    node.name
+  ].filter(Boolean))
+
   return {
     ...node,
     context,
     permalink,
+    outputPath,
     date: new Date(node.stats.birthtime || Date.now())
   }
 }

src/compiler/contentModel2/models/collection/category.js

@@ -1,3 +1,4 @@
+const { join } = require('path')
 const frontMatter = require('front-matter')
 const makeSlug = require('slug')
 const settings = require('../../../../settings').getSettings()
@@ -10,16 +11,23 @@ const models = {
 function category(node, context) {
   if (node.isDefaultCategory) {
     const slug = makeSlug(settings.defaultCategoryName)
+    const permalink = (
+      settings.permalinkPrefix +
+      context.collection.slug
+    )
+    const outputPath = join(
+      settings.out,
+      context.collection.slug,
+      'index.html'
+    )
     return {
       context,
       childContentType: context.collection.childContentType,
       content: '',
       title: settings.defaultCategoryName,
       slug,
-      permalink: (
-        settings.permalinkPrefix +
-        [ context.collection.slug, slug ].join('/')
-      ),
+      permalink,
+      outputPath,
       isDefaultCategory: true,
       posts: [],
       attachments: []
@@ -32,15 +40,21 @@ function category(node, context) {
   const indexProps = indexFile ? frontMatter(indexFile) : {}
 
   const slug = indexProps.attributes?.slug || makeSlug(node.name)
+  const permalink = (
+    settings.permalinkPrefix +
+    [ context.collection.slug, slug ].join('/')
+  )
+  const outputPath = join(
+    settings.out,
+    context.collection.slug, slug, 'index.html'
+  )
+
   const categoryContext = {
     ...indexProps.attributes,
     childContentType: indexProps.attributes?.childContentType || context.collection.childContentType,
     title: indexProps.attributes?.title || node.name,
     slug,
-    permalink: (
-      settings.permalinkPrefix +
-      [ context.collection.slug, slug ].join('/')
-    )
+    permalink
   }
 
   const tree = {
@@ -90,7 +104,8 @@ function category(node, context) {
     ...categoryContext,
     ...tree,
     context: context,
-    content: indexProps.content || ''
+    content: indexProps.content || '',
+    outputPath
   }
 }
 

src/compiler/contentModel2/models/collection/index.js

@@ -1,3 +1,4 @@
+const { join } = require('path')
 const _ = require('lodash')
 const frontMatter = require('front-matter')
 const makeSlug = require('slug')
@@ -69,12 +70,14 @@ function collection(node) {
   const indexProps = indexFile ? frontMatter(indexFile.content) : {}
 
   const slug = indexProps.attributes?.slug || makeSlug(node.name)
+  const permalink = settings.permalinkPrefix + slug
+  const outputPath = join(settings.out, slug, 'index.html')
   const context = {
     ...indexProps.attributes,
     childContentType: indexProps.attributes?.childContentType || 'text',
     title: indexProps.attributes?.title || node.name,
     slug,
-    permalink: settings.permalinkPrefix + slug
+    permalink
   }
 
   node.children.forEach(childNode => {
@@ -106,7 +109,8 @@ function collection(node) {
   return {
     ...context,
     ...tree,
-    content: indexProps.content || ''
+    content: indexProps.content || '',
+    outputPath
   }
 }
 

src/compiler/contentModel2/models/collection/post.js

@@ -1,3 +1,4 @@
+const { join } = require('path')
 const settings = require('../../../../settings').getSettings()
 const { parseTags } = require('../../helpers')
 const models = {
@@ -18,6 +19,14 @@ function post(node, context) {
     (node.children ? '' : '.html')
   )
 
+  const outputPath = join(...[
+    settings.out,
+    context.collection.slug,
+    (context.category.isDefaultCategory ? '' : context.category.slug),
+    baseEntryProps.slug,
+    (node.children ? 'index' : '')
+  ].filter(Boolean)) + '.html'
+
   const postContext = {
     title: baseEntryProps.title,
     slug: baseEntryProps.slug,
@@ -33,6 +42,7 @@ function post(node, context) {
       return models.tag(tagName, context)
     }),
     date: new Date(baseEntryProps.date || baseEntryProps.stats.birthtime || Date.now()),
+    outputPath,
     attachments: baseEntryProps.attachments.map(a => a({
       ...context,
       post: postContext

src/compiler/contentModel2/models/collection/tag.js

@@ -1,13 +1,23 @@
+const { join } = require('path')
 const makeSlug = require('slug')
 const settings = require('../../../../settings').getSettings()
 
 function tag(name, context) {
+  const slug = makeSlug(name)
+  const permalink = (
+    settings.permalinkPrefix +
+    context.collection.slug + '/tags/' + slug
+  )
+  const outputPath = join(
+    settings.out,
+    context.collection.slug,
+    slug,
+    'index.html'
+  )
   return {
     name,
-    permalink: (
-      settings.permalinkPrefix +
-      context.collection.slug + '/tags/' + makeSlug(name)
-    )
+    slug,
+    permalink
   }
 }
 

src/compiler/contentModel2/models/homepage.js

@@ -1,3 +1,4 @@
+const { join } = require('path')
 const settings = require('../../../settings').getSettings()
 const models = {
   _baseEntry: require('./_baseEntry')
@@ -8,6 +9,8 @@ function homepage(node) {
 
   const permalink = settings.permalinkPrefix
 
+  const outputPath = join(settings.out, 'index.html')
+
   const pageContext = {
     title: baseEntryProps.title,
     slug: baseEntryProps.slug,
@@ -19,7 +22,8 @@ function homepage(node) {
     attachments: baseEntryProps.attachments.map(a => a({
       page: pageContext
     })),
-    permalink
+    permalink,
+    outputPath
   }
 }
 

src/compiler/contentModel2/models/subpage.js

@@ -1,3 +1,4 @@
+const { join } = require('path')
 const settings = require('../../../settings').getSettings()
 const models = {
   _baseEntry: require('./_baseEntry')
@@ -12,6 +13,12 @@ function subpage(node) {
     (node.children ? '' : '.html')
   )
 
+  const outputPath = join(...[
+    settings.out,
+    baseEntryProps.slug,
+    (node.children ? 'index' : '')
+  ].filter(Boolean)) + '.html'
+
   const pageContext = {
     title: baseEntryProps.title,
     slug: baseEntryProps.slug,
@@ -21,6 +28,7 @@ function subpage(node) {
   return {
     ...baseEntryProps,
     ...pageContext,
+    outputPath,
     attachments: baseEntryProps.attachments.map(a => a({
       page: pageContext
     }))

src/compiler/index.js

@@ -1,10 +1,28 @@
 const Debug = require('../debug')
+const Settings = require('../settings').getSettings()
 const FileSystem = require('./fileSystem')
 const ContentModel = require('./contentModel')
 const Rendering = require('./rendering')
 
+const compile2 = async () => {
+  const ContentModel2 = require('./contentModel2')
+  const Rendering2 = require('./rendering2')
+
+  const fileSystemTree = await FileSystem.exploreTree()
+  const contentModel = ContentModel2.create(fileSystemTree)
+  await Rendering2.render(contentModel)
+  Debug.timeEnd('compiler')
+  return {
+    fileSystemTree,
+    contentModel
+  }
+}
+
 const compile = async () => {
   Debug.timeStart('compiler')
+  if (Settings.compilerVersion === 2) {
+    return compile2()
+  }
   const fileSystemTree = await FileSystem.exploreTree()
   const contentModel = await ContentModel.create(fileSystemTree)
   await Rendering.render(contentModel)

src/compiler/rendering2/helpers/filterPosts.js

@@ -0,0 +1,25 @@
+const filterPosts = (page, posts) => {
+  const filters = {
+    // TODO: i18n
+    exclude: page['exclude post types'],
+    include: page['include post types']
+  }
+
+  const excludedPostTypes = filters.exclude ?
+    filters.exclude.split(',').map(t => t.trim()) :
+    []
+
+  const includedPostTypes = filters.include ?
+    filters.include.split(',').map(t => t.trim()) :
+    []
+
+  return posts
+    .filter(({ type }) => !excludedPostTypes.includes(type))
+    .filter(({ type }) => (
+      !includedPostTypes.length || includedPostTypes.includes(type))
+    )
+}
+
+module.exports = {
+  filterPosts
+}