From de9b4bf72f4b144ab904594250e47329b25f928d Mon Sep 17 00:00:00 2001 From: Prad Nukala Date: Tue, 1 Oct 2024 14:43:25 -0400 Subject: [PATCH] feat: add Input and RegistrationForm models --- Makefile | 1 - pkg/format/Format.pkl.go | 36 ---------------- pkg/format/Macaroon.pkl.go | 16 ------- pkg/format/didmethod/DIDMethod.pkl.go | 52 ----------------------- pkg/format/init.pkl.go | 9 ---- pkg/nebula/models/Input.pkl.go | 18 ++++++++ pkg/nebula/models/RegistrationForm.pkl.go | 14 ++++++ pkg/nebula/models/init.pkl.go | 2 + pkl/fmt.pkl | 37 ---------------- 9 files changed, 34 insertions(+), 151 deletions(-) delete mode 100644 pkg/format/Format.pkl.go delete mode 100644 pkg/format/Macaroon.pkl.go delete mode 100644 pkg/format/didmethod/DIDMethod.pkl.go delete mode 100644 pkg/format/init.pkl.go create mode 100644 pkg/nebula/models/Input.pkl.go create mode 100644 pkg/nebula/models/RegistrationForm.pkl.go delete mode 100644 pkl/fmt.pkl diff --git a/Makefile b/Makefile index 608bb7e06..f0f2a7646 100644 --- a/Makefile +++ b/Makefile @@ -317,7 +317,6 @@ nebula: pkl: @echo "(pkl) Building PKL" go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/dwn.pkl - go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/fmt.pkl go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/orm.pkl go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/txns.pkl go run github.com/apple/pkl-go/cmd/pkl-gen-go ./pkl/uiux.pkl diff --git a/pkg/format/Format.pkl.go b/pkg/format/Format.pkl.go deleted file mode 100644 index bc7f6e80e..000000000 --- a/pkg/format/Format.pkl.go +++ /dev/null @@ -1,36 +0,0 @@ -// Code generated from Pkl module `format`. DO NOT EDIT. -package format - -import ( - "context" - - "github.com/apple/pkl-go/pkl" -) - -type Format struct { -} - -// LoadFromPath loads the pkl module at the given path and evaluates it into a Format -func LoadFromPath(ctx context.Context, path string) (ret *Format, err error) { - evaluator, err := pkl.NewEvaluator(ctx, pkl.PreconfiguredOptions) - if err != nil { - return nil, err - } - defer func() { - cerr := evaluator.Close() - if err == nil { - err = cerr - } - }() - ret, err = Load(ctx, evaluator, pkl.FileSource(path)) - return ret, err -} - -// Load loads the pkl module at the given source and evaluates it with the given evaluator into a Format -func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*Format, error) { - var ret Format - if err := evaluator.EvaluateModule(ctx, source, &ret); err != nil { - return nil, err - } - return &ret, nil -} diff --git a/pkg/format/Macaroon.pkl.go b/pkg/format/Macaroon.pkl.go deleted file mode 100644 index c4e9647ac..000000000 --- a/pkg/format/Macaroon.pkl.go +++ /dev/null @@ -1,16 +0,0 @@ -// Code generated from Pkl module `format`. DO NOT EDIT. -package format - -type Macaroon struct { - Location string `pkl:"location" json:"location,omitempty"` - - Originator string `pkl:"originator" json:"originator,omitempty"` - - Identifier string `pkl:"identifier" json:"identifier,omitempty"` - - FirstParty []string `pkl:"first_party" json:"first_party,omitempty"` - - ThirdParty []string `pkl:"third_party" json:"third_party,omitempty"` - - Expiration int `pkl:"expiration" json:"expiration,omitempty"` -} diff --git a/pkg/format/didmethod/DIDMethod.pkl.go b/pkg/format/didmethod/DIDMethod.pkl.go deleted file mode 100644 index 44aa49c81..000000000 --- a/pkg/format/didmethod/DIDMethod.pkl.go +++ /dev/null @@ -1,52 +0,0 @@ -// Code generated from Pkl module `format`. DO NOT EDIT. -package didmethod - -import ( - "encoding" - "fmt" -) - -type DIDMethod string - -const ( - Ipfs DIDMethod = "ipfs" - Sonr DIDMethod = "sonr" - Bitcoin DIDMethod = "bitcoin" - Ethereum DIDMethod = "ethereum" - Ibc DIDMethod = "ibc" - Webauthn DIDMethod = "webauthn" - Dwn DIDMethod = "dwn" - Service DIDMethod = "service" -) - -// String returns the string representation of DIDMethod -func (rcv DIDMethod) String() string { - return string(rcv) -} - -var _ encoding.BinaryUnmarshaler = new(DIDMethod) - -// UnmarshalBinary implements encoding.BinaryUnmarshaler for DIDMethod. -func (rcv *DIDMethod) UnmarshalBinary(data []byte) error { - switch str := string(data); str { - case "ipfs": - *rcv = Ipfs - case "sonr": - *rcv = Sonr - case "bitcoin": - *rcv = Bitcoin - case "ethereum": - *rcv = Ethereum - case "ibc": - *rcv = Ibc - case "webauthn": - *rcv = Webauthn - case "dwn": - *rcv = Dwn - case "service": - *rcv = Service - default: - return fmt.Errorf(`illegal: "%s" is not a valid DIDMethod`, str) - } - return nil -} diff --git a/pkg/format/init.pkl.go b/pkg/format/init.pkl.go deleted file mode 100644 index 6abd5e1e8..000000000 --- a/pkg/format/init.pkl.go +++ /dev/null @@ -1,9 +0,0 @@ -// Code generated from Pkl module `format`. DO NOT EDIT. -package format - -import "github.com/apple/pkl-go/pkl" - -func init() { - pkl.RegisterMapping("format", Format{}) - pkl.RegisterMapping("format#Macaroon", Macaroon{}) -} diff --git a/pkg/nebula/models/Input.pkl.go b/pkg/nebula/models/Input.pkl.go new file mode 100644 index 000000000..f1a336ad6 --- /dev/null +++ b/pkg/nebula/models/Input.pkl.go @@ -0,0 +1,18 @@ +// Code generated from Pkl module `models`. DO NOT EDIT. +package models + +type Input struct { + Label string `pkl:"label"` + + Type string `pkl:"type"` + + Placeholder string `pkl:"placeholder"` + + Value *string `pkl:"value"` + + Error *string `pkl:"error"` + + Help *string `pkl:"help"` + + Required bool `pkl:"required"` +} diff --git a/pkg/nebula/models/RegistrationForm.pkl.go b/pkg/nebula/models/RegistrationForm.pkl.go new file mode 100644 index 000000000..28fc721cc --- /dev/null +++ b/pkg/nebula/models/RegistrationForm.pkl.go @@ -0,0 +1,14 @@ +// Code generated from Pkl module `models`. DO NOT EDIT. +package models + +import "github.com/onsonr/sonr/pkg/nebula/models/formstate" + +type RegistrationForm struct { + Title string `pkl:"title"` + + Description string `pkl:"description"` + + State formstate.FormState `pkl:"state"` + + Inputs []*Input `pkl:"inputs"` +} diff --git a/pkg/nebula/models/init.pkl.go b/pkg/nebula/models/init.pkl.go index 2a507827b..9be2c6ac5 100644 --- a/pkg/nebula/models/init.pkl.go +++ b/pkg/nebula/models/init.pkl.go @@ -11,5 +11,7 @@ func init() { pkl.RegisterMapping("models#Stats", Stats{}) pkl.RegisterMapping("models#Link", Link{}) pkl.RegisterMapping("models#SocialLink", SocialLink{}) + pkl.RegisterMapping("models#Input", Input{}) pkl.RegisterMapping("models#Footer", Footer{}) + pkl.RegisterMapping("models#RegistrationForm", RegistrationForm{}) } diff --git a/pkl/fmt.pkl b/pkl/fmt.pkl deleted file mode 100644 index b20fdffa4..000000000 --- a/pkl/fmt.pkl +++ /dev/null @@ -1,37 +0,0 @@ -@go.Package { name = "github.com/onsonr/sonr/pkg/format" } - -module format - -import "package://pkg.pkl-lang.org/pkl-go/pkl.golang@0.5.0#/go.pkl" - -class JsonField extends go.Field { - structTags { - ["json"] = "%{name},omitempty" - } -} - -typealias DID = String - -typealias DIDMethod = "ipfs"|"sonr"|"bitcoin"|"ethereum"|"ibc"|"webauthn"|"dwn"|"service" - -class Macaroon { - @JsonField - location: String - - @JsonField - originator: String - - @JsonField - identifier: String - - @JsonField - first_party: List - - @JsonField - third_party: List - - @JsonField - expiration: Int -} - -typealias MacaroonToken = String