all: Rework page store, add a dynacache, improve partial rebuilds, and some general spring cleaningdevelop2024

There are some breaking changes in this commit, see #11455.

Closes #11455
Closes #11549

This fixes a set of bugs (see issue list) and it is also paying some technical debt accumulated over the years. We now build with Staticcheck enabled in the CI build.

The performance should be about the same as before for regular sized Hugo sites, but it should perform and scale much better to larger data sets, as objects that uses lots of memory (e.g. rendered Markdown, big JSON files read into maps with transform.Unmarshal etc.) will now get automatically garbage collected if needed. Performance on partial rebuilds when running the server in fast render mode should be the same, but the change detection should be much more accurate.

A list of the notable new features:

* A new dependency tracker that covers (almost) all of Hugo's API and is used to do fine grained partial rebuilds when running the server.
* A new and simpler tree document store which allows fast lookups and prefix-walking in all dimensions (e.g. language) concurrently.
* You can now configure an upper memory limit allowing for much larger data sets and/or running on lower specced PCs.
We have lifted the "no resources in sub folders" restriction for branch bundles (e.g. sections).
Memory Limit
* Hugos will, by default, set aside a quarter of the total system memory, but you can set this via the OS environment variable HUGO_MEMORYLIMIT (in gigabytes). This is backed by a partitioned LRU cache used throughout Hugo. A cache that gets dynamically resized in low memory situations, allowing Go's Garbage Collector to free the memory.

New Dependency Tracker: Hugo has had a rule based coarse grained approach to server rebuilds that has worked mostly pretty well, but there have been some surprises (e.g. stale content). This is now revamped with a new dependency tracker that can quickly calculate the delta given a changed resource (e.g. a content file, template, JS file etc.). This handles transitive relations, e.g. $page -> js.Build -> JS import, or $page1.Content -> render hook -> site.GetPage -> $page2.Title, or $page1.Content -> shortcode -> partial -> site.RegularPages -> $page2.Content -> shortcode ..., and should also handle changes to aggregated values (e.g. site.Lastmod) effectively.

This covers all of Hugo's API with 2 known exceptions (a list that may not be fully exhaustive):

Changes to files loaded with template func os.ReadFile may not be handled correctly. We recommend loading resources with resources.Get
Changes to Hugo objects (e.g. Page) passed in the template context to lang.Translate may not be detected correctly. We recommend having simple i18n templates without too much data context passed in other than simple types such as strings and numbers.
Note that the cachebuster configuration (when A changes then rebuild B) works well with the above, but we recommend that you revise that configuration, as it in most situations should not be needed. One example where it is still needed is with TailwindCSS and using changes to hugo_stats.json to trigger new CSS rebuilds.

Document Store: Previously, a little simplified, we split the document store (where we store pages and resources) in a tree per language. This worked pretty well, but the structure made some operations harder than they needed to be. We have now restructured it into one Radix tree for all languages. Internally the language is considered to be a dimension of that tree, and the tree can be viewed in all dimensions concurrently. This makes some operations re. language simpler (e.g. finding translations is just a slice range), but the idea is that it should also be relatively inexpensive to add more dimensions if needed (e.g. role).

Fixes #10169
Fixes #10364
Fixes #10482
Fixes #10630
Fixes #10656
Fixes #10694
Fixes #10918
Fixes #11262
Fixes #11439
Fixes #11453
Fixes #11457
Fixes #11466
Fixes #11540
Fixes #11551
Fixes #11556
Fixes #11654
Fixes #11661
Fixes #11663
Fixes #11664
Fixes #11669
Fixes #11671
Fixes #11807
Fixes #11808
Fixes #11809
Fixes #11815
Fixes #11840
Fixes #11853
Fixes #11860
Fixes #11883
Fixes #11904
Fixes #7388
Fixes #7425
Fixes #7436
Fixes #7544
Fixes #7882
Fixes #7960
Fixes #8255
Fixes #8307
Fixes #8863
Fixes #8927
Fixes #9192
Fixes #9324

1 files changed, 255 insertions, 541 deletions

