@primmel/primmel 1.21.13 → 1.21.15

package/dist-cli/primmel.mjs

@@ -2561,7 +2561,7 @@ var OPERATORS = [
   ".",
   "|"
 ];
-var NAV_OPS = /* @__PURE__ */ new Set(["forAll", "exists", "select"]);
+var NAV_OPS = /* @__PURE__ */ new Set(["forAll", "exists", "select", "collect"]);
 function lex(src) {
   const tokens = [];
   let i = 0;
@@ -2695,6 +2695,29 @@ var ExprParser = class {
       return inner;
     }
     if (tok.kind === "name") {
+      if (tok.value === "true" || tok.value === "false") {
+        return { type: "bool", value: tok.value === "true" };
+      }
+      if (tok.value === "if") {
+        const cond = this.parseLevel(0);
+        const thenTok = this.take();
+        if (thenTok.kind !== "name" || thenTok.value !== "then") {
+          throw new Error('expression: expected "then" in the conditional');
+        }
+        const whenTrue = this.parseLevel(0);
+        const elseTok = this.take();
+        if (elseTok.kind !== "name" || elseTok.value !== "else") {
+          throw new Error('expression: expected "else" in the conditional');
+        }
+        const whenFalse = this.parseLevel(0);
+        const endTok = this.take();
+        if (endTok.kind !== "name" || endTok.value !== "endif") {
+          throw new Error(
+            'expression: expected "endif" to close the conditional'
+          );
+        }
+        return { type: "ifelse", cond, then: whenTrue, else: whenFalse };
+      }
       const segs = [tok.value];
       while (this.peek()?.kind === "op" && this.peek().value === ".") {
         this.take();
@@ -2734,7 +2757,7 @@ var ExprParser = class {
         const opTok = this.take();
         if (opTok.kind !== "name" || !NAV_OPS.has(opTok.value)) {
           throw new Error(
-            "expression: expected a collection iterator (forAll | exists | select)"
+            "expression: expected a collection iterator (forAll | exists | select | collect)"
           );
         }
         if (this.peek()?.kind !== "op" || this.peek().value !== "(") {
@@ -2785,6 +2808,13 @@ function freeIdentifiers(ast) {
         return;
       case "str":
         return;
+      case "bool":
+        return;
+      case "ifelse":
+        walk(node.cond, bound);
+        walk(node.then, bound);
+        walk(node.else, bound);
+        return;
       case "name": {
         if (bound.has(node.path[0].split(".")[0])) {
           return;
@@ -2823,6 +2853,10 @@ function renderExpression(ast) {
       return String(ast.value);
     case "str":
       return "'" + ast.value + "'";
+    case "bool":
+      return ast.value ? "true" : "false";
+    case "ifelse":
+      return "if " + renderExpression(ast.cond) + " then " + renderExpression(ast.then) + " else " + renderExpression(ast.else) + " endif";
     case "name":
       return ast.path.join(".");
     case "call":
@@ -4080,9 +4114,6 @@ var dumpProcess = function(process2, ctx) {
     }
     out += "  }\n";
   }
-  for (const req of process2.stepRequires ?? []) {
-    out += "  requires { " + req + " }\n";
-  }
   const inputIds = process2.inputRefs && process2.inputRefs.length > 0 ? process2.inputRefs : process2.input.map((r) => r.id);
   if (inputIds.length > 0) {
     out += "  reference_data_registry {\n";
@@ -26538,9 +26569,12 @@ function checkPackage(dir, options = {}) {
       if (INLINE_FUNCTION_WORDS.has(call)) {
         continue;
       }
+      if (globalExprNames.has(call)) {
+        continue;
+      }
       if (call.includes(".")) {
         const root = call.split(".")[0];
-        if (argNames.has(root) || root === "self" || CONTEXT_ROOTS.has(root)) {
+        if (argNames.has(root) || globalExprNames.has(root) || root === "self" || CONTEXT_ROOTS.has(root)) {
           continue;
         }
       }
@@ -26700,6 +26734,17 @@ function checkPackage(dir, options = {}) {
           return null;
         case "str":
           return null;
+        case "bool":
+          return null;
+        case "ifelse": {
+          kindOf(node.cond);
+          const l = kindOf(node.then);
+          const r = kindOf(node.else);
+          if (l !== void 0 && r !== void 0 && l !== null && r !== null && l !== r) {
+            kindMixErr(node, l, r);
+          }
+          return l !== void 0 && l !== null ? l : r;
+        }
         case "name": {
           const root = node.path[0];
           if (node.path.length > 1 && (root === "self" || CONTEXT_ROOTS.has(root))) {
@@ -26747,7 +26792,7 @@ function checkPackage(dir, options = {}) {
         case "unop":
           return node.op === "not" ? null : kindOf(node.operand);
         case "nav":
-          return node.op === "select" ? void 0 : null;
+          return node.op === "select" ? void 0 : node.op === "collect" ? kindOf(node.body) : null;
         case "binop": {
           if (["<=", ">=", "<", ">", "=", "!=", "\u2260"].includes(node.op)) {
             const l2 = kindOf(node.left);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primmel/primmel",
-  "version": "1.21.13",
+  "version": "1.21.15",
   "description": "Primmel — parser, types, and serializer for the Primmel modelling language (successor to MMEL)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",