Consolidate utils

Author: jribbink

internal/cadence/linter.go

@@ -21,7 +21,6 @@ package cadence
 import (
 	"errors"
 	"fmt"
-	"path/filepath"
 	"strings"
 
 	"github.com/onflow/flow-cli/internal/util"
@@ -197,8 +196,8 @@ func (l *linter) handleImport(
 		}, nil
 	default:
 		// Normalize relative path imports to absolute paths
-		if l.isPathLocation(importedLocation) {
-			importedLocation = l.normalizePathLocation(checker.Location, importedLocation)
+		if util.IsPathLocation(importedLocation) {
+			importedLocation = util.NormalizePathLocation(checker.Location, importedLocation)
 		}
 
 		filepath, err := l.resolveImportFilepath(importedLocation, checker.Location)
@@ -244,37 +243,6 @@ func (l *linter) handleImport(
 	}
 }
 
-// isPathLocation returns true if the location is a file path (contains .cdc)
-func (l *linter) isPathLocation(location common.Location) bool {
-	stringLocation, ok := location.(common.StringLocation)
-	if !ok {
-		return false
-	}
-	return strings.Contains(stringLocation.String(), ".cdc")
-}
-
-// normalizePathLocation normalizes a relative path import against a base location
-func (l *linter) normalizePathLocation(base, relative common.Location) common.Location {
-	baseString, baseOk := base.(common.StringLocation)
-	relativeString, relativeOk := relative.(common.StringLocation)
-
-	if !baseOk || !relativeOk {
-		return relative
-	}
-
-	basePath := baseString.String()
-	relativePath := relativeString.String()
-
-	// If the relative path is absolute, return it as-is
-	if filepath.IsAbs(relativePath) {
-		return relative
-	}
-
-	// Join relative to the parent directory of the base
-	normalizedPath := filepath.Join(filepath.Dir(basePath), relativePath)
-	return common.StringLocation(normalizedPath)
-}
-
 func (l *linter) resolveImportFilepath(
 	location common.Location,
 	parentLocation common.Location,

internal/test/test.go

@@ -453,7 +453,7 @@ func importResolver(scriptPath string, state *flowkit.State) cdcTests.ImportReso
 			relativePath := location.String()
 
 			if strings.Contains(relativePath, helperScriptSubstr) {
-				importedScriptFilePath := absolutePath(scriptPath, relativePath)
+				importedScriptFilePath := util.AbsolutePath(scriptPath, relativePath)
 				scriptCode, err := state.ReadFile(importedScriptFilePath)
 				if err != nil {
 					return "", nil
@@ -482,7 +482,7 @@ func importResolver(scriptPath string, state *flowkit.State) cdcTests.ImportReso
 
 func fileResolver(scriptPath string, state *flowkit.State) cdcTests.FileResolver {
 	return func(path string) (string, error) {
-		importFilePath := absolutePath(scriptPath, path)
+		importFilePath := util.AbsolutePath(scriptPath, path)
 
 		content, err := state.ReadFile(importFilePath)
 		if err != nil {
@@ -493,14 +493,6 @@ func fileResolver(scriptPath string, state *flowkit.State) cdcTests.FileResolver
 	}
 }
 
-func absolutePath(basePath, filePath string) string {
-	if filepath.IsAbs(filePath) {
-		return filePath
-	}
-
-	return filepath.Join(filepath.Dir(basePath), filePath)
-}
-
 type result struct {
 	Results        map[string]cdcTests.Results
 	CoverageReport *runtime.CoverageReport

internal/util/files.go

@@ -22,6 +22,8 @@ import (
 	"fmt"
 	"path/filepath"
 	"strings"
+
+	"github.com/onflow/cadence/common"
 )
 
 func AddCDCExtension(name string) string {
@@ -34,3 +36,35 @@ func AddCDCExtension(name string) string {
 func StripCDCExtension(name string) string {
 	return strings.TrimSuffix(name, filepath.Ext(name))
 }
+
+// AbsolutePath resolves a relative path against a base file path.
+// If the relative path is already absolute, it returns it as-is.
+// Otherwise, it joins the relative path to the parent directory of the base path.
+func AbsolutePath(basePath, relativePath string) string {
+	if filepath.IsAbs(relativePath) {
+		return relativePath
+	}
+	return filepath.Join(filepath.Dir(basePath), relativePath)
+}
+
+// IsPathLocation returns true if the location is a file path (contains .cdc)
+func IsPathLocation(location common.Location) bool {
+	stringLocation, ok := location.(common.StringLocation)
+	if !ok {
+		return false
+	}
+	return strings.Contains(stringLocation.String(), ".cdc")
+}
+
+// NormalizePathLocation normalizes a relative path import against a base location
+func NormalizePathLocation(base, relative common.Location) common.Location {
+	baseString, baseOk := base.(common.StringLocation)
+	relativeString, relativeOk := relative.(common.StringLocation)
+
+	if !baseOk || !relativeOk {
+		return relative
+	}
+
+	normalizedPath := AbsolutePath(baseString.String(), relativeString.String())
+	return common.StringLocation(normalizedPath)
+}