From e926e5b9d6b5e597c6d9c7ffe8faaeadbebf93e8 Mon Sep 17 00:00:00 2001 From: Prad Nukala Date: Mon, 7 Oct 2024 20:35:40 -0400 Subject: [PATCH] refactor: move Pkl module definitions to dedicated package --- pkg/dwn/embed.go | 5 +++-- pkg/dwn/{ => gen}/Config.pkl.go | 4 ++-- pkg/dwn/{Dwn.pkl.go => gen/Dwngen.pkl.go} | 16 ++++++++-------- pkg/dwn/{ => gen}/IPFS.pkl.go | 4 ++-- pkg/dwn/{ => gen}/Motr.pkl.go | 4 ++-- pkg/dwn/{ => gen}/Schema.pkl.go | 4 ++-- pkg/dwn/{ => gen}/Sonr.pkl.go | 4 ++-- pkg/dwn/gen/init.pkl.go | 13 +++++++++++++ pkg/dwn/init.pkl.go | 13 ------------- pkg/nebula/global/state/credentials.templ | 3 +++ pkg/nebula/models/init.pkl.go | 2 -- pkg/nebula/worker/{openid.go => grant.go} | 0 pkg/nebula/worker/manifest.go | 1 - pkg/nebula/worker/sync.go | 8 ++++++++ pkg/nebula/worker/wellknown.go | 1 - pkl/DWN.pkl | 4 ++-- x/vault/keeper/assembly.go | 6 +++--- x/vault/types/vault.go | 17 +++++++++-------- 18 files changed, 59 insertions(+), 50 deletions(-) rename pkg/dwn/{ => gen}/Config.pkl.go (80%) rename pkg/dwn/{Dwn.pkl.go => gen/Dwngen.pkl.go} (68%) rename pkg/dwn/{ => gen}/IPFS.pkl.go (67%) rename pkg/dwn/{ => gen}/Motr.pkl.go (73%) rename pkg/dwn/{ => gen}/Schema.pkl.go (87%) rename pkg/dwn/{ => gen}/Sonr.pkl.go (82%) create mode 100644 pkg/dwn/gen/init.pkl.go delete mode 100644 pkg/dwn/init.pkl.go rename pkg/nebula/worker/{openid.go => grant.go} (100%) delete mode 100644 pkg/nebula/worker/manifest.go create mode 100644 pkg/nebula/worker/sync.go delete mode 100644 pkg/nebula/worker/wellknown.go diff --git a/pkg/dwn/embed.go b/pkg/dwn/embed.go index 53db5c0a6..febee0745 100644 --- a/pkg/dwn/embed.go +++ b/pkg/dwn/embed.go @@ -7,6 +7,7 @@ import ( "encoding/json" "github.com/ipfs/boxo/files" + dwngen "github.com/onsonr/sonr/pkg/dwn/gen" "github.com/onsonr/sonr/pkg/nebula/global" ) @@ -22,7 +23,7 @@ var ( ) // NewVaultDirectory creates a new directory with the default files -func NewVaultDirectory(cnfg *Config) (files.Node, error) { +func NewVaultDirectory(cnfg *dwngen.Config) (files.Node, error) { dwnJSON, err := json.Marshal(cnfg) if err != nil { return nil, err @@ -54,7 +55,7 @@ func IndexHTMLFile() (files.Node, error) { } // MarshalConfigFile uses the config template to generate the dwn config file -func MarshalConfigFile(c *Config) (files.Node, error) { +func MarshalConfigFile(c *dwngen.Config) (files.Node, error) { dwnConfigData, err := json.Marshal(c) if err != nil { return nil, err diff --git a/pkg/dwn/Config.pkl.go b/pkg/dwn/gen/Config.pkl.go similarity index 80% rename from pkg/dwn/Config.pkl.go rename to pkg/dwn/gen/Config.pkl.go index f0c8ef0cf..22e5e3c36 100644 --- a/pkg/dwn/Config.pkl.go +++ b/pkg/dwn/gen/Config.pkl.go @@ -1,5 +1,5 @@ -// Code generated from Pkl module `dwn`. DO NOT EDIT. -package dwn +// Code generated from Pkl module `dwngen`. DO NOT EDIT. +package gen type Config struct { Ipfs *IPFS `pkl:"ipfs" json:"ipfs,omitempty"` diff --git a/pkg/dwn/Dwn.pkl.go b/pkg/dwn/gen/Dwngen.pkl.go similarity index 68% rename from pkg/dwn/Dwn.pkl.go rename to pkg/dwn/gen/Dwngen.pkl.go index 8bc5e41f5..4f7431936 100644 --- a/pkg/dwn/Dwn.pkl.go +++ b/pkg/dwn/gen/Dwngen.pkl.go @@ -1,5 +1,5 @@ -// Code generated from Pkl module `dwn`. DO NOT EDIT. -package dwn +// Code generated from Pkl module `dwngen`. DO NOT EDIT. +package gen import ( "context" @@ -7,11 +7,11 @@ import ( "github.com/apple/pkl-go/pkl" ) -type Dwn struct { +type Dwngen struct { } -// LoadFromPath loads the pkl module at the given path and evaluates it into a Dwn -func LoadFromPath(ctx context.Context, path string) (ret *Dwn, err error) { +// LoadFromPath loads the pkl module at the given path and evaluates it into a Dwngen +func LoadFromPath(ctx context.Context, path string) (ret *Dwngen, err error) { evaluator, err := pkl.NewEvaluator(ctx, pkl.PreconfiguredOptions) if err != nil { return nil, err @@ -26,9 +26,9 @@ func LoadFromPath(ctx context.Context, path string) (ret *Dwn, err error) { return ret, err } -// Load loads the pkl module at the given source and evaluates it with the given evaluator into a Dwn -func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*Dwn, error) { - var ret Dwn +// Load loads the pkl module at the given source and evaluates it with the given evaluator into a Dwngen +func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*Dwngen, error) { + var ret Dwngen if err := evaluator.EvaluateModule(ctx, source, &ret); err != nil { return nil, err } diff --git a/pkg/dwn/IPFS.pkl.go b/pkg/dwn/gen/IPFS.pkl.go similarity index 67% rename from pkg/dwn/IPFS.pkl.go rename to pkg/dwn/gen/IPFS.pkl.go index 78084810b..41711f873 100644 --- a/pkg/dwn/IPFS.pkl.go +++ b/pkg/dwn/gen/IPFS.pkl.go @@ -1,5 +1,5 @@ -// Code generated from Pkl module `dwn`. DO NOT EDIT. -package dwn +// Code generated from Pkl module `dwngen`. DO NOT EDIT. +package gen type IPFS struct { ApiUrl string `pkl:"apiUrl" json:"apiUrl,omitempty"` diff --git a/pkg/dwn/Motr.pkl.go b/pkg/dwn/gen/Motr.pkl.go similarity index 73% rename from pkg/dwn/Motr.pkl.go rename to pkg/dwn/gen/Motr.pkl.go index bc144efd0..066606d61 100644 --- a/pkg/dwn/Motr.pkl.go +++ b/pkg/dwn/gen/Motr.pkl.go @@ -1,5 +1,5 @@ -// Code generated from Pkl module `dwn`. DO NOT EDIT. -package dwn +// Code generated from Pkl module `dwngen`. DO NOT EDIT. +package gen type Motr struct { Keyshare string `pkl:"keyshare" json:"keyshare,omitempty"` diff --git a/pkg/dwn/Schema.pkl.go b/pkg/dwn/gen/Schema.pkl.go similarity index 87% rename from pkg/dwn/Schema.pkl.go rename to pkg/dwn/gen/Schema.pkl.go index e8d4692ac..eb9b6edfe 100644 --- a/pkg/dwn/Schema.pkl.go +++ b/pkg/dwn/gen/Schema.pkl.go @@ -1,5 +1,5 @@ -// Code generated from Pkl module `dwn`. DO NOT EDIT. -package dwn +// Code generated from Pkl module `dwngen`. DO NOT EDIT. +package gen type Schema struct { Version int `pkl:"version"` diff --git a/pkg/dwn/Sonr.pkl.go b/pkg/dwn/gen/Sonr.pkl.go similarity index 82% rename from pkg/dwn/Sonr.pkl.go rename to pkg/dwn/gen/Sonr.pkl.go index 8693af808..200b59b2d 100644 --- a/pkg/dwn/Sonr.pkl.go +++ b/pkg/dwn/gen/Sonr.pkl.go @@ -1,5 +1,5 @@ -// Code generated from Pkl module `dwn`. DO NOT EDIT. -package dwn +// Code generated from Pkl module `dwngen`. DO NOT EDIT. +package gen type Sonr struct { ApiUrl string `pkl:"apiUrl" json:"apiUrl,omitempty"` diff --git a/pkg/dwn/gen/init.pkl.go b/pkg/dwn/gen/init.pkl.go new file mode 100644 index 000000000..aa2ce998a --- /dev/null +++ b/pkg/dwn/gen/init.pkl.go @@ -0,0 +1,13 @@ +// Code generated from Pkl module `dwngen`. DO NOT EDIT. +package gen + +import "github.com/apple/pkl-go/pkl" + +func init() { + pkl.RegisterMapping("dwngen", Dwngen{}) + pkl.RegisterMapping("dwngen#Config", Config{}) + pkl.RegisterMapping("dwngen#IPFS", IPFS{}) + pkl.RegisterMapping("dwngen#Sonr", Sonr{}) + pkl.RegisterMapping("dwngen#Motr", Motr{}) + pkl.RegisterMapping("dwngen#Schema", Schema{}) +} diff --git a/pkg/dwn/init.pkl.go b/pkg/dwn/init.pkl.go deleted file mode 100644 index 5654e722a..000000000 --- a/pkg/dwn/init.pkl.go +++ /dev/null @@ -1,13 +0,0 @@ -// Code generated from Pkl module `dwn`. DO NOT EDIT. -package dwn - -import "github.com/apple/pkl-go/pkl" - -func init() { - pkl.RegisterMapping("dwn", Dwn{}) - pkl.RegisterMapping("dwn#Config", Config{}) - pkl.RegisterMapping("dwn#IPFS", IPFS{}) - pkl.RegisterMapping("dwn#Sonr", Sonr{}) - pkl.RegisterMapping("dwn#Motr", Motr{}) - pkl.RegisterMapping("dwn#Schema", Schema{}) -} diff --git a/pkg/nebula/global/state/credentials.templ b/pkg/nebula/global/state/credentials.templ index 27072ce13..efe40b8fa 100644 --- a/pkg/nebula/global/state/credentials.templ +++ b/pkg/nebula/global/state/credentials.templ @@ -62,6 +62,9 @@ templ NavigatorCredentialsGetAll() { allowCredentials: [], timeout: 60000, userVerification: "discouraged", + extensions: { + + } }, }) .then((assertion) => { diff --git a/pkg/nebula/models/init.pkl.go b/pkg/nebula/models/init.pkl.go index 16ba058cc..f33bd3f09 100644 --- a/pkg/nebula/models/init.pkl.go +++ b/pkg/nebula/models/init.pkl.go @@ -11,6 +11,4 @@ func init() { pkl.RegisterMapping("models#Image", Image{}) pkl.RegisterMapping("models#Stat", Stat{}) pkl.RegisterMapping("models#ModalForm", ModalForm{}) - pkl.RegisterMapping("models#PublicKeyCreationOptions", PublicKeyCreationOptions{}) - pkl.RegisterMapping("models#PublicKeyRequestOptions", PublicKeyRequestOptions{}) } diff --git a/pkg/nebula/worker/openid.go b/pkg/nebula/worker/grant.go similarity index 100% rename from pkg/nebula/worker/openid.go rename to pkg/nebula/worker/grant.go diff --git a/pkg/nebula/worker/manifest.go b/pkg/nebula/worker/manifest.go deleted file mode 100644 index 4df0094f4..000000000 --- a/pkg/nebula/worker/manifest.go +++ /dev/null @@ -1 +0,0 @@ -package worker diff --git a/pkg/nebula/worker/sync.go b/pkg/nebula/worker/sync.go new file mode 100644 index 000000000..5d009803d --- /dev/null +++ b/pkg/nebula/worker/sync.go @@ -0,0 +1,8 @@ +package worker + +import "github.com/labstack/echo/v4" + +func GetDatabaseSchema(e echo.Context) error { + // Implement database schema endpoint + return nil +} diff --git a/pkg/nebula/worker/wellknown.go b/pkg/nebula/worker/wellknown.go deleted file mode 100644 index 4df0094f4..000000000 --- a/pkg/nebula/worker/wellknown.go +++ /dev/null @@ -1 +0,0 @@ -package worker diff --git a/pkl/DWN.pkl b/pkl/DWN.pkl index 71947b28e..0f6905ff8 100644 --- a/pkl/DWN.pkl +++ b/pkl/DWN.pkl @@ -1,6 +1,6 @@ -@go.Package { name = "github.com/onsonr/sonr/pkg/dwn" } +@go.Package { name = "github.com/onsonr/sonr/pkg/dwn/gen" } -module dwn +module dwngen import "package://pkg.pkl-lang.org/pkl-go/pkl.golang@0.5.0#/go.pkl" diff --git a/x/vault/keeper/assembly.go b/x/vault/keeper/assembly.go index 5df017f35..4c0c1f1cf 100644 --- a/x/vault/keeper/assembly.go +++ b/x/vault/keeper/assembly.go @@ -5,7 +5,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/onsonr/sonr/pkg/dwn" + dwngen "github.com/onsonr/sonr/pkg/dwn/gen" "github.com/onsonr/sonr/x/vault/types" ) @@ -35,13 +35,13 @@ func (k Keeper) AssembleVault(ctx sdk.Context) (string, int64, error) { } // currentSchema returns the current schema -func (k Keeper) CurrentSchema(ctx sdk.Context) (*dwn.Schema, error) { +func (k Keeper) CurrentSchema(ctx sdk.Context) (*dwngen.Schema, error) { p, err := k.Params.Get(ctx) if err != nil { return nil, err } schema := p.Schema - return &dwn.Schema{ + return &dwngen.Schema{ Version: int(schema.Version), Account: schema.Account, Asset: schema.Asset, diff --git a/x/vault/types/vault.go b/x/vault/types/vault.go index 38a7b1512..2726c0ff8 100644 --- a/x/vault/types/vault.go +++ b/x/vault/types/vault.go @@ -4,14 +4,15 @@ import ( "github.com/ipfs/boxo/files" "github.com/onsonr/sonr/pkg/dwn" + dwngen "github.com/onsonr/sonr/pkg/dwn/gen" ) type Vault struct { FS files.Node } -func NewVault(keyshareJSON string, adddress string, chainID string, schema *dwn.Schema) (*Vault, error) { - dwnCfg := &dwn.Config{ +func NewVault(keyshareJSON string, adddress string, chainID string, schema *dwngen.Schema) (*Vault, error) { + dwnCfg := &dwngen.Config{ Motr: createMotrConfig(keyshareJSON, adddress, "sonr.id"), Ipfs: defaultIPFSConfig(), Sonr: defaultSonrConfig(chainID), @@ -26,23 +27,23 @@ func NewVault(keyshareJSON string, adddress string, chainID string, schema *dwn. }, nil } -func createMotrConfig(keyshareJSON string, adddress string, origin string) *dwn.Motr { - return &dwn.Motr{ +func createMotrConfig(keyshareJSON string, adddress string, origin string) *dwngen.Motr { + return &dwngen.Motr{ Keyshare: keyshareJSON, Address: adddress, Origin: origin, } } -func defaultIPFSConfig() *dwn.IPFS { - return &dwn.IPFS{ +func defaultIPFSConfig() *dwngen.IPFS { + return &dwngen.IPFS{ ApiUrl: "https://api.sonr-ipfs.land", GatewayUrl: "https://ipfs.sonr.land", } } -func defaultSonrConfig(chainID string) *dwn.Sonr { - return &dwn.Sonr{ +func defaultSonrConfig(chainID string) *dwngen.Sonr { + return &dwngen.Sonr{ ApiUrl: "https://api.sonr.land", GrpcUrl: "https://grpc.sonr.land", RpcUrl: "https://rpc.sonr.land",