feat: support semicolons in types (#1151)

fixes #1135
ory · Nov 30, 2022 · a06eda7 · a06eda7
1 parent 85e1182
commit a06eda7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
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
@@ -57,16 +57,18 @@ const (
 	itemKeywordCtx
 
 	// operators
-	itemOperatorAnd       // "&&"
-	itemOperatorOr        // "||"
-	itemOperatorNot       // "!"
-	itemOperatorAssign    // "="
-	itemOperatorArrow     // "=>"
-	itemOperatorDot       // "."
-	itemOperatorColon     // ":"
-	itemOperatorComma     // ","
-	itemOperatorSemicolon // ";"
-	itemTypeUnion         // "|"
+	itemOperatorAnd    // "&&"
+	itemOperatorOr     // "||"
+	itemOperatorNot    // "!"
+	itemOperatorAssign // "="
+	itemOperatorArrow  // "=>"
+	itemOperatorDot    // "."
+	itemOperatorColon  // ":"
+	itemOperatorComma  // ","
+
+	// misc characters
+	itemSemicolon // ";"
+	itemTypeUnion // "|"
 
 	// brackets
 	itemParenLeft    // "("
@@ -228,7 +230,7 @@ var oneRuneTokens = map[rune]itemType{
 	'>': itemAngledRight,
 	'=': itemOperatorAssign,
 	',': itemOperatorComma,
-	';': itemOperatorSemicolon,
+	';': itemSemicolon,
 	'|': itemTypeUnion,
 	'!': itemOperatorNot,
 }

diff --git a/internal/schema/parser.go b/internal/schema/parser.go
@@ -180,7 +180,7 @@ func (p *parser) parseClass() {
 			p.parseRelated()
 		case item.Val == "permits":
 			p.parsePermits()
-		case item.Typ == itemOperatorSemicolon:
+		case item.Typ == itemSemicolon:
 			continue
 		default:
 			p.addFatal(item, "expected 'permits' or 'related', got %q", item.Val)
@@ -194,6 +194,9 @@ func (p *parser) parseRelated() {
 	for !p.fatal {
 		switch item := p.next(); item.Typ {
 
+		case itemSemicolon:
+			continue
+
 		case itemBraceRight:
 			return
 

diff --git a/internal/schema/parser_test.go b/internal/schema/parser_test.go
@@ -65,14 +65,14 @@ var parserTestCases = []struct {
 
   class User implements Namespace {
 	related: {
-	  manager: User[]
+	  manager: User[];
 	}
   }
   
   class Group implements Namespace {
 	related: {
-	  members: (User | Group)[]
-	}
+	  members: (User | Group)[];
+	};
   }
   
   class Folder implements Namespace {