@zenstackhq/language 3.0.0-beta.25 → 3.0.0-beta.27

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Model, DataSource, DataModel, TypeDef, Enum, Attribute, Expression, InvocationExpr, FunctionDecl } from './ast.cjs';
+import { Model, DataSource, GeneratorDecl, DataModel, TypeDef, Enum, Attribute, Expression, InvocationExpr, FunctionDecl } from './ast.cjs';
 import { ValidationAcceptor, Module, DeepPartial, AstNode } from 'langium';
 import { LangiumServices, PartialLangiumServices, LangiumSharedServices, DefaultSharedModuleContext } from 'langium/lsp';
 
@@ -40,6 +40,7 @@ declare class ZModelValidator {
     constructor(services: ZModelServices);
     checkModel(node: Model, accept: ValidationAcceptor): void;
     checkDataSource(node: DataSource, accept: ValidationAcceptor): void;
+    checkGenerator(node: GeneratorDecl, accept: ValidationAcceptor): void;
     checkDataModel(node: DataModel, accept: ValidationAcceptor): void;
     checkTypeDef(node: TypeDef, accept: ValidationAcceptor): void;
     checkEnum(node: Enum, accept: ValidationAcceptor): void;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Model, DataSource, DataModel, TypeDef, Enum, Attribute, Expression, InvocationExpr, FunctionDecl } from './ast.js';
+import { Model, DataSource, GeneratorDecl, DataModel, TypeDef, Enum, Attribute, Expression, InvocationExpr, FunctionDecl } from './ast.js';
 import { ValidationAcceptor, Module, DeepPartial, AstNode } from 'langium';
 import { LangiumServices, PartialLangiumServices, LangiumSharedServices, DefaultSharedModuleContext } from 'langium/lsp';
 
@@ -40,6 +40,7 @@ declare class ZModelValidator {
     constructor(services: ZModelServices);
     checkModel(node: Model, accept: ValidationAcceptor): void;
     checkDataSource(node: DataSource, accept: ValidationAcceptor): void;
+    checkGenerator(node: GeneratorDecl, accept: ValidationAcceptor): void;
     checkDataModel(node: DataModel, accept: ValidationAcceptor): void;
     checkTypeDef(node: TypeDef, accept: ValidationAcceptor): void;
     checkEnum(node: Enum, accept: ValidationAcceptor): void;

package/dist/index.js

@@ -7010,6 +7010,13 @@ var FunctionInvocationValidator = class {
     }
     return true;
   }
+  _checkAuth(expr, accept) {
+    if (!expr.$resolvedType) {
+      accept("error", 'cannot resolve `auth()` - make sure you have a model or type with `@auth` attribute or named "User"', {
+        node: expr
+      });
+    }
+  }
   _checkLength(expr, accept) {
     const msg = "argument must be a string or list field";
     const fieldArg = expr.args[0].value;
@@ -7119,6 +7126,15 @@ var FunctionInvocationValidator = class {
     }
   }
 };
+_ts_decorate2([
+  func("auth"),
+  _ts_metadata2("design:type", Function),
+  _ts_metadata2("design:paramtypes", [
+    typeof InvocationExpr === "undefined" ? Object : InvocationExpr,
+    typeof ValidationAcceptor === "undefined" ? Object : ValidationAcceptor
+  ]),
+  _ts_metadata2("design:returntype", void 0)
+], FunctionInvocationValidator.prototype, "_checkAuth", null);
 _ts_decorate2([
   func("length"),
   _ts_metadata2("design:type", Function),
@@ -7227,6 +7243,7 @@ function registerValidationChecks(services) {
   const checks = {
     Model: validator.checkModel,
     DataSource: validator.checkDataSource,
+    GeneratorDecl: validator.checkGenerator,
     DataModel: validator.checkDataModel,
     TypeDef: validator.checkTypeDef,
     Enum: validator.checkEnum,
@@ -7252,6 +7269,11 @@ var ZModelValidator = class {
   checkDataSource(node, accept) {
     new DataSourceValidator().validate(node, accept);
   }
+  checkGenerator(node, accept) {
+    accept("warning", '"generator" is not used by ZenStack and should be removed.', {
+      node
+    });
+  }
   checkDataModel(node, accept) {
     new DataModelValidator().validate(node, accept);
   }
@@ -8708,10 +8730,7 @@ var ZModelScopeProvider = class extends DefaultScopeProvider {
     const referenceType = this.reflection.getReferenceType(context);
     const globalScope = this.getGlobalScope(referenceType, context);
     const node = context.container;
-    const allowTypeDefScope = (
-      // isAuthOrAuthMemberAccess(node.operand) ||
-      !!AstUtils7.getContainerOfType(node, isTypeDef)
-    );
+    const allowTypeDefScope = isAuthOrAuthMemberAccess(node.operand) || !!AstUtils7.getContainerOfType(node, isTypeDef);
     return match5(node.operand).when(isReferenceExpr, (operand) => {
       const ref = operand.target.ref;
       if (isDataField(ref)) {
@@ -8740,7 +8759,7 @@ var ZModelScopeProvider = class extends DefaultScopeProvider {
     const referenceType = this.reflection.getReferenceType(context);
     const globalScope = this.getGlobalScope(referenceType, context);
     const collection = collectionPredicate.left;
-    const allowTypeDefScope = false;
+    const allowTypeDefScope = isAuthOrAuthMemberAccess(collection);
     return match5(collection).when(isReferenceExpr, (expr) => {
       const ref = expr.target.ref;
       if (isDataField(ref)) {