@zenstackhq/language 3.1.0 → 3.2.0

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Model, DataSource, GeneratorDecl, DataModel, TypeDef, Enum, Attribute, Expression, InvocationExpr, FunctionDecl } from './ast.cjs';
+import { Model, DataSource, GeneratorDecl, DataModel, TypeDef, Enum, Attribute, Expression, InvocationExpr, FunctionDecl, Procedure } from './ast.cjs';
 import { ValidationAcceptor, Module, DeepPartial, AstNode } from 'langium';
 import { LangiumServices, PartialLangiumServices, LangiumSharedServices, DefaultSharedModuleContext } from 'langium/lsp';
 
@@ -48,6 +48,7 @@ declare class ZModelValidator {
     checkExpression(node: Expression, accept: ValidationAcceptor): void;
     checkFunctionInvocation(node: InvocationExpr, accept: ValidationAcceptor): void;
     checkFunctionDecl(node: FunctionDecl, accept: ValidationAcceptor): void;
+    checkProcedure(node: Procedure, accept: ValidationAcceptor): void;
 }
 
 /**

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Model, DataSource, GeneratorDecl, DataModel, TypeDef, Enum, Attribute, Expression, InvocationExpr, FunctionDecl } from './ast.js';
+import { Model, DataSource, GeneratorDecl, DataModel, TypeDef, Enum, Attribute, Expression, InvocationExpr, FunctionDecl, Procedure } from './ast.js';
 import { ValidationAcceptor, Module, DeepPartial, AstNode } from 'langium';
 import { LangiumServices, PartialLangiumServices, LangiumSharedServices, DefaultSharedModuleContext } from 'langium/lsp';
 
@@ -48,6 +48,7 @@ declare class ZModelValidator {
     checkExpression(node: Expression, accept: ValidationAcceptor): void;
     checkFunctionInvocation(node: InvocationExpr, accept: ValidationAcceptor): void;
     checkFunctionDecl(node: FunctionDecl, accept: ValidationAcceptor): void;
+    checkProcedure(node: Procedure, accept: ValidationAcceptor): void;
 }
 
 /**

package/dist/index.js

@@ -4022,7 +4022,8 @@ var ZModelGrammar = /* @__PURE__ */ __name(() => loadedZModelGrammar ?? (loadedZ
             "terminal": {
               "$type": "Keyword",
               "value": "mutation"
-            }
+            },
+            "cardinality": "?"
           },
           {
             "$type": "Keyword",
@@ -4073,7 +4074,7 @@ var ZModelGrammar = /* @__PURE__ */ __name(() => loadedZModelGrammar ?? (loadedZ
                     "terminal": {
                       "$type": "RuleCall",
                       "rule": {
-                        "$ref": "#/rules@47"
+                        "$ref": "#/rules@49"
                       },
                       "arguments": []
                     }
@@ -4251,6 +4252,10 @@ var ZModelGrammar = /* @__PURE__ */ __name(() => loadedZModelGrammar ?? (loadedZ
             "$type": "Keyword",
             "value": "Any"
           },
+          {
+            "$type": "Keyword",
+            "value": "Void"
+          },
           {
             "$type": "Keyword",
             "value": "Unsupported"
@@ -4861,10 +4866,26 @@ var ZModelGrammar = /* @__PURE__ */ __name(() => loadedZModelGrammar ?? (loadedZ
             "$type": "Keyword",
             "value": "Boolean"
           },
+          {
+            "$type": "Keyword",
+            "value": "BigInt"
+          },
+          {
+            "$type": "Keyword",
+            "value": "Decimal"
+          },
           {
             "$type": "Keyword",
             "value": "DateTime"
           },
+          {
+            "$type": "Keyword",
+            "value": "Json"
+          },
+          {
+            "$type": "Keyword",
+            "value": "Bytes"
+          },
           {
             "$type": "Keyword",
             "value": "Null"
@@ -4877,6 +4898,14 @@ var ZModelGrammar = /* @__PURE__ */ __name(() => loadedZModelGrammar ?? (loadedZ
             "$type": "Keyword",
             "value": "Any"
           },
+          {
+            "$type": "Keyword",
+            "value": "Void"
+          },
+          {
+            "$type": "Keyword",
+            "value": "Undefined"
+          },
           {
             "$type": "Keyword",
             "value": "Unsupported"
@@ -5212,6 +5241,10 @@ function mapBuiltinTypeToExpressionType(type) {
     case "Int":
     case "Float":
     case "Null":
+    case "Object":
+    case "Unsupported":
+    case "Void":
+    case "Undefined":
       return type;
     case "BigInt":
       return "Int";
@@ -5220,10 +5253,6 @@ function mapBuiltinTypeToExpressionType(type) {
     case "Json":
     case "Bytes":
       return "Any";
-    case "Object":
-      return "Object";
-    case "Unsupported":
-      return "Unsupported";
   }
 }
 __name(mapBuiltinTypeToExpressionType, "mapBuiltinTypeToExpressionType");
@@ -5243,6 +5272,10 @@ function isRelationshipField(field) {
   return isDataModel(field.type.reference?.ref);
 }
 __name(isRelationshipField, "isRelationshipField");
+function isComputedField(field) {
+  return hasAttribute(field, "@computed");
+}
+__name(isComputedField, "isComputedField");
 function isDelegateModel(node) {
   return isDataModel(node) && hasAttribute(node, "@@delegate");
 }
@@ -5864,24 +5897,27 @@ var AttributeApplicationValidator = class {
       });
       return;
     }
-    const kindItems = this.validatePolicyKinds(kind, [
+    this.validatePolicyKinds(kind, [
       "read",
       "update",
       "all"
     ], attr, accept);
     const expr = attr.args[1]?.value;
     if (expr && AstUtils2.streamAst(expr).some((node) => isBeforeInvocation(node))) {
-      accept("error", `"before()" is not allowed in field-level policy rules`, {
+      accept("error", `"before()" is not allowed in field-level policies`, {
         node: expr
       });
     }
-    if (kindItems.includes("update") || kindItems.includes("all")) {
-      const field = attr.$container;
-      if (isRelationshipField(field)) {
-        accept("error", `Field-level policy rules with "update" or "all" kind are not allowed for relation fields. Put rules on foreign-key fields instead.`, {
-          node: attr
-        });
-      }
+    const field = attr.$container;
+    if (isRelationshipField(field)) {
+      accept("error", `Field-level policies are not allowed for relation fields.`, {
+        node: attr
+      });
+    }
+    if (isComputedField(field)) {
+      accept("error", `Field-level policies are not allowed for computed fields.`, {
+        node: attr
+      });
     }
   }
   _checkValidate(attr, accept) {
@@ -6177,7 +6213,7 @@ function validateDuplicatedDeclarations(container, decls, accept) {
     group[decl.name] = group[decl.name] ?? [];
     group[decl.name].push(decl);
     return group;
-  }, {});
+  }, /* @__PURE__ */ Object.create(null));
   for (const [name, decls2] of Object.entries(groupByName)) {
     if (decls2.length > 1) {
       let errorField = decls2[1];
@@ -7060,7 +7096,9 @@ var FunctionInvocationValidator = class {
       return true;
     }
     if (typeof argResolvedType.decl === "string") {
-      if (!typeAssignable(dstType, argResolvedType.decl, arg.value) || dstIsArray !== argResolvedType.array) {
+      const dstScalarType = mapBuiltinTypeToExpressionType(dstType);
+      const srcScalarType = mapBuiltinTypeToExpressionType(argResolvedType.decl);
+      if (!typeAssignable(dstScalarType, srcScalarType, arg.value) || dstIsArray !== argResolvedType.array) {
         accept("error", `argument is not assignable to parameter`, {
           node: arg
         });
@@ -7289,6 +7327,30 @@ _ts_decorate2([
   _ts_metadata2("design:returntype", void 0)
 ], FunctionInvocationValidator.prototype, "_checkCheck", null);
 
+// src/validators/procedure-validator.ts
+var RESERVED_PROCEDURE_NAMES = /* @__PURE__ */ new Set([
+  "__proto__",
+  "prototype",
+  "constructor"
+]);
+var ProcedureValidator = class {
+  static {
+    __name(this, "ProcedureValidator");
+  }
+  validate(proc, accept) {
+    this.validateName(proc, accept);
+    proc.attributes.forEach((attr) => validateAttributeApplication(attr, accept));
+  }
+  validateName(proc, accept) {
+    if (RESERVED_PROCEDURE_NAMES.has(proc.name)) {
+      accept("error", `Procedure name "${proc.name}" is reserved`, {
+        node: proc,
+        property: "name"
+      });
+    }
+  }
+};
+
 // src/validators/schema-validator.ts
 var SchemaValidator = class {
   static {
@@ -7376,7 +7438,8 @@ function registerValidationChecks(services) {
     Attribute: validator.checkAttribute,
     Expression: validator.checkExpression,
     InvocationExpr: validator.checkFunctionInvocation,
-    FunctionDecl: validator.checkFunctionDecl
+    FunctionDecl: validator.checkFunctionDecl,
+    Procedure: validator.checkProcedure
   };
   registry.register(checks, validator);
 }
@@ -7421,6 +7484,9 @@ var ZModelValidator = class {
   checkFunctionDecl(node, accept) {
     new FunctionDeclValidator().validate(node, accept);
   }
+  checkProcedure(node, accept) {
+    new ProcedureValidator().validate(node, accept);
+  }
 };
 
 // src/zmodel-comment-provider.ts