@ukhomeoffice/cop-react-form-renderer 6.7.0-alpha → 6.12.0

package/dist/utils/Component/addShowWhen.test.js

@@ -4,50 +4,50 @@ var _addShowWhen = _interopRequireDefault(require("./addShowWhen"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-describe('utils.Component.addShowWhen', () => {
-  const NEW_SHOW_WHEN = {
+describe('utils.Component.addShowWhen', function () {
+  var NEW_SHOW_WHEN = {
     field: 'field',
     op: '=',
     value: 'value'
   };
-  it('should return null when component is undefined', () => {
-    const result = (0, _addShowWhen.default)(undefined, {});
+  it('should return null when component is undefined', function () {
+    var result = (0, _addShowWhen.default)(undefined, {});
     expect(result).toEqual(null);
   });
-  it('should return null when component is null', () => {
-    const result = (0, _addShowWhen.default)(null, {});
+  it('should return null when component is null', function () {
+    var result = (0, _addShowWhen.default)(null, {});
     expect(result).toEqual(null);
   });
-  it('should return component when condition is undefined', () => {
-    const COMPONENT = {
+  it('should return component when condition is undefined', function () {
+    var COMPONENT = {
       alpha: 'bravo'
     };
-    const result = (0, _addShowWhen.default)(COMPONENT, undefined);
+    var result = (0, _addShowWhen.default)(COMPONENT, undefined);
     expect(result).toEqual({
       alpha: 'bravo'
     });
   });
-  it('should return component when condition is null', () => {
-    const COMPONENT = {
+  it('should return component when condition is null', function () {
+    var COMPONENT = {
       alpha: 'bravo'
     };
-    const result = (0, _addShowWhen.default)(COMPONENT, null);
+    var result = (0, _addShowWhen.default)(COMPONENT, null);
     expect(result).toEqual({
       alpha: 'bravo'
     });
   });
-  it('should add the show_when to a component with no existing show_whens', () => {
-    const COMPONENT = {
+  it('should add the show_when to a component with no existing show_whens', function () {
+    var COMPONENT = {
       alpha: 'bravo'
     };
-    const result = (0, _addShowWhen.default)(COMPONENT, NEW_SHOW_WHEN);
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_SHOW_WHEN);
     expect(result).toEqual({
       alpha: 'bravo',
       show_when: NEW_SHOW_WHEN
     });
   });
-  it('should add the array type show_when to a component with no existing show_whens', () => {
-    const NEW_ARRAY_SHOW_WHEN = [{
+  it('should add the array type show_when to a component with no existing show_whens', function () {
+    var NEW_ARRAY_SHOW_WHEN = [{
       field: 'abc',
       op: '=',
       value: 'bcd'
@@ -56,17 +56,17 @@ describe('utils.Component.addShowWhen', () => {
       op: '=',
       value: 'efg'
     }];
-    const COMPONENT = {
+    var COMPONENT = {
       alpha: 'bravo'
     };
-    const result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
     expect(result).toEqual({
       alpha: 'bravo',
       show_when: NEW_ARRAY_SHOW_WHEN
     });
   });
-  it('should add the show_when to a component with a single show_when', () => {
-    const COMPONENT = {
+  it('should add the show_when to a component with a single show_when', function () {
+    var COMPONENT = {
       alpha: 'bravo',
       show_when: {
         field: 'abc',
@@ -74,7 +74,7 @@ describe('utils.Component.addShowWhen', () => {
         value: 'bcd'
       }
     };
-    const result = (0, _addShowWhen.default)(COMPONENT, NEW_SHOW_WHEN);
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_SHOW_WHEN);
     expect(result).toEqual({
       alpha: 'bravo',
       show_when: [{
@@ -84,8 +84,8 @@ describe('utils.Component.addShowWhen', () => {
       }, NEW_SHOW_WHEN]
     });
   });
-  it('should add the show_when to a component with an array of show_whens', () => {
-    const COMPONENT = {
+  it('should add the show_when to a component with an array of show_whens', function () {
+    var COMPONENT = {
       alpha: 'bravo',
       show_when: [{
         field: 'abc',
@@ -97,7 +97,7 @@ describe('utils.Component.addShowWhen', () => {
         value: 'efg'
       }]
     };
-    const result = (0, _addShowWhen.default)(COMPONENT, NEW_SHOW_WHEN);
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_SHOW_WHEN);
     expect(result).toEqual({
       alpha: 'bravo',
       show_when: [{
@@ -111,11 +111,11 @@ describe('utils.Component.addShowWhen', () => {
       }, NEW_SHOW_WHEN]
     });
   });
-  it('should add the or type show_when to a component with no existing show_whens in an object not an array', () => {
-    const COMPONENT = {
+  it('should add the or type show_when to a component with no existing show_whens in an object not an array', function () {
+    var COMPONENT = {
       alpha: 'bravo'
     };
-    const SHOW_WHEN_OR = {
+    var SHOW_WHEN_OR = {
       type: 'or',
       condition: [{
         field: 'field1',
@@ -127,14 +127,14 @@ describe('utils.Component.addShowWhen', () => {
         value: 2
       }]
     };
-    const result = (0, _addShowWhen.default)(COMPONENT, SHOW_WHEN_OR);
+    var result = (0, _addShowWhen.default)(COMPONENT, SHOW_WHEN_OR);
     expect(result).toEqual({
       alpha: 'bravo',
       show_when: SHOW_WHEN_OR
     });
   });
-  it('should add an array of show_whens to a component with an array of show_whens', () => {
-    const NEW_ARRAY_SHOW_WHEN = [{
+  it('should add an array of show_whens to a component with an array of show_whens', function () {
+    var NEW_ARRAY_SHOW_WHEN = [{
       field: 'hij',
       op: '=',
       value: 'klm'
@@ -143,7 +143,7 @@ describe('utils.Component.addShowWhen', () => {
       op: '=',
       value: 'qrs'
     }];
-    const COMPONENT = {
+    var COMPONENT = {
       alpha: 'bravo',
       show_when: [{
         field: 'abc',
@@ -155,7 +155,7 @@ describe('utils.Component.addShowWhen', () => {
         value: 'efg'
       }]
     };
-    const result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
     expect(result).toEqual({
       alpha: 'bravo',
       show_when: [{
@@ -177,8 +177,8 @@ describe('utils.Component.addShowWhen', () => {
       }]
     });
   });
-  it('should add an array of show_whens to a component with a single show_when', () => {
-    const NEW_ARRAY_SHOW_WHEN = [{
+  it('should add an array of show_whens to a component with a single show_when', function () {
+    var NEW_ARRAY_SHOW_WHEN = [{
       field: 'hij',
       op: '=',
       value: 'klm'
@@ -187,7 +187,7 @@ describe('utils.Component.addShowWhen', () => {
       op: '=',
       value: 'qrs'
     }];
-    const COMPONENT = {
+    var COMPONENT = {
       alpha: 'bravo',
       show_when: {
         field: 'abc',
@@ -195,7 +195,7 @@ describe('utils.Component.addShowWhen', () => {
         value: 'bcd'
       }
     };
-    const result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
     expect(result).toEqual({
       alpha: 'bravo',
       show_when: [{

package/dist/utils/Component/applyToComponentTree.js

@@ -5,8 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _models = require("../../models");
-// Local imports.
-
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // Local imports.
 /**
  * Call a callback on a component and all of its child/nested components.
  * At each stage, the value of the component is set to the returned value
@@ -20,7 +24,7 @@ var _models = require("../../models");
  *          null if root is not valid.
  *          root if callback is not valid. 
  */
-const applyToComponentTree = (root, callback) => {
+var applyToComponentTree = function applyToComponentTree(root, callback) {
   var _root$data;
   if (!root) {
     return null;
@@ -28,19 +32,17 @@ const applyToComponentTree = (root, callback) => {
   if (!callback) {
     return root;
   }
-  const result = {
-    ...root
-  };
+  var result = _objectSpread({}, root);
   switch (root.type) {
     case _models.ComponentTypes.CONTAINER:
-      result.components.forEach((c, index, containerArray) => {
-        const array = containerArray;
+      result.components.forEach(function (c, index, containerArray) {
+        var array = containerArray;
         array[index] = applyToComponentTree(c, callback);
       });
       break;
     case _models.ComponentTypes.COLLECTION:
-      result.item.forEach((c, index, collectionArray) => {
-        const array = collectionArray;
+      result.item.forEach(function (c, index, collectionArray) {
+        var array = collectionArray;
         array[index] = applyToComponentTree(c, callback);
       });
       break;
@@ -49,15 +51,13 @@ const applyToComponentTree = (root, callback) => {
       if (!((_root$data = root.data) !== null && _root$data !== void 0 && _root$data.options)) {
         break;
       }
-      result.data = {
-        ...root.data
-      };
-      result.data.options = root.data.options.map(option => {
-        const newOption = {
-          ...option
-        };
+      result.data = _objectSpread({}, root.data);
+      result.data.options = root.data.options.map(function (option) {
+        var newOption = _objectSpread({}, option);
         if (option.nested) {
-          newOption.nested = option.nested.map(c => applyToComponentTree(c, callback));
+          newOption.nested = option.nested.map(function (c) {
+            return applyToComponentTree(c, callback);
+          });
         }
         return newOption;
       });

package/dist/utils/Component/applyToComponentTree.test.js

@@ -2,14 +2,18 @@
 
 var _applyToComponentTree = _interopRequireDefault(require("./applyToComponentTree"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// Local imports.
-
-describe('utils.Component.applyToComponentTree', () => {
-  const SINGLE_COMP = {
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // Local imports.
+describe('utils.Component.applyToComponentTree', function () {
+  var SINGLE_COMP = {
     type: 'text',
     label: 'alpha'
   };
-  const CONTAINER = {
+  var CONTAINER = {
     type: 'container',
     label: 'bravo',
     components: [{
@@ -17,7 +21,7 @@ describe('utils.Component.applyToComponentTree', () => {
       label: 'charlie'
     }]
   };
-  const COLLECTION = {
+  var COLLECTION = {
     type: 'collection',
     label: 'delta',
     item: [{
@@ -25,7 +29,7 @@ describe('utils.Component.applyToComponentTree', () => {
       label: 'echo'
     }]
   };
-  const COMP_WITH_NESTED = {
+  var COMP_WITH_NESTED = {
     type: 'radios',
     label: 'foxtrot',
     data: {
@@ -42,43 +46,44 @@ describe('utils.Component.applyToComponentTree', () => {
       }]
     }
   };
-  const CALLBACK = component => ({
-    ...component,
-    label: component.label.toUpperCase()
-  });
-  it('should return null when root is undefined', () => {
-    const result = (0, _applyToComponentTree.default)(undefined, CALLBACK);
+  var CALLBACK = function CALLBACK(component) {
+    return _objectSpread(_objectSpread({}, component), {}, {
+      label: component.label.toUpperCase()
+    });
+  };
+  it('should return null when root is undefined', function () {
+    var result = (0, _applyToComponentTree.default)(undefined, CALLBACK);
     expect(result).toEqual(null);
   });
-  it('should return null when root is null', () => {
-    const result = (0, _applyToComponentTree.default)(null, CALLBACK);
+  it('should return null when root is null', function () {
+    var result = (0, _applyToComponentTree.default)(null, CALLBACK);
     expect(result).toEqual(null);
   });
-  it('should return root when callback is undefined', () => {
-    const result = (0, _applyToComponentTree.default)({
+  it('should return root when callback is undefined', function () {
+    var result = (0, _applyToComponentTree.default)({
       type: 'text'
     }, undefined);
     expect(result).toEqual({
       type: 'text'
     });
   });
-  it('should return root when callback is null', () => {
-    const result = (0, _applyToComponentTree.default)({
+  it('should return root when callback is null', function () {
+    var result = (0, _applyToComponentTree.default)({
       type: 'text'
     }, null);
     expect(result).toEqual({
       type: 'text'
     });
   });
-  it('should correctly call callback on a single component', () => {
-    const result = (0, _applyToComponentTree.default)(SINGLE_COMP, CALLBACK);
+  it('should correctly call callback on a single component', function () {
+    var result = (0, _applyToComponentTree.default)(SINGLE_COMP, CALLBACK);
     expect(result).toEqual({
       type: 'text',
       label: 'ALPHA'
     });
   });
-  it('should correctly call callback on a container component', () => {
-    const result = (0, _applyToComponentTree.default)(CONTAINER, CALLBACK);
+  it('should correctly call callback on a container component', function () {
+    var result = (0, _applyToComponentTree.default)(CONTAINER, CALLBACK);
     expect(result).toEqual({
       type: 'container',
       label: 'BRAVO',
@@ -88,8 +93,8 @@ describe('utils.Component.applyToComponentTree', () => {
       }]
     });
   });
-  it('should correctly call callback on a collection component', () => {
-    const result = (0, _applyToComponentTree.default)(COLLECTION, CALLBACK);
+  it('should correctly call callback on a collection component', function () {
+    var result = (0, _applyToComponentTree.default)(COLLECTION, CALLBACK);
     expect(result).toEqual({
       type: 'collection',
       label: 'DELTA',
@@ -99,8 +104,8 @@ describe('utils.Component.applyToComponentTree', () => {
       }]
     });
   });
-  it('should correctly call callback on a component with nested components', () => {
-    const result = (0, _applyToComponentTree.default)(COMP_WITH_NESTED, CALLBACK);
+  it('should correctly call callback on a component with nested components', function () {
+    var result = (0, _applyToComponentTree.default)(COMP_WITH_NESTED, CALLBACK);
     expect(result).toEqual({
       type: 'radios',
       label: 'FOXTROT',

package/dist/utils/Component/cleanAttributes.js

@@ -4,7 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.JSON_ONLY_PROPERTIES = void 0;
-const JSON_ONLY_PROPERTIES = exports.JSON_ONLY_PROPERTIES = ['source', 'use', 'show_when', 'options', 'additionalValidation', 'full_path', 'fullPath', 'formData'];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var JSON_ONLY_PROPERTIES = exports.JSON_ONLY_PROPERTIES = ['source', 'use', 'show_when', 'options', 'additionalValidation', 'full_path', 'fullPath', 'formData'];
 
 /**
  * This method removes and properties that are entirely specific to the JSON
@@ -17,16 +23,13 @@ const JSON_ONLY_PROPERTIES = exports.JSON_ONLY_PROPERTIES = ['source', 'use', 's
  * @param {Array} alsoRemove An array of additional properties to remove.
  * @returns A clean(er) JSON object.
  */
-const cleanAttributes = function (options) {
-  let alsoRemove = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  const removeKeys = Array.isArray(alsoRemove) ? [].concat(JSON_ONLY_PROPERTIES, alsoRemove) : JSON_ONLY_PROPERTIES;
-  if (options && typeof options === 'object') {
-    return Object.keys(options).reduce((obj, key) => {
+var cleanAttributes = function cleanAttributes(options) {
+  var alsoRemove = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var removeKeys = Array.isArray(alsoRemove) ? [].concat(JSON_ONLY_PROPERTIES, alsoRemove) : JSON_ONLY_PROPERTIES;
+  if (options && _typeof(options) === 'object') {
+    return Object.keys(options).reduce(function (obj, key) {
       if (!removeKeys.includes(key)) {
-        return {
-          ...obj,
-          [key]: options[key]
-        };
+        return _objectSpread(_objectSpread({}, obj), {}, _defineProperty({}, key, options[key]));
       }
       ;
       return obj;

package/dist/utils/Component/cleanAttributes.test.js

@@ -1,34 +1,35 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _cleanAttributes = _interopRequireWildcard(require("./cleanAttributes"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // Local imports
 
-describe('utils', () => {
-  describe('Component', () => {
-    describe('clean', () => {
-      it('should handle null options', () => {
+describe('utils', function () {
+  describe('Component', function () {
+    describe('clean', function () {
+      it('should handle null options', function () {
         expect((0, _cleanAttributes.default)(null)).toEqual({});
       });
-      it('should handle undefined options', () => {
+      it('should handle undefined options', function () {
         expect((0, _cleanAttributes.default)(undefined)).toEqual({});
       });
-      it('should handle empty options', () => {
+      it('should handle empty options', function () {
         expect((0, _cleanAttributes.default)({}, null)).toEqual({});
       });
-      it('should handle a non-object options', () => {
+      it('should handle a non-object options', function () {
         expect((0, _cleanAttributes.default)(23, null)).toEqual({});
       });
-      it('should only remove properties specific to JSON', () => {
-        const OPTIONS = {
+      it('should only remove properties specific to JSON', function () {
+        var OPTIONS = {
           id: 'bob'
         };
         // Add a bunch of properties we know will need to be removed.
-        _cleanAttributes.JSON_ONLY_PROPERTIES.forEach(p => {
+        _cleanAttributes.JSON_ONLY_PROPERTIES.forEach(function (p) {
           OPTIONS[p] = 'value';
         });
-        const RESULT = (0, _cleanAttributes.default)(OPTIONS);
+        var RESULT = (0, _cleanAttributes.default)(OPTIONS);
 
         // The original options should remain untouched.
         expect(OPTIONS.id).toEqual('bob');
@@ -40,16 +41,16 @@ describe('utils', () => {
           id: 'bob'
         });
       });
-      it('should also remove properties specified in the alsoRemove parameter', () => {
-        const OPTIONS = {
+      it('should also remove properties specified in the alsoRemove parameter', function () {
+        var OPTIONS = {
           id: 'bob',
           fieldId: 'bobField'
         };
         // Add a bunch of properties we know will need to be removed.
-        _cleanAttributes.JSON_ONLY_PROPERTIES.forEach(p => {
+        _cleanAttributes.JSON_ONLY_PROPERTIES.forEach(function (p) {
           OPTIONS[p] = 'value';
         });
-        const RESULT = (0, _cleanAttributes.default)(OPTIONS, ['fieldId']);
+        var RESULT = (0, _cleanAttributes.default)(OPTIONS, ['fieldId']);
 
         // The original options should remain untouched.
         expect(OPTIONS.id).toEqual('bob');

package/dist/utils/Component/elevateNestedComponents.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _Data = _interopRequireDefault(require("../Data"));
+var _optionIsSelected = _interopRequireDefault(require("./optionIsSelected"));
 var _showComponent = _interopRequireDefault(require("./showComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -33,19 +34,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @returns A new array consisting of components interspersed
  *          with any visible nested components.
  */
-const elevateNestedComponents = (components, data) => {
-  let allComponents = [];
-  components === null || components === void 0 || components.forEach(component => {
+var elevateNestedComponents = function elevateNestedComponents(components, data) {
+  var allComponents = [];
+  components === null || components === void 0 || components.forEach(function (component) {
     allComponents.push(component);
     // If the component wasn't shown we shouldn't elevate anything nested under it
     if ((0, _showComponent.default)(component, data)) {
       var _component$data;
-      (_component$data = component.data) === null || _component$data === void 0 || (_component$data = _component$data.options) === null || _component$data === void 0 || _component$data.forEach(option => {
+      (_component$data = component.data) === null || _component$data === void 0 || (_component$data = _component$data.options) === null || _component$data === void 0 || _component$data.forEach(function (option) {
         // If this option has nested components and is
         // selected, then add its nested components to the array.
-        const sourceData = (data === null || data === void 0 ? void 0 : data[component.id]) || _Data.default.getSource(data, component.full_path);
+        var sourceData = (data === null || data === void 0 ? void 0 : data[component.id]) || _Data.default.getSource(data, component.full_path);
         // If the specific option wasn't shown we shouldn't elevate anything nested under it
-        if (Array.isArray(option.nested) && sourceData === option.value && (0, _showComponent.default)(option, data)) {
+        if (Array.isArray(option.nested) && (0, _optionIsSelected.default)(sourceData, option) && (0, _showComponent.default)(option, data)) {
           allComponents = allComponents.concat(option.nested);
         }
       });