ref(opts): remove apply from pref (#183)

internal/opts/get.go

@@ -1,8 +1,6 @@
 package opts
 
 import (
-	"io/fs"
-
 	"github.com/snivilised/traverse/pref"
 )
 
@@ -37,30 +35,3 @@ func GetWith(o *pref.Options) *Binder {
 
 	return binder
 }
-
-type ActiveState struct {
-}
-
-type LoadInfo struct {
-	O      *pref.Options
-	State  *ActiveState
-	WakeAt string
-}
-
-// put this into file load
-func Load(_ fs.FS, from string, settings ...pref.Option) (*LoadInfo, *Binder, error) {
-	o := pref.DefaultOptions()
-	// do load
-	_ = from
-	binder := NewBinder()
-	o.Events.Bind(&binder.Controls)
-
-	// TODO: save any active state on the binder, eg the wake point
-
-	err := apply(o, settings...)
-
-	return &LoadInfo{
-		O:      o,
-		WakeAt: "tbd",
-	}, binder, err
-}

internal/opts/load.go

@@ -0,0 +1,24 @@
+package opts
+
+import (
+	"io/fs"
+
+	"github.com/snivilised/traverse/pref"
+)
+
+func Load(_ fs.FS, from string, settings ...pref.Option) (*LoadInfo, *Binder, error) {
+	o := pref.DefaultOptions()
+	// do load
+	_ = from
+	binder := NewBinder()
+	o.Events.Bind(&binder.Controls)
+
+	// TODO: save any active state on the binder, eg the wake point
+
+	err := apply(o, settings...)
+
+	return &LoadInfo{
+		O:      o,
+		WakeAt: "tbd",
+	}, binder, err
+}

internal/opts/opts-defs.go

@@ -0,0 +1,16 @@
+package opts
+
+import (
+	"github.com/snivilised/traverse/pref"
+)
+
+// 📦 pkg: opts - internal options handling
+
+type ActiveState struct {
+}
+
+type LoadInfo struct {
+	O      *pref.Options
+	State  *ActiveState
+	WakeAt string
+}

pref/options.go

@@ -64,20 +64,6 @@ type (
 	Option func(o *Options) error
 )
 
-func apply(o *Options, settings ...Option) (err error) {
-	for _, option := range settings {
-		if option != nil {
-			err = option(o)
-
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return
-}
-
 // IfOption enables options to be conditional. IfOption condition evaluates to true
 // then the option is returned, otherwise nil.
 func IfOption(condition bool, option Option) Option {