Matrix more

Author: bep

hugolib/content_map_page.go

@@ -666,7 +666,7 @@ var (
 type contentNodeIs2 []contentNodeI
 
 func (n contentNodeIs2) Dims() sitematrix.VectorProvider {
-	panic("contentNodeIs2.Dims: not supported")
+	panic("Dims(): not supported")
 }
 
 func (n contentNodeIs2) Path() string {
@@ -793,9 +793,7 @@ func (s *contentNodeShifter) Delete(n contentNodeI, dims sitematrix.Vector) (con
 		}
 		return deleted, wasDeleted, isEmpty
 	case contentNodeIs2:
-		if len(v) == 0 {
-			panic("empty contentNodeIs2")
-		}
+		// panic("TODO1 Delete")
 		// TODO1 implement me.
 		return nil, false, false
 
@@ -870,8 +868,6 @@ func absint(i int) int {
 }
 
 func (s *contentNodeShifter) Shift(n contentNodeI, dims sitematrix.Vector, exact, delegeeFallback bool) (contentNodeI, bool, sitematrix.Dimension) {
-	// dims: language, version and role
-	// How accurate is the match. TODO1 revise this.
 	accuracy := sitematrix.Language
 	switch v := n.(type) {
 	case contentNodeIs:
@@ -897,14 +893,12 @@ func (s *contentNodeShifter) Shift(n contentNodeI, dims sitematrix.Vector, exact
 		}
 		return nil, false, 0
 	case contentNodeIs2:
-		if len(v) == 0 {
-			panic("empty contentNodeIs2")
-		}
 		for _, vv := range v {
 			if vv.Dims().HasVector(dims) {
 				return vv, true, sitematrix.Language
 			}
 		}
+
 		if !delegeeFallback {
 			return nil, false, 0
 		}
@@ -984,6 +978,15 @@ func (s *contentNodeShifter) ForEeachInDimension(n contentNodeI, dims sitematrix
 				}
 			}
 		}
+
+	case contentNodeIs2:
+		for _, v := range vv {
+			if v.Dims().HasVector(dims) {
+				if f(v) {
+					return
+				}
+			}
+		}
 	default:
 		if n == nil {
 			return
@@ -1094,7 +1097,8 @@ func (s *contentNodeShifter) Insert(old, new contentNodeI) (contentNodeI, conten
 			}*/
 
 		rs := append(vv, newp)
-		return contentNodeIs2(rs), vv.first(), false
+
+		return rs, vv, false
 
 	case *resourceSource:
 		newp, ok := new.(*resourceSource)

hugolib/doctree/nodeshifttree.go

@@ -433,11 +433,15 @@ func (r *NodeShiftTree[T]) shift(t T, exact, delegeeFallback bool) (T, bool, sit
 func (r *NodeShiftTree[T]) get(s string) (T, bool) {
 	s = cleanKey(s)
 	v, ok := r.tree.Get(s)
+	// dims: language, version and role
+	// How accurate is the match. TODO1 revise this.
+
 	if !ok {
 		var t T
 		return t, false
 	}
 	t, ok, _ := r.shift(v.(T), true, false) // TODO1
+
 	return t, ok
 }
 

hugolib/page__meta.go

@@ -454,7 +454,7 @@ params:
 	pcfg := pm.pageConfig
 	params := pcfg.Params
 	if params == nil {
-		panic("params not set for " + p.Title())
+		panic("params not set for " + p.Path())
 	}
 
 	var draft, published, isCJKLanguage *bool

hugolib/page__new.go

@@ -47,6 +47,7 @@ func (h *HugoSites) newPages(m *pageMeta) (iter.Seq2[int, *pageState], *paths.Pa
 			// No page created, so nothing to yield.
 			return
 		}
+
 		if !yield(0, p) {
 			return
 		}
@@ -59,6 +60,7 @@ func (h *HugoSites) newPages(m *pageMeta) (iter.Seq2[int, *pageState], *paths.Pa
 			if !yield(i, p) {
 				return
 			}
+
 		}
 	}
 
@@ -101,15 +103,7 @@ func (h *HugoSites) doNewPage(m *pageMeta) (*pageState, *paths.Path, []*Site, er
 	}
 
 	pcfg := m.pageConfig
-	if m.f != nil && m.f.Path() == "_index.md" {
-		// TODO1: Remove.
-
-		fmt.Println("===>", m.f.Path(), pcfg.Languages, pcfg.Versions, pcfg.Roles, "dims", pcfg.Dimensions, "file vectors:", dimensionsFromFile)
-		pcfg.Dimensions.ForEeachVector(func(v sitematrix.Vector) bool {
-			fmt.Println("pcfg.Dimensions.Vector", h.Conf.ConfiguredDimensions().ResolveNames(v))
-			return true
-		})
-	}
+
 	if pcfg.Lang != "" {
 		// TODO1
 		if h.Conf.IsLangDisabled(pcfg.Lang) {

hugolib/roles/roles_integration_test.go

@@ -263,7 +263,8 @@ site.GetPage p1: {{ with .Site.GetPage "p1" }}{{ .Title }}|{{ end }}$
 		// b.AssertFileContent("public/en/index.html", "Title English", "Text English")
 		b.AssertFileContent("public/v2.0.0/nn/p1/index.html", "Tittel Nynorsk", "Tekst Nynorsk", "site.GetPage p1: Tittel Nynorsk|")
 		b.AssertFileContent("public/v2.0.0/nn/p2/index.html", "p2 all||", "site.GetPage p2: p2 all", "site.GetPage p1: Tittel Nynorsk|")
-		b.AssertFileContent("public/v2.0.0/en/p2/index.html", "p2 all||", "sdf")
+		b.AssertFileContent("public/v2.0.0/en/p2/index.html", "p2 all||", "site.GetPage p1: $")
+		b.AssertFileContent("public/v2.0.0/nn/p2/index.html", "p2 all||", "site.GetPage p1: Tittel Nynorsk|$")
 		b.AssertFileContent("public/v1.2.3/en/p2/index.html", "p2 all||", "site.GetPage p2: p2 all")
 	}
 

hugolib/sitematrix/sets.go

@@ -107,6 +107,22 @@ func (s *IntSets) EqualsVector(other VectorProvider) bool {
 	})
 }
 
+// ApplyDefaultsIfNotSet applies default values to the IntSets if they are not already set.
+func (s *IntSets) SetDefaultsIfNotSet(cfg ConfiguredDimensions) {
+	if s.Languages == nil {
+		s.Languages = maps.NewOrderedIntSet()
+		s.Languages.Set(cfg.ConfiguredLanguages.IndexDefault())
+	}
+	if s.Versions == nil {
+		s.Versions = maps.NewOrderedIntSet()
+		s.Versions.Set(cfg.ConfiguredVersions.IndexDefault())
+	}
+	if s.Roles == nil {
+		s.Roles = maps.NewOrderedIntSet()
+		s.Roles.Set(cfg.ConfiguredRoles.IndexDefault())
+	}
+}
+
 func (s *IntSets) SetFrom(other *IntSets) {
 	if other == nil {
 		return

resources/page/pagemeta/page_frontmatter.go

@@ -329,12 +329,12 @@ func (p *PageConfig) CompileEearly(conf config.AllProvider, dimensionsFromFile *
 		p.Languages = hstrings.UniqueStringsReuse(p.Languages)
 	}
 
-	// TODO1 default when?
 	sets, err := sitematrix.NewIntSets2(conf.ConfiguredDimensions(), false, p.Languages, p.Versions, p.Roles)
 	if err != nil {
 		return fmt.Errorf("failed to create dimensions sets: %w", err)
 	}
 	sets.SetFrom(dimensionsFromFile)
+	sets.SetDefaultsIfNotSet(conf.ConfiguredDimensions())
 	p.Dimensions = sets
 
 	setsDelegees, err := sitematrix.NewIntSets2(conf.ConfiguredDimensions(), false, p.LanguageDelegees, p.VersionDelegees, p.RoleDelegees)