feat: add limited support for mixed operators (#107)

OpenFGAParser.g4

@@ -10,12 +10,32 @@ modelHeader: (multiLineComment NEWLINE)? MODEL NEWLINE SCHEMA WHITESPACE schemaV
 typeDefs: typeDef*;
 typeDef:  (NEWLINE multiLineComment)? NEWLINE TYPE WHITESPACE typeName=IDENTIFIER (NEWLINE RELATIONS relationDeclaration+)?;
 
-relationDeclaration: NEWLINE DEFINE WHITESPACE relationName WHITESPACE? COLON WHITESPACE? relationDef;
+// Relation definitions
+relationDeclaration: NEWLINE DEFINE WHITESPACE relationName WHITESPACE? COLON WHITESPACE? (relationDef);
 relationName: IDENTIFIER;
-relationDef: (relationDefDirectAssignment | relationDefGrouping) (relationDefPartials)?;
-relationDefPartials: (WHITESPACE OR WHITESPACE relationDefGrouping)+ | (WHITESPACE AND WHITESPACE relationDefGrouping)+ | (WHITESPACE BUT_NOT WHITESPACE relationDefGrouping)+;
+
+relationDef: (relationDefDirectAssignment | relationDefGrouping | relationRecurse) (relationDefPartials)?;
+relationDefNoDirect: (relationDefGrouping | relationRecurseNoDirect) (relationDefPartials)?;
+
+relationDefPartials:
+    (WHITESPACE OR WHITESPACE (relationDefGrouping | relationRecurseNoDirect))+
+    | (WHITESPACE AND WHITESPACE (relationDefGrouping | relationRecurseNoDirect))+
+    | (WHITESPACE BUT_NOT WHITESPACE (relationDefGrouping | relationRecurseNoDirect));
+
 relationDefGrouping: relationDefRewrite;
 
+relationRecurse:
+    LPAREN WHITESPACE* (
+    relationDef |
+    relationRecurseNoDirect
+    ) WHITESPACE* RPAREN;
+
+relationRecurseNoDirect:
+    LPAREN WHITESPACE* (
+    relationDefNoDirect |
+    relationRecurseNoDirect
+    ) WHITESPACE* RPAREN;
+
 relationDefDirectAssignment: LBRACKET WHITESPACE? relationDefTypeRestriction WHITESPACE? (COMMA WHITESPACE? relationDefTypeRestriction WHITESPACE?)* RPRACKET;
 relationDefRewrite: rewriteComputedusersetName=IDENTIFIER (WHITESPACE FROM WHITESPACE rewriteTuplesetName=IDENTIFIER)?;
 

pkg/go/errors/errors.go

@@ -8,7 +8,7 @@ import (
 var ErrUnsupportedJSON = errors.New("json not currently supported by dsl")
 
 func UnsupportedDSLNestingError(typeName string, relationName string) error {
-	return fmt.Errorf("the '%s' relation under the '%s' type has mixed operators which are not supported by the OpenFGA DSL syntax yet", relationName, typeName)
+	return fmt.Errorf("the '%s' relation definition under the '%s' type is not supported by the OpenFGA DSL syntax yet", relationName, typeName)
 }
 
 func ConditionNameDoesntMatchError(conditionName string, conditionNestedName string) error {

pkg/go/transformer/dsltojson.go

@@ -298,7 +298,7 @@ func (l *OpenFgaDslListener) EnterRelationDefPartials(ctx *parser.RelationDefPar
 		l.currentRelation.Operator = RELATION_DEFINITION_OPERATOR_OR
 	} else if len(ctx.AllAND()) > 0 {
 		l.currentRelation.Operator = RELATION_DEFINITION_OPERATOR_AND
-	} else if len(ctx.AllBUT_NOT()) > 0 {
+	} else if ctx.BUT_NOT() != nil {
 		l.currentRelation.Operator = RELATION_DEFINITION_OPERATOR_BUT_NOT
 	}
 }

pkg/js/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.2.0-beta.6
+
+### [v0.2.0-beta.6](https://github.com/openfga/language/releases/tag/vv0.2.0-beta.3...v0.2.0-beta.4) (2023-12-11)
+
+last commit: 8b692a44e937beae8693cc155b205ffc5b732fbe
+
+Added:
+- Initial limited support for mixing operators [#107](https://github.com/openfga/language/pull/107)
+
 ## v0.2.0-beta.4
 
 ### [v0.2.0-beta.4](https://github.com/openfga/language/releases/tag/vv0.2.0-beta.3...v0.2.0-beta.4) (2023-10-04)

pkg/js/errors.ts

@@ -158,7 +158,7 @@ export class UnsupportedDSLNestingError extends Error {
     public relationName: string,
   ) {
     super(
-      `the '${relationName}' relation under the '${typeName}' type has mixed operators which are not supported by the OpenFGA DSL syntax yet`,
+      `the '${relationName}' relation definition under the '${typeName}' type is not supported by the OpenFGA DSL syntax yet`,
     );
   }
 }