[CM2] Introduce inline collection contentTypes 👇

Collection index can have these properties:
- contentType
- categoryContentType
- entryContentType
- categoryAlias
- categoriesAlias
- entryAlias
- entriesAlias
- defaultCategoryName

'defaultCategoryName' is to allow custom defaultCategory names per collection.
'ContentType' fields are used for template lookup during rendering.
'Alias' fields are to assist contentType-specific templates' readability.

for example, in a custom collection template, instead of:
{{#each categories}}

you can say:
{{#each technologies}}

given you set categoriesAlias: technologies in the collection index.

Similar logic applies to all aliases and their template counterparts.
You can talk domain-driven in your templates now 💫

The idea is to brace myself to standalone contentType definitions the
CMS frontend will eventually require. For now something resembling them
can be inlined to collection frontMatter. Besides, compiler probably won't ever
care about much more than what is implemented here.

Also:
- Fix default category index overriding collection index by giving it an actual
slug, outputPath etc.
- Remove the unneeded Settings dependency from attachment, category, post and tag
- Lookup for a 'default.hbs' during rendering as a last resort, instead of 'index.hbs'
- Get rid of the default 'text' contentType

What's left:
A theme2 I guess...

Author: scriptype

src/compiler/contentModel2/models/attachment.js

@@ -1,9 +1,6 @@
 const { join } = require('path')
-const Settings = require('../../../settings')
 
 function attachment(node, context) {
-  const settings = Settings.getSettings()
-
   const permalink = [
     context.page?.permalink ||
     context.post?.permalink ||

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

@@ -1,7 +1,6 @@
 const { join } = require('path')
 const frontMatter = require('front-matter')
 const makeSlug = require('slug')
-const Settings = require('../../../../settings')
 const { isTemplateFile, Markdown } = require('../../helpers')
 const models = {
   post: require('./post'),
@@ -24,8 +23,6 @@ function parseContent(node, content) {
 }
 
 function category(node, context) {
-  const settings = Settings.getSettings()
-
   function linkPosts(post, postIndex, posts) {
     post.links = {}
     if (postIndex > 0) {
@@ -42,20 +39,31 @@ function category(node, context) {
     }
   }
 
+  const entriesAlias = context.collection.entriesAlias
+
   if (node.isDefaultCategory) {
-    return {
+    const title = context.collection.defaultCategoryName
+    const slug = makeSlug(title)
+
+    const defaultCategory = {
       context,
-      childContentType: context.collection.childContentType,
+      contentType: context.collection.categoryContentType,
       content: '',
       contentRaw: '',
-      slug: '',
-      title: settings.defaultCategoryName,
-      permalink: context.collection.permalink,
-      outputPath: context.collection.outputPath,
+      slug,
+      title,
+      permalink: [context.collection.permalink, slug].join('/'),
+      outputPath: join(context.collection.outputPath, slug),
       isDefaultCategory: true,
       posts: [],
       attachments: []
     }
+
+    if (entriesAlias) {
+      defaultCategory[entriesAlias] = defaultCategory.posts
+    }
+
+    return defaultCategory
   }
 
   const indexFile = node.children.find(isCategoryIndexFile)
@@ -67,7 +75,7 @@ function category(node, context) {
 
   const categoryContext = {
     ...indexProps.attributes,
-    childContentType: indexProps.attributes?.childContentType || context.collection.childContentType,
+    contentType: context.collection.categoryContentType,
     title: indexProps.attributes?.title || node.name,
     slug,
     permalink,
@@ -79,6 +87,10 @@ function category(node, context) {
     attachments: []
   }
 
+  if (entriesAlias) {
+    tree[entriesAlias] = tree.posts
+  }
+
   node.children.forEach(childNode => {
     if (isCategoryIndexFile(childNode)) {
       return
@@ -110,7 +122,7 @@ function category(node, context) {
   return {
     ...categoryContext,
     ...tree,
-    context: context,
+    context,
     contentRaw,
     content
   }

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

@@ -97,13 +97,30 @@ function collection(node) {
   const outputPath = join(settings.out, slug)
   const context = {
     ...indexProps.attributes,
-    childContentType: indexProps.attributes?.childContentType || 'text',
+    contentType: indexProps.attributes?.contentType || 'default',
+    categoryContentType: indexProps.attributes?.categoryContentType || 'default',
+    entryContentType: indexProps.attributes?.entryContentType || 'default',
+    categoryAlias: indexProps.attributes?.categoryAlias,
+    categoriesAlias: indexProps.attributes?.categoriesAlias,
+    entryAlias: indexProps.attributes?.entryAlias,
+    entriesAlias: indexProps.attributes?.entriesAlias,
+    defaultCategoryName: indexProps.attributes?.defaultCategoryName || settings.defaultCategoryName,
     title: indexProps.attributes?.title || node.name,
     slug,
     permalink,
     outputPath
   }
 
+  const categoriesAlias = indexProps.attributes?.categoriesAlias
+  if (categoriesAlias) {
+    tree[categoriesAlias] = tree.categories
+  }
+
+  const entriesAlias = indexProps.attributes?.entriesAlias
+  if (entriesAlias) {
+    tree[entriesAlias] = tree.posts
+  }
+
   node.children.forEach(childNode => {
     if (isCollectionIndexFile(childNode)) {
       return
@@ -127,7 +144,7 @@ function collection(node) {
     collectPostTags(post)
   })
 
-  const contentRaw = indexProps.content || ''
+  const contentRaw = indexProps.body || ''
   const content = indexFile ?
     parseContent(indexFile, contentRaw) :
     ''

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

@@ -1,14 +1,11 @@
 const { join } = require('path')
-const Settings = require('../../../../settings')
 const { parseArray } = require('../../helpers')
 const models = {
   _baseEntry: require('../_baseEntry'),
   tag: require('./tag')
 }
 
 function post(node, context) {
-  const settings = Settings.getSettings()
-
   const baseEntryProps = models._baseEntry(node, ['index', 'post'])
 
   const permalink = [
@@ -29,7 +26,7 @@ function post(node, context) {
     ...baseEntryProps,
     ...postContext,
     context,
-    contentType: baseEntryProps.contentType || context.category.childContentType,
+    contentType: context.collection.entryContentType,
     tags: parseArray(baseEntryProps.tags).map(tagName => {
       return models.tag(tagName, context)
     }),

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

@@ -1,9 +1,7 @@
 const { join } = require('path')
 const makeSlug = require('slug')
-const Settings = require('../../../../settings')
 
 function tag(name, context) {
-  const settings = Settings.getSettings()
   const slug = makeSlug(name)
   const permalink = [context.collection.permalink, 'tags', slug].join('/')
   const outputPath = join(context.collection.outputPath, slug)

src/compiler/rendering2/views/collection/category.js

@@ -17,23 +17,28 @@ const renderCategories = (Renderer, contentModel, collection) => {
       ),
       outputDir: category.outputPath,
       render: async ({ outputPath, pageOfPosts, paginationData }) => {
+        const data = {
+          ...contentModel,
+          collection,
+          category,
+          pagination: paginationData,
+          posts: pageOfPosts,
+          settings,
+          debug: Debug.getDebug()
+        }
+        const categoryAlias = category.context.collection.categoryAlias
+        if (categoryAlias) {
+          data[categoryAlias] = data.category
+        }
         return Renderer.render({
           templates: [
             `pages/${category.template}`,
-            `pages/category/${category.childContentType}`,
-            `pages/category`
+            `pages/category/${category.contentType}`,
+            `pages/category/default`
           ],
           outputPath,
           content: category.content,
-          data: {
-            ...contentModel,
-            collection,
-            category,
-            pagination: paginationData,
-            posts: pageOfPosts,
-            settings,
-            debug: Debug.getDebug()
-          }
+          data
         })
       }
     })

src/compiler/rendering2/views/collection/index.js

@@ -22,8 +22,8 @@ const renderCollections = async (Renderer, contentModel) => {
         return Renderer.render({
           templates: [
             `pages/${collection.template}`,
-            `pages/collection/${collection.childContentType}`,
-            `pages/collection`
+            `pages/collection/${collection.contentType}`,
+            `pages/collection/default`
           ],
           outputPath,
           content: collection.content,

src/compiler/rendering2/views/collection/post.js

@@ -4,24 +4,29 @@ const Debug = require('../../../../debug')
 
 const renderPosts = (Renderer, contentModel, collection) => {
   const compilation = collection.posts.map(post => {
+    const data = {
+      ...contentModel,
+      collection,
+      post,
+      settings: Settings.getSettings(),
+      debug: Debug.getDebug()
+    }
+    const entryAlias = post.context.collection.entryAlias
+    if (entryAlias) {
+      data[entryAlias] = data.post
+    }
     const renderPage = Renderer.render({
       templates: [
         `pages/${post.template}`,
         `pages/post/${post.contentType}`,
-        `pages/post`
+        `pages/post/default`
       ],
       outputPath: join(...[
         post.outputPath,
         post.hasIndex ? 'index' : ''
       ].filter(Boolean)) + '.html',
       content: post.content,
-      data: {
-        ...contentModel,
-        collection,
-        post,
-        settings: Settings.getSettings(),
-        debug: Debug.getDebug()
-      }
+      data
     })
 
     const copyAttachments = post.attachments.map(node => {

src/compiler/rendering2/views/homepage.js

@@ -9,7 +9,7 @@ const renderHomepage = async (Renderer, contentModel) => {
     templates: [
       `pages/${homepage.template}`,
       `pages/homepage/${homepage.contentType}`,
-      `pages/homepage`
+      `pages/homepage/default`
     ],
     outputPath: join(homepage.outputPath, 'index.html'),
     content: homepage.content,

src/compiler/rendering2/views/subpage.js

@@ -8,7 +8,7 @@ const renderSubpages = (Renderer, contentModel) => {
       templates: [
         `pages/${subpage.template}`,
         `pages/subpage/${subpage.contentType}`,
-        `pages/subpage`
+        `pages/subpage/default`
       ],
       outputPath: join(...[
         subpage.outputPath,