coremodels: Update to latest Thema with generics (#56602)

* Update thema to latest

* Deal with s/Library/*Runtime/

* Commit new, working results of codegen

pkg/codegen/coremodel.go

@@ -50,7 +50,7 @@ type CoremodelDeclaration struct {
 // This loading approach is intended primarily for use with code generators, or
 // other use cases external to grafana-server backend. For code within
 // grafana-server, prefer lineage loaders provided in e.g. pkg/coremodel/*.
-func ExtractLineage(path string, lib thema.Library) (*CoremodelDeclaration, error) {
+func ExtractLineage(path string, rt *thema.Runtime) (*CoremodelDeclaration, error) {
 	if !filepath.IsAbs(path) {
 		return nil, fmt.Errorf("must provide an absolute path, got %q", path)
 	}
@@ -99,7 +99,7 @@ func ExtractLineage(path string, lib thema.Library) (*CoremodelDeclaration, erro
 		panic(err)
 	}
 	ec.RelativePath = filepath.ToSlash(ec.RelativePath)
-	ec.Lineage, err = cuectx.LoadGrafanaInstancesWithThema(filepath.Dir(ec.RelativePath), fs, lib)
+	ec.Lineage, err = cuectx.LoadGrafanaInstancesWithThema(filepath.Dir(ec.RelativePath), fs, rt)
 	if err != nil {
 		return ec, err
 	}
@@ -156,7 +156,7 @@ func (cd *CoremodelDeclaration) PathVersion() string {
 // The provided path must be a directory. Generated code files will be written
 // to that path. The final element of the path must match the Lineage.Name().
 func (cd *CoremodelDeclaration) GenerateGoCoremodel(path string) (WriteDiffer, error) {
-	lin, lib := cd.Lineage, cd.Lineage.Library()
+	lin, rt := cd.Lineage, cd.Lineage.Runtime()
 	_, name := filepath.Split(path)
 	if name != lin.Name() {
 		return nil, fmt.Errorf("lineage name %q must match final element of path, got %q", lin.Name(), path)
@@ -168,7 +168,7 @@ func (cd *CoremodelDeclaration) GenerateGoCoremodel(path string) (WriteDiffer, e
 		return nil, fmt.Errorf("thema openapi generation failed: %w", err)
 	}
 
-	str, err := yaml.Marshal(lib.Context().BuildFile(f))
+	str, err := yaml.Marshal(rt.Context().BuildFile(f))
 	if err != nil {
 		return nil, fmt.Errorf("cue-yaml marshaling failed: %w", err)
 	}

pkg/codegen/pluggen.go

@@ -63,7 +63,7 @@ func MapCUEImportToTS(path string) (string, error) {
 // Errors returned from [pfs.ParsePluginFS] are placed in the option map. Only
 // filesystem traversal and read errors will result in a non-nil second return
 // value.
-func ExtractPluginTrees(parent fs.FS, lib thema.Library) (map[string]PluginTreeOrErr, error) {
+func ExtractPluginTrees(parent fs.FS, rt *thema.Runtime) (map[string]PluginTreeOrErr, error) {
 	ents, err := fs.ReadDir(parent, ".")
 	if err != nil {
 		return nil, fmt.Errorf("error reading fs root directory: %w", err)
@@ -78,7 +78,7 @@ func ExtractPluginTrees(parent fs.FS, lib thema.Library) (map[string]PluginTreeO
 		}
 
 		var either PluginTreeOrErr
-		if ptree, err := pfs.ParsePluginFS(sub, lib); err == nil {
+		if ptree, err := pfs.ParsePluginFS(sub, rt); err == nil {
 			either.Tree = (*PluginTree)(ptree)
 		} else {
 			either.Err = err
@@ -235,7 +235,7 @@ func genGoTypes(plug pfs.PluginInfo, path, subpath, prefix string) (WriteDiffer,
 	wd := NewWriteDiffer()
 	for slotname, lin := range plug.SlotImplementations() {
 		lowslot := strings.ToLower(slotname)
-		lib := lin.Library()
+		rt := lin.Runtime()
 		sch := thema.SchemaP(lin, thema.LatestVersion(lin))
 
 		// FIXME gotta hack this out of thema in order to deal with our custom imports :scream:
@@ -244,7 +244,7 @@ func genGoTypes(plug pfs.PluginInfo, path, subpath, prefix string) (WriteDiffer,
 			return nil, fmt.Errorf("thema openapi generation failed: %w", err)
 		}
 
-		str, err := yaml.Marshal(lib.Context().BuildFile(f))
+		str, err := yaml.Marshal(rt.Context().BuildFile(f))
 		if err != nil {
 			return nil, fmt.Errorf("cue-yaml marshaling failed: %w", err)
 		}

pkg/codegen/tmpl/addenda.tmpl

@@ -18,8 +18,8 @@ var currentVersion = thema.SV({{ .LatestSeqv }}, {{ .LatestSchv }})
 {{- if .IsComposed }}//
 // This is the base variant of the schema. It does not include any composed
 // plugin schemas.{{ end }}
-func Lineage(lib thema.Library, opts ...thema.BindOption) (thema.Lineage, error) {
-	return cuectx.LoadGrafanaInstancesWithThema(filepath.Join("pkg", "coremodel", "{{ .Name }}"), cueFS, lib, opts...)
+func Lineage(rt *thema.Runtime, opts ...thema.BindOption) (thema.Lineage, error) {
+	return cuectx.LoadGrafanaInstancesWithThema(filepath.Join("pkg", "coremodel", "{{ .Name }}"), cueFS, rt, opts...)
 }
 
 var _ thema.LineageFactory = Lineage
@@ -52,8 +52,8 @@ func (c *Coremodel) GoType() interface{} {
 // Note that this function does not cache, and initially loading a Thema lineage
 // can be expensive. As such, the Grafana backend should prefer to access this
 // coremodel through a registry (pkg/framework/coremodel/registry), which does cache.
-func New(lib thema.Library) (*Coremodel, error) {
-	lin, err := Lineage(lib)
+func New(rt *thema.Runtime) (*Coremodel, error) {
+	lin, err := Lineage(rt)
 	if err != nil {
 		return nil, err
 	}

pkg/codegen/tmpl/coremodel_registry.tmpl

@@ -42,12 +42,12 @@ func (b *Base) {{ .TitleName }}() *{{ .Name }}.Coremodel {
 }
 {{end}}
 
-func doProvideBase(lib thema.Library) *Base {
+func doProvideBase(rt *thema.Runtime) *Base {
 	var err error
 	reg := &Base{}
 
 {{range .Coremodels }}
-	reg.{{ .Name }}, err = {{ .Name }}.New(lib)
+	reg.{{ .Name }}, err = {{ .Name }}.New(rt)
 	if err != nil {
 		panic(fmt.Sprintf("error while initializing {{ .Name }} coremodel: %s", err))
 	}

pkg/codegen/tmpl/plugin_lineage_binding.tmpl

@@ -7,6 +7,6 @@ var currentVersion{{ .SlotName }} = thema.SV({{ .LatestSeqv }}, {{ .LatestSchv }
 
 // {{ .SlotName }}Lineage returns the Thema lineage for the {{ .PluginID }} {{ .PluginType }} plugin's
 // {{ .SlotName }} ["github.com/grafana/grafana/pkg/framework/coremodel".Slot] implementation.
-func {{ .SlotName }}Lineage(lib thema.Library, opts ...thema.BindOption) (thema.Lineage, error) {
-	return cuectx.LoadGrafanaInstancesWithThema(filepath.Join("public", "app", "{{ .Name }}"), cueFS, lib, opts...)
+func {{ .SlotName }}Lineage(rt *thema.Runtime, opts ...thema.BindOption) (thema.Lineage, error) {
+	return cuectx.LoadGrafanaInstancesWithThema(filepath.Join("public", "app", "{{ .Name }}"), cueFS, rt, opts...)
 }

pkg/codegen/tmpl/plugin_lineage_file.tmpl

@@ -19,14 +19,14 @@ var ptree *pfs.Tree
 var plugFS embed.FS
 
 // PluginTree returns the plugin tree representing the statically analyzable contents of the {{ .PluginID }} plugin.
-func PluginTree(lib *thema.Library) *pfs.Tree {
+func PluginTree(rt *thema.Runtime) *pfs.Tree {
 	var err error
-	if lib == nil {
+	if rt == nil || rt == cuectx.GrafanaThemaRuntime() {
 		parseOnce.Do(func() {
-			ptree, err = pfs.ParsePluginFS(plugFS, cuectx.ProvideThemaLibrary())
+			ptree, err = pfs.ParsePluginFS(plugFS, cuectx.GrafanaThemaRuntime())
 		})
 	} else {
-		ptree, err = pfs.ParsePluginFS(plugFS, cuectx.ProvideThemaLibrary())
+		ptree, err = pfs.ParsePluginFS(plugFS, rt)
 	}
 
 	if err != nil {
@@ -40,8 +40,8 @@ func PluginTree(lib *thema.Library) *pfs.Tree {
 {{ $pluginfo := . }}{{ range $slot := .SlotImpls }}
 // {{ .SlotName }}Lineage returns the Thema lineage for the {{ $pluginfo.PluginID }} {{ $pluginfo.PluginType }} plugin's
 // {{ .SlotName }} ["github.com/grafana/grafana/pkg/framework/coremodel".Slot] implementation.
-func {{ .SlotName }}Lineage(lib *thema.Library, opts ...thema.BindOption) (thema.Lineage, error) {
-  t := PluginTree(lib)
+func {{ .SlotName }}Lineage(rt *thema.Runtime, opts ...thema.BindOption) (thema.Lineage, error) {
+  t := PluginTree(rt)
   lin, has := t.RootPlugin().SlotImplementations()["{{ .SlotName }}"]
   if !has {
     panic("unreachable: lineage for {{ .SlotName }} does not exist, but code is only generated for existing lineages")

pkg/codegen/tmpl/plugin_registry.tmpl

@@ -10,22 +10,22 @@ import (
 	"github.com/grafana/thema"
 )
 
-func makeTreeOrPanic(path string, pkgname string, lib thema.Library) *pfs.Tree {
+func makeTreeOrPanic(path string, pkgname string, rt *thema.Runtime) *pfs.Tree {
   sub, err := fs.Sub(grafana.CueSchemaFS, path)
   if err != nil {
     panic("could not create fs sub to " + path)
   }
-  tree, err := pfs.ParsePluginFS(sub, lib)
+  tree, err := pfs.ParsePluginFS(sub, rt)
   if err != nil {
     panic(fmt.Sprintf("error parsing plugin metadata for %s: %s", pkgname, err))
   }
   return tree
 }
 
-func coreTreeList(lib thema.Library) pfs.TreeList{
+func coreTreeList(rt *thema.Runtime) pfs.TreeList{
   return pfs.TreeList{
     {{- range .Plugins }}
-    makeTreeOrPanic("{{ .Path }}", "{{ .PkgName }}", lib),
+    makeTreeOrPanic("{{ .Path }}", "{{ .PkgName }}", rt),
     {{- end }}
   }
 }

pkg/codegen/tmpl/plugin_registry_ref.tmpl

@@ -8,8 +8,8 @@ import (
   {{ if .NoAlias }}{{ .PkgName }} {{end}}"{{ .Path }}"{{ end }}
 )
 
-func coreTreeLoaders() []func(*thema.Library) *pfs.Tree{
-  return []func(*thema.Library) *pfs.Tree{
+func coreTreeLoaders() []func(*thema.Runtime) *pfs.Tree{
+  return []func(*thema.Runtime) *pfs.Tree{
     {{- range .Plugins }}
     {{ .PkgName }}.PluginTree,{{ end }}
   }