[CM2] Introduce draft nodes

Posts, categories, subCategories and collections can be made draft with:

---
draft: true
---

Drafting an entry means it'll only show up in the start mode.

Links to a draft entry (via field relations, e.g. field: +/path/to/draft/entry)
are removed from the source entries.

Also in the changes:
- Add missing setting keys to defaultSettings. Importantly, 'mode'
- Update defaultSettings of all models to include 'mode'
- Copy-paste a 'draftCheck' function across all models
- Coin the term 'node'. A node is anything in the hierarchy.

Author: scriptype

src/compiler/contentModel2/index.js

@@ -67,23 +67,33 @@ const linkEntries = (contentModel) => {
       Object.keys(post).forEach(key => {
         const value = post[key]
         if (Array.isArray(value)) {
-          value.forEach((valueItem, valueIndex) => {
+          for (let i = 0; i < value.length; i++) {
+            let valueItem = value[i]
             if (!LINKED_FIELD_SYNTAX.test(valueItem)) {
-              return
+              break
             }
             const link = parseLink(valueItem)
             const entry = findLinkedEntry(contentModel, link)
-            post[key][valueIndex] = Object.assign({}, entry)
-            linkBack(post, entry, key)
-          })
+            if (entry) {
+              post[key][i] = Object.assign({}, entry)
+              linkBack(post, entry, key)
+            } else {
+              post[key].splice(i, 1)
+              i--
+            }
+          }
         } else {
           if (!LINKED_FIELD_SYNTAX.test(value)) {
             return
           }
           const link = parseLink(value)
           const entry = findLinkedEntry(contentModel, link)
-          post[key] = Object.assign({}, entry)
-          linkBack(post, entry, key)
+          if (entry) {
+            post[key] = Object.assign({}, entry)
+            linkBack(post, entry, key)
+          } else {
+            post[key] = undefined
+          }
         }
       })
     })
@@ -101,7 +111,11 @@ const defaultContentModelSettings = {
   site: {
     title: '',
     description: ''
-  }
+  },
+  mode: 'start',
+  search: 'off',
+  rss: 'off',
+  syntaxHighlighting: 'off'
 }
 class ContentModel {
   constructor(contentModelSettings = defaultContentModelSettings, contentTypes = []) {
@@ -112,6 +126,10 @@ class ContentModel {
     this.contentTypes = contentTypes
   }
 
+  draftCheck(node) {
+    return this.settings.mode === 'start' || !node.draft
+  }
+
   create(fileSystemTree) {
     const indexFileNameOptions = ['root']
 
@@ -138,19 +156,23 @@ class ContentModel {
             .filter(ct => ct.model === 'collection')
             .map(ct => ct.collectionAlias),
           ...(indexProps.attributes?.collectionAliases || [])
-        ]
+        ],
+        mode: this.settings.mode
       }, this.contentTypes),
 
       subpage: models.subpage({
-        pagesDirectory: this.settings.pagesDirectory
+        pagesDirectory: this.settings.pagesDirectory,
+        mode: this.settings.mode
       }),
 
       homepage: models.homepage({
-        homepageDirectory: this.settings.homepageDirectory
+        homepageDirectory: this.settings.homepageDirectory,
+        mode: this.settings.mode
       }),
 
       asset: models.asset({
-        assetsDirectory: this.settings.assetsDirectory
+        assetsDirectory: this.settings.assetsDirectory,
+        mode: this.settings.mode
       })
     }
 
