@projectcaluma/ember-form-builder 11.0.0-beta.30 → 11.0.0-beta.32

package/addon/components/cfb-code-editor.hbs

@@ -8,6 +8,7 @@
       {{did-insert this.didInsertNode}}
       {{will-destroy this.willDestroyNode}}
       {{autoresize mode="height"}}
+      {{on "blur" @setDirty}}
     ></div>
   </div>
 

package/addon/components/cfb-code-editor.js

@@ -7,6 +7,8 @@ import json from "highlight.js/lib/languages/json";
 import markdown from "highlight.js/lib/languages/markdown";
 import jexl from "highlightjs-jexl/src/languages/jexl";
 
+hljs.configure({ ignoreUnescapedHTML: true });
+
 hljs.registerLanguage("json", json);
 hljs.registerLanguage("markdown", markdown);
 hljs.registerLanguage("jexl", jexl);
@@ -42,7 +44,6 @@ export default class CfbCodeEditorComponent extends Component {
 
     this._lastValue = value;
     this.args.update(value);
-    this.args.setDirty();
   }
 
   @action

package/addon/validations/question.js

@@ -9,6 +9,7 @@ import validateOptions from "../validators/options";
 
 import and from "@projectcaluma/ember-form-builder/utils/and";
 import or from "@projectcaluma/ember-form-builder/utils/or";
+import validateJexl from "@projectcaluma/ember-form-builder/validators/jexl";
 import validateSlug from "@projectcaluma/ember-form-builder/validators/slug";
 import validateType from "@projectcaluma/ember-form-builder/validators/type";
 
@@ -82,4 +83,6 @@ export default {
     validateType("FormQuestion", false),
     validatePresence(true)
   ),
+  isHidden: validateJexl(),
+  isRequired: validateJexl(),
 };

package/addon/validators/jexl.js

@@ -0,0 +1,49 @@
+import jexl from "jexl";
+
+const TRANSFORMS = [
+  "answer",
+  "mapby",
+  "debug",
+  "min",
+  "max",
+  "round",
+  "ceil",
+  "floor",
+  "sum",
+  "avg",
+  "stringify",
+];
+const BINARY_OPS = ["intersects"];
+
+const documentJexl = new jexl.Jexl();
+
+const noop = () => {};
+
+TRANSFORMS.forEach((transform) => documentJexl.addTransform(transform, noop));
+BINARY_OPS.forEach((binaryOp) => documentJexl.addBinaryOp(binaryOp, 0, noop));
+
+function parseError(error) {
+  const str = String(error)
+    .replace(/^Error:/, "") // Remove "Error:" prefix
+    .replace(/(of expression):.*$/, (_, match) => match) // Remove everything after "of expression"
+    .replace(/in expression:.*$/, "") // Remove "in expression: [expression]"
+    .replace(/\.$/g, "") // Remove trailing dot
+    .replace(/\s\s+/g, " ") // Remove double whitespace chars
+    .trim();
+
+  return str;
+}
+
+export default function validateJexl() {
+  return (key, newValue) => {
+    try {
+      if (newValue) {
+        documentJexl.evalSync(newValue);
+      }
+
+      return true;
+    } catch (error) {
+      return parseError(error);
+    }
+  };
+}

package/blueprints/@projectcaluma/ember-form-builder/index.js

@@ -10,7 +10,7 @@ module.exports = {
         { name: "@projectcaluma/ember-form" },
         { name: "ember-engines" },
         { name: "ember-math-helpers" },
-        { name: "ember-pikaday" },
+        { name: "ember-flatpickr" },
         { name: "ember-power-select" },
       ],
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "11.0.0-beta.30",
+  "version": "11.0.0-beta.32",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -10,7 +10,7 @@
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
   "scripts": {
-    "test": "npm-run-all test:*",
+    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
@@ -24,8 +24,8 @@
     "@embroider/macros": "^1.9.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.0-beta.30",
-    "@projectcaluma/ember-form": "^11.0.0-beta.30",
+    "@projectcaluma/ember-core": "^11.0.0-beta.32",
+    "@projectcaluma/ember-form": "^11.0.0-beta.32",
     "codejar": "^3.6.0",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.3",
@@ -37,9 +37,9 @@
     "ember-concurrency": "^2.3.7",
     "ember-engines-router-service": "^0.3.0",
     "ember-fetch": "^8.1.2",
+    "ember-flatpickr": "^3.2.3",
     "ember-intl": "^5.7.2",
     "ember-math-helpers": "^2.18.2",
-    "ember-pikaday": "^4.0.0",
     "ember-power-select": "^6.0.1",
     "ember-resources": "^5.4.0",
     "ember-test-selectors": "^6.0.0",
@@ -62,10 +62,10 @@
     "@ember/test-helpers": "2.7.0",
     "@embroider/test-setup": "1.8.3",
     "@faker-js/faker": "7.6.0",
-    "@projectcaluma/ember-testing": "11.0.0-beta.30",
+    "@projectcaluma/ember-testing": "11.0.0-beta.32",
     "broccoli-asset-rev": "3.0.0",
     "ember-autoresize-modifier": "^0.6.0",
-    "ember-cli": "4.7.0",
+    "ember-cli": "4.8.0",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -89,7 +89,7 @@
     "webpack": "5.74.0"
   },
   "engines": {
-    "node": "14.* || >= 16"
+    "node": "14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"

package/addon/modifiers/pikaday.js

@@ -1,2 +0,0 @@
-import "ember-pikaday/pikaday.css";
-export { default } from "ember-pikaday/modifiers/pikaday";