refactor: move Pkl module definitions to dedicated package

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

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"`

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
 	}

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"`

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"`

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"`

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"`

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{})
+}

pkg/dwn/init.pkl.go

@@ -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{})
-}