IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Kindsys: Replace DefForGen with kindsys.Kind (#62642)

Browse Source 
* Kindsys: Replace DeclForGen with kindsys.Kind

DeclForGen was always unnecessary - it just wasn't obvious on initial
implementation, when we were focused on generating unique types for each
core kind. This removes it, considerably simplifying interactions with
kindsys - virtually everything now just relies on kindsys.Kind and its
derived interfaces.

* Removed unused jenny

* Rename params in jennies
This commit is contained in:
sam boyer
2023-01-31 19:40:15 -05:00
committed by GitHub
parent 0f0a53fbbb
commit 30b4205521
25 changed files with 273 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/codegen/jenny_tsveneerindex.go
View File

@@ -39,20 +39,20 @@ func (gen *genTSVeneerIndex) JennyName() string {
return "TSVeneerIndexJenny"
}
func (gen *genTSVeneerIndex) Generate(decls ...*DefForGen) (*codejen.File, error) {
func (gen *genTSVeneerIndex) Generate(kinds ...kindsys.Kind) (*codejen.File, error) {
tsf := new(ast.File)
for _, def := range decls {
for _, def := range kinds {
sch := def.Lineage().Latest()
f, err := typescript.GenerateTypes(sch, &typescript.TypeConfig{
RootName: def.Properties.Common().Name,
Group: def.Properties.Common().LineageIsGroup,
RootName: def.Props().Common().Name,
Group: def.Props().Common().LineageIsGroup,
})
if err != nil {
return nil, fmt.Errorf("%s: %w", def.Properties.Common().Name, err)
return nil, fmt.Errorf("%s: %w", def.Props().Common().Name, err)
}
elems, err := gen.extractTSIndexVeneerElements(def, f)
if err != nil {
return nil, fmt.Errorf("%s: %w", def.Properties.Common().Name, err)
return nil, fmt.Errorf("%s: %w", def.Props().Common().Name, err)
}
tsf.Nodes = append(tsf.Nodes, elems...)
}
@@ -60,9 +60,9 @@ func (gen *genTSVeneerIndex) Generate(decls ...*DefForGen) (*codejen.File, error
return codejen.NewFile(filepath.Join(gen.dir, "index.gen.ts"), []byte(tsf.String()), gen), nil
}
func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def *DefForGen, tf *ast.File) ([]ast.Decl, error) {
func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def kindsys.Kind, tf *ast.File) ([]ast.Decl, error) {
lin := def.Lineage()
comm := def.Properties.Common()
comm := def.Props().Common()
// Check the root, then walk the tree
rootv := lin.Latest().Underlying()
@@ -139,7 +139,7 @@ func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def *DefForGen, tf *as
}
vpath := fmt.Sprintf("v%v", thema.LatestVersion(lin)[0])
if def.Properties.Common().Maturity.Less(kindsys.MaturityStable) {
if def.Props().Common().Maturity.Less(kindsys.MaturityStable) {
vpath = "x"
}