feat: replace lfs with nefilim (#217)

snivilised · Oct 15, 2024 · 303c854 · 303c854
1 parent 58184f6
commit 303c854
Show file tree

Hide file tree

Showing 55 changed files with 116 additions and 2,803 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -79,6 +79,7 @@
     "Mutables",
     "nakedret",
     "navi",
+    "nefilim",
     "nicksnyder",
     "nolint",
     "nolintlint",

diff --git a/director-resume_test.go b/director-resume_test.go
@@ -11,13 +11,13 @@ import (
 	. "github.com/onsi/gomega"    //nolint:revive // ok
 
 	"github.com/snivilised/li18ngo"
+	nef "github.com/snivilised/nefilim"
 	tv "github.com/snivilised/traverse"
 	"github.com/snivilised/traverse/core"
 	"github.com/snivilised/traverse/cycle"
 	"github.com/snivilised/traverse/enums"
 	lab "github.com/snivilised/traverse/internal/laboratory"
 	"github.com/snivilised/traverse/internal/services"
-	"github.com/snivilised/traverse/lfs"
 	"github.com/snivilised/traverse/locale"
 	"github.com/snivilised/traverse/pref"
 )
@@ -70,7 +70,7 @@ var _ = Describe("Director(Resume)", Ordered, func() {
 						Using: tv.Using{
 							Subscription: tv.SubscribeFiles,
 							Handler:      noOpHandler,
-							GetTraverseFS: func(_ string) lfs.TraverseFS {
+							GetTraverseFS: func(_ string) nef.TraverseFS {
 								return emptyFS
 							},
 						},

diff --git a/director.go b/director.go
@@ -1,6 +1,7 @@
 package tv
 
 import (
+	nef "github.com/snivilised/nefilim"
 	"github.com/snivilised/traverse/internal/feat/filter"
 	"github.com/snivilised/traverse/internal/feat/hiber"
 	"github.com/snivilised/traverse/internal/feat/nanny"
@@ -10,7 +11,6 @@ import (
 	"github.com/snivilised/traverse/internal/opts"
 	"github.com/snivilised/traverse/internal/third/lo"
 	"github.com/snivilised/traverse/internal/types"
-	"github.com/snivilised/traverse/lfs"
 	"github.com/snivilised/traverse/pref"
 )
 
@@ -78,17 +78,17 @@ func features(o *pref.Options, using *pref.Using, mediator types.Mediator,
 func Prime(using *pref.Using, settings ...pref.Option) *Builders {
 	return &Builders{
 		using: using,
-		traverseFS: pref.CreateTraverseFS(func(root string) lfs.TraverseFS {
+		traverseFS: pref.CreateTraverseFS(func(root string) nef.TraverseFS {
 			if using.GetTraverseFS != nil {
 				return using.GetTraverseFS(root)
 			}
 
-			return lfs.NewTraverseFS(lfs.At{
+			return nef.NewTraverseFS(nef.At{
 				Root:      root,
 				Overwrite: noOverwrite,
 			})
 		}),
-		extent: extension(func(tsys lfs.TraverseFS) extent {
+		extent: extension(func(tsys nef.TraverseFS) extent {
 			return &primeExtent{
 				baseExtent: baseExtent{
 					fileSys: fileSystems{
@@ -129,17 +129,17 @@ func Prime(using *pref.Using, settings ...pref.Option) *Builders {
 func Resume(was *Was, settings ...pref.Option) *Builders {
 	return &Builders{
 		using: &was.Using,
-		traverseFS: pref.CreateTraverseFS(func(root string) lfs.TraverseFS {
+		traverseFS: pref.CreateTraverseFS(func(root string) nef.TraverseFS {
 			if was.Using.GetTraverseFS != nil {
 				return was.Using.GetTraverseFS(root)
 			}
 
-			return lfs.NewTraverseFS(lfs.At{
+			return nef.NewTraverseFS(nef.At{
 				Root:      root,
 				Overwrite: noOverwrite,
 			})
 		}),
-		extent: extension(func(tsys lfs.TraverseFS) extent {
+		extent: extension(func(tsys nef.TraverseFS) extent {
 			return &resumeExtent{
 				baseExtent: baseExtent{
 					fileSys: fileSystems{

diff --git a/extent.go b/extent.go
@@ -1,11 +1,11 @@
 package tv
 
 import (
+	nef "github.com/snivilised/nefilim"
 	"github.com/snivilised/traverse/internal/feat/resume"
 	"github.com/snivilised/traverse/internal/kernel"
 	"github.com/snivilised/traverse/internal/opts"
 	"github.com/snivilised/traverse/internal/types"
-	"github.com/snivilised/traverse/lfs"
 	"github.com/snivilised/traverse/pref"
 )
 
@@ -14,19 +14,19 @@ type extent interface {
 	was() *pref.Was
 	plugin(*kernel.Artefacts) types.Plugin
 	options(...pref.Option) (*pref.Options, *opts.Binder, error)
-	traverseFS() lfs.TraverseFS
+	traverseFS() nef.TraverseFS
 	complete() bool
 }
 
 type fileSystems struct {
-	tsys lfs.TraverseFS
+	tsys nef.TraverseFS
 }
 
 type baseExtent struct {
 	fileSys fileSystems
 }
 
-func (ex *baseExtent) traverseFS() lfs.TraverseFS {
+func (ex *baseExtent) traverseFS() nef.TraverseFS {
 	return ex.fileSys.tsys
 }
 

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.23.0
 require (
 	github.com/onsi/ginkgo/v2 v2.20.2
 	github.com/onsi/gomega v1.34.2
-	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
 )
 
 require (
@@ -18,10 +18,11 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/snivilised/li18ngo v0.1.4
+	github.com/snivilised/nefilim v0.1.1
 	github.com/snivilised/pants v0.1.2
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
 	golang.org/x/text v0.19.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -30,20 +30,22 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/snivilised/li18ngo v0.1.4 h1:y6EECoVFpmkud2yDEeBnMnebPmSvdrEZ/LAq1PoPctE=
 github.com/snivilised/li18ngo v0.1.4/go.mod h1:Or3qUhpR6AM1X51i82RtyCvORWy2/hrxY9lg1i1gFTE=
+github.com/snivilised/nefilim v0.1.1 h1:uMhLSfj5prGr2bahwzSM50rpd22fiiv0ZDLSzxYWsgg=
+github.com/snivilised/nefilim v0.1.1/go.mod h1:+4/hKxgfvE8eNjLMJC+3ropEZSQuiR/NqfPtIuw7ZMw=
 github.com/snivilised/pants v0.1.2 h1:6Abj02gV5rFYyKfCsmeEiOi1pLdRyITKUY5oDoRgYuU=
 github.com/snivilised/pants v0.1.2/go.mod h1:BOZa24yLxVjjnTCFWQeCzUWL8eK4TLtXtkz3pMdEFQM=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=
-golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
 golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/internal-traverse-defs.go b/internal-traverse-defs.go
@@ -3,9 +3,9 @@ package tv
 import (
 	"io/fs"
 
+	nef "github.com/snivilised/nefilim"
 	"github.com/snivilised/traverse/internal/opts"
 	"github.com/snivilised/traverse/internal/types"
-	"github.com/snivilised/traverse/lfs"
 	"github.com/snivilised/traverse/pref"
 )
 
@@ -57,12 +57,12 @@ func (fn filesystem) build(path string) fs.FS {
 }
 
 type extentBuilder interface {
-	build(tsys lfs.TraverseFS) extent
+	build(tsys nef.TraverseFS) extent
 }
 
-type extension func(tsys lfs.TraverseFS) extent
+type extension func(tsys nef.TraverseFS) extent
 
-func (fn extension) build(tsys lfs.TraverseFS) extent {
+func (fn extension) build(tsys nef.TraverseFS) extent {
 	return fn(tsys)
 }
 

diff --git a/internal/feat/filter/scheme-sampler.go b/internal/feat/filter/scheme-sampler.go
@@ -3,12 +3,12 @@ package filter
 import (
 	"io/fs"
 
+	nef "github.com/snivilised/nefilim"
 	"github.com/snivilised/traverse/core"
 	"github.com/snivilised/traverse/enums"
 	"github.com/snivilised/traverse/internal/filtering"
 	"github.com/snivilised/traverse/internal/third/lo"
 	"github.com/snivilised/traverse/internal/types"
-	"github.com/snivilised/traverse/lfs"
 )
 
 type samplerScheme struct {
@@ -43,7 +43,7 @@ func (s *samplerScheme) next(node *core.Node,
 ) (bool, error) {
 	if node.Extension.Scope.IsRoot() {
 		matching := s.filter.Matching(
-			[]fs.DirEntry{lfs.FromFileInfo(node.Info)},
+			[]fs.DirEntry{nef.FromFileInfo(node.Info)},
 		)
 		result := len(matching) > 0
 

diff --git a/internal/feat/hiber/hibernate_test.go b/internal/feat/hiber/hibernate_test.go
@@ -10,13 +10,13 @@ import (
 
 	"github.com/snivilised/li18ngo"
 
+	nef "github.com/snivilised/nefilim"
 	tv "github.com/snivilised/traverse"
 	"github.com/snivilised/traverse/core"
 	"github.com/snivilised/traverse/enums"
 	lab "github.com/snivilised/traverse/internal/laboratory"
 	"github.com/snivilised/traverse/internal/services"
 	"github.com/snivilised/traverse/internal/third/lo"
-	"github.com/snivilised/traverse/lfs"
 )
 
 var _ = Describe("feature", Ordered, func() {
@@ -57,7 +57,7 @@ var _ = Describe("feature", Ordered, func() {
 								)
 								return nil
 							},
-							GetTraverseFS: func(_ string) lfs.TraverseFS {
+							GetTraverseFS: func(_ string) nef.TraverseFS {
 								return FS
 							},
 						},
@@ -151,7 +151,7 @@ var _ = Describe("feature", Ordered, func() {
 					Root:         path,
 					Subscription: entry.Subscription,
 					Handler:      client,
-					GetTraverseFS: func(_ string) lfs.TraverseFS {
+					GetTraverseFS: func(_ string) nef.TraverseFS {
 						return FS
 					},
 				},

diff --git a/internal/feat/hiber/with-filter_test.go b/internal/feat/hiber/with-filter_test.go
@@ -9,13 +9,13 @@ import (
 	. "github.com/onsi/gomega"    //nolint:revive // ok
 
 	"github.com/snivilised/li18ngo"
+	nef "github.com/snivilised/nefilim"
 	tv "github.com/snivilised/traverse"
 
 	"github.com/snivilised/traverse/core"
 	"github.com/snivilised/traverse/enums"
 	lab "github.com/snivilised/traverse/internal/laboratory"
 	"github.com/snivilised/traverse/internal/services"
-	"github.com/snivilised/traverse/lfs"
 	"github.com/snivilised/traverse/pref"
 )
 
@@ -50,7 +50,7 @@ var _ = Describe("feature", Ordered, func() {
 					Root:         path,
 					Subscription: entry.Subscription,
 					Handler:      entry.Callback,
-					GetTraverseFS: func(_ string) lfs.TraverseFS {
+					GetTraverseFS: func(_ string) nef.TraverseFS {
 						return FS
 					},
 				},

diff --git a/internal/feat/sampling/controller.go b/internal/feat/sampling/controller.go
@@ -3,11 +3,11 @@ package sampling
 import (
 	"io/fs"
 
+	nef "github.com/snivilised/nefilim"
 	"github.com/snivilised/traverse/core"
 	"github.com/snivilised/traverse/enums"
 	"github.com/snivilised/traverse/internal/third/lo"
 	"github.com/snivilised/traverse/internal/types"
-	"github.com/snivilised/traverse/lfs"
 	"github.com/snivilised/traverse/pref"
 )
 
@@ -27,7 +27,7 @@ func (p *controller) Next(_ *core.Node, _ types.Inspection) (bool, error) {
 func (p *controller) sample(result []fs.DirEntry, _ error,
 	_ fs.ReadDirFS, _ string,
 ) ([]fs.DirEntry, error) {
-	files, folders := lfs.Separate(result)
+	files, folders := nef.Separate(result)
 
 	return union(&readResult{
 		files:   files,

diff --git a/internal/feat/sampling/navigator-sample_test.go b/internal/feat/sampling/navigator-sample_test.go
@@ -8,13 +8,13 @@ import (
 	. "github.com/onsi/ginkgo/v2" //nolint:revive // ok
 	. "github.com/onsi/gomega"    //nolint:revive // ok
 	"github.com/snivilised/li18ngo"
+	nef "github.com/snivilised/nefilim"
 	tv "github.com/snivilised/traverse"
 	"github.com/snivilised/traverse/core"
 	"github.com/snivilised/traverse/enums"
 	lab "github.com/snivilised/traverse/internal/laboratory"
 	"github.com/snivilised/traverse/internal/services"
 	"github.com/snivilised/traverse/internal/third/lo"
-	"github.com/snivilised/traverse/lfs"
 	"github.com/snivilised/traverse/locale"
 	"github.com/snivilised/traverse/pref"
 )
@@ -56,7 +56,7 @@ var _ = Describe("feature", Ordered, func() {
 							)
 							return nil
 						},
-						GetTraverseFS: func(_ string) lfs.TraverseFS {
+						GetTraverseFS: func(_ string) nef.TraverseFS {
 							return FS
 						},
 					},
@@ -124,7 +124,7 @@ var _ = Describe("feature", Ordered, func() {
 					Root:         path,
 					Subscription: entry.Subscription,
 					Handler:      callback,
-					GetTraverseFS: func(_ string) lfs.TraverseFS {
+					GetTraverseFS: func(_ string) nef.TraverseFS {
 						return FS
 					},
 				},

diff --git a/internal/filtering/filter-custom_test.go b/internal/filtering/filter-custom_test.go
@@ -8,13 +8,13 @@ import (
 	. "github.com/onsi/ginkgo/v2" //nolint:revive // ok
 	. "github.com/onsi/gomega"    //nolint:revive // ok
 	"github.com/snivilised/li18ngo"
+	nef "github.com/snivilised/nefilim"
 	tv "github.com/snivilised/traverse"
 	"github.com/snivilised/traverse/core"
 	"github.com/snivilised/traverse/enums"
 	lab "github.com/snivilised/traverse/internal/laboratory"
 	"github.com/snivilised/traverse/internal/services"
 	"github.com/snivilised/traverse/internal/third/lo"
-	"github.com/snivilised/traverse/lfs"
 	"github.com/snivilised/traverse/pref"
 )
 
@@ -74,7 +74,7 @@ var _ = Describe("NavigatorFilterCustom", Ordered, func() {
 					Root:         path,
 					Subscription: entry.Subscription,
 					Handler:      callback,
-					GetTraverseFS: func(_ string) lfs.TraverseFS {
+					GetTraverseFS: func(_ string) nef.TraverseFS {
 						return FS
 					},
 				},

diff --git a/internal/filtering/filter-extended-glob_test.go b/internal/filtering/filter-extended-glob_test.go
@@ -8,13 +8,13 @@ import (
 	. "github.com/onsi/ginkgo/v2" //nolint:revive // ok
 	. "github.com/onsi/gomega"    //nolint:revive // ok
 	"github.com/snivilised/li18ngo"
+	nef "github.com/snivilised/nefilim"
 	tv "github.com/snivilised/traverse"
 	"github.com/snivilised/traverse/core"
 	"github.com/snivilised/traverse/enums"
 	lab "github.com/snivilised/traverse/internal/laboratory"
 	"github.com/snivilised/traverse/internal/services"
 	"github.com/snivilised/traverse/internal/third/lo"
-	"github.com/snivilised/traverse/lfs"
 	"github.com/snivilised/traverse/pref"
 )
 
@@ -63,7 +63,7 @@ var _ = Describe("filtering", Ordered, func() {
 								)
 								return nil
 							},
-							GetTraverseFS: func(_ string) lfs.TraverseFS {
+							GetTraverseFS: func(_ string) nef.TraverseFS {
 								return FS
 							},
 						},
@@ -135,7 +135,7 @@ var _ = Describe("filtering", Ordered, func() {
 					Root:         path,
 					Subscription: entry.Subscription,
 					Handler:      callback,
-					GetTraverseFS: func(_ string) lfs.TraverseFS {
+					GetTraverseFS: func(_ string) nef.TraverseFS {
 						return FS
 					},
 				},