improve scope computation of member access expression

zenstackhq · Apr 15, 2024 · 8962e89 · 8962e89
1 parent 4a2681e
commit 8962e89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/schema/src/language-server/zmodel-scope.ts b/packages/schema/src/language-server/zmodel-scope.ts
@@ -144,9 +144,9 @@ export class ZModelScopeProvider extends DefaultScopeProvider {
                 return EMPTY_SCOPE;
             })
             .when(isMemberAccessExpr, (operand) => {
-                // operand is a member access, it must be resolved to a
+                // operand is a member access, it must be resolved to a non-array data model type
                 const ref = operand.member.ref;
-                if (isDataModelField(ref)) {
+                if (isDataModelField(ref) && !ref.type.array) {
                     const targetModel = ref.type.reference?.ref;
                     return this.createScopeForModel(targetModel, globalScope);
                 }

diff --git a/tests/integration/tests/regression/issue-756.test.ts b/tests/integration/tests/regression/issue-756.test.ts
@@ -28,6 +28,6 @@ describe('Regression: issue 756', () => {
           }
         `
             )
-        ).toContain('expression cannot be resolved');
+        ).toContain(`Could not resolve reference to DataModelField named 'authorId'.`);
     });
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,6 @@ describe('Regression: issue 756', () => { @@
               }
             `
                 )
-            ).toContain('expression cannot be resolved');
+            ).toContain(`Could not resolve reference to DataModelField named 'authorId'.`);
         });
     });