Work

Author: bep

config/allconfig/alldecoders.go

@@ -217,9 +217,14 @@ var allDecoderSetups = map[string]decodeWeight{
 	"roles": {
 		key: "roles",
 		decode: func(d decodeWeight, p decodeConfig) error {
-			var err error
+			var (
+				err                error
+				defaultContentRole string
+			)
 			m := maps.CleanConfigStringMap(p.p.GetStringMap(d.key))
-			p.c.Roles, err = roles.DecodeConfig(p.c.RootConfig.DefaultContentRole, m)
+			p.c.Roles, defaultContentRole, err = roles.DecodeConfig(p.c.RootConfig.DefaultContentRole, m)
+			p.c.RootConfig.DefaultContentRole = defaultContentRole
+
 			return err
 		},
 	},

hugolib/cascade_test.go

@@ -917,3 +917,47 @@ title: p2
 	b.AssertFileExists("public/sx/index.html", true)    // failing
 	b.AssertFileExists("public/sx/p2/index.html", true) // failing
 }
+
+func TestDimensionsCascadeConfig(t *testing.T) {
+	files := `
+-- hugo.toml --
+disableKinds = ["taxonomy", "term", "rss", "sitemap"]
+[languages]
+[languages.en]
+weight = 1
+[languages.nn]
+weight = 2
+[languages.sv]
+weight = 3
+
+[versions]
+[versions.v1.0.0]
+[versions.v2.0.0]
+
+[cascade]
+languages = ["en*"]
+languageDelegees = ["nn*"]
+versions = ["v1*"]
+versionDelegees = ["v2*"]
+roles = ["guest*"]
+roleDelegees = ["member*"]
+-- content/_index.md --
+---
+title: "Home"
+---
+-- layouts/all.html --
+All.
+
+`
+
+	b := Test(t, files)
+	b.Assert(len(b.H.Sites), qt.Equals, 1)
+
+	homeEn := b.H.Sites[0].Home().(*pageState)
+	b.Assert(homeEn.m.pageConfig.Versions, qt.DeepEquals, []string{"v1*"})
+	b.Assert(homeEn.m.pageConfig.VersionDelegees, qt.DeepEquals, []string{"v2*"})
+	b.Assert(homeEn.m.pageConfig.Roles, qt.DeepEquals, []string{"guest*"})
+	b.Assert(homeEn.m.pageConfig.RoleDelegees, qt.DeepEquals, []string{"member*"})
+	b.Assert(homeEn.m.pageConfig.Languages, qt.DeepEquals, []string{"en*"})
+	b.Assert(homeEn.m.pageConfig.LanguageDelegees, qt.DeepEquals, []string{"nn*"})
+}

hugolib/content_map_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	qt "github.com/frankban/quicktest"
+	"github.com/gohugoio/hugo/hugolib/doctree"
 	"github.com/gohugoio/hugo/identity"
 )
 
@@ -508,6 +509,10 @@ func (n *testContentNode) isContentNodeBranch() bool {
 func (n *testContentNode) resetBuildState() {
 }
 
+func (n *testContentNode) matchDirectOrInDelegees(doctree.Dimensions) (contentNodeI, doctree.Dimensions) {
+	panic("not implemented")
+}
+
 func (n *testContentNode) MarkStale() {
 }
 

hugolib/hugo_sites_build.go

@@ -161,7 +161,7 @@ func (h *HugoSites) Build(config BuildCfg, events ...fsnotify.Event) error {
 		}
 	}
 
