fix: relax OPL parsing (#1059)

* Allow semicolons in more places * Allow commas in more places
ory · Oct 10, 2022 · a15c5ad · a15c5ad
1 parent 2b03d6f
commit a15c5ad
Show file tree

Hide file tree

Showing 5 changed files with 219 additions and 21 deletions.
diff --git a/internal/schema/.snapshots/TestParser-suite=snapshots-advanced_typescript_syntax.json b/internal/schema/.snapshots/TestParser-suite=snapshots-advanced_typescript_syntax.json
@@ -0,0 +1,150 @@
+{
+  "Resource": [
+    {
+      "name": "admins",
+      "types": [
+        {
+          "namespace": "Role",
+          "relation": "member"
+        }
+      ]
+    },
+    {
+      "name": "supervisors",
+      "types": [
+        {
+          "namespace": "Role",
+          "relation": "member"
+        }
+      ]
+    },
+    {
+      "name": "annotators",
+      "types": [
+        {
+          "namespace": "Role",
+          "relation": "member"
+        }
+      ]
+    },
+    {
+      "name": "medicalAnnotators",
+      "types": [
+        {
+          "namespace": "Role",
+          "relation": "member"
+        }
+      ]
+    },
+    {
+      "name": "read",
+      "rewrite": {
+        "operator": "or",
+        "children": [
+          {
+            "relation": "admins",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "annotators",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "medicalAnnotators",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "supervisors",
+            "computed_subject_set_relation": "member"
+          }
+        ]
+      }
+    },
+    {
+      "name": "update",
+      "rewrite": {
+        "operator": "or",
+        "children": [
+          {
+            "relation": "admins",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "annotators",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "medicalAnnotators",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "supervisors",
+            "computed_subject_set_relation": "member"
+          }
+        ]
+      }
+    },
+    {
+      "name": "create",
+      "rewrite": {
+        "operator": "or",
+        "children": [
+          {
+            "relation": "admins",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "annotators",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "supervisors",
+            "computed_subject_set_relation": "member"
+          }
+        ]
+      }
+    },
+    {
+      "name": "approve",
+      "rewrite": {
+        "operator": "or",
+        "children": [
+          {
+            "relation": "admins",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "supervisors",
+            "computed_subject_set_relation": "member"
+          }
+        ]
+      }
+    },
+    {
+      "name": "delete",
+      "rewrite": {
+        "operator": "or",
+        "children": [
+          {
+            "relation": "admins",
+            "computed_subject_set_relation": "member"
+          },
+          {
+            "relation": "supervisors",
+            "computed_subject_set_relation": "member"
+          }
+        ]
+      }
+    }
+  ],
+  "Role": [
+    {
+      "name": "member",
+      "types": [
+        {
+          "namespace": "Role"
+        }
+      ]
+    }
+  ]
+}
diff --git a/internal/schema/itemtype_string.go b/internal/schema/itemtype_string.go
diff --git a/internal/schema/lexer.go b/internal/schema/lexer.go
@@ -54,15 +54,16 @@ const (
 	itemKeywordCtx
 
 	// operators
-	itemOperatorAnd    // "&&"
-	itemOperatorOr     // "||"
-	itemOperatorNot    // "!"
-	itemOperatorAssign // "="
-	itemOperatorArrow  // "=>"
-	itemOperatorDot    // "."
-	itemOperatorColon  // ":"
-	itemOperatorComma  // ","
-	itemTypeUnion      // "|"
+	itemOperatorAnd       // "&&"
+	itemOperatorOr        // "||"
+	itemOperatorNot       // "!"
+	itemOperatorAssign    // "="
+	itemOperatorArrow     // "=>"
+	itemOperatorDot       // "."
+	itemOperatorColon     // ":"
+	itemOperatorComma     // ","
+	itemOperatorSemicolon // ";"
+	itemTypeUnion         // "|"
 
 	// brackets
 	itemParenLeft    // "("
@@ -217,6 +218,7 @@ var oneRuneTokens = map[rune]itemType{
 	'>': itemAngledRight,
 	'=': itemOperatorAssign,
 	',': itemOperatorComma,
+	';': itemOperatorSemicolon,
 	'|': itemTypeUnion,
 	'!': itemOperatorNot,
 }

diff --git a/internal/schema/parser.go b/internal/schema/parser.go
@@ -177,6 +177,8 @@ func (p *parser) parseClass() {
 			p.parseRelated()
 		case item.Val == "permits":
 			p.parsePermits()
+		case item.Typ == itemOperatorSemicolon:
+			continue
 		default:
 			p.addFatal(item, "expected 'permits' or 'related', got %q", item.Val)
 			return
@@ -205,7 +207,7 @@ func (p *parser) parseRelated() {
 			case itemParenLeft:
 				types = append(types, p.parseTypeUnion()...)
 			}
-			p.match("[", "]")
+			p.match("[", "]", optional(","))
 			p.namespace.Relations = append(p.namespace.Relations, ast.Relation{
 				Name:  relation,
 				Types: types,

diff --git a/internal/schema/parser_test.go b/internal/schema/parser_test.go
@@ -71,6 +71,49 @@ var parserTestCases = []struct {
 		this.related.siblings.traverse(s => s.permits.edit(ctx)),
 	}
   }
+`}, {"advanced typescript syntax",
+		`
+import { Namespace, SubjectSet, Context } from '@ory/keto-namespace-types';
+
+class Role implements Namespace {
+  related: {
+    member: Role[]
+  }
+}
+
+class Resource implements Namespace {
+  related: {
+    admins: SubjectSet<Role, 'member'>[],
+    supervisors: SubjectSet<Role, 'member'>[],
+    annotators: SubjectSet<Role, 'member'>[],
+    medicalAnnotators: SubjectSet<Role, 'member'>[],
+  };
+
+  permits = {
+    read: (ctx: Context) => this.related.admins.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.annotators.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.medicalAnnotators.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.supervisors.traverse((role) => role.related.member.includes(ctx.subject)),
+
+	// TODO: support referencing permits.
+    // comment: (ctx: Context) => this.permits.read(ctx),
+
+    update: (ctx: Context) => this.related.admins.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.annotators.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.medicalAnnotators.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.supervisors.traverse((role) => role.related.member.includes(ctx.subject)),
+
+    create: (ctx: Context) => this.related.admins.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.annotators.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.supervisors.traverse((role) => role.related.member.includes(ctx.subject)),
+
+    approve: (ctx: Context) => this.related.admins.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.supervisors.traverse((role) => role.related.member.includes(ctx.subject)),
+
+    delete: (ctx: Context) => this.related.admins.traverse((role) => role.related.member.includes(ctx.subject)) ||
+      this.related.supervisors.traverse((role) => role.related.member.includes(ctx.subject)),
+  };
+}
 `},
 }