feel 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de0fedb1a035e540ac1d2b2e7e7f0cfd6c85dfa0b0919b69d3690ae1fe81a78
-  data.tar.gz: 99975ce815f3c1fb9b63d064f303edb9599d7a1f49b5470daac2494143cd0cf1
+  metadata.gz: 26fdb4664c8065677848ea5b18de3a9f7e62da890af5d086862c9a7273aea58f
+  data.tar.gz: 7b81758ba746aa0641a5974c74f3afecc501b498887c0eb4c86c62de60ce45a1
 SHA512:
-  metadata.gz: 1c283691f93b500f00aa4c23f68ce6dc8321e56691321c86d9d0e5a340e7cae48ca62a842500d17e9ddbaf12beadbdef39dda1819cfe3a4f8c6e866cedfd6ba1
-  data.tar.gz: 9ee3653ab96ee639d01c052d03783890ca9b31a505091edb3d58562e49031cd1711069c6abe92d103bac899dca0763b78c879e9b35dfe000b744e6e13da7447d
+  metadata.gz: 5a4d084ec29dc0d2265a6da43946b2d88a7c67fa82ad206b0bf967cb53352c53cb5d36ad7a6c95c5f8cd4e5ed5326ff5df43e30ecc7318c7e2996b1c89608d88
+  data.tar.gz: 4aa63c524997dea7f8df494573e4fa45317c713585739812094d60b6fa213f95b6670f429db77edabc371bb92fe30942cae32d0d54e3fa00150e7351fd2851b5

data/lib/feel/feel.treetop

@@ -179,7 +179,7 @@ grammar FEEL
   # 7.b interval ;
   #
   rule simple_positive_unary_test
-    head:((unary_operator / "not") __)? tail:endpoint <SimplePositiveUnaryTest> /
+    head:((unary_operator / "not") __)? tail:endpoint !(__ comparison_operator) <SimplePositiveUnaryTest> /
     interval
   end
 
@@ -244,7 +244,9 @@ grammar FEEL
   rule simple_unary_tests
     expr:simple_positive_unary_tests <SimpleUnaryTests> /
     negate:"not" __ "(" __ expr:simple_positive_unary_tests __ ")" <SimpleUnaryTests> /
-    "-" <SimpleUnaryTests>
+    "-" <SimpleUnaryTests> /
+    # Handles ? in comparisons (e.g. "? > 5") — SimplePositiveUnaryTest handles ? in endpoints (e.g. "contains(?, \"x\")").
+    expr:simple_expression <ExpressionUnaryTest>
   end
 
   #
@@ -372,7 +374,7 @@ grammar FEEL
   # 30. name start char = "?" | [A-Z] | "\_" | [a-z] | [\uC0-\uD6] | [\uD8-\uF6] | [\uF8-\u2FF] | [\u370-\u37D] | [\u37F-\u1FFF] | [\u200C-\u200D] | [\u2070-\u218F] | [\u2C00-\u2FEF] | [\u3001-\uD7FF] | [\uF900-\uFDCF] | [\uFDF0-\uFFFD] | [\u10000-\uEFFFF] ;
   # 
   rule name_start_char
-    [A-Z] / [a-z] / "_" / name_start_unicode_char
+    "?" / [A-Z] / [a-z] / "_" / name_start_unicode_char
   end
 
   rule name_start_unicode_char
@@ -575,7 +577,7 @@ grammar FEEL
   # 51.d expression , "in" , " (", positive unary tests, ")" ;
   #
   rule comparison
-    left:non_recursive_simple_expression_for_comparison __ operator:comparision_operator __ right:expression <Comparison>
+    left:non_recursive_simple_expression_for_comparison __ operator:comparison_operator __ right:expression <Comparison>
   end
 
   rule non_recursive_simple_expression_for_comparison
@@ -590,7 +592,7 @@ grammar FEEL
     expression __ "[" __ filter:expression __ "]" <FilterExpression>
   end
 
-  rule comparision_operator
+  rule comparison_operator
     "=" / "!=" / "<=" / ">=" / "<" / ">"
   end
 

data/lib/feel/nodes.rb

@@ -2,6 +2,13 @@
 
 module FEEL
   class Node < Treetop::Runtime::SyntaxNode
+    def contains_input_placeholder?
+      return true if is_a?(Name) && text_value == "?"
+      return false unless respond_to?(:elements) && elements
+
+      elements.any? { |el| el.respond_to?(:contains_input_placeholder?) && el.contains_input_placeholder? }
+    end
+
     #
     # Takes a context hash and returns an array of qualified names
     # { "person": { "name": { "first": "Eric", "last": "Carlson" }, "age": 60 } } => ["person", "person.name.first", "person.name.last", "person.age"]
@@ -125,6 +132,11 @@ module FEEL
   class SimplePositiveUnaryTest < Node
     def eval(context = {})
       operator = head.text_value.strip
+
+      if operator.empty? && tail.respond_to?(:contains_input_placeholder?) && tail.contains_input_placeholder?
+        return ->(input) { tail.eval(context.merge("?" => input)) }
+      end
+
       endpoint = tail.eval(context)
 
       case operator
@@ -242,6 +254,12 @@ module FEEL
     end
   end
 
+  class ExpressionUnaryTest < Node
+    def eval(context = {})
+      ->(input) { expr.eval(context.merge("?" => input)) }
+    end
+  end
+
   #
   # 15. positive unary test = simple positive unary test | "null" ;
   #

data/lib/feel/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FEEL
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feel
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Connected Bits