refactor: migrate to new configuration system and model definitions

pkg/common/models/Account.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 type Account struct {

pkg/common/models/Asset.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 type Asset struct {

pkg/common/models/Chain.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 type Chain struct {

pkg/common/models/Credential.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 type Credential struct {

pkg/common/models/DID.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 import (

pkg/common/models/Grant.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 type Grant struct {

pkg/common/models/JWK.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 type JWK struct {

pkg/common/models/Keyshare.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 type Keyshare struct {

pkg/common/models/Models.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 import (
@@ -7,14 +7,14 @@ import (
 	"github.com/apple/pkl-go/pkl"
 )
 
-type ORM struct {
+type Models struct {
 	DbName string `pkl:"db_name"`
 
 	DbVersion int `pkl:"db_version"`
 }
 
-// LoadFromPath loads the pkl module at the given path and evaluates it into a ORM
-func LoadFromPath(ctx context.Context, path string) (ret *ORM, err error) {
+// LoadFromPath loads the pkl module at the given path and evaluates it into a Models
+func LoadFromPath(ctx context.Context, path string) (ret *Models, err error) {
 	evaluator, err := pkl.NewEvaluator(ctx, pkl.PreconfiguredOptions)
 	if err != nil {
 		return nil, err
@@ -29,9 +29,9 @@ func LoadFromPath(ctx context.Context, path string) (ret *ORM, err error) {
 	return ret, err
 }
 
-// Load loads the pkl module at the given source and evaluates it with the given evaluator into a ORM
-func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*ORM, error) {
-	var ret ORM
+// Load loads the pkl module at the given source and evaluates it with the given evaluator into a Models
+func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*Models, error) {
+	var ret Models
 	if err := evaluator.EvaluateModule(ctx, source, &ret); err != nil {
 		return nil, err
 	}

pkg/common/models/Profile.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 type Profile struct {

pkg/common/models/assettype/AssetType.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package assettype
 
 import (

pkg/common/models/didmethod/DIDMethod.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package didmethod
 
 import (

pkg/common/models/init.pkl.go

@@ -1,17 +1,17 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package models
 
 import "github.com/apple/pkl-go/pkl"
 
 func init() {
-	pkl.RegisterMapping("sonr.motr.ORM", ORM{})
-	pkl.RegisterMapping("sonr.motr.ORM#Account", Account{})
-	pkl.RegisterMapping("sonr.motr.ORM#Asset", Asset{})
-	pkl.RegisterMapping("sonr.motr.ORM#Chain", Chain{})
-	pkl.RegisterMapping("sonr.motr.ORM#Credential", Credential{})
-	pkl.RegisterMapping("sonr.motr.ORM#DID", DID{})
-	pkl.RegisterMapping("sonr.motr.ORM#JWK", JWK{})
-	pkl.RegisterMapping("sonr.motr.ORM#Grant", Grant{})
-	pkl.RegisterMapping("sonr.motr.ORM#Keyshare", Keyshare{})
-	pkl.RegisterMapping("sonr.motr.ORM#Profile", Profile{})
+	pkl.RegisterMapping("sonr.orm.Models", Models{})
+	pkl.RegisterMapping("sonr.orm.Models#Account", Account{})
+	pkl.RegisterMapping("sonr.orm.Models#Asset", Asset{})
+	pkl.RegisterMapping("sonr.orm.Models#Chain", Chain{})
+	pkl.RegisterMapping("sonr.orm.Models#Credential", Credential{})
+	pkl.RegisterMapping("sonr.orm.Models#DID", DID{})
+	pkl.RegisterMapping("sonr.orm.Models#JWK", JWK{})
+	pkl.RegisterMapping("sonr.orm.Models#Grant", Grant{})
+	pkl.RegisterMapping("sonr.orm.Models#Keyshare", Keyshare{})
+	pkl.RegisterMapping("sonr.orm.Models#Profile", Profile{})
 }

pkg/common/models/keyalgorithm/KeyAlgorithm.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package keyalgorithm
 
 import (

pkg/common/models/keycurve/KeyCurve.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package keycurve
 
 import (

pkg/common/models/keyencoding/KeyEncoding.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package keyencoding
 
 import (

pkg/common/models/keyrole/KeyRole.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package keyrole
 
 import (

pkg/common/models/keysharerole/KeyShareRole.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package keysharerole
 
 import (

pkg/common/models/keytype/KeyType.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package keytype
 
 import (

pkg/common/models/permissiongrant/PermissionGrant.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package permissiongrant
 
 import (

pkg/common/models/permissionscope/PermissionScope.pkl.go

@@ -1,4 +1,4 @@
-// Code generated from Pkl module `sonr.motr.ORM`. DO NOT EDIT.
+// Code generated from Pkl module `sonr.orm.Models`. DO NOT EDIT.
 package permissionscope
 
 import (

pkg/config/env.go

@@ -0,0 +1,46 @@
+package config
+
+import (
+	"context"
+
+	"github.com/apple/pkl-go/pkl"
+	hwayconfig "github.com/onsonr/sonr/pkg/config/hway"
+)
+
+// LoadFromBytes loads the environment from the given bytes
+func LoadHwayFromBytes(data []byte) (hwayconfig.Hway, error) {
+	text := string(data)
+	return LoadHwayFromString(text)
+}
+
+// LoadFromString loads the environment from the given string
+func LoadHwayFromString(text string) (hwayconfig.Hway, error) {
+	evaluator, err := pkl.NewEvaluator(context.Background(), pkl.PreconfiguredOptions)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		cerr := evaluator.Close()
+		if err == nil {
+			err = cerr
+		}
+	}()
+	ret, err := hwayconfig.Load(context.Background(), evaluator, pkl.TextSource(text))
+	return ret, err
+}
+
+// LoadFromURL loads the environment from the given URL
+func LoadFromURL(url string) (hwayconfig.Hway, error) {
+	evaluator, err := pkl.NewEvaluator(context.Background(), pkl.PreconfiguredOptions)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		cerr := evaluator.Close()
+		if err == nil {
+			err = cerr
+		}
+	}()
+	ret, err := hwayconfig.Load(context.Background(), evaluator, pkl.UriSource(url))
+	return ret, err
+}

pkg/config/hway/Hway.pkl.go

@@ -0,0 +1,103 @@
+// Code generated from Pkl module `sonr.conf.Hway`. DO NOT EDIT.
+package hway
+
+import (
+	"context"
+
+	"github.com/apple/pkl-go/pkl"
+)
+
+type Hway interface {
+	GetServePort() int
+
+	GetConfigDir() string
+
+	GetSqliteFile() string
+
+	GetChainId() string
+
+	GetIpfsGatewayUrl() string
+
+	GetSonrApiUrl() string
+
+	GetSonrGrpcUrl() string
+
+	GetSonrRpcUrl() string
+}
+
+var _ Hway = (*HwayImpl)(nil)
+
+type HwayImpl struct {
+	ServePort int `pkl:"servePort"`
+
+	ConfigDir string `pkl:"configDir"`
+
+	SqliteFile string `pkl:"sqliteFile"`
+
+	ChainId string `pkl:"chainId"`
+
+	IpfsGatewayUrl string `pkl:"ipfsGatewayUrl"`
+
+	SonrApiUrl string `pkl:"sonrApiUrl"`
+
+	SonrGrpcUrl string `pkl:"sonrGrpcUrl"`
+
+	SonrRpcUrl string `pkl:"sonrRpcUrl"`
+}
+
+func (rcv *HwayImpl) GetServePort() int {
+	return rcv.ServePort
+}
+
+func (rcv *HwayImpl) GetConfigDir() string {
+	return rcv.ConfigDir
+}
+
+func (rcv *HwayImpl) GetSqliteFile() string {
+	return rcv.SqliteFile
+}
+
+func (rcv *HwayImpl) GetChainId() string {
+	return rcv.ChainId
+}
+
+func (rcv *HwayImpl) GetIpfsGatewayUrl() string {
+	return rcv.IpfsGatewayUrl
+}
+
+func (rcv *HwayImpl) GetSonrApiUrl() string {
+	return rcv.SonrApiUrl
+}
+
+func (rcv *HwayImpl) GetSonrGrpcUrl() string {
+	return rcv.SonrGrpcUrl
+}
+
+func (rcv *HwayImpl) GetSonrRpcUrl() string {
+	return rcv.SonrRpcUrl
+}
+
+// LoadFromPath loads the pkl module at the given path and evaluates it into a Hway
+func LoadFromPath(ctx context.Context, path string) (ret Hway, 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 Hway
+func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (Hway, error) {
+	var ret HwayImpl
+	if err := evaluator.EvaluateModule(ctx, source, &ret); err != nil {
+		return nil, err
+	}
+	return &ret, nil
+}

pkg/config/hway/init.pkl.go

@@ -0,0 +1,8 @@
+// Code generated from Pkl module `sonr.conf.Hway`. DO NOT EDIT.
+package hway
+
+import "github.com/apple/pkl-go/pkl"
+
+func init() {
+	pkl.RegisterMapping("sonr.conf.Hway", HwayImpl{})
+}

pkg/config/motr/Config.pkl.go

@@ -0,0 +1,18 @@
+// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+package motr
+
+type Config struct {
+	IpfsGatewayUrl string `pkl:"ipfsGatewayUrl" json:"ipfsGatewayUrl,omitempty"`
+
+	MotrToken string `pkl:"motrToken" json:"motrToken,omitempty"`
+
+	MotrAddress string `pkl:"motrAddress" json:"motrAddress,omitempty"`
+
+	SonrApiUrl string `pkl:"sonrApiUrl" json:"sonrApiUrl,omitempty"`
+
+	SonrRpcUrl string `pkl:"sonrRpcUrl" json:"sonrRpcUrl,omitempty"`
+
+	SonrChainId string `pkl:"sonrChainId" json:"sonrChainId,omitempty"`
+
+	VaultSchema *Schema `pkl:"vaultSchema" json:"vaultSchema,omitempty"`
+}

pkg/config/motr/Environment.pkl.go

@@ -0,0 +1,14 @@
+// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+package motr
+
+type Environment struct {
+	IsDevelopment bool `pkl:"isDevelopment" json:"isDevelopment,omitempty"`
+
+	CacheVersion string `pkl:"cacheVersion" json:"cacheVersion,omitempty"`
+
+	HttpserverPath string `pkl:"httpserverPath" json:"httpserverPath,omitempty"`
+
+	WasmExecPath string `pkl:"wasmExecPath" json:"wasmExecPath,omitempty"`
+
+	WasmPath string `pkl:"wasmPath" json:"wasmPath,omitempty"`
+}

pkg/config/motr/Motr.pkl.go

@@ -0,0 +1,36 @@
+// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+package motr
+
+import (
+	"context"
+
+	"github.com/apple/pkl-go/pkl"
+)
+
+type Motr struct {
+}
+
+// LoadFromPath loads the pkl module at the given path and evaluates it into a Motr
+func LoadFromPath(ctx context.Context, path string) (ret *Motr, 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 Motr
+func Load(ctx context.Context, evaluator pkl.Evaluator, source *pkl.ModuleSource) (*Motr, error) {
+	var ret Motr
+	if err := evaluator.EvaluateModule(ctx, source, &ret); err != nil {
+		return nil, err
+	}
+	return &ret, nil
+}

pkg/config/motr/Schema.pkl.go

@@ -0,0 +1,22 @@
+// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+package motr
+
+type Schema struct {
+	Version int `pkl:"version"`
+
+	Account string `pkl:"account" json:"account,omitempty"`
+
+	Asset string `pkl:"asset" json:"asset,omitempty"`
+
+	Chain string `pkl:"chain" json:"chain,omitempty"`
+
+	Credential string `pkl:"credential" json:"credential,omitempty"`
+
+	Jwk string `pkl:"jwk" json:"jwk,omitempty"`
+
+	Grant string `pkl:"grant" json:"grant,omitempty"`
+
+	Keyshare string `pkl:"keyshare" json:"keyshare,omitempty"`
+
+	Profile string `pkl:"profile" json:"profile,omitempty"`
+}

pkg/config/motr/init.pkl.go

@@ -0,0 +1,11 @@
+// Code generated from Pkl module `sonr.conf.Motr`. DO NOT EDIT.
+package motr
+
+import "github.com/apple/pkl-go/pkl"
+
+func init() {
+	pkl.RegisterMapping("sonr.conf.Motr", Motr{})
+	pkl.RegisterMapping("sonr.conf.Motr#Config", Config{})
+	pkl.RegisterMapping("sonr.conf.Motr#Schema", Schema{})
+	pkl.RegisterMapping("sonr.conf.Motr#Environment", Environment{})
+}