@sanity/validation 2.33.4-shopify.8 → 2.34.1-canary.0

package/lib/validateDocument.js

@@ -5,78 +5,77 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = validateDocument;
 exports.resolveTypeForArrayItem = resolveTypeForArrayItem;
+exports.validateDocumentObservable = validateDocumentObservable;
 exports.validateItem = validateItem;
-
 var _uniqBy2 = _interopRequireDefault(require("lodash/uniqBy"));
-
+var _flatten2 = _interopRequireDefault(require("lodash/flatten"));
 var _types = require("@sanity/types");
-
+var _rxjs = require("rxjs");
+var _operators = require("rxjs/operators");
 var _typeString = _interopRequireDefault(require("./util/typeString"));
-
+var _requestIdleCallback = require("./util/requestIdleCallback");
 var _ValidationError = _interopRequireDefault(require("./ValidationError"));
-
 var _normalizeValidationRules = _interopRequireDefault(require("./util/normalizeValidationRules"));
-
 var _excluded = ["value", "type", "path", "parent"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 var isRecord = maybeRecord => typeof maybeRecord === 'object' && maybeRecord !== null && !Array.isArray(maybeRecord);
-
 var isNonNullable = value => value !== null && value !== undefined;
+
 /**
  * @internal
  */
-
-
 function resolveTypeForArrayItem(item, candidates) {
   // if there is only one type available, assume that it's the correct one
   if (candidates.length === 1) return candidates[0];
-
   var itemType = (0, _types.isTypedObject)(item) && item._type;
-
   var primitive = item === undefined || item === null || !itemType && (0, _typeString.default)(item).toLowerCase();
-
   if (primitive && primitive !== 'object') {
     return candidates.find(candidate => candidate.jsonType === primitive);
   }
-
   return candidates.find(candidate => {
     var _candidate$type;
-
     return ((_candidate$type = candidate.type) === null || _candidate$type === void 0 ? void 0 : _candidate$type.name) === itemType;
   }) || candidates.find(candidate => candidate.name === itemType) || candidates.find(candidate => candidate.name === 'object' && primitive === 'object');
 }
-
-function validateDocument(_x, _x2, _x3) {
-  return _validateDocument.apply(this, arguments);
+var EMPTY_MARKERS = [];
+function validateDocument(doc, schema, context) {
+  return validateDocumentObservable(doc, schema, context).toPromise();
+}
+function validateDocumentObservable(doc, schema, context) {
+  var documentType = schema.get(doc._type);
+  if (!documentType) {
+    console.warn('Schema type for object type "%s" not found, skipping validation', doc._type);
+    return (0, _rxjs.of)(EMPTY_MARKERS);
+  }
+  return validateItemObservable({
+    parent: undefined,
+    value: doc,
+    path: [],
+    document: doc,
+    type: documentType,
+    getDocumentExists: context === null || context === void 0 ? void 0 : context.getDocumentExists
+  }).pipe((0, _operators.catchError)(err => {
+    console.error(err);
+    return (0, _rxjs.of)([{
+      type: 'validation',
+      level: 'error',
+      path: [],
+      item: new _ValidationError.default(err === null || err === void 0 ? void 0 : err.message)
+    }]);
+  }));
 }
+
 /**
  * this is used make optional properties required by replacing optionals with
  * `T[P] | undefined`. this is used to prevent errors in `validateItem` where
@@ -85,147 +84,120 @@ function validateDocument(_x, _x2, _x3) {
  * https://medium.com/terria/typescript-transforming-optional-properties-to-required-properties-that-may-be-undefined-7482cb4e1585
  */
 
-
-function _validateDocument() {
-  _validateDocument = _asyncToGenerator(function* (doc, schema, context) {
-    var documentType = schema.get(doc._type);
-
-    if (!documentType) {
-      console.warn('Schema type for object type "%s" not found, skipping validation', doc._type);
-      return [];
-    }
-
-    try {
-      return yield validateItem({
-        parent: undefined,
-        value: doc,
-        path: [],
-        document: doc,
-        type: documentType,
-        getDocumentExists: context === null || context === void 0 ? void 0 : context.getDocumentExists
-      });
-    } catch (err) {
-      console.error(err);
-      return [{
-        type: 'validation',
-        level: 'error',
-        path: [],
-        item: new _ValidationError.default(err === null || err === void 0 ? void 0 : err.message)
-      }];
-    }
-  });
-  return _validateDocument.apply(this, arguments);
-}
-
-function validateItem(_x4) {
-  return _validateItem.apply(this, arguments);
+function validateItem(opts) {
+  return validateItemObservable(opts).toPromise();
 }
+function validateItemObservable(_ref) {
+  var value = _ref.value,
+    type = _ref.type,
+    _ref$path = _ref.path,
+    path = _ref$path === void 0 ? [] : _ref$path,
+    parent = _ref.parent,
+    restOfContext = _objectWithoutProperties(_ref, _excluded);
+  var rules = (0, _normalizeValidationRules.default)(type);
+  // run validation for the current value
+  var selfChecks = rules.map(rule => (0, _rxjs.defer)(() => rule.validate(value, _objectSpread(_objectSpread({}, restOfContext), {}, {
+    parent,
+    path,
+    type
+  }))));
+
+  // run validation for nested values (conditionally)
+  var fieldChecks = [];
+  var selfIsRequired = rules.some(rule => rule.isRequired());
+  var shouldRunNestedObjectValidation =
+  // run nested validation for objects
+  (type === null || type === void 0 ? void 0 : type.jsonType) === 'object' && (
+  // if the value is truthy
+  !!value ||
+  // or
+  // (the value is null or undefined) and the top-level value is required
+  (value === null || value === undefined) && selfIsRequired);
+  if (shouldRunNestedObjectValidation) {
+    var fieldTypes = type.fields.reduce((acc, field) => {
+      acc[field.name] = field.type;
+      return acc;
+    }, {});
+
+    // Validation for rules set at the object level with `Rule.fields({/* ... */})`
+    fieldChecks = fieldChecks.concat(rules.map(rule => rule._fieldRules).filter(isNonNullable).flatMap(fieldResults => Object.entries(fieldResults)).flatMap(_ref2 => {
+      var _ref3 = _slicedToArray(_ref2, 2),
+        name = _ref3[0],
+        validation = _ref3[1];
+      var fieldType = fieldTypes[name];
+      return (0, _normalizeValidationRules.default)(_objectSpread(_objectSpread({}, fieldType), {}, {
+        validation
+      })).map(subRule => {
+        var nestedValue = isRecord(value) ? value[name] : undefined;
+        return (0, _rxjs.defer)(() => subRule.validate(nestedValue, _objectSpread(_objectSpread({}, restOfContext), {}, {
+          parent: value,
+          path: path.concat(name),
+          type: fieldType
+        })));
+      });
+    }));
+
+    // Validation from each field's schema `validation: Rule => {/* ... */}` function
+    fieldChecks = fieldChecks.concat(type.fields.map(field => validateItemObservable(_objectSpread(_objectSpread({}, restOfContext), {}, {
+      parent: value,
+      value: isRecord(value) ? value[field.name] : undefined,
+      path: path.concat(field.name),
+      type: field.type
+    }))));
+  }
 
-function _validateItem() {
-  _validateItem = _asyncToGenerator(function* (_ref) {
-    var value = _ref.value,
-        type = _ref.type,
-        _ref$path = _ref.path,
-        path = _ref$path === void 0 ? [] : _ref$path,
-        parent = _ref.parent,
-        restOfContext = _objectWithoutProperties(_ref, _excluded);
-
-    var rules = (0, _normalizeValidationRules.default)(type); // run validation for the current value
-
-    var selfChecks = rules.map(rule => rule.validate(value, _objectSpread(_objectSpread({}, restOfContext), {}, {
-      parent,
-      path,
-      type
-    }))); // run validation for nested values (conditionally)
-
-    var nestedChecks = [];
-    var selfIsRequired = rules.some(rule => rule.isRequired());
-    var shouldRunNestedObjectValidation = // run nested validation for objects
-    (type === null || type === void 0 ? void 0 : type.jsonType) === 'object' && ( // if the value is truthy
-    !!value || // or
-    // (the value is null or undefined) and the top-level value is required
-    (value === null || value === undefined) && selfIsRequired);
-
-    if (shouldRunNestedObjectValidation) {
-      var fieldTypes = type.fields.reduce((acc, field) => {
-        acc[field.name] = field.type;
-        return acc;
-      }, {}); // Validation for rules set at the object level with `Rule.fields({/* ... */})`
-
-      nestedChecks = nestedChecks.concat(rules.map(rule => rule._fieldRules).filter(isNonNullable).flatMap(fieldResults => Object.entries(fieldResults)).flatMap(_ref2 => {
-        var _ref3 = _slicedToArray(_ref2, 2),
-            name = _ref3[0],
-            validation = _ref3[1];
-
-        var fieldType = fieldTypes[name];
-        return (0, _normalizeValidationRules.default)(_objectSpread(_objectSpread({}, fieldType), {}, {
-          validation
-        })).map(subRule => {
-          var nestedValue = isRecord(value) ? value[name] : undefined;
-          return subRule.validate(nestedValue, _objectSpread(_objectSpread({}, restOfContext), {}, {
-            parent: value,
-            path: path.concat(name),
-            type: fieldType
-          }));
-        });
-      })); // Validation from each field's schema `validation: Rule => {/* ... */}` function
-
-      nestedChecks = nestedChecks.concat(type.fields.map(field => validateItem(_objectSpread(_objectSpread({}, restOfContext), {}, {
-        parent: value,
-        value: isRecord(value) ? value[field.name] : undefined,
-        path: path.concat(field.name),
-        type: field.type
-      }))));
-    } // note: unlike objects, arrays should not run nested validation for undefined
-    // values because we won't have a valid path to put a marker (i.e. missing the
-    // key or index in the path) and the downstream form builder won't have a
-    // valid target component
-
-
-    var shouldRunNestedValidationForArrays = (type === null || type === void 0 ? void 0 : type.jsonType) === 'array' && Array.isArray(value);
-
-    if (shouldRunNestedValidationForArrays) {
-      nestedChecks = nestedChecks.concat(value.map(item => validateItem(_objectSpread(_objectSpread({}, restOfContext), {}, {
-        parent: value,
-        value: item,
-        path: path.concat((0, _types.isKeyedObject)(item) ? {
-          _key: item._key
-        } : value.indexOf(item)),
-        type: resolveTypeForArrayItem(item, type.of)
-      }))));
-    } // markDefs also do no run nested validation if the parent object is undefined
-    // for a similar reason to arrays
-
-
-    var shouldRunNestedValidationForMarkDefs = (0, _types.isBlock)(value) && value.markDefs.length && (0, _types.isBlockSchemaType)(type);
-
-    if (shouldRunNestedValidationForMarkDefs) {
-      var _type$fields = _slicedToArray(type.fields, 1),
-          spanChildrenField = _type$fields[0];
-
-      var spanType = spanChildrenField.type.of.find(_types.isSpanSchemaType);
-      var annotations = ((spanType === null || spanType === void 0 ? void 0 : spanType.annotations) || []).reduce((map, annotationType) => {
-        map.set(annotationType.name, annotationType);
-        return map;
-      }, new Map());
-      nestedChecks = nestedChecks.concat(value.markDefs.map(markDef => validateItem(_objectSpread(_objectSpread({}, restOfContext), {}, {
-        parent: value,
-        value: markDef,
-        path: path.concat(['markDefs', {
-          _key: markDef._key
-        }]),
-        type: annotations.get(markDef._type)
-      }))));
-    }
+  // note: unlike objects, arrays should not run nested validation for undefined
+  // values because we won't have a valid path to put a marker (i.e. missing the
+  // key or index in the path) and the downstream form builder won't have a
+  // valid target component
+  var shouldRunNestedValidationForArrays = (type === null || type === void 0 ? void 0 : type.jsonType) === 'array' && Array.isArray(value);
+  if (shouldRunNestedValidationForArrays) {
+    fieldChecks = fieldChecks.concat(value.map(item => validateItemObservable(_objectSpread(_objectSpread({}, restOfContext), {}, {
+      parent: value,
+      value: item,
+      path: path.concat((0, _types.isKeyedObject)(item) ? {
+        _key: item._key
+      } : value.indexOf(item)),
+      type: resolveTypeForArrayItem(item, type.of)
+    }))));
+  }
 
-    var results = (yield Promise.all([...selfChecks, ...nestedChecks])).flat(); // run `uniqBy` if `_fieldRules` are present because they can
+  // markDefs also do no run nested validation if the parent object is undefined
+  // for a similar reason to arrays
+  var shouldRunNestedValidationForMarkDefs = (0, _types.isBlock)(value) && value.markDefs.length && (0, _types.isBlockSchemaType)(type);
+  if (shouldRunNestedValidationForMarkDefs) {
+    var _type$fields = _slicedToArray(type.fields, 1),
+      spanChildrenField = _type$fields[0];
+    var spanType = spanChildrenField.type.of.find(_types.isSpanSchemaType);
+    var annotations = ((spanType === null || spanType === void 0 ? void 0 : spanType.annotations) || []).reduce((acc, annotationType) => {
+      acc.set(annotationType.name, annotationType);
+      return acc;
+    }, new Map());
+    fieldChecks = fieldChecks.concat(value.markDefs.map(markDef => validateItemObservable(_objectSpread(_objectSpread({}, restOfContext), {}, {
+      parent: value,
+      value: markDef,
+      path: path.concat(['markDefs', {
+        _key: markDef._key
+      }]),
+      type: annotations.get(markDef._type)
+    }))));
+  }
+  return (0, _rxjs.defer)(() => (0, _rxjs.merge)([...selfChecks, ...fieldChecks])).pipe((0, _operators.mergeMap)(validateNode => (0, _rxjs.concat)(idle(), validateNode), 40), (0, _operators.mergeAll)(), (0, _operators.toArray)(), (0, _operators.map)(_flatten2.default), (0, _operators.map)(results => {
+    // run `uniqBy` if `_fieldRules` are present because they can
     // cause repeat markers
-
     if (rules.some(rule => rule._fieldRules)) {
       return (0, _uniqBy2.default)(results, rule => JSON.stringify(rule));
     }
-
     return results;
+  }));
+}
+function idle(timeout) {
+  return new _rxjs.Observable(observer => {
+    var handle = (0, _requestIdleCallback.requestIdleCallback)(() => {
+      observer.complete();
+    }, timeout ? {
+      timeout
+    } : undefined);
+    return () => (0, _requestIdleCallback.cancelIdleCallback)(handle);
   });
-  return _validateItem.apply(this, arguments);
 }

package/lib/validators/arrayValidator.js

@@ -4,108 +4,82 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _deepEquals = _interopRequireDefault(require("../util/deepEquals"));
-
 var _ValidationError = _interopRequireDefault(require("../ValidationError"));
-
 var _genericValidator = _interopRequireDefault(require("./genericValidator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 var arrayValidators = _objectSpread(_objectSpread({}, _genericValidator.default), {}, {
   min: (minLength, value, message) => {
     if (!value || value.length >= minLength) {
       return true;
     }
-
     return message || "Must have at least ".concat(minLength, " items");
   },
   max: (maxLength, value, message) => {
     if (!value || value.length <= maxLength) {
       return true;
     }
-
     return message || "Must have at most ".concat(maxLength, " items");
   },
   length: (wantedLength, value, message) => {
     if (!value || value.length === wantedLength) {
       return true;
     }
-
     return message || "Must have exactly ".concat(wantedLength, " items");
   },
   presence: (flag, value, message) => {
     if (flag === 'required' && !value) {
       return message || 'Required';
     }
-
     return true;
   },
   valid: (allowedValues, values, message) => {
     var valueType = typeof values;
-
     if (valueType === 'undefined') {
       return true;
     }
-
     var paths = [];
-
     var _loop = function _loop(i) {
       var value = values[i];
-
       if (allowedValues.some(expected => (0, _deepEquals.default)(expected, value))) {
         return "continue";
       }
-
       var pathSegment = value && value._key ? {
         _key: value._key
       } : i;
       paths.push([pathSegment]);
     };
-
     for (var i = 0; i < values.length; i++) {
       var _ret = _loop(i);
-
       if (_ret === "continue") continue;
     }
-
     return paths.length === 0 ? true : new _ValidationError.default(message || 'Value did not match any allowed values', {
       paths
     });
   },
   unique: (_unused, value, message) => {
     var dupeIndices = [];
-
     if (!value) {
       return true;
     }
-
     for (var x = 0; x < value.length; x++) {
       for (var y = x + 1; y < value.length; y++) {
         var itemA = value[x];
         var itemB = value[y];
-
         if (!(0, _deepEquals.default)(itemA, itemB)) {
           continue;
         }
-
         if (dupeIndices.indexOf(x) === -1) {
           dupeIndices.push(x);
         }
-
         if (dupeIndices.indexOf(y) === -1) {
           dupeIndices.push(y);
         }
       }
     }
-
     var paths = dupeIndices.map(idx => {
       var item = value[idx];
       var pathSegment = item && item._key ? {
@@ -118,6 +92,5 @@ var arrayValidators = _objectSpread(_objectSpread({}, _genericValidator.default)
     }) : true;
   }
 });
-
 var _default = arrayValidators;
 exports.default = _default;

package/lib/validators/booleanValidator.js

@@ -4,26 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _genericValidator = _interopRequireDefault(require("./genericValidator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 var booleanValidators = _objectSpread(_objectSpread({}, _genericValidator.default), {}, {
   presence: (flag, value, message) => {
     if (flag === 'required' && typeof value !== 'boolean') {
       return message || 'Required';
     }
-
     return true;
   }
 });
-
 var _default = booleanValidators;
 exports.default = _default;

package/lib/validators/dateValidator.js

@@ -5,25 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.isRecord = isRecord;
-
 var _format = _interopRequireDefault(require("date-fns/format"));
-
 var _genericValidator = _interopRequireDefault(require("./genericValidator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function isRecord(obj) {
   return typeof obj === 'object' && obj !== null && !Array.isArray(obj);
-} // eslint-disable-next-line no-useless-escape
+}
 
+// eslint-disable-next-line no-useless-escape
+var isoDate = /^(?:[-+]\d{2})?(?:\d{4}(?!\d{2}\b))(?:(-?)(?:(?:0[1-9]|1[0-2])(?:\1(?:[12]\d|0[1-9]|3[01]))?|W(?:[0-4]\d|5[0-2])(?:-?[1-7])?|(?:00[1-9]|0[1-9]\d|[12]\d{2}|3(?:[0-5]\d|6[1-6])))(?![T]$|[T][\d]+Z$)(?:[T\s](?:(?:(?:[01]\d|2[0-3])(?:(:?)[0-5]\d)?|24\:?00)(?:[.,]\d+(?!:))?)(?:\2[0-5]\d(?:[.,]\d+)?)?(?:[Z]|(?:[+-])(?:[01]\d|2[0-3])(?::?[0-5]\d)?)?)?)?$/;
 
-var isoDate = /^(?:[-+]\d{2})?(?:\d{4}(?!\d{2}\b))(?:(-?)(?:(?:0[1-9]|1[0-2])(?:\1(?:[12]\d|0[1-9]|3[01]))?|W(?:[0-4]\d|5[0-2])(?:-?[1-7])?|(?:00[1-9]|0[1-9]\d|[12]\d{2}|3(?:[0-5]\d|6[1-6])))(?![T]$|[T][\d]+Z$)(?:[T\s](?:(?:(?:[01]\d|2[0-3])(?:(:?)[0-5]\d)?|24\:?00)(?:[.,]\d+(?!:))?)(?:\2[0-5]\d(?:[.,]\d+)?)?(?:[Z]|(?:[+-])(?:[01]\d|2[0-3])(?::?[0-5]\d)?)?)?)?$/; // eslint-disable-next-line no-warning-comments
+// eslint-disable-next-line no-warning-comments
 // TODO (eventually): move these to schema type package
 
 var getFormattedDate = function getFormattedDate() {
@@ -31,54 +26,45 @@ var getFormattedDate = function getFormattedDate() {
   var value = arguments.length > 1 ? arguments[1] : undefined;
   var options = arguments.length > 2 ? arguments[2] : undefined;
   var format = 'yyyy-MM-dd';
-
   if (options && options.dateFormat) {
     format = options.dateFormat;
   }
-
   if (type === 'date') {
     // If the type is date only
     return (0, _format.default)(new Date(value), format);
-  } // If the type is datetime
-
+  }
 
+  // If the type is datetime
   if (options && options.timeFormat) {
     format += " ".concat(options.timeFormat);
   } else {
     format += ' HH:mm';
   }
-
   return (0, _format.default)(new Date(value), format);
 };
-
 function parseDate(date) {
   var throwOnError = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (!date) return null;
-  if (date === 'now') return new Date(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  if (date === 'now') return new Date();
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   var parsed = new Date(date);
   var isInvalid = isNaN(parsed.getTime());
-
   if (isInvalid && throwOnError) {
     throw new Error("Unable to parse \"".concat(date, "\" to a date"));
   }
-
   return isInvalid ? null : parsed;
 }
-
 var dateValidators = _objectSpread(_objectSpread({}, _genericValidator.default), {}, {
   type: (_unused, value, message) => {
     var strVal = "".concat(value);
-
     if (!strVal || isoDate.test(value)) {
       return true;
     }
-
     return message || 'Must be a valid ISO-8601 formatted date string';
   },
   min: (minDate, value, message, context) => {
     var dateVal = parseDate(value);
-
     if (!dateVal) {
       return true; // `type()` should catch parse errors
     }
@@ -86,18 +72,15 @@ var dateValidators = _objectSpread(_objectSpread({}, _genericValidator.default),
     if (!value || dateVal >= parseDate(minDate, true)) {
       return true;
     }
-
     if (!context.type) {
       throw new Error("`type` was not provided in validation context.");
     }
-
     var dateTimeOptions = isRecord(context.type.options) ? context.type.options : {};
     var date = getFormattedDate(context.type.name, minDate, dateTimeOptions);
     return message || "Must be at or after ".concat(date);
   },
   max: (maxDate, value, message, context) => {
     var dateVal = parseDate(value);
-
     if (!dateVal) {
       return true; // `type()` should catch parse errors
     }
@@ -105,16 +88,13 @@ var dateValidators = _objectSpread(_objectSpread({}, _genericValidator.default),
     if (!value || dateVal <= parseDate(maxDate, true)) {
       return true;
     }
-
     if (!context.type) {
       throw new Error("`type` was not provided in validation context.");
     }
-
     var dateTimeOptions = isRecord(context.type.options) ? context.type.options : {};
     var date = getFormattedDate(context.type.name, maxDate, dateTimeOptions);
     return message || "Must be at or before ".concat(date);
   }
 });
-
 var _default = dateValidators;
 exports.default = _default;