From 9a5fb38f484e3d9f456b1558d62290796cef70a4 Mon Sep 17 00:00:00 2001
From: Pete Davison <pd93.uk@outlook.com>
Date: Tue, 13 Feb 2024 19:29:28 +0000
Subject: [PATCH] refactor: rename node resolver methods

---
 taskfile/node.go       | 4 ++--
 taskfile/node_file.go  | 4 ++--
 taskfile/node_http.go  | 4 ++--
 taskfile/node_stdin.go | 4 ++--
 taskfile/reader.go     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/taskfile/node.go b/taskfile/node.go
index 5e3c3cf9..b05b92cb 100644
--- a/taskfile/node.go
+++ b/taskfile/node.go
@@ -18,8 +18,8 @@ type Node interface {
 	Dir() string
 	Optional() bool
 	Remote() bool
-	ResolveIncludeEntrypoint(entrypoint string) (string, error)
-	ResolveIncludeDir(dir string) (string, error)
+	ResolveEntrypoint(entrypoint string) (string, error)
+	ResolveDir(dir string) (string, error)
 }
 
 func NewRootNode(
diff --git a/taskfile/node_file.go b/taskfile/node_file.go
index 7304f42c..94557e6e 100644
--- a/taskfile/node_file.go
+++ b/taskfile/node_file.go
@@ -77,7 +77,7 @@ func resolveFileNodeEntrypointAndDir(l *logger.Logger, entrypoint, dir string) (
 	return entrypoint, dir, nil
 }
 
-func (node *FileNode) ResolveIncludeEntrypoint(entrypoint string) (string, error) {
+func (node *FileNode) ResolveEntrypoint(entrypoint string) (string, error) {
 	// If the file is remote, we don't need to resolve the path
 	if strings.Contains(entrypoint, "://") {
 		return entrypoint, nil
@@ -98,7 +98,7 @@ func (node *FileNode) ResolveIncludeEntrypoint(entrypoint string) (string, error
 	return filepathext.SmartJoin(entrypointDir, path), nil
 }
 
-func (node *FileNode) ResolveIncludeDir(dir string) (string, error) {
+func (node *FileNode) ResolveDir(dir string) (string, error) {
 	path, err := execext.Expand(dir)
 	if err != nil {
 		return "", err
diff --git a/taskfile/node_http.go b/taskfile/node_http.go
index 1b88dc7e..e32c4469 100644
--- a/taskfile/node_http.go
+++ b/taskfile/node_http.go
@@ -75,7 +75,7 @@ func (node *HTTPNode) Read(ctx context.Context) ([]byte, error) {
 	return b, nil
 }
 
-func (node *HTTPNode) ResolveIncludeEntrypoint(entrypoint string) (string, error) {
+func (node *HTTPNode) ResolveEntrypoint(entrypoint string) (string, error) {
 	ref, err := url.Parse(entrypoint)
 	if err != nil {
 		return "", err
@@ -83,7 +83,7 @@ func (node *HTTPNode) ResolveIncludeEntrypoint(entrypoint string) (string, error
 	return node.URL.ResolveReference(ref).String(), nil
 }
 
-func (node *HTTPNode) ResolveIncludeDir(dir string) (string, error) {
+func (node *HTTPNode) ResolveDir(dir string) (string, error) {
 	path, err := execext.Expand(dir)
 	if err != nil {
 		return "", err
diff --git a/taskfile/node_stdin.go b/taskfile/node_stdin.go
index d14e5d2e..aa0e7a06 100644
--- a/taskfile/node_stdin.go
+++ b/taskfile/node_stdin.go
@@ -44,7 +44,7 @@ func (node *StdinNode) Read(ctx context.Context) ([]byte, error) {
 	return stdin, nil
 }
 
-func (node *StdinNode) ResolveIncludeEntrypoint(entrypoint string) (string, error) {
+func (node *StdinNode) ResolveEntrypoint(entrypoint string) (string, error) {
 	// If the file is remote, we don't need to resolve the path
 	if strings.Contains(entrypoint, "://") {
 		return entrypoint, nil
@@ -62,7 +62,7 @@ func (node *StdinNode) ResolveIncludeEntrypoint(entrypoint string) (string, erro
 	return filepathext.SmartJoin(node.Dir(), path), nil
 }
 
-func (node *StdinNode) ResolveIncludeDir(dir string) (string, error) {
+func (node *StdinNode) ResolveDir(dir string) (string, error) {
 	path, err := execext.Expand(dir)
 	if err != nil {
 		return "", err
diff --git a/taskfile/reader.go b/taskfile/reader.go
index ba0a5261..42e64914 100644
--- a/taskfile/reader.go
+++ b/taskfile/reader.go
@@ -64,12 +64,12 @@ func Read(
 				return err
 			}
 
-			entrypoint, err := node.ResolveIncludeEntrypoint(include.Taskfile)
+			entrypoint, err := node.ResolveEntrypoint(include.Taskfile)
 			if err != nil {
 				return err
 			}
 
-			dir, err := node.ResolveIncludeDir(include.Dir)
+			dir, err := node.ResolveDir(include.Dir)
 			if err != nil {
 				return err
 			}