Patternification

Author: scriptype

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

@@ -139,7 +139,7 @@ class Category extends ContentModelEntryNode {
       attachments: []
     }
 
-    if (!this.fsNode.children || !this.fsNode.children.length) {
+    if (this.isDefaultCategory) {
       return tree
     }
 
@@ -155,11 +155,9 @@ class Category extends ContentModelEntryNode {
       key: contextKey
     })
 
-    this.fsNode.children.forEach(childNode => {
-      if (childNode === this.indexFile) {
-        return
-      }
+    const childNodes = this.fsNode.children.filter(node => node !== this.indexFile)
 
+    childNodes.forEach(childNode => {
       if (this.matchers.post(childNode)) {
         const postSettings = {
           entryAlias: this.entryAlias || this.settings.entryAlias,
@@ -319,10 +317,9 @@ class Category extends ContentModelEntryNode {
       )
     }
 
-    /*
-     * Collection doesn't render uncategorized posts, so it must be done here.
-     * An unnamed default category shouldn't render anything else. This way, we
-     * avoid race conditions with collection's rendering in the same paths. */
+    /* Uncategorized posts are rendered by the default category.
+     * If default category is untitled, it should render only the posts.
+     * Otherwise it'll race with collection to render at same outputPaths. */
     const isUntitledDefaultCategory = this.isDefaultCategory && !this.slug
     if (isUntitledDefaultCategory) {
       return renderPosts()

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

@@ -143,11 +143,9 @@ class Collection extends ContentModelEntryNode {
       key: 'collection'
     })
 
-    this.fsNode.children.forEach(childNode => {
-      if (childNode === this.indexFile) {
-        return
-      }
+    const childNodes = this.fsNode.children.filter(node => node !== this.indexFile)
 
+    childNodes.forEach(childNode => {
       if (this.matchers.dataFile(childNode, this.fsNode)) {
         const data = JSON.parse(childNode.content || '[]')
         if (!Array.isArray(data)) {

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

@@ -51,10 +51,6 @@ class Post extends ContentModelEntryNode {
       attachments: []
     }
 
-    if (!this.fsNode.children || !this.fsNode.children.length) {
-      return tree
-    }
-
     const childContext = this.context.push({
       title: this.title,
       slug: this.slug,
@@ -63,10 +59,9 @@ class Post extends ContentModelEntryNode {
       key: 'post'
     })
 
-    this.fsNode.children.forEach(childNode => {
-      if (childNode === this.indexFile) {
-        return
-      }
+    const childNodes = (this.fsNode.children || []).filter(node => node !== this.indexFile)
+
+    childNodes.forEach(childNode => {
       if (this.matchers.attachment(childNode)) {
         tree.attachments.push(
           new models.Attachment(childNode, childContext)

src/compiler/contentModel/models/homepage.js

@@ -51,11 +51,7 @@ class Homepage extends ContentModelEntryNode {
       attachments: []
     }
 
-    if (!this.fsNode.children || !this.fsNode.children.length) {
-      return tree
-    }
-
-    const context = {
+    const childContext = {
       homepage: {
         title: this.title,
         slug: this.slug,
@@ -64,13 +60,12 @@ class Homepage extends ContentModelEntryNode {
       }
     }
 
-    this.fsNode.children.forEach(childNode => {
-      if (childNode === this.indexFile) {
-        return
-      }
+    const childNodes = (this.fsNode.children || []).filter(node => node !== this.indexFile)
+
+    childNodes.forEach(childNode => {
       if (this.matchers.attachment(childNode)) {
         tree.attachments.push(
-          new models.Attachment(childNode, context)
+          new models.Attachment(childNode, childContext)
         )
       }
     })

src/compiler/contentModel/models/subpage.js

@@ -43,25 +43,20 @@ class Subpage extends ContentModelEntryNode {
       attachments: []
     }
 
-    if (!this.fsNode.children || !this.fsNode.children.length) {
-      return tree
-    }
-
-    const context = this.context.push({
+    const childContext = this.context.push({
       title: this.title,
       slug: this.slug,
       permalink: this.permalink,
       outputPath: this.outputPath,
       key: 'page'
     })
 
-    this.fsNode.children.forEach(childNode => {
-      if (childNode === this.indexFile) {
-        return
-      }
+    const childNodes = (this.fsNode.children || []).filter(node => node !== this.indexFile)
+
+    childNodes.forEach(childNode => {
       if (this.matchers.attachment(childNode)) {
         tree.attachments.push(
-          new models.Attachment(childNode, context)
+          new models.Attachment(childNode, childContext)
         )
       }
     })