added tests to resolve module aliases

evaluator/functions.go

@@ -1594,11 +1594,7 @@ func requireFn(tok token.Token, env *object.Environment, args ...object.Object)
 		packageAliasesLoaded = true
 	}
 
-	a, error := util.UnaliasPath(args[0].Inspect(), packageAliases)
-	if error != nil {
-		return newError(tok, "error resolving '%s': %s\n", args[0].Inspect(), error.Error())
-	}
-
+	a := util.UnaliasPath(args[0].Inspect(), packageAliases)
 	file := filepath.Join(env.Dir, a)
 	e := object.NewEnvironment(env.Writer, filepath.Dir(file))
 	return doSource(tok, e, file, args...)

util/util.go

@@ -104,7 +104,7 @@ func UniqueStrings(slice []string) []string {
 
 // UnaliasPath translates a path alias
 // to the full path in the filesystem.
-func UnaliasPath(path string, packageAlias map[string]string) (string, error) {
+func UnaliasPath(path string, packageAlias map[string]string) string {
 	// An alias can come in different forms:
 	//  - package
 	//  - package/file.abs
@@ -113,7 +113,7 @@ func UnaliasPath(path string, packageAlias map[string]string) (string, error) {
 	parts := strings.Split(path, string(os.PathSeparator))
 
 	if len(parts) < 1 {
-		return path, nil
+		return path
 	}
 
 	if packageAlias[parts[0]] != "" {
@@ -130,7 +130,7 @@ func UnaliasPath(path string, packageAlias map[string]string) (string, error) {
 			p = append(p, "index.abs")
 		}
 
-		return filepath.Join(p...), nil
+		return filepath.Join(p...)
 	}
-	return path, nil
+	return path
 }

util/util_test.go

@@ -0,0 +1,27 @@
+package util
+
+import (
+	"testing"
+)
+
+func TestUnaliasPath(t *testing.T) {
+	tests := []struct {
+		path     string
+		aliases  map[string]string
+		expected string
+	}{
+		{"test", map[string]string{}, "test"},
+		{"test/sample.abs", map[string]string{}, "test/sample.abs"},
+		{"test/sample.abs", map[string]string{"test": "path"}, "path/sample.abs"},
+		{"test", map[string]string{"test": "path"}, "path/index.abs"},
+		{"./test", map[string]string{"test": "path"}, "./test"},
+	}
+
+	for _, tt := range tests {
+		res := UnaliasPath(tt.path, tt.aliases)
+
+		if res != tt.expected {
+			t.Fatalf("error unaliasing path, expected %s, got %s", tt.expected, res)
+		}
+	}
+}