Merge pull request #272 from zenstackhq/dev

ymc9 · web-flow · commit 5f639de799bc · 2025-09-24T05:05:25.000Z
merge dev to main (v3.0.0-beta.7)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "ZenStack",
     "packageManager": "pnpm@10.12.1",
     "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
diff --git a/packages/dialects/sql.js/package.json b/packages/dialects/sql.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/kysely-sql-js",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "Kysely dialect for sql.js",
     "type": "module",
     "scripts": {
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/ide/vscode/package.json b/packages/ide/vscode/package.json
@@ -1,7 +1,7 @@
 {
     "name": "zenstack-v3",
     "publisher": "zenstack",
-    "version": "3.0.6",
+    "version": "3.0.8",
     "displayName": "ZenStack V3 Language Tools",
     "description": "VSCode extension for ZenStack (v3) ZModel language",
     "private": true,
diff --git a/packages/language/package.json b/packages/language/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/language/src/module.ts b/packages/language/src/module.ts
@@ -9,6 +9,7 @@ import {
 } from 'langium/lsp';
 import { ZModelGeneratedModule, ZModelGeneratedSharedModule, ZModelLanguageMetaData } from './generated/module';
 import { ZModelValidator, registerValidationChecks } from './validator';
+import { ZModelDocumentBuilder } from './zmodel-document-builder';
 import { ZModelLinker } from './zmodel-linker';
 import { ZModelScopeComputation, ZModelScopeProvider } from './zmodel-scope';
 import { ZModelWorkspaceManager } from './zmodel-workspace-manager';
@@ -49,6 +50,7 @@ export type ZModelSharedServices = LangiumSharedServices;
 
 export const ZModelSharedModule: Module<ZModelSharedServices, DeepPartial<ZModelSharedServices>> = {
     workspace: {
+        DocumentBuilder: (services) => new ZModelDocumentBuilder(services),
         WorkspaceManager: (services) => new ZModelWorkspaceManager(services),
     },
 };
diff --git a/packages/language/src/utils.ts b/packages/language/src/utils.ts
@@ -1,4 +1,3 @@
-import { invariant } from '@zenstackhq/common-helpers';
 import { AstUtils, URI, type AstNode, type LangiumDocument, type LangiumDocuments, type Reference } from 'langium';
 import fs from 'node:fs';
 import path from 'path';
@@ -172,7 +171,10 @@ export function getRecursiveBases(
     }
     seen.add(decl);
     decl.mixins.forEach((mixin) => {
-        const baseDecl = mixin.ref;
+        // avoid using mixin.ref since this function can be called before linking
+        const baseDecl = decl.$container.declarations.find(
+            (d): d is TypeDef => isTypeDef(d) && d.name === mixin.$refText,
+        );
         if (baseDecl) {
             if (!includeDelegate && isDelegateModel(baseDecl)) {
                 return;
@@ -517,13 +519,15 @@ export function getAllFields(
 
     const fields: DataField[] = [];
     for (const mixin of decl.mixins) {
-        invariant(mixin.ref, `Mixin ${mixin.$refText} is not resolved`);
-        fields.push(...getAllFields(mixin.ref, includeIgnored, seen));
+        if (mixin.ref) {
+            fields.push(...getAllFields(mixin.ref, includeIgnored, seen));
+        }
     }
 
     if (isDataModel(decl) && decl.baseModel) {
-        invariant(decl.baseModel.ref, `Base model ${decl.baseModel.$refText} is not resolved`);
-        fields.push(...getAllFields(decl.baseModel.ref, includeIgnored, seen));
+        if (decl.baseModel.ref) {
+            fields.push(...getAllFields(decl.baseModel.ref, includeIgnored, seen));
+        }
     }
 
     fields.push(...decl.fields.filter((f) => includeIgnored || !hasAttribute(f, '@ignore')));
@@ -541,13 +545,15 @@ export function getAllAttributes(
 
     const attributes: DataModelAttribute[] = [];
     for (const mixin of decl.mixins) {
-        invariant(mixin.ref, `Mixin ${mixin.$refText} is not resolved`);
-        attributes.push(...getAllAttributes(mixin.ref, seen));
+        if (mixin.ref) {
+            attributes.push(...getAllAttributes(mixin.ref, seen));
+        }
     }
 
     if (isDataModel(decl) && decl.baseModel) {
-        invariant(decl.baseModel.ref, `Base model ${decl.baseModel.$refText} is not resolved`);
-        attributes.push(...getAllAttributes(decl.baseModel.ref, seen));
+        if (decl.baseModel.ref) {
+            attributes.push(...getAllAttributes(decl.baseModel.ref, seen));
+        }
     }
 
     attributes.push(...decl.attributes);
diff --git a/packages/language/src/validator.ts b/packages/language/src/validator.ts
@@ -1,6 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions */
-
-import type { AstNode, LangiumDocument, ValidationAcceptor, ValidationChecks } from 'langium';
+import type { ValidationAcceptor, ValidationChecks } from 'langium';
 import type {
     Attribute,
     DataModel,
@@ -50,54 +48,39 @@ export function registerValidationChecks(services: ZModelServices) {
 export class ZModelValidator {
     constructor(protected readonly services: ZModelServices) {}
 
-    private shouldCheck(node: AstNode) {
-        let doc: LangiumDocument | undefined;
-        let currNode: AstNode | undefined = node;
-        while (currNode) {
-            if (currNode.$document) {
-                doc = currNode.$document;
-                break;
-            }
-            currNode = currNode.$container;
-        }
-
-        return doc?.parseResult.lexerErrors.length === 0 && doc?.parseResult.parserErrors.length === 0;
-    }
-
     checkModel(node: Model, accept: ValidationAcceptor): void {
-        this.shouldCheck(node) &&
-            new SchemaValidator(this.services.shared.workspace.LangiumDocuments).validate(node, accept);
+        new SchemaValidator(this.services.shared.workspace.LangiumDocuments).validate(node, accept);
     }
 
     checkDataSource(node: DataSource, accept: ValidationAcceptor): void {
-        this.shouldCheck(node) && new DataSourceValidator().validate(node, accept);
+        new DataSourceValidator().validate(node, accept);
     }
 
     checkDataModel(node: DataModel, accept: ValidationAcceptor): void {
-        this.shouldCheck(node) && new DataModelValidator().validate(node, accept);
+        new DataModelValidator().validate(node, accept);
     }
 
     checkTypeDef(node: TypeDef, accept: ValidationAcceptor): void {
-        this.shouldCheck(node) && new TypeDefValidator().validate(node, accept);
+        new TypeDefValidator().validate(node, accept);
     }
 
     checkEnum(node: Enum, accept: ValidationAcceptor): void {
-        this.shouldCheck(node) && new EnumValidator().validate(node, accept);
+        new EnumValidator().validate(node, accept);
     }
 
     checkAttribute(node: Attribute, accept: ValidationAcceptor): void {
-        this.shouldCheck(node) && new AttributeValidator().validate(node, accept);
+        new AttributeValidator().validate(node, accept);
     }
 
     checkExpression(node: Expression, accept: ValidationAcceptor): void {
-        this.shouldCheck(node) && new ExpressionValidator().validate(node, accept);
+        new ExpressionValidator().validate(node, accept);
     }
 
     checkFunctionInvocation(node: InvocationExpr, accept: ValidationAcceptor): void {
-        this.shouldCheck(node) && new FunctionInvocationValidator().validate(node, accept);
+        new FunctionInvocationValidator().validate(node, accept);
     }
 
     checkFunctionDecl(node: FunctionDecl, accept: ValidationAcceptor): void {
-        this.shouldCheck(node) && new FunctionDeclValidator().validate(node, accept);
+        new FunctionDeclValidator().validate(node, accept);
     }
 }
diff --git a/packages/language/src/zmodel-document-builder.ts b/packages/language/src/zmodel-document-builder.ts
@@ -0,0 +1,22 @@
+import { DefaultDocumentBuilder, type BuildOptions, type LangiumDocument } from 'langium';
+
+export class ZModelDocumentBuilder extends DefaultDocumentBuilder {
+    override buildDocuments(documents: LangiumDocument[], options: BuildOptions, cancelToken: any): Promise<void> {
+        return super.buildDocuments(
+            documents,
+            {
+                ...options,
+                validation:
+                    // force overriding validation options
+                    options.validation === false || options.validation === undefined
+                        ? options.validation
+                        : {
+                              stopAfterLexingErrors: true,
+                              stopAfterParsingErrors: true,
+                              stopAfterLinkingErrors: true,
+                          },
+            },
+            cancelToken,
+        );
+    }
+}
diff --git a/packages/language/test/expression-validation.test.ts b/packages/language/test/expression-validation.test.ts
@@ -2,7 +2,7 @@ import { describe, it } from 'vitest';
 import { loadSchema, loadSchemaWithError } from './utils';
 
 describe('Expression Validation Tests', () => {
-    it('should reject model comparison', async () => {
+    it('should reject model comparison1', async () => {
         await loadSchemaWithError(
             `
             model User {
@@ -15,14 +15,15 @@ describe('Expression Validation Tests', () => {
                 id Int @id
                 title String
                 author User @relation(fields: [authorId], references: [id])
+                authorId Int
                 @@allow('all', author == this)
             }
         `,
             'comparison between models is not supported',
         );
     });
 
-    it('should reject model comparison', async () => {
+    it('should reject model comparison2', async () => {
         await loadSchemaWithError(
             `
             model User {
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/runtime",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "ZenStack Runtime",
     "type": "module",
     "scripts": {
@@ -53,12 +53,12 @@
         },
         "./plugins/policy": {
             "import": {
-                "types": "./dist/plugins/policy.d.ts",
-                "default": "./dist/plugins/policy.js"
+                "types": "./dist/plugins/policy/index.d.ts",
+                "default": "./dist/plugins/policy/index.js"
             },
             "require": {
-                "types": "./dist/plugins/policy.d.cts",
-                "default": "./dist/plugins/policy.cjs"
+                "types": "./dist/plugins/policy/index.d.cts",
+                "default": "./dist/plugins/policy/index.cjs"
             }
         },
         "./package.json": {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
diff --git a/packages/tanstack-query/package.json b/packages/tanstack-query/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "",
     "main": "index.js",
     "type": "module",
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {
diff --git a/packages/typescript-config/package.json b/packages/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "private": true,
     "license": "MIT"
 }
diff --git a/packages/vitest-config/package.json b/packages/vitest-config/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "private": true,
     "license": "MIT",
     "exports": {
diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "",
     "type": "module",
     "main": "index.js",
diff --git a/samples/blog/package.json b/samples/blog/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sample-blog",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "description": "",
     "main": "index.js",
     "scripts": {
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -1,6 +1,6 @@
 {
     "name": "e2e",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/regression/package.json b/tests/regression/package.json
@@ -1,6 +1,6 @@
 {
     "name": "regression",
-    "version": "3.0.0-beta.6",
+    "version": "3.0.0-beta.7",
     "private": true,
     "type": "module",
     "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-v3",`
`3`		`- "version": "3.0.0-beta.6",`
	`3`	`+ "version": "3.0.0-beta.7",`
`4`	`4`	`"description": "ZenStack",`
`5`	`5`	`"packageManager": "[email protected]",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/common-helpers",`
`3`		`- "version": "3.0.0-beta.6",`
	`3`	`+ "version": "3.0.0-beta.7",`
`4`	`4`	`"description": "ZenStack Common Helpers",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-zenstack",`
`3`		`- "version": "3.0.0-beta.6",`
	`3`	`+ "version": "3.0.0-beta.7",`
`4`	`4`	`"description": "Create a new ZenStack project",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/kysely-sql-js",`
`3`		`- "version": "3.0.0-beta.6",`
	`3`	`+ "version": "3.0.0-beta.7",`
`4`	`4`	`"description": "Kysely dialect for sql.js",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/eslint-config",`
`3`		`- "version": "3.0.0-beta.6",`
	`3`	`+ "version": "3.0.0-beta.7",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-v3",`
`3`	`3`	`"publisher": "zenstack",`
`4`		`- "version": "3.0.6",`
	`4`	`+ "version": "3.0.8",`
`5`	`5`	`"displayName": "ZenStack V3 Language Tools",`
`6`	`6`	`"description": "VSCode extension for ZenStack (v3) ZModel language",`
`7`	`7`	`"private": true,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`	`3`	`"description": "ZenStack ZModel language specification",`
`4`		`- "version": "3.0.0-beta.6",`
	`4`	`+ "version": "3.0.0-beta.7",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"author": "ZenStack Team",`
`7`	`7`	`"files": [`