Tag posts have full tag objects in their tags field

Now, when tags are listed in a tag index, their tags can become links to other tag indices.

Previously, contentModel.tags were created when post.tags was a simple array of string, and then the linking between tags and posts took place. This made posts inside contentModel.tags have tags as strings, rather than the full tag objects.

Now, weirdly, linking actually introduces the tag objects for the first time. Then the tags enhancer collects those objects and creates the array of tags in contentModel, attaching the posts in the tag object

Author: scriptype

src/compiler/contentModel/enhancers/links.js

@@ -1,5 +1,6 @@
 const _ = require('lodash')
-const { pipe } = require('../../../helpers')
+const Settings = require('../../../settings')
+const { pipe, getSlug, makePermalink } = require('../../../helpers')
 
 const getScoreByOverlap = (arrayOfStrings1 = [], arrayOfStrings2 = []) => {
   const overlap = _.intersection(
@@ -145,11 +146,19 @@ const linkMentionedEntries = (contentModel) => {
 }
 
 const _linkPostTags = (post, tags) => {
+  const { permalinkPrefix } = Settings.getSettings()
   return {
     ...post,
     tags: post.tags.map(tag => {
-      const { posts, ...rest } = tags.find(t => t.tag === tag)
-      return rest
+      const permalink = makePermalink({
+        prefix: permalinkPrefix,
+        parts: ['tags', tag]
+      })
+      return {
+        tag,
+        slug: getSlug(tag),
+        permalink
+      }
     })
   }
 }

src/compiler/contentModel/enhancers/tags.js

@@ -1,7 +1,6 @@
 const { join } = require('path')
-const Settings = require('../../../settings')
-const { getSlug, makePermalink } = require('../../../helpers')
 
+/* Extract tags from posts as an array of tags with posts */
 const getTags = (posts) => {
   const tags = posts.map((post) => {
     return post.tags.map((tag) => {
@@ -12,32 +11,22 @@ const getTags = (posts) => {
   const flatTags = [].concat(...tags)
 
   const tagsIndex = flatTags.reduce((acc, tagWithPost) => {
-    const tag = tagWithPost.tag
+    const { tag, post } = tagWithPost
     return {
       ...acc,
-      [tag]: [
-        ...(acc[tag] || []),
-        tagWithPost.post
-      ]
+      [tag.tag]: {
+        ...tag,
+        posts: [
+          ...(acc[tag.tag] ? acc[tag.tag].posts : []),
+          post
+        ]
+      }
     }
   }, {})
 
-  const { permalinkPrefix } = Settings.getSettings()
-
   return Object
     .keys(tagsIndex)
-    .map(key => {
-      const permalink = makePermalink({
-        prefix: permalinkPrefix,
-        parts: ['tags', key]
-      })
-      return {
-        tag: key,
-        slug: getSlug(key),
-        permalink,
-        posts: tagsIndex[key]
-      }
-    })
+    .map(key => tagsIndex[key])
     .sort((a, b) => b.posts.length - a.posts.length)
 }
 

src/compiler/contentModel/index.js

@@ -11,8 +11,8 @@ const create = async (fileSystemTree) => {
     decorate.bind(null, 'contentModel'),
     withDates,
     withSortedPosts,
+    withLinkedPosts,
     withTags,
-    withLinkedPosts
   ])
   return contentModel
 }