From 61469330f36fb91fd8b8f372f5d8e22944b41128 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Thu, 19 Nov 2020 13:01:40 +0100
Subject: [PATCH] Add pkg/expr for unified expression handling

---
 compose/service/values/expr.go | 8 ++------
 pkg/expr/expr.go               | 7 +++++++
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 pkg/expr/expr.go

diff --git a/compose/service/values/expr.go b/compose/service/values/expr.go
index 64cb1cab9..be18dd125 100644
--- a/compose/service/values/expr.go
+++ b/compose/service/values/expr.go
@@ -3,8 +3,8 @@ package values
 import (
 	"context"
 	"fmt"
-	"github.com/PaesslerAG/gval"
 	"github.com/cortezaproject/corteza-server/compose/types"
+	"github.com/cortezaproject/corteza-server/pkg/expr"
 )
 
 func makeInvalidExprErr(field *types.ModuleField, expr string, err error) types.RecordValueError {
@@ -30,15 +30,11 @@ func makeValueExprIncompErr(field *types.ModuleField) types.RecordValueError {
 	}
 }
 
-func parser() gval.Language {
-	return gval.Full()
-}
-
 // Expression evaluates expression in ModuleField.Expressions.Value and
 // assigns results to the record on that field
 func Expression(ctx context.Context, m *types.Module, r *types.Record, old *types.Record, rve *types.RecordValueErrorSet) {
 	var (
-		exprParser = parser()
+		exprParser = expr.Parser()
 
 		scope = make(map[string]interface{})
 
diff --git a/pkg/expr/expr.go b/pkg/expr/expr.go
new file mode 100644
index 000000000..788246f47
--- /dev/null
+++ b/pkg/expr/expr.go
@@ -0,0 +1,7 @@
+package expr
+
+import "github.com/PaesslerAG/gval"
+
+func Parser() gval.Language {
+	return gval.Full()
+}