@projectcaluma/ember-form-builder 11.0.0-beta.39 → 11.0.0-beta.40

package/addon/components/cfb-form-editor/question/default.js

@@ -1,6 +1,7 @@
 import { getOwner } from "@ember/application";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
+import { camelize } from "@ember/string";
 import Component from "@glimmer/component";
 
 import { TYPE_MAP } from "@projectcaluma/ember-form/lib/field";
@@ -60,16 +61,20 @@ export default class CfbFormEditorQuestionDefault extends Component {
       __typename: "Form",
     };
 
+    const typename = TYPE_MAP[this.args.model.__typename];
+    const valueKey = camelize(typename.replace(/Answer$/, "Value"));
+
     const newAnswer = {
       id: btoa(`Answer:dv-answer-${this.args.model.slug}`),
-      __typename: TYPE_MAP[this.args.model.__typename],
+      __typename: typename,
+      [valueKey]: undefined,
     };
 
     // The value depends on where it comes from. If there is a default value
     // present on load the `value.content` will be set. After an update through
     // this component the value will be a POJO on `value`.
     const answer = {
-      ...(this.args._value?.content || this.args._value || newAnswer),
+      ...(this.args.value?.content ?? this.args.value ?? newAnswer),
       question: this.question,
     };
 
@@ -115,8 +120,8 @@ export default class CfbFormEditorQuestionDefault extends Component {
 
     this.args.update({
       [this.field.answer._valueKey]: this.field.answer.serializedValue,
-      __typename: this.field.answer.__typename,
-      id: this.field.answer.id,
+      __typename: this.field.answer.raw.__typename,
+      id: this.field.answer.raw.id,
     });
 
     if (this.field.errors.length > 0) {

package/addon/validations/question.js

@@ -27,14 +27,14 @@ export default {
     validateType("IntegerQuestion", false),
     and(
       validateNumber({ allowBlank: true, integer: true }),
-      validateGtLt({ lt: "integerMaxValue" })
+      validateGtLt({ lt: "integerMaxValue", allowNone: true })
     )
   ),
   integerMaxValue: or(
     validateType("IntegerQuestion", false),
     and(
       validateNumber({ allowBlank: true, integer: true }),
-      validateGtLt({ gt: "integerMinValue" })
+      validateGtLt({ gt: "integerMinValue", allowNone: true })
     )
   ),
 
@@ -42,14 +42,14 @@ export default {
     validateType("FloatQuestion", false),
     and(
       validateNumber({ allowBlank: true }),
-      validateGtLt({ lt: "floatMaxValue" })
+      validateGtLt({ lt: "floatMaxValue", allowNone: true })
     )
   ),
   floatMaxValue: or(
     validateType("FloatQuestion", false),
     and(
       validateNumber({ allowBlank: true }),
-      validateGtLt({ gt: "floatMinValue" })
+      validateGtLt({ gt: "floatMinValue", allowNone: true })
     )
   ),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "11.0.0-beta.39",
+  "version": "11.0.0-beta.40",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -10,12 +10,13 @@
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
   "scripts": {
-    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
+    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
   "peerDependencies": {
-    "ember-engines": ">= 0.8"
+    "ember-engines": ">= 0.8",
+    "ember-source": "^3.28.0 || ^4.0.0"
   },
   "dependencies": {
     "@ember/legacy-built-in-components": "^0.4.1",
@@ -24,11 +25,11 @@
     "@embroider/macros": "^1.10.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.0-beta.39",
-    "@projectcaluma/ember-form": "^11.0.0-beta.39",
+    "@projectcaluma/ember-core": "^11.0.0-beta.40",
+    "@projectcaluma/ember-form": "^11.0.0-beta.40",
     "codejar": "^3.6.0",
     "ember-apollo-client": "~4.0.2",
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-changeset": "^4.1.2",
     "ember-changeset-validations": "^4.1.1",
     "ember-cli-babel": "^7.26.11",
@@ -60,12 +61,13 @@
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.7.0",
-    "@embroider/test-setup": "2.0.0",
+    "@embroider/test-setup": "2.0.2",
     "@faker-js/faker": "7.6.0",
-    "@projectcaluma/ember-testing": "11.0.0-beta.39",
+    "@projectcaluma/ember-testing": "11.0.0-beta.40",
     "broccoli-asset-rev": "3.0.0",
+    "concurrently": "7.6.0",
     "ember-autoresize-modifier": "^0.6.0",
-    "ember-cli": "4.8.0",
+    "ember-cli": "4.9.2",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -73,17 +75,15 @@
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-data": "4.7.3",
-    "ember-disable-prototype-extensions": "1.1.3",
-    "ember-engines": "0.9.0",
+    "ember-engines": "0.8.23",
     "ember-load-initializers": "2.1.2",
-    "ember-qunit": "6.0.0",
+    "ember-qunit": "6.1.1",
     "ember-resolver": "8.0.3",
-    "ember-source": "4.8.2",
+    "ember-source": "4.9.3",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
     "miragejs": "0.1.46",
-    "npm-run-all": "4.1.5",
     "qunit": "2.19.3",
     "qunit-dom": "2.0.0",
     "webpack": "5.75.0"