feat: allow quoting object keys in OPL

ory · Nov 16, 2022 · 081d834 · 081d834
1 parent 640abc1
commit 081d834
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internal/schema/parser.go b/internal/schema/parser.go
@@ -195,7 +195,7 @@ func (p *parser) parseRelated() {
 		switch item := p.next(); item.Typ {
 		case itemBraceRight:
 			return
-		case itemIdentifier:
+		case itemIdentifier, itemStringLiteral:
 			relation := item.Val
 			var types []ast.RelationType
 			p.match(":")
@@ -216,7 +216,7 @@ func (p *parser) parseRelated() {
 				Types: types,
 			})
 		default:
-			p.addFatal(item, "expected identifier or '}', got %q", item.Val)
+			p.addFatal(item, "expected identifier or '}', got %s %q", item.Typ.String(), item.Val)
 			return
 		}
 	}
@@ -258,7 +258,7 @@ func (p *parser) parsePermits() {
 		case itemBraceRight:
 			return
 
-		case itemIdentifier:
+		case itemIdentifier, itemStringLiteral:
 			permission := item.Val
 			p.match(
 				":", "(", "ctx", optional(":", "Context"), ")",
@@ -276,7 +276,7 @@ func (p *parser) parsePermits() {
 				})
 
 		default:
-			p.addFatal(item, "expected identifier or '}', got %q", item.Val)
+			p.addFatal(item, "expected identifier or '}', got %s %q", item.Typ.String(), item.Val)
 			return
 		}
 	}

diff --git a/internal/schema/parser_test.go b/internal/schema/parser_test.go
@@ -90,7 +90,7 @@ var parserTestCases = []struct {
 	related: {
 	  parents: (File | Folder)[]
 	  viewers: (User | SubjectSet<Group, "members">)[]
-	  owners: (User | SubjectSet<Group, "members">)[]
+	  "owners": (User | SubjectSet<Group, "members">)[]
 	  siblings: File[]
 	}
   
@@ -107,7 +107,7 @@ var parserTestCases = []struct {
 		this.related.viewers.includes(ctx.subject) ) ||
 		this.related.owners.includes(ctx.subject),
   
-	  edit: (ctx: Context) => this.related.owners.includes(ctx.subject),
+	  'edit': (ctx: Context) => this.related.owners.includes(ctx.subject),
 
 	  not: (ctx: Context) => !this.related.owners.includes(ctx.subject),