[CM2] Add basic props & pass ctx to attachments

Author: scriptype

src/compiler/contentModel2/models/_baseEntry.js

@@ -1,36 +1,54 @@
+const _ = require('lodash')
 const frontMatter = require('front-matter')
 const slug = require('slug')
-const {
-  templateExtensions,
-  isTemplateFile,
-  removeExtension
-} = require('../helpers')
+const { templateExtensions, removeExtension } = require('../helpers')
 
 const models = {
   attachment: require('./attachment')
 }
 
-function _baseEntry(node, indexFileNameOptions) {
-  const dotlessTemplateExtensions = templateExtensions.map(e => e.substring(1))
-  const entryFile = node.children ?
-    node.children.find(child => {
-      return isTemplateFile(child) && child.name.match(
-        new RegExp(`^(${indexFileNameOptions.join('|')})\.(${dotlessTemplateExtensions.join('|')})$`, 'i')
-      )
-    }) :
-    node
+const isIndexFile = (node, nameOptions) => {
+  const names = nameOptions.join('|')
+  const extensions = templateExtensions.join('|')
+  const namePattern = new RegExp(`^(${names})(${extensions})$`, 'i')
+  return !node.children && node.name.match(namePattern)
+}
+
+function parseFolderedEntry(node, indexFileNameOptions) {
+  const tree = {
+    indexFile: null,
+    attachments: []
+  }
+  node.children.forEach(childNode => {
+    if (isIndexFile(childNode, indexFileNameOptions)) {
+      tree.indexFile = childNode
+      return
+    }
+    tree.attachments.push(models.attachment.bind(null, childNode))
+  })
 
-  const attachments = (node.children || [])
-    .filter(child => child !== entryFile)
-    .map(child => models.attachment(child))
+  return {
+    ...tree,
+    name: node.name
+  }
+}
 
+function _baseEntry(node, indexFileNameOptions) {
+  const folderedEntry = node.children ?
+    parseFolderedEntry(node, indexFileNameOptions) :
+    undefined
+  const entryFile = folderedEntry?.indexFile || node
   const { attributes, body } = frontMatter(entryFile.content)
+  const entryName = removeExtension(
+    folderedEntry?.name || entryFile.name
+  )
+  const attachments = folderedEntry?.attachments || []
 
   return {
-    ...node,
+    ..._.omit(node, 'children'),
     ...attributes,
-    title: attributes.title || removeExtension(node.children ? node.name : entryFile.name),
-    slug: attributes.slug || slug(removeExtension(node.children ? node.name : entryFile.name), '-'),
+    title: attributes.title || entryName,
+    slug: attributes.slug || slug(entryName),
     content: body || '',
     attachments
   }

src/compiler/contentModel2/models/attachment.js

@@ -1,5 +1,23 @@
-function attachment(node) {
-  return node
+const settings = require('../../../settings').getSettings()
+
+function attachment(node, context) {
+  const permalink = (
+    settings.permalinkPrefix +
+    [
+      context.collection?.slug,
+      context.category?.isDefaultCategory ? '' : context.category.slug,
+      context.post?.slug,
+      context.page?.slug,
+      node.name
+    ].filter(Boolean).join('/')
+  )
+
+  return {
+    ...node,
+    context,
+    permalink,
+    date: new Date(node.stats.birthtime || Date.now())
+  }
 }
 
 module.exports = attachment

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

@@ -62,7 +62,10 @@ function category(node, context) {
         )
       }
       return tree.attachments.push(
-        models.attachment(childNode)
+        models.attachment(childNode, {
+          ...context,
+          category: categoryContext
+        })
       )
     }
     if (childNode.children.some(c => isTemplateFile(c) && c.name.match(/^(index|post)\..+$/))) {
@@ -74,7 +77,10 @@ function category(node, context) {
       )
     }
     return tree.push(
-      models.attachment(childNode)
+      models.attachment(childNode, {
+        ...context,
+        category: categoryContext
+      })
     )
   })
 

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