@@ -192,9 +214,11 @@ class ContentModel {
       }
 
       if (this.models.collection.match(node)) {
-        return this.contentModel.collections.push(
-          this.models.collection.create(node, context)
-        )
+        const collection = this.models.collection.create(node, context)
+        if (this.draftCheck(collection)) {
+          this.contentModel.collections.push(collection)
+        }
+        return
       }
 
       if (this.models.asset.matchAssetsDirectory(node)) {

src/compiler/contentModel2/models/asset.js

@@ -2,7 +2,8 @@ const { join, resolve } = require('path')
 const { makePermalink } = require('../helpers')
 
 const defaultSettings = {
-  assetsDirectory: 'assets'
+  assetsDirectory: 'assets',
+  mode: 'start'
 }
 module.exports = function Asset(settings = defaultSettings) {
   const assetsDirectoryNameOptions = [settings.assetsDirectory, 'assets']

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

@@ -43,7 +43,8 @@ function linkPosts(post, postIndex, posts) {
 
 const defaultSettings = {
   categoryAlias: undefined,
-  entryAlias: undefined
+  entryAlias: undefined,
+  mode: 'start'
 }
 module.exports = function Category(settings = defaultSettings, contentTypes, level = 1) {
   const indexFileNameOptions = [settings.categoryAlias, 'category'].filter(Boolean)
@@ -54,6 +55,10 @@ module.exports = function Category(settings = defaultSettings, contentTypes, lev
     )
   }
 
+  const draftCheck = (node) => {
+    return settings.mode === 'start' || !node.draft
+  }
+
   const childModels = {
     attachment: models.attachment(),
     post: models.post({
@@ -62,6 +67,8 @@ module.exports = function Category(settings = defaultSettings, contentTypes, lev
   }
 
   return {
+    draftCheck,
+
     match: (node) => node.children?.find(childNode => {
       const containsPosts = childModels.post.match(childNode)
       if (level > 3) {
@@ -166,8 +173,10 @@ module.exports = function Category(settings = defaultSettings, contentTypes, lev
         }
         if (childModels.post.match(childNode)) {
           const post = childModels.post.create(childNode, childContext)
-          tree.levelPosts.push(post)
-          tree.posts.push(post)
+          if (draftCheck(post)) {
+            tree.levelPosts.push(post)
+            tree.posts.push(post)
+          }
           return
         }
         if (Category().match(childNode)) {
@@ -176,8 +185,10 @@ module.exports = function Category(settings = defaultSettings, contentTypes, lev
             categoryAlias: categoryContext.categoryAlias || settings.categoryAlias
           }, contentTypes, level + 1)
           const subCategory = SubCategoryModel.create(childNode, childContext)
-          tree.categories.push(subCategory)
-          tree.posts.push(...subCategory.posts)
+          if (draftCheck(subCategory)) {
+            tree.categories.push(subCategory)
+            tree.posts.push(...subCategory.posts)
+          }
           return
         }
         if (childModels.attachment.match(childNode)) {

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

@@ -48,7 +48,8 @@ function locatePinnedEntries(entries) {
 
 const defaultSettings = {
   defaultCategoryName: '',
-  collectionAliases: []
+  collectionAliases: [],
+  mode: 'start'
 }
 module.exports = function Collection(settings = defaultSettings, contentTypes = []) {
   const indexFileNameOptions = [
@@ -66,6 +67,10 @@ module.exports = function Collection(settings = defaultSettings, contentTypes =
     return node.name.match(new RegExp(`^${parentNode.name}\\.json$`, 'i'))
   }
 
+  const draftCheck = (node) => {
+    return settings.mode === 'start' || !node.draft
+  }
+
   return {
     match: node => {
       const hasCollectionIndex = node.children?.find(isCollectionIndexFile)
@@ -97,9 +102,11 @@ module.exports = function Collection(settings = defaultSettings, contentTypes =
         const uncategorizedPost = childNode ?
           childModels.post.create(childNode, postContext) :
           childModels.post.createFromData(postData, postContext)
-        defaultCategory.levelPosts.push(uncategorizedPost)
-        defaultCategory.posts.push(uncategorizedPost)
-        tree.posts.push(uncategorizedPost)
+        if (childModels.category.draftCheck(uncategorizedPost)) {
+          defaultCategory.levelPosts.push(uncategorizedPost)
+          defaultCategory.posts.push(uncategorizedPost)
+          tree.posts.push(uncategorizedPost)
+        }
       }
 
       const tree = {
@@ -154,10 +161,12 @@ module.exports = function Collection(settings = defaultSettings, contentTypes =
         attachment: models.attachment(),
         category: models.category({
           categoryAlias: indexProps.attributes?.categoryAlias || contentType?.categoryAlias,
-          entryAlias: indexProps.attributes?.entryAlias || contentType?.entryAlias
+          entryAlias: indexProps.attributes?.entryAlias || contentType?.entryAlias,
+          mode: settings.mode
         }, contentTypes),
         post: models.post({
-          entryAlias: indexProps.attributes?.entryAlias || contentType?.entryAlias
+          entryAlias: indexProps.attributes?.entryAlias || contentType?.entryAlias,
+          mode: settings.mode
         }, contentTypes)
       }
 
@@ -185,8 +194,10 @@ module.exports = function Collection(settings = defaultSettings, contentTypes =
               key: 'collection'
             })
           )
-          tree.categories.push(newCategory)
-          tree.posts.push(...newCategory.posts)
+          if (draftCheck(newCategory)) {
+            tree.categories.push(newCategory)
+            tree.posts.push(...newCategory.posts)
+          }
           return
         }
         if (childModels.attachment.match(childNode)) {

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

@@ -8,7 +8,8 @@ const models = {
 }
 
 const defaultSettings = {
-  entryAlias: undefined
+  entryAlias: undefined,
+  mode: 'start'
 }
 module.exports = function Post(settings = defaultSettings, contentTypes = []) {
   const indexFileNameOptions = [settings.entryAlias, 'post', 'index'].filter(Boolean)

src/compiler/contentModel2/models/homepage.js

@@ -6,7 +6,8 @@ const models = {
 }
 
 const defaultSettings = {
-  homepageDirectory: 'homepage'
+  homepageDirectory: 'homepage',
+  mode: 'start'
 }
 module.exports = function Homepage(settings = defaultSettings) {
   const indexFileNameOptions = ['homepage', 'home', 'index']

src/compiler/contentModel2/models/subpage.js

@@ -6,7 +6,8 @@ const models = {
 }
 
 const defaultSettings = {
-  pagesDirectory: 'pages'
+  pagesDirectory: 'pages',
+  mode: 'start'
 }
 module.exports = function Subpage(settings = defaultSettings) {
   const indexFileNameOptions = ['page', 'index']