@ukhomeoffice/cop-react-form-renderer 6.5.1-peter → 6.7.0-alpha

package/dist/utils/Data/setupRefDataUrlForComponent.test.js

@@ -5,28 +5,28 @@ var _setupRefDataUrlForComponent = _interopRequireDefault(require("./setupRefDat
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-describe('utils', function () {
-  describe('Data', function () {
-    describe('setupRefDataUrlForComponent', function () {
-      var DATA = {
+describe('utils', () => {
+  describe('Data', () => {
+    describe('setupRefDataUrlForComponent', () => {
+      const DATA = {
         urls: {
           refData: '/ref-data'
         }
       };
-      it('can handle a null component', function () {
+      it('can handle a null component', () => {
         expect((0, _setupRefDataUrlForComponent.default)(null, DATA)).toBeNull();
       });
-      it('can handle an undefined component', function () {
+      it('can handle an undefined component', () => {
         expect((0, _setupRefDataUrlForComponent.default)(undefined, DATA)).toBeUndefined();
       });
-      it('can handle a component with no data property', function () {
-        var COMPONENT = {
+      it('can handle a component with no data property', () => {
+        const COMPONENT = {
           id: 'component'
         };
         expect((0, _setupRefDataUrlForComponent.default)(COMPONENT, DATA)).toEqual(COMPONENT);
       });
-      it('can handle a component with no data.url property', function () {
-        var COMPONENT = {
+      it('can handle a component with no data.url property', () => {
+        const COMPONENT = {
           id: 'component',
           data: {
             options: []
@@ -34,8 +34,8 @@ describe('utils', function () {
         };
         expect((0, _setupRefDataUrlForComponent.default)(COMPONENT, DATA)).toEqual(COMPONENT);
       });
-      it('should appropriately update the component URL', function () {
-        var COMPONENT = {
+      it('should appropriately update the component URL', () => {
+        const COMPONENT = {
           id: 'component',
           // eslint-disable-next-line no-template-curly-in-string
           data: {
@@ -49,8 +49,8 @@ describe('utils', function () {
           }
         });
       });
-      it('should leave a URL alone that does not require replacement', function () {
-        var COMPONENT = {
+      it('should leave a URL alone that does not require replacement', () => {
+        const COMPONENT = {
           id: 'component',
           data: {
             url: '/somewhere-else/v1/teams'
@@ -63,8 +63,8 @@ describe('utils', function () {
           }
         });
       });
-      it('should appropriately handle a missing value in the data', function () {
-        var COMPONENT = {
+      it('should appropriately handle a missing value in the data', () => {
+        const COMPONENT = {
           id: 'component',
           // eslint-disable-next-line no-template-curly-in-string
           data: {
@@ -78,15 +78,15 @@ describe('utils', function () {
           }
         });
       });
-      it('should appropriately update the component URLs within a container', function () {
-        var COMPONENT = {
+      it('should appropriately update the component URLs within a container', () => {
+        const COMPONENT = {
           id: 'component',
           // eslint-disable-next-line no-template-curly-in-string
           data: {
             url: '${urls.refData}/v1/teams'
           }
         };
-        var CONTAINER = {
+        const CONTAINER = {
           id: 'container',
           type: _models.ComponentTypes.CONTAINER,
           components: [COMPONENT]
@@ -102,15 +102,15 @@ describe('utils', function () {
           }]
         });
       });
-      it('should appropriately update the component URLs within a collection', function () {
-        var COMPONENT = {
+      it('should appropriately update the component URLs within a collection', () => {
+        const COMPONENT = {
           id: 'component',
           // eslint-disable-next-line no-template-curly-in-string
           data: {
             url: '${urls.refData}/v1/teams'
           }
         };
-        var COLLECTION = {
+        const COLLECTION = {
           id: 'container',
           type: _models.ComponentTypes.COLLECTION,
           item: [COMPONENT]
@@ -126,8 +126,8 @@ describe('utils', function () {
           }]
         });
       });
-      it('should not update the component URL when skipUrlInterpolation prop is true', function () {
-        var COMPONENT = {
+      it('should not update the component URL when skipUrlInterpolation prop is true', () => {
+        const COMPONENT = {
           id: 'component',
           data: {
             // eslint-disable-next-line no-template-curly-in-string

package/dist/utils/FormPage/applyConditionalProperties.js

@@ -6,24 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _ = _interopRequireDefault(require(".."));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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); }
 /**
  * Apply properties to a page based on whether certain conditions are met.
  * @param {object} page The page object.
  * @returns A copy of the page object with any passing conditional 
  * properties applied.
  */
-var applyConditionalProperties = function applyConditionalProperties(page) {
+const applyConditionalProperties = page => {
   if (!page.conditionalProperties) {
     return page;
   }
-  var pageWithProperties = _objectSpread({}, page);
-  page.conditionalProperties.forEach(function (entry) {
+  let pageWithProperties = {
+    ...page
+  };
+  page.conditionalProperties.forEach(entry => {
     if (_.default.Condition.met(entry.condition, page.formData[entry.condition.field])) {
       pageWithProperties = Object.assign(pageWithProperties, entry.properties);
     }

package/dist/utils/FormPage/applyConditionalProperties.test.js

@@ -2,22 +2,18 @@
 
 var _applyConditionalProperties = _interopRequireDefault(require("./applyConditionalProperties"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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.FormPage.applyConditionalProperties', function () {
-  it('should not change the page if there are no conditional properties', function () {
-    var PAGE = {
+// Local imports
+
+describe('utils.FormPage.applyConditionalProperties', () => {
+  it('should not change the page if there are no conditional properties', () => {
+    const PAGE = {
       id: 'testPage'
     };
-    var result = (0, _applyConditionalProperties.default)(PAGE);
+    const result = (0, _applyConditionalProperties.default)(PAGE);
     expect(result).toEqual(PAGE);
   });
-  it('should not apply properties with conditions that have not been met', function () {
-    var PAGE = {
+  it('should not apply properties with conditions that have not been met', () => {
+    const PAGE = {
       id: 'testPage',
       conditionalProperties: [{
         condition: {
@@ -33,11 +29,11 @@ describe('utils.FormPage.applyConditionalProperties', function () {
         alpha: '012'
       }
     };
-    var result = (0, _applyConditionalProperties.default)(PAGE);
+    const result = (0, _applyConditionalProperties.default)(PAGE);
     expect(result).toEqual(PAGE);
   });
-  it('should apply properties with conditions that have been met', function () {
-    var PAGE = {
+  it('should apply properties with conditions that have been met', () => {
+    const PAGE = {
       id: 'testPage',
       conditionalProperties: [{
         condition: {
@@ -53,9 +49,10 @@ describe('utils.FormPage.applyConditionalProperties', function () {
         alpha: '123'
       }
     };
-    var result = (0, _applyConditionalProperties.default)(PAGE);
-    expect(result).toEqual(_objectSpread(_objectSpread({}, PAGE), {}, {
+    const result = (0, _applyConditionalProperties.default)(PAGE);
+    expect(result).toEqual({
+      ...PAGE,
       beta: '456'
-    }));
+    });
   });
 });

package/dist/utils/FormPage/getConditionalText.js

@@ -32,15 +32,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {String} key The key to use to find the text to use in each option, defaults to 'text'. 
  * @returns The first string that passes its' conditions, or null if something went wrong.
  */
-var getConditionalText = function getConditionalText(options, formData) {
-  var key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'text';
+const getConditionalText = function (options, formData) {
+  let key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'text';
   if (typeof options === 'string') {
     return _copReactComponents.Utils.interpolateString(options, formData);
   }
   if (!Array.isArray(options) || Object.keys(formData).length === 0) {
     return null;
   }
-  var shownOption = options.find(function (option) {
+  const shownOption = options.find(option => {
     if (typeof option === 'string') {
       // This is intended to allow a plain string 'fallback' option in the array.
       // As such, it should be the last option in the array as any options after

package/dist/utils/FormPage/getConditionalText.test.js

@@ -2,26 +2,26 @@
 
 var _getConditionalText = _interopRequireDefault(require("./getConditionalText"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('utils.FormPage.getConditionalText', function () {
-  var FORM_DATA = {
+describe('utils.FormPage.getConditionalText', () => {
+  const FORM_DATA = {
     testField: 'Alpha',
     testField2: 'yes'
   };
-  it('should return null if no options are provided', function () {
-    var result = (0, _getConditionalText.default)(null, FORM_DATA);
+  it('should return null if no options are provided', () => {
+    const result = (0, _getConditionalText.default)(null, FORM_DATA);
     expect(result).toEqual(null);
   });
-  it('should return the option if it\'s just a string', function () {
-    var result = (0, _getConditionalText.default)('abc123', FORM_DATA);
+  it('should return the option if it\'s just a string', () => {
+    const result = (0, _getConditionalText.default)('abc123', FORM_DATA);
     expect(result).toEqual('abc123');
   });
-  it('should return a correctly interpolated string', function () {
+  it('should return a correctly interpolated string', () => {
     // eslint-disable-next-line no-template-curly-in-string
-    var result = (0, _getConditionalText.default)('${testField} string', FORM_DATA);
+    const result = (0, _getConditionalText.default)('${testField} string', FORM_DATA);
     expect(result).toEqual("".concat(FORM_DATA.testField, " string"));
   });
-  it('should return the option that has it\'s conditions met', function () {
-    var OPTIONS = [{
+  it('should return the option that has it\'s conditions met', () => {
+    const OPTIONS = [{
       text: 'Text A',
       show_when: [{
         field: 'testField2',
@@ -36,11 +36,11 @@ describe('utils.FormPage.getConditionalText', function () {
         value: 'yes'
       }]
     }];
-    var result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
+    const result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
     expect(result).toEqual('Text B');
   });
-  it('should return a plain string option if one is encountered in the array', function () {
-    var OPTIONS = [{
+  it('should return a plain string option if one is encountered in the array', () => {
+    const OPTIONS = [{
       text: 'Text A',
       show_when: [{
         field: 'testField2',
@@ -55,11 +55,11 @@ describe('utils.FormPage.getConditionalText', function () {
         value: 'notTheValue'
       }]
     }, "Default text"];
-    var result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
+    const result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
     expect(result).toEqual('Default text');
   });
-  it('should correctly interpolate a plain string option in the array', function () {
-    var OPTIONS = [{
+  it('should correctly interpolate a plain string option in the array', () => {
+    const OPTIONS = [{
       text: 'Text A',
       show_when: [{
         field: 'testField2',
@@ -76,11 +76,11 @@ describe('utils.FormPage.getConditionalText', function () {
     },
     // eslint-disable-next-line no-template-curly-in-string
     "${testField} text"];
-    var result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
+    const result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
     expect(result).toEqual("".concat(FORM_DATA.testField, " text"));
   });
-  it('should correctly interpolate a conditional option', function () {
-    var OPTIONS = [{
+  it('should correctly interpolate a conditional option', () => {
+    const OPTIONS = [{
       text: 'Text A',
       show_when: [{
         field: 'testField2',
@@ -96,11 +96,11 @@ describe('utils.FormPage.getConditionalText', function () {
         value: 'yes'
       }]
     }];
-    var result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
+    const result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
     expect(result).toEqual("".concat(FORM_DATA.testField, " text"));
   });
-  it('should correctly use a conditional option', function () {
-    var OPTIONS = [{
+  it('should correctly use a conditional option', () => {
+    const OPTIONS = [{
       text: 'Text A',
       show_when: [{
         field: 'testField2',
@@ -116,11 +116,11 @@ describe('utils.FormPage.getConditionalText', function () {
         value: 'yes'
       }]
     }];
-    var result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
+    const result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA);
     expect(result).toEqual("".concat(FORM_DATA.testField, " text"));
   });
-  it('should correctly use a different key to find the text if one is provided', function () {
-    var OPTIONS = [{
+  it('should correctly use a different key to find the text if one is provided', () => {
+    const OPTIONS = [{
       customKey: 'Text A',
       show_when: [{
         field: 'testField2',
@@ -136,11 +136,11 @@ describe('utils.FormPage.getConditionalText', function () {
         value: 'yes'
       }]
     }];
-    var result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA, 'customKey');
+    const result = (0, _getConditionalText.default)(OPTIONS, FORM_DATA, 'customKey');
     expect(result).toEqual("".concat(FORM_DATA.testField, " text"));
   });
-  it('should return null for a conditional option if formData is empty', function () {
-    var OPTIONS = [{
+  it('should return null for a conditional option if formData is empty', () => {
+    const OPTIONS = [{
       text: 'Text A',
       show_when: [{
         field: 'testField2',
@@ -156,7 +156,7 @@ describe('utils.FormPage.getConditionalText', function () {
         value: 'yes'
       }]
     }];
-    var result = (0, _getConditionalText.default)(OPTIONS, {});
+    const result = (0, _getConditionalText.default)(OPTIONS, {});
     expect(result).toEqual(null);
   });
 });

package/dist/utils/FormPage/getFormPage.js

@@ -10,12 +10,8 @@ var _getPageActions = _interopRequireDefault(require("./getPageActions"));
 var _getParagraphFromText = _interopRequireDefault(require("./getParagraphFromText"));
 var _useComponent = _interopRequireDefault(require("./useComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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
+// Local imports
+
 /**
  * Converts a page object defined in the JSON to a page object for rendering.
  * @param {object} pageOptions The JSON page.
@@ -23,27 +19,30 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * @param {object} formData The top-level form data, used for setting up components.
  * @returns A page object for rendering.
  */
-var getFormPage = function getFormPage(pageOptions, formComponents, formData) {
+const getFormPage = (pageOptions, formComponents, formData) => {
   if (!pageOptions) {
     return null;
   }
-  var components = pageOptions.components.map(function (componentOptions) {
+  const components = pageOptions.components.map(componentOptions => {
     if (typeof componentOptions === 'string') {
       return (0, _getParagraphFromText.default)(componentOptions);
     }
-    var ret;
+    let ret;
     if (componentOptions.use) {
       ret = (0, _useComponent.default)(componentOptions, formComponents);
     } else {
-      ret = _objectSpread({}, componentOptions);
+      ret = {
+        ...componentOptions
+      };
     }
     return formData ? _Data.default.refData.setupUrl(ret, formData) : ret;
   });
-  var actions = (0, _getPageActions.default)(pageOptions);
-  return _Container.default.setup(_objectSpread(_objectSpread({}, pageOptions), {}, {
-    formData: formData,
-    components: components,
-    actions: actions
-  }));
+  const actions = (0, _getPageActions.default)(pageOptions);
+  return _Container.default.setup({
+    ...pageOptions,
+    formData,
+    components,
+    actions
+  });
 };
 var _default = exports.default = getFormPage;

package/dist/utils/FormPage/getFormPage.test.js

@@ -2,16 +2,12 @@
 
 var _getFormPage = _interopRequireDefault(require("./getFormPage"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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', function () {
-  describe('FormPage', function () {
-    describe('getFormPage', function () {
-      var FORM_COMPONENTS = [{
+// Local imports
+
+describe('utils', () => {
+  describe('FormPage', () => {
+    describe('getFormPage', () => {
+      const FORM_COMPONENTS = [{
         id: 'a',
         fieldId: 'a',
         label: 'Alpha',
@@ -46,17 +42,17 @@ describe('utils', function () {
         label: 'Bravo ${currentUser.surname}',
         type: 'text'
       }];
-      var FORM_DATA = {
+      const FORM_DATA = {
         urls: {
           refData: 'https://ho.gov.uk/ref-data/'
         }
       };
-      it('should handle null or undefined pageOptions', function () {
+      it('should handle null or undefined pageOptions', () => {
         expect((0, _getFormPage.default)(null, FORM_COMPONENTS, FORM_DATA)).toBeNull();
         expect((0, _getFormPage.default)(undefined, FORM_COMPONENTS, FORM_DATA)).toBeNull();
       });
-      it('should handle a page not using any form components', function () {
-        var PAGE = {
+      it('should handle a page not using any form components', () => {
+        const PAGE = {
           title: 'Page',
           components: [{
             type: 'heading',
@@ -70,8 +66,8 @@ describe('utils', function () {
           formData: FORM_DATA
         });
       });
-      it('should handle a page with inline strings and convert them to paragraphs', function () {
-        var PAGE = {
+      it('should handle a page with inline strings and convert them to paragraphs', () => {
+        const PAGE = {
           title: 'Page',
           components: ["Opening paragraph", {
             type: 'heading',
@@ -85,9 +81,10 @@ describe('utils', function () {
             type: 'html',
             tagName: 'p',
             content: PAGE.components[0]
-          }, _objectSpread(_objectSpread({}, PAGE.components[1]), {}, {
+          }, {
+            ...PAGE.components[1],
             full_path: PAGE.components[1].fieldId
-          }), {
+          }, {
             type: 'html',
             tagName: 'p',
             content: PAGE.components[2]
@@ -95,8 +92,8 @@ describe('utils', function () {
           formData: FORM_DATA
         });
       });
-      it('should handle a page that references a form-level component', function () {
-        var PAGE = {
+      it('should handle a page that references a form-level component', () => {
+        const PAGE = {
           title: 'Page',
           components: ["Opening paragraph", {
             type: 'heading',
@@ -106,30 +103,31 @@ describe('utils', function () {
             use: 'a'
           }]
         };
-        var A = FORM_COMPONENTS[0];
+        const A = FORM_COMPONENTS[0];
         expect((0, _getFormPage.default)(PAGE, FORM_COMPONENTS, FORM_DATA)).toEqual({
           title: PAGE.title,
           components: [{
             type: 'html',
             tagName: 'p',
             content: PAGE.components[0]
-          }, _objectSpread(_objectSpread({}, PAGE.components[1]), {}, {
+          }, {
+            ...PAGE.components[1],
             full_path: PAGE.components[1].fieldId
-          }), {
+          }, {
             type: 'html',
             tagName: 'p',
             content: PAGE.components[2]
-          }, _objectSpread(_objectSpread({
-            use: 'a'
-          }, A), {}, {
+          }, {
+            use: 'a',
+            ...A,
             cya_label: A.label,
             full_path: A.fieldId
-          })],
+          }],
           formData: FORM_DATA
         });
       });
-      it('should handle a page that references a form-level component with a data url', function () {
-        var PAGE = {
+      it('should handle a page that references a form-level component with a data url', () => {
+        const PAGE = {
           title: 'Page',
           components: ["Opening paragraph", {
             type: 'heading',
@@ -139,33 +137,34 @@ describe('utils', function () {
             use: 'c'
           }]
         };
-        var C = FORM_COMPONENTS[2];
+        const C = FORM_COMPONENTS[2];
         expect((0, _getFormPage.default)(PAGE, FORM_COMPONENTS, FORM_DATA)).toEqual({
           title: PAGE.title,
           components: [{
             type: 'html',
             tagName: 'p',
             content: PAGE.components[0]
-          }, _objectSpread(_objectSpread({}, PAGE.components[1]), {}, {
+          }, {
+            ...PAGE.components[1],
             full_path: PAGE.components[1].fieldId
-          }), {
+          }, {
             type: 'html',
             tagName: 'p',
             content: PAGE.components[2]
-          }, _objectSpread(_objectSpread({
-            use: 'c'
-          }, C), {}, {
+          }, {
+            use: 'c',
+            ...C,
             cya_label: C.label,
             data: {
               url: "".concat(FORM_DATA.urls.refData, "/v3/charlies")
             },
             full_path: C.fieldId
-          })],
+          }],
           formData: FORM_DATA
         });
       });
-      it('should handle a page that references a form-level component with a data url without an environment context', function () {
-        var PAGE = {
+      it('should handle a page that references a form-level component with a data url without an environment context', () => {
+        const PAGE = {
           title: 'Page',
           components: ["Opening paragraph", {
             type: 'heading',
@@ -175,29 +174,31 @@ describe('utils', function () {
             use: 'c'
           }]
         };
-        var C = FORM_COMPONENTS[2];
+        const C = FORM_COMPONENTS[2];
         expect((0, _getFormPage.default)(PAGE, FORM_COMPONENTS, {})).toEqual({
           title: PAGE.title,
           components: [{
             type: 'html',
             tagName: 'p',
             content: PAGE.components[0]
-          }, _objectSpread(_objectSpread({}, PAGE.components[1]), {}, {
+          }, {
+            ...PAGE.components[1],
             full_path: PAGE.components[1].fieldId
-          }), {
+          }, {
             type: 'html',
             tagName: 'p',
             content: PAGE.components[2]
-          }, // eslint-disable-next-line no-template-curly-in-string
-          _objectSpread(_objectSpread({
-            use: 'c'
-          }, C), {}, {
+          },
+          // eslint-disable-next-line no-template-curly-in-string
+          {
+            use: 'c',
+            ...C,
             cya_label: C.label,
             full_path: C.fieldId,
             data: {
               url: '/v3/charlies'
             }
-          })],
+          }],
           formData: {}
         });
       });