feat(nef): add path calc (#271)

.vscode/settings.json

@@ -39,6 +39,7 @@
     "Fastward",
     "fieldalignment",
     "figo",
+    "foobarbaz",
     "fortytw",
     "fsys",
     "Fugazi",

base-op.go

@@ -2,6 +2,7 @@ package nef
 
 type baseOp[F ExistsInFS] struct {
 	fS   F
+	calc PathCalc
 	root string
 }
 

fs-absolute.go

@@ -3,28 +3,43 @@ package nef
 import (
 	"io/fs"
 	"os"
+	"strings"
 )
 
-type absoluteFS struct{}
+type absoluteFS struct {
+	calc PathCalc
+}
 
 // NewUniversalABS creates an absolute universal file system
 func NewUniversalABS() UniversalFS {
-	return &absoluteFS{}
+	return &absoluteFS{
+		calc: &AbsoluteCalc{},
+	}
 }
 
 // NewTraverseABS creates an absolute traverse file system
 func NewTraverseABS() TraverseFS {
-	return &absoluteFS{}
+	return &absoluteFS{
+		calc: &AbsoluteCalc{},
+	}
 }
 
 // NewReaderABS creates an absolute reader file system
 func NewReaderABS() ReaderFS {
-	return &absoluteFS{}
+	return &absoluteFS{
+		calc: &AbsoluteCalc{},
+	}
 }
 
 // NewWriterABS creates an absolute writer file system
 func NewWriterABS() WriterFS {
-	return &absoluteFS{}
+	return &absoluteFS{
+		calc: &AbsoluteCalc{},
+	}
+}
+
+func (f *absoluteFS) Calc() PathCalc {
+	return f.calc
 }
 
 // FileExists does file exist at the path specified
@@ -103,8 +118,24 @@ func (f *absoluteFS) MakeDirAll(name string, perm os.FileMode) error {
 }
 
 // Ensure is not currently implemented on absoluteFS
-func (f *absoluteFS) Ensure(_ PathAs) (string, error) {
-	panic("NOT-IMPL: absoluteFS.Ensure")
+func (f *absoluteFS) Ensure(as PathAs) (at string, err error) {
+	var (
+		directory, file string
+	)
+	calc := f.calc
+
+	if strings.HasSuffix(as.Name, string(os.PathSeparator)) {
+		directory = as.Name
+		file = as.Default
+	} else {
+		directory, file = calc.Split(as.Name)
+	}
+
+	if !f.DirectoryExists(directory) {
+		err = f.MakeDirAll(directory, as.Perm)
+	}
+
+	return calc.Clean(calc.Join(directory, file)), err
 }
 
 // Move is not currently implemented on absoluteFS

fs-change_test.go

@@ -2,7 +2,6 @@ package nef_test
 
 import (
 	"fmt"
-	"path/filepath"
 
 	. "github.com/onsi/ginkgo/v2" //nolint:revive // ok
 	. "github.com/onsi/gomega"    //nolint:revive // ok
@@ -65,7 +64,7 @@ var _ = Describe("op: change", Ordered, func() {
 				Expect(require(root, entry.from)).To(Succeed())
 			},
 			action: func(entry fsTE[nef.UniversalFS], fS nef.UniversalFS) {
-				destination := filepath.Base(entry.to)
+				destination := fS.Calc().Base(entry.to)
 				Expect(fS.Change(entry.from, destination)).To(Succeed(),
 					fmt.Sprintf("OVERWRITE: %v", entry.overwrite),
 				)
@@ -88,7 +87,8 @@ var _ = Describe("op: change", Ordered, func() {
 				Expect(fS.Change(entry.from, entry.to)).To(Succeed(),
 					fmt.Sprintf("OVERWRITE: %v", entry.overwrite),
 				)
-				Expect(luna.AsFile(luna.Yoke(lab.Static.FS.Scratch, entry.to))).To(luna.ExistInFS(fS))
+				calc := fS.Calc()
+				Expect(luna.AsFile(calc.Join(lab.Static.FS.Scratch, entry.to))).To(luna.ExistInFS(fS))
 				Expect(luna.AsDirectory(entry.to)).NotTo(luna.ExistInFS(fS))
 			},
 		}),
@@ -107,7 +107,8 @@ var _ = Describe("op: change", Ordered, func() {
 				Expect(fS.Change(entry.from, entry.to)).To(Succeed(),
 					fmt.Sprintf("OVERWRITE: %v", entry.overwrite),
 				)
-				file := luna.Yoke(lab.Static.FS.Scratch, entry.to)
+				calc := fS.Calc()
+				file := calc.Join(lab.Static.FS.Scratch, entry.to)
 				Expect(luna.AsFile(file)).To(luna.ExistInFS(fS))
 				Expect(luna.AsDirectory(entry.to)).NotTo(luna.ExistInFS(fS))
 			},
@@ -125,7 +126,7 @@ var _ = Describe("op: change", Ordered, func() {
 				Expect(require(root, entry.to)).To(Succeed())
 			},
 			action: func(entry fsTE[nef.UniversalFS], fS nef.UniversalFS) {
-				destination := filepath.Base(entry.to)
+				destination := fS.Calc().Base(entry.to)
 				Expect(fS.Change(entry.from, destination)).NotTo(Succeed(),
 					fmt.Sprintf("OVERWRITE: %v", entry.overwrite),
 				)
@@ -141,14 +142,14 @@ var _ = Describe("op: change", Ordered, func() {
 			require: lab.Static.FS.Scratch,
 			from:    lab.Static.FS.Change.From.File,
 			to:      lab.Static.FS.Change.To.File,
-			arrange: func(entry fsTE[nef.UniversalFS], _ nef.UniversalFS) {
+			arrange: func(entry fsTE[nef.UniversalFS], fS nef.UniversalFS) {
 				Expect(require(root,
 					entry.require,
 					entry.from,
 				)).To(Succeed())
 				Expect(require(root,
 					entry.require,
-					luna.Yoke(lab.Static.FS.Scratch, entry.to),
+					fS.Calc().Join(lab.Static.FS.Scratch, entry.to),
 				)).To(Succeed())
 			},
 			action: func(entry fsTE[nef.UniversalFS], fS nef.UniversalFS) {

fs-changer.go

@@ -2,7 +2,6 @@ package nef
 
 import (
 	"os"
-	"path/filepath"
 	"strings"
 	"sync"
 
@@ -81,8 +80,8 @@ func (m *baseChanger) rename(from, to string) error {
 	}
 
 	return os.Rename(
-		filepath.Join(m.root, from),
-		filepath.Join(m.root, destination),
+		m.calc.Join(m.root, from),
+		m.calc.Join(m.root, destination),
 	)
 }
 
@@ -102,12 +101,15 @@ func (l *lazyChanger) instance(root string, overwrite bool, fS ChangerFS) change
 func (l *lazyChanger) create(root string, overwrite bool, fS ChangerFS) changer {
 	// create an interface for this function
 	//
+	calc := fS.Calc()
+
 	return lo.TernaryF(overwrite,
 		func() changer {
 			return &overwriteChanger{
 				baseChanger: baseChanger{
 					baseOp: baseOp[ChangerFS]{
 						fS:   fS,
+						calc: calc,
 						root: root,
 					},
 				},
@@ -118,6 +120,7 @@ func (l *lazyChanger) create(root string, overwrite bool, fS ChangerFS) changer
 				baseChanger: baseChanger{
 					baseOp: baseOp[ChangerFS]{
 						fS:   fS,
+						calc: calc,
 						root: root,
 					},
 				},