Added Windows paths support when requiring local files (dop251#61)

* added os specific abs path check for requiring local files

* added .\ and ..\ Windows only checks

Author: ganigeorgiev

require/module_test.go

@@ -7,6 +7,8 @@ import (
 	"io"
 	"os"
 	"path"
+	"path/filepath"
+	"runtime"
 	"testing"
 
 	js "github.com/dop251/goja"
@@ -182,23 +184,68 @@ func TestRequireRegistryNativeModule(t *testing.T) {
 }
 
 func TestRequire(t *testing.T) {
+	absPath, err := filepath.Abs("./testdata/m.js")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	isWindows := runtime.GOOS == "windows"
+
+	tests := []struct {
+		path string
+		ok   bool
+	}{
+		{
+			"./testdata/m.js",
+			true,
+		},
+		{
+			"../require/testdata/m.js",
+			true,
+		},
+		{
+			absPath,
+			true,
+		},
+		{
+			`.\testdata\m.js`,
+			isWindows,
+		},
+		{
+			`..\require\testdata\m.js`,
+			isWindows,
+		},
+	}
+
 	const SCRIPT = `
-	var m = require("./testdata/m.js");
+	var m = require(testPath);
 	m.test();
 	`
 
-	vm := js.New()
+	for _, test := range tests {
+		t.Run(test.path, func(t *testing.T) {
+			vm := js.New()
+			vm.Set("testPath", test.path)
 
-	registry := new(Registry)
-	registry.Enable(vm)
+			registry := new(Registry)
+			registry.Enable(vm)
 
-	v, err := vm.RunString(SCRIPT)
-	if err != nil {
-		t.Fatal(err)
-	}
+			v, err := vm.RunString(SCRIPT)
 
-	if !v.StrictEquals(vm.ToValue("passed")) {
-		t.Fatalf("Unexpected result: %v", v)
+			ok := err == nil
+
+			if ok != test.ok {
+				t.Fatalf("Expected ok to be %v, got %v (%v)", test.ok, ok, err)
+			}
+
+			if !ok {
+				return
+			}
+
+			if !v.StrictEquals(vm.ToValue("passed")) {
+				t.Fatalf("Unexpected result: %v", v)
+			}
+		})
 	}
 }
 

require/resolve.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"path"
+	"path/filepath"
+	"runtime"
 	"strings"
 
 	js "github.com/dop251/goja"
@@ -28,9 +30,7 @@ func (r *RequireModule) resolve(modpath string) (module *js.Object, err error) {
 	}
 
 	p := path.Join(start, modpath)
-	if strings.HasPrefix(origPath, "./") ||
-		strings.HasPrefix(origPath, "/") || strings.HasPrefix(origPath, "../") ||
-		origPath == "." || origPath == ".." {
+	if isFileOrDirectoryPath(origPath) {
 		if module = r.modules[p]; module != nil {
 			return
 		}
@@ -258,3 +258,19 @@ func (r *RequireModule) loadModuleFile(path string, jsModule *js.Object) error {
 
 	return nil
 }
+
+func isFileOrDirectoryPath(path string) bool {
+	result := path == "." || path == ".." ||
+		strings.HasPrefix(path, "/") ||
+		strings.HasPrefix(path, "./") ||
+		strings.HasPrefix(path, "../")
+
+	if runtime.GOOS == "windows" {
+		result = result ||
+			strings.HasPrefix(path, `.\`) ||
+			strings.HasPrefix(path, `..\`) ||
+			filepath.IsAbs(path)
+	}
+
+	return result
+}