Merge pull request #19 from spatialcurrent/javascript

GopherJS Build of DFL (Closes #18)

Author: pjdufour

README.md

@@ -76,6 +76,16 @@ You can also use DFL to filter OpenStreetMap features.
 # returns true as exit code 0
 ```
 
+# Building
+
+**CLI**
+
+The command line DFL program can be built with the `scripts/build_cli.sh` script.
+
+**JavaScript**
+
+You can compile DFL to pure JavaScript with the `scripts/build_javascript.sh` script.
+
 # Contributing
 
 [Spatial Current, Inc.](https://spatialcurrent.io) is currently accepting pull requests for this repository.  We'd love to have your contributions!  Please see [Contributing.md](https://github.com/spatialcurrent/go-dfl/blob/master/CONTRIBUTING.md) for how to get started.

cmd/dfljs/main.go

@@ -0,0 +1,100 @@
+// =================================================================
+//
+// Copyright (C) 2018 Spatial Current, Inc. - All Rights Reserved
+// Released as open source under the MIT License.  See LICENSE file.
+//
+// =================================================================
+
+// DFLJS is the Javascript version of DFL.
+//
+// Usage
+//
+// In you html document simply add dfl as a script and call dfl.EvaluateBool(expression, {"a": 1});
+//
+package main
+
+import (
+	"github.com/spatialcurrent/go-dfl/dfl"
+)
+
+import (
+	"github.com/gopherjs/gopherjs/js"
+	"honnef.co/go/js/console"
+)
+
+func main() {
+	js.Global.Set("dfl", map[string]interface{}{
+		"EvaluateBool":   EvaluateBool,
+		"EvaluateInt":    EvaluateInt,
+		"EvaluateString": EvaluateString,
+	})
+}
+
+func EvaluateBool(s string, options *js.Object) bool {
+	root, err := dfl.Parse(s)
+	if err != nil {
+		console.Log(err.Error())
+		return false
+	}
+
+	root = root.Compile()
+
+	ctx := map[string]interface{}{}
+	for _, key := range js.Keys(options) {
+		ctx[key] = options.Get(key).Interface()
+	}
+
+	result, err := dfl.EvaluateBool(root, ctx, dfl.FunctionMap{})
+	if err != nil {
+		console.Log(err.Error())
+		return false
+	}
+
+	return result
+}
+
+func EvaluateInt(s string, options *js.Object) int {
+	root, err := dfl.Parse(s)
+	if err != nil {
+		console.Log(err.Error())
+		return 0
+	}
+
+	root = root.Compile()
+
+	ctx := map[string]interface{}{}
+	for _, key := range js.Keys(options) {
+		ctx[key] = options.Get(key).Interface()
+	}
+
+	result, err := dfl.EvaluateInt(root, ctx, dfl.FunctionMap{})
+	if err != nil {
+		console.Log(err.Error())
+		return 0
+	}
+
+	return result
+}
+
+func EvaluateString(s string, options *js.Object) string {
+	root, err := dfl.Parse(s)
+	if err != nil {
+		console.Log(err.Error())
+		return ""
+	}
+
+	root = root.Compile()
+
+	ctx := map[string]interface{}{}
+	for _, key := range js.Keys(options) {
+		ctx[key] = options.Get(key).Interface()
+	}
+
+	result, err := dfl.EvaluateString(root, ctx, dfl.FunctionMap{})
+	if err != nil {
+		console.Log(err.Error())
+		return ""
+	}
+
+	return result
+}

dfl/TryConvertString_test.go

@@ -65,7 +65,6 @@ func TestTryConvertStringTimes(t *testing.T) {
 
 }
 
-
 func TestTryConvertStringIPv4(t *testing.T) {
 
 	testCases := []struct {

scripts/build.sh scripts/build_cli.shscripts/build.sh renamed to scripts/build_cli.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+mkdir -p $DIR/../bin
+
+echo "******************"
+echo "Formatting $(realpath $DIR/../dfl)"
+cd $DIR/../dfl
+go fmt
+echo "Done formatting."
+echo "******************"
+echo "Building Javascript for DFL"
+cd $DIR/../bin
+gopherjs build github.com/spatialcurrent/go-dfl/cmd/dfljs
+if [[ "$?" != 0 ]] ; then
+    echo "Error building Javascript for DFL"
+    exit 1
+fi
+echo "Executable built at $(realpath $DIR/../bin)"