@zenstackhq/language 3.0.0-beta.8 → 3.0.0-beta.9

package/dist/index.d.cts

@@ -80,7 +80,7 @@ declare function createZModelServices(): {
 declare class DocumentLoadError extends Error {
     constructor(message: string);
 }
-declare function loadDocument(fileName: string, pluginModelFiles?: string[]): Promise<{
+declare function loadDocument(fileName: string, additionalModelFiles?: string[]): Promise<{
     success: true;
     model: Model;
     warnings: string[];

package/dist/index.d.ts

@@ -80,7 +80,7 @@ declare function createZModelServices(): {
 declare class DocumentLoadError extends Error {
     constructor(message: string);
 }
-declare function loadDocument(fileName: string, pluginModelFiles?: string[]): Promise<{
+declare function loadDocument(fileName: string, additionalModelFiles?: string[]): Promise<{
     success: true;
     model: Model;
     warnings: string[];

package/dist/index.js

@@ -5208,8 +5208,14 @@ function getRecursiveBases(decl, includeDelegate = true, seen = /* @__PURE__ */
     return result;
   }
   seen.add(decl);
-  decl.mixins.forEach((mixin) => {
-    const baseDecl = decl.$container.declarations.find((d) => isTypeDef(d) && d.name === mixin.$refText);
+  const bases = [
+    ...decl.mixins,
+    ...isDataModel(decl) && decl.baseModel ? [
+      decl.baseModel
+    ] : []
+  ];
+  bases.forEach((base) => {
+    const baseDecl = decl.$container.declarations.find((d) => isTypeDef(d) || isDataModel(d) && d.name === base.$refText);
     if (baseDecl) {
       if (!includeDelegate && isDelegateModel(baseDecl)) {
         return;
@@ -5852,6 +5858,10 @@ function assignableToAttributeParam(arg, param, attr) {
   let dstIsArray = param.type.array;
   if (dstType === "ContextType") {
     if (isDataField(attr.$container)) {
+      const dstIsTypedJson = hasAttribute(attr.$container, "@json");
+      if (dstIsTypedJson && attr.decl.ref?.name === "@default") {
+        return argResolvedType.decl === "String";
+      }
       dstIsArray = attr.$container.type.array;
     }
   }
@@ -5943,6 +5953,9 @@ function isValidAttributeTarget(attrDecl, targetDecl) {
       case "TypeDefField":
         allowed = allowed || isTypeDef(targetDecl.type.reference?.ref);
         break;
+      case "ListField":
+        allowed = allowed || !isDataModel(targetDecl.type.reference?.ref) && targetDecl.type.array;
+        break;
       default:
         break;
     }
@@ -6721,7 +6734,7 @@ var FunctionInvocationValidator = class {
         }
         curr = curr.$container;
       }
-      const exprContext = match(containerAttribute?.decl.$refText).with("@default", () => ExpressionContext.DefaultValue).with(P.union("@@allow", "@@deny", "@allow", "@deny"), () => ExpressionContext.AccessPolicy).with("@@validate", () => ExpressionContext.ValidationRule).with("@@index", () => ExpressionContext.Index).otherwise(() => void 0);
+      const exprContext = this.getExpressionContext(containerAttribute);
       const funcAllowedContext = getFunctionExpressionContext(funcDecl);
       if (exprContext && !funcAllowedContext.includes(exprContext)) {
         accept("error", `function "${funcDecl.name}" is not allowed in the current context: ${exprContext}`, {
@@ -6753,6 +6766,18 @@ var FunctionInvocationValidator = class {
       checker.value.call(this, expr, accept);
     }
   }
+  getExpressionContext(containerAttribute) {
+    if (!containerAttribute) {
+      return void 0;
+    }
+    if (this.isValidationAttribute(containerAttribute)) {
+      return ExpressionContext.ValidationRule;
+    }
+    return match(containerAttribute?.decl.$refText).with("@default", () => ExpressionContext.DefaultValue).with(P.union("@@allow", "@@deny", "@allow", "@deny"), () => ExpressionContext.AccessPolicy).with("@@index", () => ExpressionContext.Index).otherwise(() => void 0);
+  }
+  isValidationAttribute(attr) {
+    return !!attr.decl.ref?.attributes.some((attr2) => attr2.decl.$refText === "@@@validation");
+  }
   validateArgs(funcDecl, args, accept) {
     let success = true;
     for (let i = 0; i < funcDecl.params.length; i++) {
@@ -6813,6 +6838,43 @@ var FunctionInvocationValidator = class {
     }
     return true;
   }
+  _checkLength(expr, accept) {
+    const msg = "argument must be a string or list field";
+    const fieldArg = expr.args[0].value;
+    if (!isDataFieldReference(fieldArg)) {
+      accept("error", msg, {
+        node: expr.args[0]
+      });
+      return;
+    }
+    if (isDataModel(fieldArg.$resolvedType?.decl)) {
+      accept("error", msg, {
+        node: expr.args[0]
+      });
+      return;
+    }
+    if (!fieldArg.$resolvedType?.array && fieldArg.$resolvedType?.decl !== "String") {
+      accept("error", msg, {
+        node: expr.args[0]
+      });
+    }
+  }
+  _checkRegex(expr, accept) {
+    const regex = expr.args[1]?.value;
+    if (!isStringLiteral(regex)) {
+      accept("error", "second argument must be a string literal", {
+        node: expr.args[1]
+      });
+      return;
+    }
+    try {
+      new RegExp(regex.value);
+    } catch (e) {
+      accept("error", "invalid regular expression: " + e.message, {
+        node: expr.args[1]
+      });
+    }
+  }
   // TODO: move this to policy plugin
   _checkCheck(expr, accept) {
     let valid = true;
@@ -6885,6 +6947,24 @@ var FunctionInvocationValidator = class {
     }
   }
 };
+_ts_decorate2([
+  func("length"),
+  _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, "_checkLength", null);
+_ts_decorate2([
+  func("regex"),
+  _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, "_checkRegex", null);
 _ts_decorate2([
   func("check"),
   _ts_metadata2("design:type", Function),
@@ -7435,7 +7515,7 @@ var ZModelScopeComputation = class extends DefaultScopeComputation {
   }
   processNode(node, document, scopes) {
     super.processNode(node, document, scopes);
-    if (isDataModel(node)) {
+    if (isDataModel(node) || isTypeDef(node)) {
       const bases = getRecursiveBases(node);
       for (const base of bases) {
         for (const field of base.fields) {
@@ -7736,7 +7816,7 @@ var DocumentLoadError = class extends Error {
     super(message);
   }
 };
-async function loadDocument(fileName, pluginModelFiles = []) {
+async function loadDocument(fileName, additionalModelFiles = []) {
   const { ZModelLanguage: services } = createZModelServices();
   const extensions = services.LanguageMetaData.fileExtensions;
   if (!extensions.includes(path3.extname(fileName))) {
@@ -7759,7 +7839,7 @@ async function loadDocument(fileName, pluginModelFiles = []) {
   }
   const _dirname = typeof __dirname !== "undefined" ? __dirname : path3.dirname(fileURLToPath2(import.meta.url));
   const stdLib = await services.shared.workspace.LangiumDocuments.getOrCreateDocument(URI3.file(path3.resolve(path3.join(_dirname, "../res", STD_LIB_MODULE_NAME))));
-  const pluginDocs = await Promise.all(pluginModelFiles.map((file) => services.shared.workspace.LangiumDocuments.getOrCreateDocument(URI3.file(path3.resolve(file)))));
+  const pluginDocs = await Promise.all(additionalModelFiles.map((file) => services.shared.workspace.LangiumDocuments.getOrCreateDocument(URI3.file(path3.resolve(file)))));
   const langiumDocuments = services.shared.workspace.LangiumDocuments;
   const document = await langiumDocuments.getOrCreateDocument(URI3.file(path3.resolve(fileName)));
   const importedURIs = await loadImports(document, langiumDocuments);