Fix entryAlias not working in uncategorized post

In ContentModelEntryNode, use getIndexFile template method to set
this.indexFile (and not this.subtree.indexFile). Once the indexFile is
set and its content and frontmatter is parsed, continue calling other
template methods, importantly, getSubtreeMatchers.

After switching to use matcha expressions in matchers, they got out of
their function wrappers. So, if they wanted to refer to this properties
coming from front-matter, getSubtreeMatchers must have been called in
super after indexFile is parsed. This change does just that.

Setting this.indexFile instead of this.subtree.indexFile is for the
coherence. If indexFile remained under 'subtree', then it would be
confusing why its matcher is not in the getSubtreeMatchers. It feels
right to have it directly in 'this'.

Also add a missing edge-case to e2e-magazine: Uncategorized foldered
post with an aliased indexFile. Lack of this test so far was what
allowed this bug to hide so far.

Author: scriptype

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

@@ -93,6 +93,13 @@ class Category extends ContentModelEntryNode {
     })
   }
 
+  getIndexFile() {
+    return this.fsNode.children?.find(
+      matcha.templateFile({
+        nameOptions: [this.settings.categoryAlias, 'category']
+      })
+    ) || this.fsNode
+  }
 
   getPermalink() {
     if (this.fsNode.isDefaultCategory) {
@@ -112,10 +119,6 @@ class Category extends ContentModelEntryNode {
     })
 
     return {
-      indexFile: matcha.templateFile({
-        nameOptions: [this.settings.categoryAlias, 'category']
-      }),
-
       category: matcha.directory({
         childSearchDepth: 3,
         children: [ postMatcher ]
@@ -129,7 +132,6 @@ class Category extends ContentModelEntryNode {
 
   parseSubtree() {
     const tree = {
-      indexFile: this.indexFile,
       categories: [],
       posts: [],
       levelPosts: [],
@@ -153,7 +155,7 @@ class Category extends ContentModelEntryNode {
     })
 
     this.fsNode.children.forEach(childNode => {
-      if (this.matchers.indexFile(childNode)) {
+      if (childNode === this.indexFile) {
         return
       }
 

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

@@ -81,6 +81,14 @@ class Collection extends ContentModelEntryNode {
     this.subtree = this.parseSubtree()
   }
 
+  getIndexFile() {
+    return this.fsNode.children.find(
+      matcha.templateFile({
+        nameOptions: this.settings.collectionAliases.concat('collection')
+      })
+    )
+  }
+
   getSlug() {
     return this.__originalAttributes__.slug === null ?
       '' :
@@ -103,10 +111,6 @@ class Collection extends ContentModelEntryNode {
     })
 
     return {
-      indexFile: matcha.templateFile({
-        nameOptions: (this.settings.collectionAliases || []).concat('collection').filter(Boolean)
-      }),
-
       dataFile: matcha.dataFile({
         nameOptions: [this.fsNode.name]
       }),
@@ -124,7 +128,6 @@ class Collection extends ContentModelEntryNode {
 
   parseSubtree() {
     const tree = {
-      indexFile: this.indexFile,
       categories: [],
       posts: [],
       levelPosts: [],
@@ -140,7 +143,7 @@ class Collection extends ContentModelEntryNode {
     })
 
     this.fsNode.children.forEach(childNode => {
-      if (this.matchers.indexFile(childNode)) {
+      if (childNode === this.indexFile) {
         return
       }
 

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

@@ -31,19 +31,22 @@ class Post extends ContentModelEntryNode {
     this.subtree = this.parseSubtree()
   }
 
-  getSubtreeMatchers() {
-    return {
-      indexFile: matcha.templateFile({
+  getIndexFile() {
+    return this.fsNode.children?.find(
+      matcha.templateFile({
         nameOptions: [this.settings.entryAlias, 'post', 'index']
-      }),
+      })
+    ) || this.fsNode
+  }
 
+  getSubtreeMatchers() {
+    return {
       attachment: matcha.true()
     }
   }
 
   parseSubtree() {
     const tree = {
-      indexFile: this.fsNode,
       attachments: []
     }
 
@@ -60,7 +63,7 @@ class Post extends ContentModelEntryNode {
     })
 
     this.fsNode.children.forEach(childNode => {
-      if (this.matchers.indexFile(childNode)) {
+      if (childNode === this.indexFile) {
         return
       }
       if (this.matchers.attachment(childNode)) {

src/compiler/contentModel/models/homepage.js

@@ -23,6 +23,14 @@ class Homepage extends ContentModelEntryNode {
     this.subtree = this.parseSubtree()
   }
 
+  getIndexFile() {
+    return this.fsNode.children?.find(
+      matcha.templateFile({
+        nameOptions: ['homepage', 'home', 'index']
+      })
+    ) || this.fsNode
+  }
+
   getPermalink() {
     return this.context.peek().permalink
   }
@@ -33,17 +41,12 @@ class Homepage extends ContentModelEntryNode {
 
   getSubtreeMatchers() {
     return {
-      indexFile: matcha.templateFile({
-        nameOptions: ['homepage', 'home', 'index']
-      }),
-
       attachment: matcha.true()
     }
   }
 
   parseSubtree() {
     const tree = {
-      indexFile: this.fsNode,
       attachments: []
     }
 
@@ -61,7 +64,7 @@ class Homepage extends ContentModelEntryNode {
     }
 
     this.fsNode.children.forEach(childNode => {
-      if (this.matchers.indexFile(childNode)) {
+      if (childNode === this.indexFile) {
         return
       }
       if (this.matchers.attachment(childNode)) {

src/compiler/contentModel/models/subpage.js

@@ -23,19 +23,22 @@ class Subpage extends ContentModelEntryNode {
     this.subtree = this.parseSubtree()
   }
 
-  getSubtreeMatchers() {
-    return {
-      indexFile: matcha.templateFile({
+  getIndexFile() {
+    return this.fsNode.children?.find(
+      matcha.templateFile({
         nameOptions: ['page', 'index']
-      }),
+      })
+    ) || this.fsNode
+  }
 
+  getSubtreeMatchers() {
+    return {
       attachment: matcha.true()
     }
   }
 
   parseSubtree() {
     const tree = {
-      indexFile: this.fsNode,
       attachments: []
     }
 
@@ -52,7 +55,7 @@ class Subpage extends ContentModelEntryNode {
     })
 
     this.fsNode.children.forEach(childNode => {
-      if (this.matchers.indexFile(childNode)) {
+      if (childNode === this.indexFile) {
         return
       }
       if (this.matchers.attachment(childNode)) {

src/e2e-tests/magazine/fixtures/fs/content/demos/Hey World/demo.md

@@ -0,0 +1,8 @@
+---
+date: 2025-12-06
+maker: +authors/enes
+tags: [html, hey world]
+---
+<h1>Hey world</h1>
+
+<p>Adipisicing nesciunt ab quos eos nesciunt Nemo ab aliquid quod magnam eaque voluptatem. Possimus tenetur veniam nostrum magnam in? Ipsa atque cupiditate illum hic mollitia Soluta excepturi vel consequatur exercitationem.</p>

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

@@ -296,7 +296,8 @@ const FIXTURE_CONTENT_MODEL = {
               slug: 'intelligent-drum-n-bass',
               permalink: '/demos/threejs/intelligent-drum-n-bass'
             },
-            { title: 'Hello World', slug: 'hello-world', permalink: '/demos/hello-world' }
+            { title: 'Hello World', slug: 'hello-world', permalink: '/demos/hello-world' },
+            { title: 'Hey World', slug: 'hey-world', permalink: '/demos/hey-world' }
           ],
           articles: [
             {
@@ -906,6 +907,29 @@ const FIXTURE_CONTENT_MODEL = {
             }
           }
         },
+        {
+          title: 'Hey World',
+          maker: { title: 'Mustafa Enes', slug: 'enes' },
+          date: '2025-12-06',
+          permalink: '/demos/hey-world',
+          contentType: 'Demo',
+          tags: ['html', 'hey world'],
+          content: '<h1>Hey world</h1>\n\n<p>Adipisicing nesciunt ab quos eos nesciunt Nemo ab aliquid quod magnam eaque voluptatem. Possimus tenetur veniam nostrum magnam in? Ipsa atque cupiditate illum hic mollitia Soluta excepturi vel consequatur exercitationem.</p>',
+          context: {
+            collection: {
+              title: 'demos',
+              permalink: '/demos'
+            },
+            categories: []
+          },
+          links: {
+            nextPost: null,
+            previousPost: {
+              title: 'good-morning-world',
+              permalink: '/demos/good-morning-world.html'
+            }
+          }
+        },
         {
           title: 'good-morning-world',
           maker: { title: 'Sir Tim Berners Lee', slug: 'tim' },
@@ -926,7 +950,10 @@ const FIXTURE_CONTENT_MODEL = {
               title: 'Hello World',
               permalink: '/demos/hello-world'
             },
-            nextPost: null
+            nextPost: {
+              title: 'Hey World',
+              permalink: '/demos/hey-world'
+            }
           }
         }
       ]
@@ -1060,4 +1087,4 @@ const FIXTURE_CONTENT_MODEL = {
 module.exports = {
   FIXTURE_SETTINGS,
   FIXTURE_CONTENT_MODEL
-}
+}

src/lib/ContentModelEntryNode.js

@@ -8,15 +8,12 @@ class ContentModelEntryNode extends ContentModelNode {
   constructor(fsNode, context, settings = {}) {
     super(fsNode, context, settings)
 
-    this.matchers = this.getSubtreeMatchers()
-    this.subtree = {
-      indexFile: this.getIndexFile()
-    }
+    this.indexFile = this.getIndexFile()
 
     const isFlatData = !fsNode.stats?.birthtime
     const entryProperties = parseTextEntry(
       this.fsNode,
-      this.subtree.indexFile || this.fsNode,
+      this.indexFile || this.fsNode,
       isFlatData
     )
 
@@ -25,10 +22,12 @@ class ContentModelEntryNode extends ContentModelNode {
     this.slug = this.getSlug()
     this.permalink = this.getPermalink()
     this.outputPath = this.getOutputPath()
+    this.matchers = this.getSubtreeMatchers()
+    this.subtree = {}
   }
 
   getIndexFile() {
-    return this.fsNode.children?.find(this.matchers.indexFile) || this.fsNode
+    return this.fsNode
   }
 
   getSlug() {