fix: supporting using type names as reference target as well

zenstackhq · May 20, 2024 · d17a85c · d17a85c
1 parent 5a13d8b
commit d17a85c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/packages/language/src/generated/grammar.ts b/packages/language/src/generated/grammar.ts
@@ -956,7 +956,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
               "terminal": {
                 "$type": "RuleCall",
                 "rule": {
-                  "$ref": "#/rules@46"
+                  "$ref": "#/rules@47"
                 },
                 "arguments": []
               },

diff --git a/packages/language/src/zmodel.langium b/packages/language/src/zmodel.langium
@@ -74,7 +74,7 @@ NullExpr:
     value='null';
 
 ReferenceExpr:
-    target=[ReferenceTarget:RegularID] ('(' ReferenceArgList ')')?;
+    target=[ReferenceTarget:RegularIDWithTypeNames] ('(' ReferenceArgList ')')?;
 
 fragment ReferenceArgList:
     args+=ReferenceArg (',' args+=ReferenceArg)*;

diff --git a/packages/schema/tests/schema/parser.test.ts b/packages/schema/tests/schema/parser.test.ts
@@ -87,6 +87,24 @@ describe('Parsing Tests', () => {
         expect((attrVal.value as ReferenceExpr).target.ref?.name).toBe('USER');
     });
 
+    it('enum fields named with type name', async () => {
+        const content = `
+            enum MyEnum {
+                DateTime
+                Int
+                String
+            }
+
+            model User {
+                id String @id
+                role MyEnum @default(DateTime)
+
+                @@allow('all', role == String)
+            }
+        `;
+        await loadModel(content);
+    });
+
     it('enum dup name resolve', async () => {
         const content = `
             datasource db {