Extract pagesDirectory as separate model

It just parses its child nodes. Rendering of them are still handled by
ContentModel index.

Add basic fixture data so tests confirm this works.

Author: scriptype

src/compiler/contentModel/index.js

@@ -1,13 +1,12 @@
 const { resolve } = require('path')
-const _ = require('lodash')
-const frontMatter = require('front-matter')
 const ImmutableStack = require('../../lib/ImmutableStack')
-const { removeExtension, isTemplateFile } = require('../../lib/contentModelHelpers')
+const { removeExtension } = require('../../lib/contentModelHelpers')
 const ContentModelEntryNode = require('../../lib/ContentModelEntryNode')
 const matcha = require('../../lib/matcha')
 
 const models = {
   Homepage: require('./models/homepage'),
+  PagesDirectory: require('./models/pagesDirectory'),
   Subpage: require('./models/subpage'),
   Collection: require('./models/collection'),
   Asset: require('./models/asset')
@@ -231,11 +230,11 @@ class ContentModel extends ContentModelEntryNode {
         nameOptions: [this.settings.pagesDirectory, 'subpages', 'pages']
       }),
 
-      asset: matcha.true(),
-
       assetsDirectory: matcha.directory({
         nameOptions: [this.settings.assetsDirectory, 'assets']
-      })
+      }),
+
+      asset: matcha.true()
     }
   }
 
@@ -246,6 +245,7 @@ class ContentModel extends ContentModelEntryNode {
         this.context,
         { homepageDirectory: this.settings.homepageDirectory }
       ),
+      pagesDirectory: [],
       subpages: [],
       collections: [],
       assets: []
@@ -272,21 +272,14 @@ class ContentModel extends ContentModelEntryNode {
       }
 
       if (this.matchers.pagesDirectory(node)) {
-        return node.children.forEach(childNode => {
-          if (this.matchers.subpage(childNode)) {
-            tree.subpages.push(
-              new models.Subpage(childNode, this.context, {
-                pagesDirectory: this.settings.pagesDirectory
-              })
-            )
-          } else if (this.matchers.asset(childNode)) {
-            tree.assets.push(
-              new models.Asset(childNode, this.context, {
-                assetsDirectory: this.settings.assetsDirectory
-              })
-            )
-          }
+        tree.pagesDirectory = new models.PagesDirectory(node, this.context, {
+          pagesDirectory: this.settings.pagesDirectory,
+          assetsDirectory: this.settings.assetsDirectory,
+          debug: this.settings.debug
         })
+        tree.subpages.push(...tree.pagesDirectory.subtree.subpages)
+        tree.assets.push(...tree.pagesDirectory.subtree.assets)
+        return
       }
 
       if (this.matchers.collection(node)) {

src/compiler/contentModel/models/pagesDirectory.js

@@ -0,0 +1,68 @@
+const ContentModelEntryNode = require('../../../lib/ContentModelEntryNode')
+const matcha = require('../../../lib/matcha')
+
+const models = {
+  Subpage: require('./subpage'),
+  Asset: require('./asset')
+}
+
+const defaultSettings = {
+  pagesDirectory: 'pages',
+  assetsDirectory: 'assets',
+  mode: 'start',
+  debug: false
+}
+class PagesDirectory extends ContentModelEntryNode {
+  static serialize(pagesDirectory) {
+    return {
+      subpages: pagesDirectory.subtree.subpages.map(models.Subpage.serialize),
+      assets: pagesDirectory.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 {
+      subpage: matcha.folderable({
+        nameOptions: {
+          index: ['page', 'index']
+        }
+      }),
+
+      asset: matcha.true()
+    }
+  }
+
+  parseSubtree() {
+    const tree = {
+      subpages: [],
+      assets: []
+    }
+
+    this.fsNode.children.forEach(childNode => {
+      if (this.matchers.subpage(childNode)) {
+        return tree.subpages.push(
+          new models.Subpage(childNode, this.context, {
+            pagesDirectory: this.settings.pagesDirectory
+          })
+        )
+      }
+      if (this.matchers.asset(childNode)) {
+        return tree.assets.push(
+          new models.Asset(childNode, this.context, {
+            assetsDirectory: this.settings.assetsDirectory
+          })
+        )
+      }
+    })
+    return tree
+  }
+}
+
+module.exports = PagesDirectory

src/e2e-tests/magazine/fixtures/fs/content/pages/A page here.md

@@ -0,0 +1 @@
+This is a page

src/e2e-tests/magazine/fixtures/fs/content/pages/A page there.txt

@@ -0,0 +1,4 @@
+---
+template: CustomPage
+---
+A page there

src/e2e-tests/magazine/fixtures/fs/content/pages/And this one/index.md

@@ -0,0 +1 @@
+This is another subpage in the pages directory

src/e2e-tests/magazine/fixtures/model.js

@@ -1080,6 +1080,24 @@ const FIXTURE_CONTENT_MODEL = {
       permalink: '/newsletter.html',
       date: '2025-11-16',
       content: 'Sign up now'
+    },
+    {
+      title: 'A page here',
+      permalink: '/a-page-here.html',
+      date: '2025-11-18',
+      content: 'This is a page'
+    },
+    {
+      title: 'A page there',
+      permalink: '/a-page-there.html',
+      date: '2025-11-20',
+      content: 'A page there'
+    },
+    {
+      title: 'And this one',
+      permalink: '/and-this-one',
+      date: '2025-11-22',
+      content: 'This is another subpage in the pages directory'
     }
   ]
 }