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

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

@@ -2,23 +2,19 @@
 
 var _getAutocompleteSource = _interopRequireDefault(require("./getAutocompleteSource"));
 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('Data', function () {
+// Local imports
+
+describe('utils', () => {
+  describe('Data', () => {
     // test data
-    var gbCurrency = {
+    const gbCurrency = {
       currencyName: 'Great British Pounds',
       currencyCode: 'GBP',
       value: 'GBP',
       label: 'GBP',
       slangTerm: 'quid'
     };
-    var usCurrency = {
+    const usCurrency = {
       currencyName: 'United States Dollars',
       currencyCode: 'USD',
       value: 'USD',
@@ -26,7 +22,7 @@ describe('utils', function () {
       slangTerm: 'bucks',
       synonyms: ['greenbacks']
     };
-    var options = {
+    const options = {
       alpha: {
         value: 'a',
         label: 'Alpha'
@@ -44,30 +40,30 @@ describe('utils', function () {
         label: 'Word Alphabet'
       }
     };
-    var testCurrencies = [gbCurrency, usCurrency];
-    describe('getAutocompleteSource', function () {
-      it('should handle a null config', function () {
-        var SOURCE = (0, _getAutocompleteSource.default)(null);
+    const testCurrencies = [gbCurrency, usCurrency];
+    describe('getAutocompleteSource', () => {
+      it('should handle a null config', () => {
+        const SOURCE = (0, _getAutocompleteSource.default)(null);
         expect(typeof SOURCE === 'function').toBeTruthy();
-        SOURCE('query', function (results) {
+        SOURCE('query', results => {
           expect(Array.isArray(results)).toBeTruthy();
           expect(results.length).toEqual(0);
         });
       });
-      describe('without custom item labels', function () {
-        it('should get any specified options from the config', function () {
-          var CONFIG = {
+      describe('without custom item labels', () => {
+        it('should get any specified options from the config', () => {
+          const CONFIG = {
             data: {
               options: [options.alpha, options.bravo]
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
           expect(typeof SOURCE === 'function').toBeTruthy();
-          SOURCE('a', function (results) {
+          SOURCE('a', results => {
             expect(results.length).toEqual(2);
             expect(results).toEqual([options.alpha, options.bravo]);
           });
-          SOURCE('al', function (results) {
+          SOURCE('al', results => {
             expect(results.length).toEqual(1);
             expect(results).toEqual([{
               value: 'a',
@@ -75,93 +71,95 @@ describe('utils', function () {
             }]);
           });
         });
-        it('should handle an empty query', function () {
-          var CONFIG = {
+        it('should handle an empty query', () => {
+          const CONFIG = {
             data: {
               options: [options.alpha, options.bravo]
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
-          SOURCE('', function (results) {
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          SOURCE('', results => {
             expect(results.length).toEqual(2);
             expect(results).toEqual([options.alpha, options.bravo]);
           });
         });
-        it('should handle an undefined query', function () {
-          var CONFIG = {
+        it('should handle an undefined query', () => {
+          const CONFIG = {
             data: {
               options: [options.alpha, options.bravo]
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
-          SOURCE(undefined, function (results) {
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          SOURCE(undefined, results => {
             expect(results.length).toEqual(2);
             expect(results).toEqual([options.alpha, options.bravo]);
           });
         });
-        it('should handle a null query', function () {
-          var CONFIG = {
+        it('should handle a null query', () => {
+          const CONFIG = {
             data: {
               options: [options.alpha, options.bravo]
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
-          SOURCE(null, function (results) {
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          SOURCE(null, results => {
             expect(results.length).toEqual(2);
             expect(results).toEqual([options.alpha, options.bravo]);
           });
         });
-        it('should handle a missing label on an option', function () {
-          var CONFIG = {
+        it('should handle a missing label on an option', () => {
+          const CONFIG = {
             data: {
               options: [options.alpha, {
                 value: 'b'
               }]
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
           expect(typeof SOURCE === 'function').toBeTruthy();
-          SOURCE('a', function (results) {
+          SOURCE('a', results => {
             expect(results.length).toEqual(1);
             expect(results).toEqual([options.alpha]);
           });
         });
-        it('should return matches in the right order', function () {
-          var CONFIG = {
+        it('should return matches in the right order', () => {
+          const CONFIG = {
             data: {
               options: [options.alIncluded, options.alStart, options.bravo, options.alpha]
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
           expect(typeof SOURCE === 'function').toBeTruthy();
-          SOURCE('al', function (results) {
+          SOURCE('al', results => {
             expect(results.length).toEqual(3);
             expect(results).toEqual([options.alpha, options.alStart, options.alIncluded]);
           });
         });
-        it('should match options using a defined synonym', function () {
-          var CONFIG = {
+        it('should match options using a defined synonym', () => {
+          const CONFIG = {
             data: {
-              options: [_objectSpread(_objectSpread({}, options.alpha), {}, {
+              options: [{
+                ...options.alpha,
                 synonyms: ['first']
-              }), {
+              }, {
                 value: 'b'
               }]
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
           expect(typeof SOURCE === 'function').toBeTruthy();
-          SOURCE('first', function (results) {
+          SOURCE('first', results => {
             expect(results.length).toEqual(1);
-            expect(results).toEqual([_objectSpread(_objectSpread({}, options.alpha), {}, {
+            expect(results).toEqual([{
+              ...options.alpha,
               synonyms: ['first']
-            })]);
+            }]);
           });
         });
       });
-      describe('with custom item labels', function () {
-        it('should get any specified options from the config', function () {
-          var CONFIG = {
+      describe('with custom item labels', () => {
+        it('should get any specified options from the config', () => {
+          const CONFIG = {
             item: {
               value: 'currencyCode',
               label: 'currencyCode',
@@ -172,19 +170,19 @@ describe('utils', function () {
               options: testCurrencies
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
           expect(typeof SOURCE === 'function').toBeTruthy();
-          SOURCE('GB', function (results) {
+          SOURCE('GB', results => {
             expect(results.length).toEqual(1);
             expect(results).toEqual([gbCurrency]);
           });
-          SOURCE(' (', function (results) {
+          SOURCE(' (', results => {
             expect(results.length).toEqual(2);
             expect(results).toEqual(testCurrencies);
           });
         });
-        it('should handle an empty query', function () {
-          var CONFIG = {
+        it('should handle an empty query', () => {
+          const CONFIG = {
             item: {
               value: 'currencyCode',
               label: 'currencyCode',
@@ -195,14 +193,14 @@ describe('utils', function () {
               options: testCurrencies
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
-          SOURCE('', function (results) {
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          SOURCE('', results => {
             expect(results.length).toEqual(2);
             expect(results).toEqual(testCurrencies);
           });
         });
-        it('should handle an undefined query', function () {
-          var CONFIG = {
+        it('should handle an undefined query', () => {
+          const CONFIG = {
             item: {
               value: 'currencyCode',
               label: 'currencyCode',
@@ -213,14 +211,14 @@ describe('utils', function () {
               options: testCurrencies
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
-          SOURCE(undefined, function (results) {
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          SOURCE(undefined, results => {
             expect(results.length).toEqual(2);
             expect(results).toEqual(testCurrencies);
           });
         });
-        it('should handle a null query', function () {
-          var CONFIG = {
+        it('should handle a null query', () => {
+          const CONFIG = {
             item: {
               value: 'currencyCode',
               label: 'currencyCode',
@@ -231,14 +229,14 @@ describe('utils', function () {
               options: testCurrencies
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
-          SOURCE(null, function (results) {
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          SOURCE(null, results => {
             expect(results.length).toEqual(2);
             expect(results).toEqual(testCurrencies);
           });
         });
-        it('should handle a missing label on an option', function () {
-          var CONFIG = {
+        it('should handle a missing label on an option', () => {
+          const CONFIG = {
             item: {
               value: 'currencyCode',
               label: 'currencyCode',
@@ -253,9 +251,9 @@ describe('utils', function () {
               }]
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
           expect(typeof SOURCE === 'function').toBeTruthy();
-          SOURCE('a', function (results) {
+          SOURCE('a', results => {
             // We expect 2 results here instead of 1 because defining a custom
             // format for item labels means the label is constructed upon processing
             // a query - we're not relying on the 'label' field of the option.
@@ -268,8 +266,8 @@ describe('utils', function () {
             }]);
           });
         });
-        it('should match options using a defined synonym', function () {
-          var CONFIG = {
+        it('should match options using a defined synonym', () => {
+          const CONFIG = {
             item: {
               value: 'currencyCode',
               label: 'currencyCode',
@@ -280,17 +278,15 @@ describe('utils', function () {
               options: testCurrencies
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
           expect(typeof SOURCE === 'function').toBeTruthy();
-          SOURCE('greenbacks', function (results) {
+          SOURCE('greenbacks', results => {
             expect(results.length).toEqual(1);
-            expect(results).toEqual(testCurrencies.filter(function (c) {
-              return c.currencyCode === 'USD';
-            }));
+            expect(results).toEqual(testCurrencies.filter(c => c.currencyCode === 'USD'));
           });
         });
-        it('should match options using defined extra searchable fields', function () {
-          var CONFIG = {
+        it('should match options using defined extra searchable fields', () => {
+          const CONFIG = {
             item: {
               value: 'currencyCode',
               label: 'currencyCode',
@@ -302,13 +298,11 @@ describe('utils', function () {
               options: testCurrencies
             }
           };
-          var SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
+          const SOURCE = (0, _getAutocompleteSource.default)(CONFIG);
           expect(typeof SOURCE === 'function').toBeTruthy();
-          SOURCE('buc', function (results) {
+          SOURCE('buc', results => {
             expect(results.length).toEqual(1);
-            expect(results).toEqual(testCurrencies.filter(function (c) {
-              return c.currencyCode === 'USD';
-            }));
+            expect(results).toEqual(testCurrencies.filter(c => c.currencyCode === 'USD'));
           });
         });
       });

package/dist/utils/Data/getDataPath.js

@@ -4,46 +4,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var DOT = '.';
-var SLASH = '/';
-var DOT_DOT = "".concat(DOT).concat(DOT);
-var PARENT_PATH = "".concat(DOT).concat(SLASH);
-var toPath = function toPath(arr) {
-  return arr.join(DOT);
-};
-var toParts = function toParts(str) {
-  var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DOT;
+const DOT = '.';
+const SLASH = '/';
+const DOT_DOT = "".concat(DOT).concat(DOT);
+const PARENT_PATH = "".concat(DOT).concat(SLASH);
+const toPath = arr => arr.join(DOT);
+const toParts = function (str) {
+  let separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DOT;
   return str.split(separator);
 };
-var isDotDot = function isDotDot(str) {
-  return str === DOT_DOT;
-};
-var isDotOrDotDot = function isDotOrDotDot(str) {
-  return [DOT, DOT_DOT].indexOf(str) > -1;
-};
-var isRelativePath = function isRelativePath(path) {
-  return path && path.indexOf(DOT) === 0;
-};
-var standardiseRelativePath = function standardiseRelativePath(path) {
+const isDotDot = str => str === DOT_DOT;
+const isDotOrDotDot = str => [DOT, DOT_DOT].indexOf(str) > -1;
+const isRelativePath = path => path && path.indexOf(DOT) === 0;
+const standardiseRelativePath = path => {
   if (path.indexOf(PARENT_PATH) === 0) {
     return path;
   }
   return "".concat(PARENT_PATH).concat(path);
 };
-var ascendPath = function ascendPath(startPath, ascent) {
-  var relativePath = standardiseRelativePath(ascent);
+const ascendPath = (startPath, ascent) => {
+  const relativePath = standardiseRelativePath(ascent);
   // Always add 1 because we're starting on a leaf node within a "directory".
-  var stepsToClimb = toParts(relativePath, SLASH).filter(isDotDot).length + 1;
-  var pathParts = startPath ? toParts(startPath) : [];
+  const stepsToClimb = toParts(relativePath, SLASH).filter(isDotDot).length + 1;
+  const pathParts = startPath ? toParts(startPath) : [];
   if (stepsToClimb >= pathParts.length) {
     return '';
   }
   return toPath(pathParts.slice(0, -stepsToClimb));
 };
-var descendPath = function descendPath(startPath, descent) {
-  var stepsDown = toParts(descent, SLASH).filter(function (str) {
-    return !isDotOrDotDot(str);
-  });
+const descendPath = (startPath, descent) => {
+  const stepsDown = toParts(descent, SLASH).filter(str => !isDotOrDotDot(str));
   return startPath ? "".concat(startPath, ".").concat(toPath(stepsDown)) : toPath(stepsDown);
 };
 
@@ -66,7 +56,7 @@ var descendPath = function descendPath(startPath, descent) {
  *   getDataPath('../../relative.path', 'this.is.the.current.path');
  *   // => 'this.is.relative.path'
  */
-var getDataPath = function getDataPath(path, currentPath) {
+const getDataPath = (path, currentPath) => {
   if (isRelativePath(path)) {
     return descendPath(ascendPath(currentPath, path), path);
   }

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

@@ -2,17 +2,17 @@
 
 var _getDataPath = _interopRequireDefault(require("./getDataPath"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('utils.Data.getDataPath', function () {
-  var CURRENT_PATH = 'this.is.the.current.path';
-  var RELATIVE = 'relative.path';
-  var ABSOLUTE = 'absolute.path';
-  var doTest = function doTest(path, currentPath, expected) {
+describe('utils.Data.getDataPath', () => {
+  const CURRENT_PATH = 'this.is.the.current.path';
+  const RELATIVE = 'relative.path';
+  const ABSOLUTE = 'absolute.path';
+  const doTest = (path, currentPath, expected) => {
     expect((0, _getDataPath.default)(path, currentPath)).toEqual(expected);
   };
-  it("should return an absolute path appropriately", function () {
+  it("should return an absolute path appropriately", () => {
     doTest(ABSOLUTE, CURRENT_PATH, ABSOLUTE);
   });
-  it("should return an absolute path appropriately where the current path is null", function () {
+  it("should return an absolute path appropriately where the current path is null", () => {
     doTest(ABSOLUTE, null, ABSOLUTE);
   });
   [{
@@ -31,18 +31,18 @@ describe('utils.Data.getDataPath', function () {
     p: "../../../../../../../".concat(RELATIVE),
     e: RELATIVE,
     d: 'an inappropriately nested node'
-  }].forEach(function (test) {
-    it("should return ".concat(test.d, " appropriately"), function () {
+  }].forEach(test => {
+    it("should return ".concat(test.d, " appropriately"), () => {
       doTest(test.p, CURRENT_PATH, test.e);
     });
-    it("should return ".concat(test.d, " appropriately where the current path is null"), function () {
+    it("should return ".concat(test.d, " appropriately where the current path is null"), () => {
       doTest(test.p, null, RELATIVE);
     });
   });
-  it('should handle a null path and return null', function () {
+  it('should handle a null path and return null', () => {
     doTest(null, CURRENT_PATH, null);
   });
-  it('should handle an undefined path and return undefined', function () {
+  it('should handle an undefined path and return undefined', () => {
     doTest(undefined, CURRENT_PATH, undefined);
   });
 });

package/dist/utils/Data/getOptions.js

@@ -6,35 +6,39 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 var _Condition = _interopRequireDefault(require("../Condition"));
+var _nestInRefdataOptions = _interopRequireDefault(require("./nestInRefdataOptions"));
 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); } // Global Imports
+// Global Imports
+
 // Local Imports
-var interpolateOptions = function interpolateOptions(config, options) {
-  return options.map(function (opt) {
-    if (opt.show_when) {
-      var result = opt.show_when.type === 'or' ? _Condition.default.meetsOne(opt, config.formData) : _Condition.default.meetsAll(opt, config.formData);
-      if (!result) {
-        return null;
-      }
-    }
-    if (typeof opt === 'string') {
-      return opt;
+
+const interpolateOptions = (config, options) => options.map(opt => {
+  if (opt.show_when) {
+    const result = opt.show_when.type === 'or' ? _Condition.default.meetsOne(opt, config.formData) : _Condition.default.meetsAll(opt, config.formData);
+    if (!result) {
+      return null;
     }
-    return _objectSpread(_objectSpread({}, opt), {}, {
-      value: _copReactComponents.Utils.interpolateString(opt.value, config.formData),
-      label: _copReactComponents.Utils.interpolateString(opt.label, config.formData)
-    });
-  }).filter(function (n) {
-    return n;
-  });
-};
-var getOptions = function getOptions(config, callback) {
+  }
+  if (typeof opt === 'string') {
+    return opt;
+  }
+  if (config.alternativeHintField) {
+    // eslint-disable-next-line no-param-reassign
+    opt.hint = opt[config.alternativeHintField];
+  }
+  return {
+    ...opt,
+    value: _copReactComponents.Utils.interpolateString(opt.value, config.formData),
+    label: _copReactComponents.Utils.interpolateString(opt.label, config.formData)
+  };
+}).filter(n => n);
+const getOptions = (config, callback) => {
   if (config) {
+    var _config$data, _config$data2;
+    if (config.options && config !== null && config !== void 0 && (_config$data = config.data) !== null && _config$data !== void 0 && _config$data.options && config !== null && config !== void 0 && (_config$data2 = config.data) !== null && _config$data2 !== void 0 && _config$data2.url) {
+      const combinedOptions = (0, _nestInRefdataOptions.default)(config.options, config.data.options);
+      return callback(interpolateOptions(config, combinedOptions));
+    }
     if (config.options) {
       return callback(interpolateOptions(config, config.options));
     }