-	for _, s := range h.Sites {
+	for s := range h.allSites() {
 		s.state = siteStateReady
 	}
 

hugolib/page__meta.go

@@ -251,65 +251,15 @@ func (p *pageMeta) setMetaPre(pi *contentParseInfo, logger loggers.Logger, conf
 	frontmatter := pi.frontMatter
 
 	if frontmatter != nil {
-		pcfg := p.pageConfig
-		// Needed for case insensitive fetching of params values
-		maps.PrepareParams(frontmatter)
-		pcfg.Params = frontmatter
-		// Check for any cascade define on itself.
-		if cv, found := frontmatter["cascade"]; found {
-			var err error
-			cascade, err := page.DecodeCascade(logger, true, cv)
-			if err != nil {
-				return err
-			}
-			pcfg.CascadeCompiled = cascade
-		}
-
-		// Look for path, lang, roles and kind, all of which values we need early on.
-		if v, found := frontmatter["path"]; found {
-			pcfg.Path = paths.ToSlashPreserveLeading(cast.ToString(v))
-		}
-		if v, found := frontmatter["lang"]; found {
-			lang := strings.ToLower(cast.ToString(v))
-			if _, ok := conf.PathParser().LanguageIndex[lang]; ok {
-				pcfg.Lang = lang
-			}
-		}
-		if v, found := frontmatter["kind"]; found {
-			s := cast.ToString(v)
-			if s != "" {
-				pcfg.Kind = kinds.GetKindMain(s)
-				if pcfg.Kind == "" {
-					return fmt.Errorf("unknown kind %q in front matter", s)
-				}
-			}
-		}
-		if v, found := frontmatter["roles"]; found {
-			pcfg.Roles = cast.ToStringSlice(v)
-		}
-		if v, found := frontmatter["versions"]; found {
-			pcfg.Versions = cast.ToStringSlice(v)
-		}
-		if v, found := frontmatter["languages"]; found {
-			pcfg.Languages = cast.ToStringSlice(v)
-		}
-		if v, found := frontmatter["languagedelegees"]; found {
-			pcfg.LanguageDelegees = cast.ToStringSlice(v)
-		}
-		if v, found := frontmatter["versiondelegees"]; found {
-			pcfg.VersionDelegees = cast.ToStringSlice(v)
-		}
-		if v, found := frontmatter["roledelegees"]; found {
-			pcfg.RoleDelegees = cast.ToStringSlice(v)
+		if err := p.pageConfig.SetMetaPreFromMap(frontmatter, logger, conf); err != nil {
+			return err
 		}
-
 	} else if p.pageMetaParams.pageConfig.Params == nil {
 		p.pageConfig.Params = make(maps.Params)
 	}
 
 	p.pageMetaParams.init(conf.Watching())
 
-	// TODO1 check if we can allow cascade from config.
 	if err := p.pageConfig.CompileEearly(conf); err != nil {
 		return fmt.Errorf("failed to compile roles: %w", err)
 	}

hugolib/roles/roles.go

@@ -102,22 +102,27 @@ func (r RolesInternal) IndexMatch(filter predicate.Filter[string]) (iter.Seq[int
 	}, nil
 }
 
-func (r *RolesInternal) init(defaultContentRole string) error {
+const dfaultContentRoleFallback = "guest"
+
+func (r *RolesInternal) init(defaultContentRole string) (string, error) {
 	if len(r.roleConfigs) == 0 {
 		// Add a default role.
-		r.roleConfigs[""] = RoleConfig{}
+		if defaultContentRole == "" {
+			defaultContentRole = dfaultContentRoleFallback
+		}
+		r.roleConfigs[defaultContentRole] = RoleConfig{}
 	}
 
 	var defaultSeen bool
 	for k, v := range r.roleConfigs {
 		if k == "" {
-			return errors.New("role name cannot be empty")
+			return "", errors.New("role name cannot be empty")
 		}
 
 		if err := paths.ValidateIdentifier(k); err != nil {
 			// TODO1 config keys gets auto lowercased, so this will (almost) never happen.
 			// TODO1: Tree store: linked list for dimension nodes.
-			return fmt.Errorf("role name %q is invalid: %s", k, err)
+			return "", fmt.Errorf("role name %q is invalid: %s", k, err)
 		}
 
 		var isDefault bool
@@ -150,27 +155,31 @@ func (r *RolesInternal) init(defaultContentRole string) error {
 		first.Default = true
 		r.roleConfigs[first.Name] = first.RoleConfig
 		r.Sorted[0] = first
+		defaultContentRole = first.Name
 	}
 
-	return nil
+	return defaultContentRole, nil
 }
 
 func (r RolesInternal) Has(role string) bool {
 	_, found := r.roleConfigs[role]
 	return found
 }
 
-func DecodeConfig(defaultContentRole string, m map[string]any) (*config.ConfigNamespace[map[string]RoleConfig, RolesInternal], error) {
-	return config.DecodeNamespace[map[string]RoleConfig](m, func(in any) (RolesInternal, any, error) {
+func DecodeConfig(defaultContentRole string, m map[string]any) (*config.ConfigNamespace[map[string]RoleConfig, RolesInternal], string, error) {
+	v, err := config.DecodeNamespace[map[string]RoleConfig](m, func(in any) (RolesInternal, any, error) {
 		var roles RolesInternal
 		var conf map[string]RoleConfig
 		if err := mapstructure.Decode(m, &conf); err != nil {
 			return roles, nil, err
 		}
 		roles.roleConfigs = conf
-		if err := roles.init(defaultContentRole); err != nil {
+		var err error
+		if defaultContentRole, err = roles.init(defaultContentRole); err != nil {
 			return roles, nil, err
 		}
 		return roles, nil, nil
 	})
+
+	return v, defaultContentRole, err
 }

hugolib/roles/roles_integration_test.go

@@ -84,7 +84,7 @@ RegularPages: {{ range .RegularPages }}{{ .RelPermalink }} r: {{ .Site.Language.
 
 `
 
-	for range 20 {
+	for range 3 {
 		b := hugolib.Test(t, files)
 
 		// TODO1 export Default?

hugolib/site_test.go

@@ -1018,7 +1018,7 @@ Content: {{ .Content }}|
 
 func checkLinkCase(site *Site, link string, currentPage page.Page, relative bool, outputFormat string, expected string, t *testing.T, i int) {
 	t.Helper()
-	if out, err := site.refLink(link, currentPage, relative, outputFormat); err != nil || out != expected {
+	if out, err := site.siteRefLinker.refLink(link, currentPage, relative, outputFormat); err != nil || out != expected {
 		t.Fatalf("[%d] Expected %q from %q to resolve to %q, got %q - error: %s", i, link, currentPage.Path(), expected, out, err)
 	}
 }

resources/page/pagemeta/page_frontmatter.go

@@ -96,19 +96,113 @@ type PageConfigEarly struct {
 	VersionDelegees  []string
 	LanguageDelegees []string
 
+	// User defined params.
+	Params maps.Params
+
 	Cascade []map[string]any
 
 	// Content holds the content for this page.
 	Content Source
+
+	// Compiled values.
+	CascadeCompiled *maps.Ordered[page.PageMatcher, maps.Params] `mapstructure:"-" json:"-"`
+}
+
+const (
+	pageMetaKeyVersions         = "versions"
+	pageMetaKeyLanguages        = "languages"
+	pageMetaKeyRoles            = "roles"
+	pageMetaKeyVersionDelegees  = "versiondelegees"
+	pageMetaKeyLanguageDelegees = "languagedelegees"
+	pageMetaKeyRoleDelegees     = "roledelegees"
+	pageMetaKeyCascade          = "cascade"
+	pageMetaKeyPath             = "path"
+	pageMetaKeyLang             = "lang"
+	pageMetaKeyKind             = "kind"
+)
+
+func (pcfg *PageConfigEarly) SetMetaPreFromMap(frontmatter map[string]any, logger loggers.Logger, conf config.AllProvider) error {
+	// Needed for case insensitive fetching of params values.
+	maps.PrepareParams(frontmatter)
+	pcfg.Params = frontmatter
+	// Check for any cascade define on itself.
+	if cv, found := frontmatter[pageMetaKeyCascade]; found {
+		var err error
+		cascade, err := page.DecodeCascade(logger, true, cv)
+		if err != nil {
+			return err
+		}
+		pcfg.CascadeCompiled = cascade
+	}
+
+	// Look for path, lang, roles and kind, all of which values we need early on.
+	if v, found := frontmatter[pageMetaKeyPath]; found {
+		pcfg.Path = paths.ToSlashPreserveLeading(cast.ToString(v))
+	}
+	if v, found := frontmatter[pageMetaKeyLang]; found {
+		lang := strings.ToLower(cast.ToString(v))
+		if _, ok := conf.PathParser().LanguageIndex[lang]; ok {
+			pcfg.Lang = lang
+		}
+	}
+	if v, found := frontmatter[pageMetaKeyKind]; found {
+		s := cast.ToString(v)
+		if s != "" {
+			pcfg.Kind = kinds.GetKindMain(s)
+			if pcfg.Kind == "" {
+				return fmt.Errorf("unknown kind %q in front matter", s)
+			}
+		}
+	}
+	if v, found := frontmatter[pageMetaKeyRoles]; found {
+		pcfg.Roles = cast.ToStringSlice(v)
+	}
+	if v, found := frontmatter[pageMetaKeyVersions]; found {
+		pcfg.Versions = cast.ToStringSlice(v)
+	}
+	if v, found := frontmatter[pageMetaKeyLanguages]; found {
+		pcfg.Languages = cast.ToStringSlice(v)
+	}
+	if v, found := frontmatter[pageMetaKeyLanguageDelegees]; found {
+		pcfg.LanguageDelegees = cast.ToStringSlice(v)
+	}
+	if v, found := frontmatter[pageMetaKeyVersionDelegees]; found {
+		pcfg.VersionDelegees = cast.ToStringSlice(v)
+	}
+	if v, found := frontmatter[pageMetaKeyRoleDelegees]; found {
+		pcfg.RoleDelegees = cast.ToStringSlice(v)
+	}
+
+	return nil
 }
 
 func (p *PageConfigEarly) setConfigCascadeValueIfNotSet(key string, value any) {
 	switch key {
-	// TODO1 complement.
-	case "versions":
+	case pageMetaKeyVersions:
 		if p.Versions == nil {
 			p.Versions = types.ToStringSlicePreserveString(value)
 		}
+	case pageMetaKeyLanguages:
+		if p.Languages == nil {
+			p.Languages = types.ToStringSlicePreserveString(value)
+		}
+	case pageMetaKeyRoles:
+		if p.Roles == nil {
+			p.Roles = types.ToStringSlicePreserveString(value)
+		}
+	case pageMetaKeyVersionDelegees:
+		if p.VersionDelegees == nil {
+			p.VersionDelegees = types.ToStringSlicePreserveString(value)
+		}
+	case pageMetaKeyLanguageDelegees:
+		if p.LanguageDelegees == nil {
+			p.LanguageDelegees = types.ToStringSlicePreserveString(value)
+		}
+	case pageMetaKeyRoleDelegees:
+		if p.RoleDelegees == nil {
+			p.RoleDelegees = types.ToStringSlicePreserveString(value)
+		}
+
 	}
 }
 
@@ -142,18 +236,14 @@ type PageConfig struct {
 	Build   BuildConfig
 	Menus   any // Can be a string, []string or map[string]any.
 
-	// User defined params.
-	Params maps.Params
-
 	// The raw data from the content adapter.
 	// TODO(bep) clean up the ContentAdapterData vs Params.
 	ContentAdapterData map[string]any `mapstructure:"-" json:"-"`
 
 	// Compiled values.
-	ConfiguredOutputFormats output.Formats                               `mapstructure:"-" json:"-"`
-	CascadeCompiled         *maps.Ordered[page.PageMatcher, maps.Params] `mapstructure:"-" json:"-"`
-	ContentMediaType        media.Type                                   `mapstructure:"-" json:"-"`
-	IsFromContentAdapter    bool                                         `mapstructure:"-" json:"-"`
+	ConfiguredOutputFormats output.Formats `mapstructure:"-" json:"-"`
+	ContentMediaType        media.Type     `mapstructure:"-" json:"-"`
+	IsFromContentAdapter    bool           `mapstructure:"-" json:"-"`
 
 	LanguagesCompiledSet        *maps.OrderedIntSet `mapstructure:"-" json:"-"`
 	RolesCompiledSet            *maps.OrderedIntSet `mapstructure:"-" json:"-"`