okta-expression-parser 0.2.1__tar.gz → 0.3.0__tar.gz

{okta_expression_parser-0.2.1 → okta_expression_parser-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: okta-expression-parser
-Version: 0.2.1
+Version: 0.3.0
 Summary: Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language
 Author: Mathew Moon
 Author-email: me@mathewmoon.net

{okta_expression_parser-0.2.1 → okta_expression_parser-0.3.0}/okta_expression_parser/lexer.py

@@ -24,6 +24,8 @@ class ExpressionLexer(Lexer):
         NOT,
         NULL,
         BOOL,
+        COLON,
+        QUESTION_MARK,
         MEMBEROF,
         MEMBEROFANY,
         USER,
@@ -49,6 +51,8 @@ class ExpressionLexer(Lexer):
     MEMBEROFANY = "isMemberOfAnyGroup"
     MEMBEROF = "isMemberOfGroup"
     USER = r"user\b"
+    COLON = r"\:"
+    QUESTION_MARK = r"\?"
 
     NULL = r"null|NULL|Null"
     CLASS = r"String|Arrays|Convert|Iso3166Convert|Groups"

{okta_expression_parser-0.2.1 → okta_expression_parser-0.3.0}/okta_expression_parser/parser.py

@@ -14,9 +14,8 @@ from .lexer import ExpressionLexer
 
 
 class ExpressionParser(sly.Parser):
-    if debug_file := environ.get("OKTA_EXPRESSION_PARSER_LOG_FILE"):
-        #: Writes grammar rules to a file for debugging
-        debugfile: str = environ.get(debug_file)
+    #: Writes grammar rules to a file for debugging
+    debugfile = environ.get("OKTA_EXPRESSION_PARSER_LOG_FILE")
 
     #: Gets the token list from the lexer (required)
     tokens: Sequence = ExpressionLexer.tokens
@@ -64,6 +63,12 @@ class ExpressionParser(sly.Parser):
     def parse(self, expression: str):
         return super().parse(ExpressionLexer().tokenize(expression))
 
+    @_("operand")  # noqa: 821
+    @_("condition")  # noqa: 821
+    def result(self, p: YaccProduction) -> bool:  # noqa: 811
+        res = p.condition if hasattr(p, "condition") else p.operand
+        return res
+
     @_("operand EQ operand")  # noqa: 821
     def condition(self, p: YaccProduction) -> bool:
         operand0 = p.operand0
@@ -107,17 +112,39 @@ class ExpressionParser(sly.Parser):
         operand1 = p.operand1
         return type(operand0) == type(operand1) and operand0 > operand1
 
+    @_('"(" condition ")"')  # noqa: 821
+    def condition(self, p: YaccProduction) -> bool:  # noqa: 811
+        return p.condition
+
+    @_('"(" operand ")"')  # noqa: 821
+    def operand(self, p: YaccProduction) -> bool:  # noqa: 811
+        return p.operand
+
     @_("condition AND condition")  # noqa: 821
     def condition(self, p: YaccProduction) -> bool:  # noqa: 811
-        condition0 = p.condition0
-        condition1 = p.condition1
-        return condition0 and condition1
+        return p.condition0 and p.condition1
+
+    @_("operand AND operand")  # noqa: 821
+    def condition(self, p: YaccProduction) -> bool:  # noqa: 811
+        return p.operand0 and p.operand1
+
+    @_("operand AND condition")  # noqa: 821
+    @_("condition AND operand")  # noqa: 821
+    def condition(self, p: YaccProduction) -> bool:  # noqa: 811
+        return p.condition and p.operand
 
     @_("condition OR condition")  # noqa: 821
     def condition(self, p: YaccProduction) -> bool:  # noqa: 811
-        condition0 = p.condition0
-        condition1 = p.condition1
-        return condition0 or condition1
+        return p.condition0 or p.condition1
+
+    @_("operand OR operand")  # noqa: 821
+    def condition(self, p: YaccProduction) -> bool:  # noqa: 811
+        return p.operand0 or p.operand1
+
+    @_("operand OR condition")  # noqa: 821
+    @_("condition OR operand")  # noqa: 821
+    def condition(self, p: YaccProduction) -> bool:  # noqa: 811
+        return p.condition or p.operand
 
     @_("NOT condition")  # noqa: 821
     def condition(self, p: YaccProduction) -> bool:  # noqa: 811
@@ -128,22 +155,11 @@ class ExpressionParser(sly.Parser):
     def condition(self, p: YaccProduction) -> bool:  # noqa: 811
         return not p.operand
 
-    @_('"(" condition ")"')  # noqa: 821
-    def condition(self, p: YaccProduction) -> bool:  # noqa: 811
-        condition = p.condition
-        return condition
-
     @_('operand "," operand')  # noqa: 821
     def operand(self, p: YaccProduction) -> List[Any]:  # noqa: 811
         operand0 = p.operand0
         operand1 = p.operand1
 
-        # if not isinstance(operand0, tuple):
-        #    return (operand0, operand1)
-        #
-        # else:
-        #    return operand0 + (operand1,)
-
         if isinstance(operand0, tuple) and isinstance(operand1, tuple):
             res = operand0 + operand1
         elif isinstance(operand0, tuple) and not isinstance(operand1, tuple):
@@ -292,7 +308,8 @@ class ExpressionParser(sly.Parser):
             return False
 
         val = p.operand
-        if not isinstance(val, list):
+
+        if not isinstance(val, tuple):
             val = [val]
 
         res = list(set(self.__group_ids) & set(val))
@@ -306,9 +323,28 @@ class ExpressionParser(sly.Parser):
         if not self.__group_ids:
             return False
 
-        # return p.operand.lower() in self.__group_ids
         return p.operand in self.__group_ids
 
+    #@_("turnary")  # noqa: 821
+    #def operand(self, p: YaccProduction) -> Any:
+    #    condition = p.turnary[0]
+    #    if_true = p.turnary[1]
+    #    if_false = p.turnary[2]
+    #    if condition:
+    #        return if_true
+    #    else:
+    #        return if_false
+
+    @_("operand QUESTION_MARK operand COLON operand")  # noqa: 821
+    @_("condition QUESTION_MARK operand COLON operand")  # noqa: 821
+    def operand(self, p: YaccProduction) -> Any:  # noqa: 811
+        condition = p.condition if hasattr(p, "condition") else p.operand0
+        if_true = p.operand0 if hasattr(p, "condition") else p.operand1
+        if_false = p.operand1 if hasattr(p, "condition") else p.operand2
+
+        return if_true if condition else if_false
+        #return (condition, p.operand0, p.operand1)
+
     @_("condition error")  # noqa: 821
     def operand(self, x):  # noqa: 811
         raise SyntaxError(

{okta_expression_parser-0.2.1 → okta_expression_parser-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "okta-expression-parser"
-version = "0.2.1"
+version = "0.3.0"
 description = "Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language"
 authors = ["Mathew Moon <me@mathewmoon.net>"]
 readme = "README.md"