diff --git a/hugolib/page.go b/hugolib/page.go
index bf5e19ac4..f8ec5e225 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -14,16 +14,14 @@
 package hugolib
 
 import (
-	"bytes"
 	"context"
 	"fmt"
-	"path"
-	"path/filepath"
-	"sort"
-	"strings"
-
-	"go.uber.org/atomic"
+	"strconv"
+	"sync"
+	"sync/atomic"
 
+	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugolib/doctree"
 	"github.com/gohugoio/hugo/identity"
 	"github.com/gohugoio/hugo/media"
 	"github.com/gohugoio/hugo/output"
@@ -35,29 +33,25 @@ import (
 
 	"github.com/gohugoio/hugo/tpl"
 
-	"github.com/gohugoio/hugo/hugofs/files"
-
-	"github.com/gohugoio/hugo/helpers"
-
 	"github.com/gohugoio/hugo/common/herrors"
-	"github.com/gohugoio/hugo/parser/metadecoders"
-
-	"github.com/gohugoio/hugo/parser/pageparser"
+	"github.com/gohugoio/hugo/common/maps"
 
 	"github.com/gohugoio/hugo/source"
 
 	"github.com/gohugoio/hugo/common/collections"
 	"github.com/gohugoio/hugo/common/text"
-	"github.com/gohugoio/hugo/resources"
 	"github.com/gohugoio/hugo/resources/kinds"
 	"github.com/gohugoio/hugo/resources/page"
 	"github.com/gohugoio/hugo/resources/resource"
 )
 
 var (
-	_ page.Page           = (*pageState)(nil)
-	_ collections.Grouper = (*pageState)(nil)
-	_ collections.Slicer  = (*pageState)(nil)
+	_ page.Page                                = (*pageState)(nil)
+	_ collections.Grouper                      = (*pageState)(nil)
+	_ collections.Slicer                       = (*pageState)(nil)
+	_ identity.DependencyManagerScopedProvider = (*pageState)(nil)
+	_ contentNodeI                             = (*pageState)(nil)
+	_ pageContext                              = (*pageState)(nil)
 )
 
 var (
@@ -74,15 +68,6 @@ type pageContext interface {
 	posOffset(offset int) text.Position
 	wrapError(err error) error
 	getContentConverter() converter.Converter
-	addDependency(dep identity.Provider)
-}
-
-// wrapErr adds some context to the given error if possible.
-func wrapErr(err error, ctx any) error {
-	if pc, ok := ctx.(pageContext); ok {
-		return pc.wrapError(err)
-	}
-	return err
 }
 
 type pageSiteAdapter struct {
@@ -90,20 +75,9 @@ type pageSiteAdapter struct {
 	s *Site
 }
 
-func (pa pageSiteAdapter) GetPageWithTemplateInfo(info tpl.Info, ref string) (page.Page, error) {
-	p, err := pa.GetPage(ref)
-	if p != nil {
-		// Track pages referenced by templates/shortcodes
-		// when in server mode.
-		if im, ok := info.(identity.Manager); ok {
-			im.Add(p)
-		}
-	}
-	return p, err
-}
-
 func (pa pageSiteAdapter) GetPage(ref string) (page.Page, error) {
-	p, err := pa.s.getPageNew(pa.p, ref)
+	p, err := pa.s.getPage(pa.p, ref)
+
 	if p == nil {
 		// The nil struct has meaning in some situations, mostly to avoid breaking
 		// existing sites doing $nilpage.IsDescendant($p), which will always return
@@ -116,7 +90,7 @@ func (pa pageSiteAdapter) GetPage(ref string) (page.Page, error) {
 type pageState struct {
 	// Incremented for each new page created.
 	// Note that this will change between builds for a given Page.
-	id int
+	pid uint64
 
 	// This slice will be of same length as the number of global slice of output
 	// formats (for all sites).
@@ -126,16 +100,69 @@ type pageState struct {
 	pageOutputTemplateVariationsState *atomic.Uint32
 
 	// This will be shifted out when we start to render a new output format.
+	pageOutputIdx int
 	*pageOutput
 
 	// Common for all output formats.
 	*pageCommon
+
+	resource.Staler
+	dependencyManager    identity.Manager
+	resourcesPublishInit *sync.Once
+}
+
+func (p *pageState) IdentifierBase() string {
+	return p.Path()
+}
+
+func (p *pageState) GetIdentity() identity.Identity {
+	return p
+}
+
+func (p *pageState) ForEeachIdentity(f func(identity.Identity) bool) {
+	f(p)
+}
+
+func (p *pageState) GetDependencyManager() identity.Manager {
+	return p.dependencyManager
+}
+
+func (p *pageState) GetDependencyManagerForScope(scope int) identity.Manager {
+	switch scope {
+	case pageDependencyScopeDefault:
+		return p.dependencyManagerOutput
+	case pageDependencyScopeGlobal:
+		return p.dependencyManager
+	default:
+		return identity.NopManager
+	}
+}
+
+func (p *pageState) Key() string {
+	return "page-" + strconv.FormatUint(p.pid, 10)
+}
+
+func (p *pageState) resetBuildState() {
+	p.Scratcher = maps.NewScratcher()
 }
 
 func (p *pageState) reusePageOutputContent() bool {
 	return p.pageOutputTemplateVariationsState.Load() == 1
 }
 
+func (po *pageState) isRenderedAny() bool {
+	for _, o := range po.pageOutputs {
+		if o.isRendered() {
+			return true
+		}
+	}
+	return false
+}
+
+func (p *pageState) isContentNodeBranch() bool {
+	return p.IsNode()
+}
+
 func (p *pageState) Err() resource.ResourceError {
 	return nil
 }
@@ -151,11 +178,6 @@ func (p *pageState) Eq(other any) bool {
 	return p == pp
 }
 
-// GetIdentity is for internal use.
-func (p *pageState) GetIdentity() identity.Identity {
-	return identity.NewPathIdentity(files.ComponentFolderContent, filepath.FromSlash(p.Pathc()))
-}
-
 func (p *pageState) HeadingsFiltered(context.Context) tableofcontents.Headings {
 	return nil
 }
@@ -175,10 +197,11 @@ func (p *pageHeadingsFiltered) page() page.Page {
 
 // For internal use by the related content feature.
 func (p *pageState) ApplyFilterToHeadings(ctx context.Context, fn func(*tableofcontents.Heading) bool) related.Document {
-	if p.pageOutput.cp.tableOfContents == nil {
-		return p
+	r, err := p.content.contentToC(ctx, p.pageOutput.pco)
+	if err != nil {
+		panic(err)
 	}
-	headings := p.pageOutput.cp.tableOfContents.Headings.FilterBy(fn)
+	headings := r.tableOfContents.Headings.FilterBy(fn)
 	return &pageHeadingsFiltered{
 		pageState: p,
 		headings:  headings,
@@ -196,72 +219,28 @@ func (p *pageState) CodeOwners() []string {
 // GetTerms gets the terms defined on this page in the given taxonomy.
 // The pages returned will be ordered according to the front matter.
 func (p *pageState) GetTerms(taxonomy string) page.Pages {
-	if p.treeRef == nil {
-		return nil
-	}
-
-	m := p.s.pageMap
-
-	taxonomy = strings.ToLower(taxonomy)
-	prefix := cleanSectionTreeKey(taxonomy)
-	self := strings.TrimPrefix(p.treeRef.key, "/")
-
-	var pas page.Pages
-
-	m.taxonomies.WalkQuery(pageMapQuery{Prefix: prefix}, func(s string, n *contentNode) bool {
-		key := s + self
-		if tn, found := m.taxonomyEntries.Get(key); found {
-			vi := tn.(*contentNode).viewInfo
-			pas = append(pas, pageWithOrdinal{pageState: n.p, ordinal: vi.ordinal})
-		}
-		return false
-	})
-
-	page.SortByDefault(pas)
-
-	return pas
+	return p.s.pageMap.getTermsForPageInTaxonomy(p.Path(), taxonomy)
 }
 
 func (p *pageState) MarshalJSON() ([]byte, error) {
 	return page.MarshalPageToJSON(p)
 }
 
-func (p *pageState) getPages() page.Pages {
-	b := p.bucket
-	if b == nil {
-		return nil
-	}
-	return b.getPages()
-}
-
-func (p *pageState) getPagesRecursive() page.Pages {
-	b := p.bucket
-	if b == nil {
-		return nil
-	}
-	return b.getPagesRecursive()
-}
-
-func (p *pageState) getPagesAndSections() page.Pages {
-	b := p.bucket
-	if b == nil {
-		return nil
-	}
-	return b.getPagesAndSections()
-}
-
 func (p *pageState) RegularPagesRecursive() page.Pages {
-	p.regularPagesRecursiveInit.Do(func() {
-		var pages page.Pages
-		switch p.Kind() {
-		case kinds.KindSection, kinds.KindHome:
-			pages = p.getPagesRecursive()
-		default:
-			pages = p.RegularPages()
-		}
-		p.regularPagesRecursive = pages
-	})
-	return p.regularPagesRecursive
+	switch p.Kind() {
+	case kinds.KindSection, kinds.KindHome:
+		return p.s.pageMap.getPagesInSection(
+			pageMapQueryPagesInSection{
+				pageMapQueryPagesBelowPath: pageMapQueryPagesBelowPath{
+					Path:    p.Path(),
+					Include: pagePredicates.ShouldListLocal.And(pagePredicates.KindPage),
+				},
+				Recursive: true,
+			},
+		)
+	default:
+		return p.RegularPages()
+	}
 }
 
 func (p *pageState) PagesRecursive() page.Pages {
@@ -269,110 +248,95 @@ func (p *pageState) PagesRecursive() page.Pages {
 }
 
 func (p *pageState) RegularPages() page.Pages {
-	p.regularPagesInit.Do(func() {
-		var pages page.Pages
-
-		switch p.Kind() {
-		case kinds.KindPage:
-		case kinds.KindSection, kinds.KindHome, kinds.KindTaxonomy:
-			pages = p.getPages()
-		case kinds.KindTerm:
-			all := p.Pages()
-			for _, p := range all {
-				if p.IsPage() {
-					pages = append(pages, p)
-				}
-			}
-		default:
-			pages = p.s.RegularPages()
-		}
-
-		p.regularPages = pages
-	})
-
-	return p.regularPages
+	switch p.Kind() {
+	case kinds.KindPage:
+	case kinds.KindSection, kinds.KindHome, kinds.KindTaxonomy:
+		return p.s.pageMap.getPagesInSection(
+			pageMapQueryPagesInSection{
+				pageMapQueryPagesBelowPath: pageMapQueryPagesBelowPath{
+					Path:    p.Path(),
+					Include: pagePredicates.ShouldListLocal.And(pagePredicates.KindPage),
+				},
+			},
+		)
+	case kinds.KindTerm:
+		return p.s.pageMap.getPagesWithTerm(
+			pageMapQueryPagesBelowPath{
+				Path:    p.Path(),
+				Include: pagePredicates.ShouldListLocal.And(pagePredicates.KindPage),
+			},
+		)
+	default:
+		return p.s.RegularPages()
+	}
+	return nil
 }
 
 func (p *pageState) Pages() page.Pages {
-	p.pagesInit.Do(func() {
-		var pages page.Pages
-
-		switch p.Kind() {
-		case kinds.KindPage:
-		case kinds.KindSection, kinds.KindHome:
-			pages = p.getPagesAndSections()
-		case kinds.KindTerm:
-			b := p.treeRef.n
-			viewInfo := b.viewInfo
-			taxonomy := p.s.Taxonomies()[viewInfo.name.plural].Get(viewInfo.termKey)
-			pages = taxonomy.Pages()
-		case kinds.KindTaxonomy:
-			pages = p.bucket.getTaxonomies()
-		default:
-			pages = p.s.Pages()
-		}
-
-		p.pages = pages
-	})
-
-	return p.pages
+	switch p.Kind() {
+	case kinds.KindPage:
+	case kinds.KindSection, kinds.KindHome:
+		return p.s.pageMap.getPagesInSection(
+			pageMapQueryPagesInSection{
+				pageMapQueryPagesBelowPath: pageMapQueryPagesBelowPath{
+					Path:    p.Path(),
+					KeyPart: "page-section",
+					Include: pagePredicates.ShouldListLocal.And(
+						pagePredicates.KindPage.Or(pagePredicates.KindSection),
+					),
+				},
+			},
+		)
+	case kinds.KindTerm:
+		return p.s.pageMap.getPagesWithTerm(
+			pageMapQueryPagesBelowPath{
+				Path: p.Path(),
+			},
+		)
+	case kinds.KindTaxonomy:
+		return p.s.pageMap.getPagesInSection(
+			pageMapQueryPagesInSection{
+				pageMapQueryPagesBelowPath: pageMapQueryPagesBelowPath{
+					Path:    p.Path(),
+					KeyPart: "term",
+					Include: pagePredicates.ShouldListLocal.And(pagePredicates.KindTerm),
+				},
+				Recursive: true,
+			},
+		)
+	default:
+		return p.s.Pages()
+	}
+	return nil
 }
 
 // RawContent returns the un-rendered source content without
 // any leading front matter.
 func (p *pageState) RawContent() string {
-	if p.source.parsed == nil {
+	if p.content.parseInfo.itemsStep2 == nil {
 		return ""
 	}
-	start := p.source.posMainContent
+	start := p.content.parseInfo.posMainContent
 	if start == -1 {
 		start = 0
 	}
-
-	return string(p.source.parsed.Input()[start:])
-}
-
-func (p *pageState) sortResources() {
-	sort.SliceStable(p.resources, func(i, j int) bool {
-		ri, rj := p.resources[i], p.resources[j]
-		if ri.ResourceType() < rj.ResourceType() {
-			return true
-		}
-
-		p1, ok1 := ri.(page.Page)
-		p2, ok2 := rj.(page.Page)
-
-		if ok1 != ok2 {
-			return ok2
-		}
-
-		if ok1 {
-			return page.DefaultPageSort(p1, p2)
-		}
-
-		// Make sure not to use RelPermalink or any of the other methods that
-		// trigger lazy publishing.
-		return ri.Name() < rj.Name()
-	})
+	source, err := p.content.contentSource()
+	if err != nil {
+		panic(err)
+	}
+	return string(source[start:])
 }
 
 func (p *pageState) Resources() resource.Resources {
-	p.resourcesInit.Do(func() {
-		p.sortResources()
-		if len(p.m.resourcesMetadata) > 0 {
-			resources.AssignMetadata(p.m.resourcesMetadata, p.resources...)
-			p.sortResources()
-		}
-	})
-	return p.resources
+	return p.s.pageMap.getOrCreateResourcesForPage(p)
 }
 
 func (p *pageState) HasShortcode(name string) bool {
-	if p.shortcodeState == nil {
+	if p.content.shortcodeState == nil {
 		return false
 	}
 
-	return p.shortcodeState.hasName(name)
+	return p.content.shortcodeState.hasName(name)
 }
 
 func (p *pageState) Site() page.Site {
@@ -380,47 +344,72 @@ func (p *pageState) Site() page.Site {
 }
 
 func (p *pageState) String() string {
-	if sourceRef := p.sourceRef(); sourceRef != "" {
-		return fmt.Sprintf("Page(%s)", sourceRef)
-	}
-	return fmt.Sprintf("Page(%q)", p.Title())
+	return fmt.Sprintf("Page(%s)", p.Path())
 }
 
 // IsTranslated returns whether this content file is translated to
 // other language(s).
 func (p *pageState) IsTranslated() bool {
-	p.s.h.init.translations.Do(context.Background())
-	return len(p.translations) > 0
+	return len(p.Translations()) > 0
 }
 
-// TranslationKey returns the key used to map language translations of this page.
-// It will use the translationKey set in front matter if set, or the content path and
-// filename (excluding any language code and extension), e.g. "about/index".
-// The Page Kind is always prepended.
+// TranslationKey returns the key used to identify a translation of this content.
 func (p *pageState) TranslationKey() string {
-	p.translationKeyInit.Do(func() {
-		if p.m.translationKey != "" {
-			p.translationKey = p.Kind() + "/" + p.m.translationKey
-		} else if p.IsPage() && !p.File().IsZero() {
-			p.translationKey = path.Join(p.Kind(), filepath.ToSlash(p.File().Dir()), p.File().TranslationBaseName())
-		} else if p.IsNode() {
-			p.translationKey = path.Join(p.Kind(), p.SectionsPath())
-		}
-	})
-
-	return p.translationKey
+	if p.m.translationKey != "" {
+		return p.m.translationKey
+	}
+	return p.Path()
 }
 
 // AllTranslations returns all translations, including the current Page.
 func (p *pageState) AllTranslations() page.Pages {
-	p.s.h.init.translations.Do(context.Background())
-	return p.allTranslations
+	key := p.Path() + "/" + "translations-all"
+	pages, err := p.s.pageMap.getOrCreatePagesFromCache(key, func(string) (page.Pages, error) {
+		if p.m.translationKey != "" {
+			// translationKey set by user.
+			pas, _ := p.s.h.translationKeyPages.Get(p.m.translationKey)
+			pasc := make(page.Pages, len(pas))
+			copy(pasc, pas)
+			page.SortByLanguage(pasc)
+			return pasc, nil
+		}
+		var pas page.Pages
+		p.s.pageMap.treePages.ForEeachInDimension(p.Path(), doctree.DimensionLanguage.Index(),
+			func(n contentNodeI) bool {
+				if n != nil {
+					pas = append(pas, n.(page.Page))
+				}
+				return false
+			},
+		)
+
+		pas = pagePredicates.ShouldLink.Filter(pas)
+		page.SortByLanguage(pas)
+		return pas, nil
+	})
+	if err != nil {
+		panic(err)
+	}
+
+	return pages
 }
 
 // Translations returns the translations excluding the current Page.
 func (p *pageState) Translations() page.Pages {
-	p.s.h.init.translations.Do(context.Background())
-	return p.translations
+	key := p.Path() + "/" + "translations"
+	pages, err := p.s.pageMap.getOrCreatePagesFromCache(key, func(string) (page.Pages, error) {
+		var pas page.Pages
+		for _, pp := range p.AllTranslations() {
+			if !pp.Eq(p) {
+				pas = append(pas, pp)
+			}
+		}
+		return pas, nil
+	})
+	if err != nil {
+		panic(err)
+	}
+	return pages
 }
 
 func (ps *pageState) initCommonProviders(pp pagePaths) error {
@@ -450,8 +439,12 @@ func (p *pageState) getLayoutDescriptor() layouts.LayoutDescriptor {
 				section = sections[0]
 			}
 		case kinds.KindTaxonomy, kinds.KindTerm:
-			b := p.getTreeRef().n
-			section = b.viewInfo.name.singular
+
+			if p.m.singular != "" {
+				section = p.m.singular
+			} else if len(sections) > 0 {
+				section = sections[0]
+			}
 		default:
 		}
 
@@ -470,14 +463,6 @@ func (p *pageState) getLayoutDescriptor() layouts.LayoutDescriptor {
 func (p *pageState) resolveTemplate(layouts ...string) (tpl.Template, bool, error) {
 	f := p.outputFormat()
 
-	if len(layouts) == 0 {
-		selfLayout := p.selfLayoutForOutput(f)
-		if selfLayout != "" {
-			templ, found := p.s.Tmpl().Lookup(selfLayout)
-			return templ, found, nil
-		}
-	}
-
 	d := p.getLayoutDescriptor()
 
 	if len(layouts) > 0 {
@@ -488,15 +473,6 @@ func (p *pageState) resolveTemplate(layouts ...string) (tpl.Template, bool, erro
 	return p.s.Tmpl().LookupLayout(d, f)
 }
 
-// This is serialized
-func (p *pageState) initOutputFormat(isRenderingSite bool, idx int) error {
-	if err := p.shiftToOutputFormat(isRenderingSite, idx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // Must be run after the site section tree etc. is built and ready.
 func (p *pageState) initPage() error {
 	if _, err := p.init.Do(context.Background()); err != nil {
@@ -505,12 +481,11 @@ func (p *pageState) initPage() error {
 	return nil
 }
 
-func (p *pageState) renderResources() (err error) {
-	p.resourcesPublishInit.Do(func() {
-		var toBeDeleted []int
-
-		for i, r := range p.Resources() {
+func (p *pageState) renderResources() error {
+	var initErr error
 
+	p.resourcesPublishInit.Do(func() {
+		for _, r := range p.Resources() {
 			if _, ok := r.(page.Page); ok {
 				// Pages gets rendered with the owning page but we count them here.
 				p.s.PathSpec.ProcessingStats.Incr(&p.s.PathSpec.ProcessingStats.Pages)
@@ -519,50 +494,21 @@ func (p *pageState) renderResources() (err error) {
 
 			src, ok := r.(resource.Source)
 			if !ok {
-				err = fmt.Errorf("Resource %T does not support resource.Source", src)
+				initErr = fmt.Errorf("resource %T does not support resource.Source", src)
 				return
 			}
 
 			if err := src.Publish(); err != nil {
-				if herrors.IsNotExist(err) {
-					// The resource has been deleted from the file system.
-					// This should be extremely rare, but can happen on live reload in server
-					// mode when the same resource is member of different page bundles.
-					toBeDeleted = append(toBeDeleted, i)
-				} else {
+				if !herrors.IsNotExist(err) {
 					p.s.Log.Errorf("Failed to publish Resource for page %q: %s", p.pathOrTitle(), err)
 				}
 			} else {
 				p.s.PathSpec.ProcessingStats.Incr(&p.s.PathSpec.ProcessingStats.Files)
 			}
 		}
-
-		for _, i := range toBeDeleted {
-			p.deleteResource(i)
-		}
 	})
 
-	return
-}
-
-func (p *pageState) deleteResource(i int) {
-	p.resources = append(p.resources[:i], p.resources[i+1:]...)
-}
-
-func (p *pageState) getTargetPaths() page.TargetPaths {
-	return p.targetPaths()
-}
-
-func (p *pageState) setTranslations(pages page.Pages) {
-	p.allTranslations = pages
-	page.SortByLanguage(p.allTranslations)
-	translations := make(page.Pages, 0)
-	for _, t := range p.allTranslations {
-		if !t.Eq(p) {
-			translations = append(translations, t)
-		}
-	}
-	p.translations = translations
+	return initErr
 }
 
 func (p *pageState) AlternativeOutputFormats() page.OutputFormats {
@@ -588,229 +534,39 @@ var defaultRenderStringOpts = renderStringOpts{
 	Markup:  "", // Will inherit the page's value when not set.
 }
 
-func (p *pageState) addDependency(dep identity.Provider) {
-	if !p.s.watching() || p.pageOutput.cp == nil {
-		return
-	}
-	p.pageOutput.cp.dependencyTracker.Add(dep)
-}
-
-// wrapError adds some more context to the given error if possible/needed
-func (p *pageState) wrapError(err error) error {
+func (p *pageMeta) wrapError(err error) error {
 	if err == nil {
 		panic("wrapError with nil")
 	}
 
-	if p.File().IsZero() {
+	if p.File() == nil {
 		// No more details to add.
-		return fmt.Errorf("%q: %w", p.Pathc(), err)
-	}
-
-	filename := p.File().Filename()
-
-	// Check if it's already added.
-	for _, ferr := range herrors.UnwrapFileErrors(err) {
-		errfilename := ferr.Position().Filename
-		if errfilename == filename {
-			if ferr.ErrorContext() == nil {
-				f, ioerr := p.s.SourceSpec.Fs.Source.Open(filename)
-				if ioerr != nil {
-					return err
-				}
-				defer f.Close()
-				ferr.UpdateContent(f, nil)
-			}
-			return err
-		}
+		return fmt.Errorf("%q: %w", p.Path(), err)
 	}
 
-	lineMatcher := herrors.NopLineMatcher
-
-	if textSegmentErr, ok := err.(*herrors.TextSegmentError); ok {
-		lineMatcher = herrors.ContainsMatcher(textSegmentErr.Segment)
-	}
+	return hugofs.AddFileInfoToError(err, p.File().FileInfo(), p.s.SourceSpec.Fs.Source)
+}
 
-	return herrors.NewFileErrorFromFile(err, filename, p.s.SourceSpec.Fs.Source, lineMatcher)
+// wrapError adds some more context to the given error if possible/needed
+func (p *pageState) wrapError(err error) error {
+	return p.m.wrapError(err)
 }
 
 func (p *pageState) getContentConverter() converter.Converter {
 	var err error
-	p.m.contentConverterInit.Do(func() {
+	p.contentConverterInit.Do(func() {
 		markup := p.m.markup
 		if markup == "html" {
 			// Only used for shortcode inner content.
 			markup = "markdown"
 		}
-		p.m.contentConverter, err = p.m.newContentConverter(p, markup)
+		p.contentConverter, err = p.m.newContentConverter(p, markup)
 	})
 
 	if err != nil {
 		p.s.Log.Errorln("Failed to create content converter:", err)
 	}
-	return p.m.contentConverter
-}
-
-func (p *pageState) mapContent(bucket *pagesMapBucket, meta *pageMeta) error {
-	p.cmap = &pageContentMap{
-		items: make([]any, 0, 20),
-	}
-
-	return p.mapContentForResult(
-		p.source.parsed,
-		p.shortcodeState,
-		p.cmap,
-		meta.markup,
-		func(m map[string]interface{}) error {
-			return meta.setMetadata(bucket, p, m)
-		},
-	)
-}
-
-func (p *pageState) mapContentForResult(
-	result pageparser.Result,
-	s *shortcodeHandler,
-	rn *pageContentMap,
-	markup string,
-	withFrontMatter func(map[string]any) error,
-) error {
-	iter := result.Iterator()
-
-	fail := func(err error, i pageparser.Item) error {
-		if fe, ok := err.(herrors.FileError); ok {
-			return fe
-		}
-		return p.parseError(err, result.Input(), i.Pos())
-	}
-
-	// the parser is guaranteed to return items in proper order or fail, so …
-	// … it's safe to keep some "global" state
-	var currShortcode shortcode
-	var ordinal int
-	var frontMatterSet bool
-
-Loop:
-	for {
-		it := iter.Next()
-
-		switch {
-		case it.Type == pageparser.TypeIgnore:
-		case it.IsFrontMatter():
-			f := pageparser.FormatFromFrontMatterType(it.Type)
-			m, err := metadecoders.Default.UnmarshalToMap(it.Val(result.Input()), f)
-			if err != nil {
-				if fe, ok := err.(herrors.FileError); ok {
-					pos := fe.Position()
-					// Apply the error to the content file.
-					pos.Filename = p.File().Filename()
-					// Offset the starting position of front matter.
-					offset := iter.LineNumber(result.Input()) - 1
-					if f == metadecoders.YAML {
-						offset -= 1
-					}
-					pos.LineNumber += offset
-
-					fe.UpdatePosition(pos)
-
-					return fe
-				} else {
-					return err
-				}
-			}
-
-			if withFrontMatter != nil {
-				if err := withFrontMatter(m); err != nil {
-					return err
-				}
-			}
-
-			frontMatterSet = true
-
-			next := iter.Peek()
-			p.source.posMainContent = next.Pos()
-
-			if !p.s.shouldBuild(p) {
-				// Nothing more to do.
-				return nil
-			}
-
-		case it.Type == pageparser.TypeLeadSummaryDivider:
-			posBody := -1
-			f := func(item pageparser.Item) bool {
-				if posBody == -1 && !item.IsDone() {
-					posBody = item.Pos()
-				}
-
-				if item.IsNonWhitespace(result.Input()) {
-					p.truncated = true
-
-					// Done
-					return false
-				}
-				return true
-			}
-			iter.PeekWalk(f)
-
-			p.source.posSummaryEnd = it.Pos()
-			p.source.posBodyStart = posBody
-			p.source.hasSummaryDivider = true
-
-			if markup != "html" {
-				// The content will be rendered by Goldmark or similar,
-				// and we need to track the summary.
-				rn.AddReplacement(internalSummaryDividerPre, it)
-			}
-
-		// Handle shortcode
-		case it.IsLeftShortcodeDelim():
-			// let extractShortcode handle left delim (will do so recursively)
-			iter.Backup()
-
-			currShortcode, err := s.extractShortcode(ordinal, 0, result.Input(), iter)
-			if err != nil {
-				return fail(err, it)
-			}
-
-			currShortcode.pos = it.Pos()
-			currShortcode.length = iter.Current().Pos() - it.Pos()
-			if currShortcode.placeholder == "" {
-				currShortcode.placeholder = createShortcodePlaceholder("s", p.id, currShortcode.ordinal)
-			}
-
-			if currShortcode.name != "" {
-				s.addName(currShortcode.name)
-			}
-
-			if currShortcode.params == nil {
-				var s []string
-				currShortcode.params = s
-			}
-
-			currShortcode.placeholder = createShortcodePlaceholder("s", p.id, ordinal)
-			ordinal++
-			s.shortcodes = append(s.shortcodes, currShortcode)
-
-			rn.AddShortcode(currShortcode)
-		case it.IsEOF():
-			break Loop
-		case it.IsError():
-			err := fail(it.Err, it)
-			currShortcode.err = err
-			return err
-
-		default:
-			rn.AddBytes(it)
-		}
-	}
-
-	if !frontMatterSet && withFrontMatter != nil {
-		// Page content without front matter. Assign default front matter from
-		// cascades etc.
-		if err := withFrontMatter(nil); err != nil {
-			return err
-		}</