From 3b671086dd46cf60b7423c67a30767789550b198 Mon Sep 17 00:00:00 2001
From: ymc9 <104139426+ymc9@users.noreply.github.com>
Date: Fri, 13 Oct 2023 19:41:05 -0700
Subject: [PATCH 1/2] fix: resolve member access expr only in the context of
 operand type

---
 .../src/language-server/zmodel-linker.ts      | 16 ++++-----
 .../tests/regression/issue-756.test.ts        | 33 +++++++++++++++++++
 2 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 tests/integration/tests/regression/issue-756.test.ts

diff --git a/packages/schema/src/language-server/zmodel-linker.ts b/packages/schema/src/language-server/zmodel-linker.ts
index ba6396695..75c191e8f 100644
--- a/packages/schema/src/language-server/zmodel-linker.ts
+++ b/packages/schema/src/language-server/zmodel-linker.ts
@@ -92,9 +92,10 @@ export class ZModelLinker extends DefaultLinker {
         container: AstNode,
         property: string,
         document: LangiumDocument,
-        extraScopes: ScopeProvider[]
+        extraScopes: ScopeProvider[],
+        onlyFromExtraScopes = false
     ) {
-        if (!this.resolveFromScopeProviders(container, property, document, extraScopes)) {
+        if (!this.resolveFromScopeProviders(container, property, document, extraScopes) && !onlyFromExtraScopes) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const reference: Reference<AstNode> = (container as any)[property];
             this.doLink({ reference, container, property }, document);
@@ -327,12 +328,11 @@ export class ZModelLinker extends DefaultLinker {
         if (operandResolved && !operandResolved.array && isDataModel(operandResolved.decl)) {
             const modelDecl = operandResolved.decl as DataModel;
             const provider = (name: string) => modelDecl.$resolvedFields.find((f) => f.name === name);
-            extraScopes = [provider, ...extraScopes];
-        }
-
-        this.linkReference(node, 'member', document, extraScopes);
-        if (node.member.ref) {
-            this.resolveToDeclaredType(node, node.member.ref.type);
+            // member access is resolved only in the context of the operand type
+            this.linkReference(node, 'member', document, [provider], true);
+            if (node.member.ref) {
+                this.resolveToDeclaredType(node, node.member.ref.type);
+            }
         }
     }
 
diff --git a/tests/integration/tests/regression/issue-756.test.ts b/tests/integration/tests/regression/issue-756.test.ts
new file mode 100644
index 000000000..b10e60af2
--- /dev/null
+++ b/tests/integration/tests/regression/issue-756.test.ts
@@ -0,0 +1,33 @@
+import { loadModel, loadModelWithError } from '@zenstackhq/testtools';
+
+describe('Regression: issue 756', () => {
+    it('regression', async () => {
+        expect(
+            await loadModelWithError(
+                `
+        generator client {
+            provider = "prisma-client-js"
+        }
+            
+        datasource db {
+            provider = "postgresql"
+            url      = env("DATABASE_URL")
+        }
+                    
+        model User {
+            id Int @id @default(autoincrement())
+            email Int
+            posts Post[]
+          }
+          
+          model Post {
+            id Int @id @default(autoincrement())
+            author User? @relation(fields: [authorId], references: [id])
+            authorId Int
+            @@allow('all', auth().posts.authorId == authorId)
+          }
+        `
+            )
+        ).toContain('expression cannot be resolved');
+    });
+});

From 088a778b16021235df1aee46aefb1f92d44e4ede Mon Sep 17 00:00:00 2001
From: ymc9 <104139426+ymc9@users.noreply.github.com>
Date: Fri, 13 Oct 2023 19:50:27 -0700
Subject: [PATCH 2/2] fix test

---
 .../schema/tests/schema/validation/attribute-validation.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/tests/schema/validation/attribute-validation.test.ts b/packages/schema/tests/schema/validation/attribute-validation.test.ts
index 5c638a841..6f81dabc2 100644
--- a/packages/schema/tests/schema/validation/attribute-validation.test.ts
+++ b/packages/schema/tests/schema/validation/attribute-validation.test.ts
@@ -1017,7 +1017,7 @@ describe('Attribute tests', () => {
                 @@allow('all', auth().email != null)
             }
         `)
-        ).toContain(`Could not resolve reference to DataModelField named 'email'.`);
+        ).toContain(`expression cannot be resolved`);
     });
 
     it('collection predicate expression check', async () => {