update

Author: ymc9

packages/language/src/zmodel-scope.ts

@@ -36,8 +36,8 @@ import {
     getAuthDecl,
     getRecursiveBases,
     isAuthInvocation,
-    isCollectionPredicate,
     isBeforeInvocation,
+    isCollectionPredicate,
     resolveImportUri,
 } from './utils';
 
@@ -75,7 +75,7 @@ export class ZModelScopeComputation extends DefaultScopeComputation {
 
     override processNode(node: AstNode, document: LangiumDocument<AstNode>, scopes: PrecomputedScopes) {
         super.processNode(node, document, scopes);
-        if (isDataModel(node)) {
+        if (isDataModel(node) || isTypeDef(node)) {
             // add base fields to the scope recursively
             const bases = getRecursiveBases(node);
             for (const base of bases) {

tests/regression/test/v2-migrated/issue-971.test.ts

@@ -4,18 +4,18 @@ import { it } from 'vitest';
 it('verifies issue 971', async () => {
     await loadSchema(
         `
-abstract model Level1 {
+type Level1 {
     id String @id @default(cuid())
     URL String?
     @@validate(URL != null, "URL must be provided") // works
 }
-abstract model Level2 extends Level1 {
+type Level2 with Level1 {
     @@validate(URL != null, "URL must be provided") // works 
 }
-abstract model Level3 extends Level2 {
+type Level3 with Level2 {
     @@validate(URL != null, "URL must be provided") // doesn't work
 }
-model Foo extends Level3 {
+model Foo with Level3 {
 }
             `,
     );