@zenstackhq/language 3.0.0-beta.6 → 3.0.0-beta.7

package/dist/index.d.cts

@@ -21,7 +21,6 @@ declare const ZModelLanguageMetaData: {
 declare class ZModelValidator {
     protected readonly services: ZModelServices;
     constructor(services: ZModelServices);
-    private shouldCheck;
     checkModel(node: Model, accept: ValidationAcceptor): void;
     checkDataSource(node: DataSource, accept: ValidationAcceptor): void;
     checkDataModel(node: DataModel, accept: ValidationAcceptor): void;

package/dist/index.d.ts

@@ -21,7 +21,6 @@ declare const ZModelLanguageMetaData: {
 declare class ZModelValidator {
     protected readonly services: ZModelServices;
     constructor(services: ZModelServices);
-    private shouldCheck;
     checkModel(node: Model, accept: ValidationAcceptor): void;
     checkDataSource(node: DataSource, accept: ValidationAcceptor): void;
     checkDataModel(node: DataModel, accept: ValidationAcceptor): void;

package/dist/index.js

@@ -5109,7 +5109,6 @@ import { AstUtils as AstUtils2 } from "langium";
 import pluralize from "pluralize";
 
 // src/utils.ts
-import { invariant } from "@zenstackhq/common-helpers";
 import { AstUtils, URI } from "langium";
 import fs from "fs";
 import path from "path";
@@ -5214,7 +5213,7 @@ function getRecursiveBases(decl, includeDelegate = true, seen = /* @__PURE__ */
   }
   seen.add(decl);
   decl.mixins.forEach((mixin) => {
-    const baseDecl = mixin.ref;
+    const baseDecl = decl.$container.declarations.find((d) => isTypeDef(d) && d.name === mixin.$refText);
     if (baseDecl) {
       if (!includeDelegate && isDelegateModel(baseDecl)) {
         return;
@@ -5489,12 +5488,14 @@ function getAllFields(decl, includeIgnored = false, seen = /* @__PURE__ */ new S
   seen.add(decl);
   const fields = [];
   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")));
   return fields;
@@ -5507,12 +5508,14 @@ function getAllAttributes(decl, seen = /* @__PURE__ */ new Set()) {
   seen.add(decl);
   const attributes = [];
   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);
   return attributes;
@@ -5961,7 +5964,7 @@ var AttributeValidator = class {
 };
 
 // src/validators/datamodel-validator.ts
-import { invariant as invariant2 } from "@zenstackhq/common-helpers";
+import { invariant } from "@zenstackhq/common-helpers";
 import { AstUtils as AstUtils3 } from "langium";
 
 // src/validators/common.ts
@@ -6332,7 +6335,7 @@ var DataModelValidator = class {
     if (!model.baseModel) {
       return;
     }
-    invariant2(model.baseModel.ref, "baseModel must be resolved");
+    invariant(model.baseModel.ref, "baseModel must be resolved");
     if (!isDelegateModel(model.baseModel.ref)) {
       accept("error", `Model ${model.baseModel.$refText} cannot be extended because it's not a delegate model`, {
         node: model,
@@ -6354,7 +6357,7 @@ var DataModelValidator = class {
       }
       seen.push(current);
       if (current.baseModel) {
-        invariant2(current.baseModel.ref, "baseModel must be resolved");
+        invariant(current.baseModel.ref, "baseModel must be resolved");
         todo.push(current.baseModel.ref);
       }
     }
@@ -6976,44 +6979,53 @@ var ZModelValidator = class {
   constructor(services) {
     this.services = services;
   }
-  shouldCheck(node) {
-    let doc;
-    let currNode = 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, accept) {
-    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, accept) {
-    this.shouldCheck(node) && new DataSourceValidator().validate(node, accept);
+    new DataSourceValidator().validate(node, accept);
   }
   checkDataModel(node, accept) {
-    this.shouldCheck(node) && new DataModelValidator().validate(node, accept);
+    new DataModelValidator().validate(node, accept);
   }
   checkTypeDef(node, accept) {
-    this.shouldCheck(node) && new TypeDefValidator().validate(node, accept);
+    new TypeDefValidator().validate(node, accept);
   }
   checkEnum(node, accept) {
-    this.shouldCheck(node) && new EnumValidator().validate(node, accept);
+    new EnumValidator().validate(node, accept);
   }
   checkAttribute(node, accept) {
-    this.shouldCheck(node) && new AttributeValidator().validate(node, accept);
+    new AttributeValidator().validate(node, accept);
   }
   checkExpression(node, accept) {
-    this.shouldCheck(node) && new ExpressionValidator().validate(node, accept);
+    new ExpressionValidator().validate(node, accept);
   }
   checkFunctionInvocation(node, accept) {
-    this.shouldCheck(node) && new FunctionInvocationValidator().validate(node, accept);
+    new FunctionInvocationValidator().validate(node, accept);
   }
   checkFunctionDecl(node, accept) {
-    this.shouldCheck(node) && new FunctionDeclValidator().validate(node, accept);
+    new FunctionDeclValidator().validate(node, accept);
+  }
+};
+
+// src/zmodel-document-builder.ts
+import { DefaultDocumentBuilder } from "langium";
+var ZModelDocumentBuilder = class extends DefaultDocumentBuilder {
+  static {
+    __name(this, "ZModelDocumentBuilder");
+  }
+  buildDocuments(documents, options, cancelToken) {
+    return super.buildDocuments(documents, {
+      ...options,
+      validation: (
+        // force overriding validation options
+        options.validation === false || options.validation === void 0 ? options.validation : {
+          stopAfterLexingErrors: true,
+          stopAfterParsingErrors: true,
+          stopAfterLinkingErrors: true
+        }
+      )
+    }, cancelToken);
   }
 };
 
@@ -7669,6 +7681,7 @@ var ZModelLanguageModule = {
 };
 var ZModelSharedModule = {
   workspace: {
+    DocumentBuilder: /* @__PURE__ */ __name((services) => new ZModelDocumentBuilder(services), "DocumentBuilder"),
     WorkspaceManager: /* @__PURE__ */ __name((services) => new ZModelWorkspaceManager(services), "WorkspaceManager")
   }
 };