Reconcile coremodels, entities, objects under new kind framework (#56492)
* Update thema to latest * Deal with s/Library/*Runtime/ * Commit new, working results of codegen * We like pointers now * Always take runtime arg for NewBase() * Sketchy handwavy pass at entity meta framework * Little nibbles * Update pkg/framework/coremodel/entityframework.cue Co-authored-by: Artur Wierzbicki <wierzbicki.artur.94@gmail.com> * Move file into new framework location * Introduce loaders, Go code * Complete rename to kind * Flesh out framework, add svg/dashboard examples * Cruft removal * Remove generated kind go files from gitignore * Refine maturity concept, add SlotKind * Update embed and go deps * Export PrefixWithGrafanaCUE * Make the loader actually work, holy crap * Many small tweaks to type.cue * Add Apache 2 licensing exceptions for kinds * Add new kinds dir, start of generator * Roll back to earlier oapi-codegen * Introduce new grafana-specific CUE loaders * Introduce new tidy code generators framework * Catch up kind framework with tinkering * Add slices for the generators * Add write/verify step to main generator * Many renames * Split up kind framework cue files * Use kind.Decl within generated kinds * Create kind.SomeDecl wrapper type to cache lineages * Better names again * Get one generated implemented, hopefully * Copy dashboard schema into new kind.cue * Small fixes to make the initial gen work * Put svg kind in its new home * Add generated Go dashboard type * More renames and cleanups * Add base kind registry and generator * Stop blacklisting *_gen.go files This is not the Go best practice, anyway. All we actually want to ignore for enterprise is generated wire files. * Change codegen output directories pkg/kind -> pkg/kinds pkg/registry/kindreg -> pkg/registry/corekind * Rename pkg/framework/kind to pkg/kindsys * Add core structured kind generator * Add plural and machine names to kind spec * Copy playlist over to kind system * Consolidate kindsys files * Add raw kind generator * Update CODEOWNERS for kind framework * Touch up comments a bit * More docs tweaks * Remove generated types to reduce noise for review * Split each generator into its own file * Rename Slot kind to Composable kind * Add handwavy types for customkind loading * Guard against init calls to framework loader * First pass at doc on extending the kind system * Improve attribute example in docs * Fix wire imports * Add basic TS types generator * Fix composable kind category def * No need for a separate file with generate directive * Catch dashboard schema up * Rename generator types to something saner and generic * Make version configurable in ts/go generators * Add CommonMeta to ease property access * Add kindsys prop indicating whether lineage is group * Put all kind categories back in a single file * Finish with kindsys group props * Refactor maturity progression per discussion - Replace "committed" with "merged" - All kindcats can use all maturity levels, at least for now * Convert ts veneer index generator to modular system * Move over to new jennywrites framework * Strip down old coremodel generator * Use public version of jennywrites * Pull latest thema * Commit generated Go types * Add header injection postprocessor * Move sdboyer/jennywrites to grafana/codejen * Tweak header output * Remove dashboard and playlist coremodels * Fix up backend dashboards devenv test * Fix TS import patterns to new gen filename * Update internal imports, remove coremodel registry * Fix compilation errors, wire generation * Export and replace the prefix dropper * More Go struct and field name changes * Last name fixes, hopefully * Fix lint errors * Last lint error Co-authored-by: Artur Wierzbicki <wierzbicki.artur.94@gmail.com>
This commit is contained in:
co-authored by
Artur Wierzbicki
parent
f92d978386
commit
07e5f8117f
@@ -29,7 +29,7 @@ type FooThing struct {
|
||||
}`,
|
||||
out: `package foo
|
||||
|
||||
type Model struct {
|
||||
type Foo struct {
|
||||
Id int64
|
||||
Ref Thing
|
||||
}
|
||||
@@ -52,7 +52,7 @@ type FooThing struct {
|
||||
}`,
|
||||
out: `package foo
|
||||
|
||||
type Model struct {
|
||||
type Foo struct {
|
||||
Id int64
|
||||
Ref *Thing
|
||||
}
|
||||
@@ -77,7 +77,7 @@ type FooThing struct {
|
||||
}`,
|
||||
out: `package foo
|
||||
|
||||
type Model struct {
|
||||
type Foo struct {
|
||||
Id int64
|
||||
Ref []Thing
|
||||
PRef []*Thing
|
||||
@@ -104,7 +104,7 @@ type FooThing struct {
|
||||
}`,
|
||||
out: `package foo
|
||||
|
||||
type Model struct {
|
||||
type Foo struct {
|
||||
Id int64
|
||||
KeyRef map[Thing]string
|
||||
ValRef map[string]Thing
|
||||
@@ -132,7 +132,7 @@ type FooThing struct {
|
||||
}`,
|
||||
out: `package foo
|
||||
|
||||
type Model struct {
|
||||
type Foo struct {
|
||||
Id int64
|
||||
KeyRef map[*Thing]string
|
||||
ValRef map[string]*Thing
|
||||
@@ -154,7 +154,7 @@ type Foo struct {
|
||||
}`,
|
||||
out: `package foo
|
||||
|
||||
type Model struct {
|
||||
type Foo struct {
|
||||
Id int64
|
||||
FooRef []string
|
||||
}
|
||||
@@ -235,6 +235,37 @@ type Thing string
|
||||
// of objects, only types, so we shouldn't encounter this case.
|
||||
skip: true,
|
||||
},
|
||||
"comments": {
|
||||
in: `package foo
|
||||
|
||||
// Foo is a thing. It should be Foo still.
|
||||
type Foo struct {
|
||||
Id int64
|
||||
Ref FooThing
|
||||
}
|
||||
|
||||
// FooThing is also a thing. We want [FooThing] to be known properly.
|
||||
// Even if FooThing
|
||||
// were not a FooThing, in our minds, forever shall it be FooThing.
|
||||
type FooThing struct {
|
||||
Id int64
|
||||
}`,
|
||||
out: `package foo
|
||||
|
||||
// Foo is a thing. It should be Foo still.
|
||||
type Foo struct {
|
||||
Id int64
|
||||
Ref Thing
|
||||
}
|
||||
|
||||
// Thing is also a thing. We want [Thing] to be known properly.
|
||||
// Even if Thing
|
||||
// were not a Thing, in our minds, forever shall it be Thing.
|
||||
type Thing struct {
|
||||
Id int64
|
||||
}
|
||||
`,
|
||||
},
|
||||
}
|
||||
|
||||
for name, it := range tt {
|
||||
@@ -250,7 +281,7 @@ type Thing string
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
drop := makePrefixDropper("Foo", "Model")
|
||||
drop := PrefixDropper("Foo")
|
||||
astutil.Apply(inf, drop, nil)
|
||||
buf := new(bytes.Buffer)
|
||||
err = format.Node(buf, fset, inf)
|
||||
|
||||
Reference in New Issue
Block a user