@@ -10,28 +10,6 @@ const models = {
 }
 
 function collection(node) {
-  const tree = {
-    categories: [],
-    posts: [],
-    tags: [],
-    attachments: []
-  }
-
-  const indexFile = node.children.find(child => {
-    return isTemplateFile(child) && child.name.match(/^collection\..+$/)
-  })
-
-  const indexProps = indexFile ? frontMatter(indexFile.content) : {}
-
-  const slug = indexProps.attributes?.slug || makeSlug(node.name)
-  const context = {
-    ...indexProps.attributes,
-    childContentType: indexProps.attributes?.childContentType || 'text',
-    title: indexProps.attributes?.title || node.name,
-    slug,
-    permalink: settings.permalinkPrefix + slug
-  }
-
   function collectPostTags(post) {
     post.tags.forEach(postTag => {
       let collectionTag = tree.tags.find(t => t.name === postTag.name)
@@ -77,6 +55,28 @@ function collection(node) {
     tree.posts.push(uncategorizedPost)
   }
 
+  const tree = {
+    categories: [],
+    posts: [],
+    tags: [],
+    attachments: []
+  }
+
+  const indexFile = node.children.find(child => {
+    return isTemplateFile(child) && child.name.match(/^collection\..+$/)
+  })
+
+  const indexProps = indexFile ? frontMatter(indexFile.content) : {}
+
+  const slug = indexProps.attributes?.slug || makeSlug(node.name)
+  const context = {
+    ...indexProps.attributes,
+    childContentType: indexProps.attributes?.childContentType || 'text',
+    title: indexProps.attributes?.title || node.name,
+    slug,
+    permalink: settings.permalinkPrefix + slug
+  }
+
   node.children.forEach(childNode => {
     if (!childNode.children) {
       if (isTemplateFile(childNode)) {

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

@@ -7,23 +7,36 @@ const models = {
 
 function post(node, context) {
   const baseEntryProps = models._baseEntry(node, ['index', 'post'])
+
+  const permalink = (
+    settings.permalinkPrefix +
+    [
+      context.collection.slug,
+      context.category.isDefaultCategory ? '' : context.category.slug,
+      baseEntryProps.slug
+    ].filter(Boolean).join('/') +
+    (node.children ? '' : '.html')
+  )
+
+  const postContext = {
+    title: baseEntryProps.title,
+    slug: baseEntryProps.slug,
+    permalink
+  }
+
   return {
     ...baseEntryProps,
+    ...postContext,
     context,
     contentType: baseEntryProps.contentType || context.category.childContentType,
     tags: parseTags(baseEntryProps.tags).map(tagName => {
       return models.tag(tagName, context)
     }),
     date: new Date(baseEntryProps.date || baseEntryProps.stats.birthtime || Date.now()),
-    permalink: (
-      settings.permalinkPrefix +
-      [
-        context.collection.slug,
-        context.category.isDefaultCategory ? '' : context.category.slug,
-        baseEntryProps.slug
-      ].filter(Boolean).join('/') +
-      (node.children ? '' : '.html')
-    )
+    attachments: baseEntryProps.attachments.map(a => a({
+      ...context,
+      post: postContext
+    }))
   }
 }
 

src/compiler/contentModel2/models/homepage.js

@@ -5,9 +5,21 @@ const models = {
 
 function homepage(node) {
   const baseEntryProps = models._baseEntry(node, ['index'])
+
+  const permalink = settings.permalinkPrefix
+
+  const pageContext = {
+    title: baseEntryProps.title,
+    slug: baseEntryProps.slug,
+    permalink
+  }
+
   return {
     ...baseEntryProps,
-    permalink: settings.permalinkPrefix
+    attachments: baseEntryProps.attachments.map(a => a({
+      page: pageContext
+    })),
+    permalink
   }
 }
 

src/compiler/contentModel2/models/subpage.js

@@ -5,13 +5,25 @@ const models = {
 
 function subpage(node) {
   const baseEntryProps = models._baseEntry(node, ['index', 'page'])
+
+  const permalink = (
+    settings.permalinkPrefix +
+    baseEntryProps.slug +
+    (node.children ? '' : '.html')
+  )
+
+  const pageContext = {
+    title: baseEntryProps.title,
+    slug: baseEntryProps.slug,
+    permalink
+  }
+
   return {
     ...baseEntryProps,
-    permalink: (
-      settings.permalinkPrefix +
-      baseEntryProps.slug +
-      (node.children ? '' : '.html')
-    )
+    ...pageContext,
+    attachments: baseEntryProps.attachments.map(a => a({
+      page: pageContext
+    }))
   }
 }
 

src/tests/compiler/contentModel2.js

@@ -8,8 +8,9 @@ const FSTree = os.platform() === 'win32' ?
 
 test('compiler/contentModel2', t => {
   t.test('exits 0', async () => {
-    console.log(
-      contentModel2.create(FSTree).collections[0]
+    console.dir(
+      contentModel2.create(FSTree).collections[0],
+      { depth: null, colors: true }
     )
   })
 })