Parse expression once in validate #56

    * Add new test that uses license exception as normal license key

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

src/license_expression/__init__.py

@@ -696,20 +696,17 @@ def validate(self, expression, strict=True, **kwargs):
             original_expression=str(expression)
         )
 
-        # Check `expression` type
+        # Check `expression` type and syntax
         try:
-            parsed_expression = self.parse(expression)
+            parsed_expression = self.parse(expression, strict=strict)
         except ExpressionError as e:
             expression_info.errors.append(str(e))
-            return expression_info
-
-        if strict:
-            # Check `expression` syntax
-            try:
-                parsed_expression = self.parse(expression, strict=strict)
-            except ExpressionParseError as e:
-                expression_info.errors.append(str(e))
+            error_code = e.error_code
+            # If we have these error codes, then we have a problematic license
+            # key that we need to append to `invalid_keys`
+            if error_code and error_code in (PARSE_INVALID_EXCEPTION, PARSE_INVALID_SYMBOL_AS_EXCEPTION):
                 expression_info.invalid_keys.append(e.token_string)
+            return expression_info
 
         # Check `expression` keys (validate)
         try:

tests/test_license_expression.py

@@ -2265,6 +2265,13 @@ def test_validation_exception_with_choice(self):
         assert result.errors == []
         assert result.invalid_keys == []
 
+    def test_validation_exception_as_regular_key(self):
+        result = self.licensing.validate('GPL-2.0-or-later AND WxWindows-exception-3.1')
+        assert result.original_expression == 'GPL-2.0-or-later AND WxWindows-exception-3.1'
+        assert not result.normalized_expression
+        assert result.errors == ['A license exception symbol can only be used as an exception in a "WITH exception" statement. for token: "WxWindows-exception-3.1" at position: 21']
+        assert result.invalid_keys == ['WxWindows-exception-3.1']
+
     def test_validation_bad_syntax(self):
         result = self.licensing.validate('Apache-2.0 + MIT')
         assert result.original_expression == 'Apache-2.0 + MIT'