Separate AssetsDirectory as a model too

Same logic with pagesDirectory. And add basic checks that verify assets
are recognized all well.

Author: scriptype

src/compiler/contentModel/index.js

@@ -9,6 +9,7 @@ const models = {
   PagesDirectory: require('./models/pagesDirectory'),
   Subpage: require('./models/subpage'),
   Collection: require('./models/collection'),
+  AssetsDirectory: require('./models/assetsDirectory'),
   Asset: require('./models/asset')
 }
 
@@ -308,13 +309,11 @@ class ContentModel extends ContentModelEntryNode {
       }
 
       if (this.matchers.assetsDirectory(node)) {
-        return tree.assets.push(
-          ...node.children.map(childNode => {
-            return new models.Asset(childNode, this.context, {
-              assetsDirectory: this.settings.assetsDirectory
-            })
-          })
-        )
+        tree.assetsDirectory = new models.AssetsDirectory(node, this.context, {
+          assetsDirectory: this.settings.assetsDirectory
+        })
+        tree.assets.push(...tree.assetsDirectory.subtree.assets)
+        return
       }
 
       if (this.matchers.asset(node)) {

src/compiler/contentModel/models/assetsDirectory.js

@@ -0,0 +1,49 @@
+const ContentModelEntryNode = require('../../../lib/ContentModelEntryNode')
+const matcha = require('../../../lib/matcha')
+
+const models = {
+  Asset: require('./asset')
+}
+
+const defaultSettings = {
+  assetsDirectory: 'assets'
+}
+class AssetsDirectory extends ContentModelEntryNode {
+  static serialize(assetsDirectory) {
+    return {
+      assets: assetsDirectory.subtree.assets.map(models.Asset.serialize)
+    }
+  }
+
+  constructor(fsNode, context, settings) {
+    super(fsNode, context, settings)
+    this.matchers = this.getSubtreeMatchers()
+    this.subtree = this.parseSubtree()
+    this.afterEffects()
+  }
+
+  getSubtreeMatchers() {
+    return {
+      asset: matcha.true()
+    }
+  }
+
+  parseSubtree() {
+    const tree = {
+      assets: []
+    }
+
+    this.fsNode.children.forEach(childNode => {
+      if (this.matchers.asset(childNode)) {
+        return tree.assets.push(
+          new models.Asset(childNode, this.context, {
+            assetsDirectory: this.settings.assetsDirectory
+          })
+        )
+      }
+    })
+    return tree
+  }
+}
+
+module.exports = AssetsDirectory

src/e2e-tests/magazine/fixtures/fs/content/an asset/and a child.jpeg

@@ -0,0 +1 @@
+yes yes

src/e2e-tests/magazine/fixtures/fs/content/an asset/another.mp3

@@ -0,0 +1 @@
+everywhere

src/e2e-tests/magazine/fixtures/fs/content/assets/are/assets.mpeg

@@ -0,0 +1 @@
+an mp4

src/e2e-tests/magazine/fixtures/fs/content/assets/here.mp4

@@ -21,13 +21,20 @@
 
   {{> @partial-block }}
 
-  <h2 data-title>Pages</h2>
+  <h2>Pages</h2>
   <ul>
     {{#each subpages as |subpage|}}
     <li><a data-subpage-link href="{{subpage.permalink}}">{{subpage.title}}</a></li>
     {{/each}}
   </ul>
 
+  <h2>Assets</h2>
+  <ul>
+    {{#each assets as |asset|}}
+    <li><a data-asset-link href="{{asset.permalink}}">{{asset.title}}</a></li>
+    {{/each}}
+  </ul>
+
   <h2>Collections</h2>
 
   {{#each collections as |collection|}}