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

package/lib/validators/genericValidator.js

@@ -4,57 +4,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _typeString = _interopRequireDefault(require("../util/typeString"));
-
 var _deepEquals = _interopRequireDefault(require("../util/deepEquals"));
-
 var _pathToString = _interopRequireDefault(require("../util/pathToString"));
-
 var _ValidationError = _interopRequireDefault(require("../ValidationError"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 SLOW_VALIDATOR_TIMEOUT = 5000;
-
 var formatValidationErrors = options => {
   var message;
-
   if (options.message) {
     message = options.message;
   } else if (options.results.length === 1) {
     var _options$results$;
-
     message = (_options$results$ = options.results[0]) === null || _options$results$ === void 0 ? void 0 : _options$results$.item.message;
   } else {
     message = "[".concat(options.results.map(err => err.item.message).join(" - ".concat(options.operation, " - ")), "]");
   }
-
   return new _ValidationError.default(message, {
     children: options.results.length > 1 ? options.results : undefined,
     operation: options.operation
   });
 };
-
 var genericValidators = {
   type: (expected, value, message) => {
     var actualType = (0, _typeString.default)(value);
-
     if (actualType !== expected && actualType !== 'undefined') {
       return message || "Expected type \"".concat(expected, "\", got \"").concat(actualType, "\"");
     }
-
     return true;
   },
   presence: (expected, value, message) => {
     if (value === undefined && expected === 'required') {
       return message || 'Value is required';
     }
-
     return true;
   },
   all: function () {
@@ -68,18 +52,17 @@ var genericValidators = {
         operation: 'AND'
       });
     });
-
     function all(_x, _x2, _x3, _x4) {
       return _all.apply(this, arguments);
     }
-
     return all;
   }(),
   either: function () {
     var _either = _asyncToGenerator(function* (children, value, message, context) {
       var resolved = yield Promise.all(children.map(child => child.validate(value, context)));
-      var results = resolved.flat(); // Read: There is at least one rule that matched
+      var results = resolved.flat();
 
+      // Read: There is at least one rule that matched
       if (results.length < children.length) return true;
       return formatValidationErrors({
         message,
@@ -87,20 +70,16 @@ var genericValidators = {
         operation: 'OR'
       });
     });
-
     function either(_x5, _x6, _x7, _x8) {
       return _either.apply(this, arguments);
     }
-
     return either;
   }(),
   valid: (allowedValues, actual, message) => {
     var valueType = typeof actual;
-
     if (valueType === 'undefined') {
       return true;
     }
-
     var value = (valueType === 'number' || valueType === 'string') && "".concat(actual);
     var strValue = value && value.length > 30 ? "".concat(value.slice(0, 30), "\u2026") : value;
     var defaultMessage = value ? "Value \"".concat(strValue, "\" did not match any allowed values") : 'Value did not match any allowed values';
@@ -113,21 +92,17 @@ var genericValidators = {
         console.warn("Custom validator at ".concat((0, _pathToString.default)(context.path), " has taken more than ").concat(SLOW_VALIDATOR_TIMEOUT, "ms to respond"));
       }, SLOW_VALIDATOR_TIMEOUT);
       var result;
-
       try {
         result = yield fn(value, context);
       } finally {
         clearTimeout(slowTimer);
       }
-
       if (typeof result === 'string') return message || result;
       return result;
     });
-
     function custom(_x9, _x10, _x11, _x12) {
       return _custom.apply(this, arguments);
     }
-
     return custom;
   }()
 };

package/lib/validators/numberValidator.js

@@ -4,67 +4,52 @@ 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 precisionRx = /(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/;
-
 var numberValidators = _objectSpread(_objectSpread({}, _genericValidator.default), {}, {
   integer: (_unused, value, message) => {
     if (!Number.isInteger(value)) {
       return message || 'Must be an integer';
     }
-
     return true;
   },
   precision: (limit, value, message) => {
     if (value === undefined) return true;
     var places = value.toString().match(precisionRx);
     var decimals = Math.max((places[1] ? places[1].length : 0) - (places[2] ? parseInt(places[2], 10) : 0), 0);
-
     if (decimals > limit) {
       return message || "Max precision is ".concat(limit);
     }
-
     return true;
   },
   min: (minNum, value, message) => {
     if (value >= minNum) {
       return true;
     }
-
     return message || "Must be greater than or equal ".concat(minNum);
   },
   max: (maxNum, value, message) => {
     if (value <= maxNum) {
       return true;
     }
-
     return message || "Must be less than or equal ".concat(maxNum);
   },
   greaterThan: (num, value, message) => {
     if (value > num) {
       return true;
     }
-
     return message || "Must be greater than ".concat(num);
   },
   lessThan: (maxNum, value, message) => {
     if (value < maxNum) {
       return true;
     }
-
     return message || "Must be less than ".concat(maxNum);
   }
 });
-
 var _default = numberValidators;
 exports.default = _default;

package/lib/validators/objectValidator.js

@@ -4,37 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _types = require("@sanity/types");
-
 var _genericValidator = _interopRequireDefault(require("./genericValidator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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); }); }; }
-
 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 metaKeys = ['_key', '_type', '_weak'];
-
 var objectValidators = _objectSpread(_objectSpread({}, _genericValidator.default), {}, {
   presence: (expected, value, message) => {
     if (expected !== 'required') {
       return true;
     }
-
     var keys = value && Object.keys(value).filter(key => !metaKeys.includes(key));
-
     if (value === undefined || keys && keys.length === 0) {
       return message || 'Required';
     }
-
     return true;
   },
   reference: function () {
@@ -42,41 +29,31 @@ var objectValidators = _objectSpread(_objectSpread({}, _genericValidator.default
       if (!value) {
         return true;
       }
-
       if (!(0, _types.isReference)(value)) {
         return message || true;
       }
-
       var type = context.type,
-          getDocumentExists = context.getDocumentExists;
-
+        getDocumentExists = context.getDocumentExists;
       if (!type) {
         throw new Error("`type` was not provided in validation context");
       }
-
       if ('weak' in type && type.weak) {
         return true;
       }
-
       if (!getDocumentExists) {
         throw new Error("`getDocumentExists` was not provided in validation context");
       }
-
       var exists = yield getDocumentExists({
         id: value._ref
       });
-
       if (!exists) {
         return 'This reference must be published';
       }
-
       return true;
     });
-
     function reference(_x, _x2, _x3, _x4) {
       return _reference.apply(this, arguments);
     }
-
     return reference;
   }(),
   assetRequired: (flag, value, message) => {
@@ -84,10 +61,8 @@ var objectValidators = _objectSpread(_objectSpread({}, _genericValidator.default
       var assetType = flag.assetType || 'Asset';
       return message || "".concat(assetType, " required");
     }
-
     return true;
   }
 });
-
 var _default = objectValidators;
 exports.default = _default;

package/lib/validators/slugValidator.js

@@ -4,27 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.slugValidator = void 0;
-
 var _memoize2 = _interopRequireDefault(require("lodash/memoize"));
-
 var _types = require("@sanity/types");
-
 var _getClient = _interopRequireDefault(require("../getClient"));
-
 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 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 memoizedWarnOnArraySlug = (0, _memoize2.default)(warnOnArraySlug);
-
 function getDocumentIds(id) {
   var isDraft = id.indexOf('drafts.') === 0;
   return {
@@ -32,7 +21,6 @@ function getDocumentIds(id) {
     draft: isDraft ? id : "drafts.".concat(id)
   };
 }
-
 function serializePath(path) {
   return path.reduce((target, part, i) => {
     var isIndex = typeof part === 'number';
@@ -42,34 +30,26 @@ function serializePath(path) {
     return "".concat(target).concat(add);
   }, '');
 }
-
 var defaultIsUnique = (slug, context) => {
   var document = context.document,
-      path = context.path,
-      type = context.type;
+    path = context.path,
+    type = context.type;
   var schemaOptions = type === null || type === void 0 ? void 0 : type.options;
-
   if (!document) {
     throw new Error("`document` was not provided in validation context.");
   }
-
   if (!path) {
     throw new Error("`path` was not provided in validation context.");
   }
-
   var disableArrayWarning = (schemaOptions === null || schemaOptions === void 0 ? void 0 : schemaOptions.disableArrayWarning) || false;
-
   var _getDocumentIds = getDocumentIds(document._id),
-      published = _getDocumentIds.published,
-      draft = _getDocumentIds.draft;
-
+    published = _getDocumentIds.published,
+    draft = _getDocumentIds.draft;
   var docType = document._type;
   var atPath = serializePath(path.concat('current'));
-
   if (!disableArrayWarning && atPath.includes('[]')) {
     memoizedWarnOnArraySlug(serializePath(path));
   }
-
   var constraints = ['_type == $docType', "!(_id in [$draft, $published])", "".concat(atPath, " == $slug")].join(' && ');
   return (0, _getClient.default)().fetch("!defined(*[".concat(constraints, "][0]._id)"), {
     docType,
@@ -80,54 +60,43 @@ var defaultIsUnique = (slug, context) => {
     tag: 'validation.slug-is-unique'
   });
 };
-
 function warnOnArraySlug(serializedPath) {
   /* eslint-disable no-console */
   console.warn(["Slug field at path ".concat(serializedPath, " is within an array and cannot be automatically checked for uniqueness"), "If you need to check for uniqueness, provide your own \"isUnique\" method", "To disable this message, set `disableArrayWarning: true` on the slug `options` field"].join('\n'));
   /* eslint-enable no-console */
 }
+
 /**
  * Validates slugs values by querying for uniqueness from the client.
  *
  * This is a custom rule implementation (e.g. `Rule.custom(slugValidator)`)
  * that's populated in `inferFromSchemaType` when the type name is `slug`
  */
-
-
 var slugValidator = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(function* (value, context) {
     var _context$type;
-
     if (!value) {
       return true;
     }
-
     if (typeof value !== 'object') {
       return 'Slug must be an object';
     }
-
     var slugValue = value.current;
-
     if (!slugValue) {
       return 'Slug must have a value';
     }
-
     var options = context === null || context === void 0 ? void 0 : (_context$type = context.type) === null || _context$type === void 0 ? void 0 : _context$type.options;
     var isUnique = (options === null || options === void 0 ? void 0 : options.isUnique) || defaultIsUnique;
     var wasUnique = yield isUnique(slugValue, _objectSpread(_objectSpread({}, context), {}, {
       defaultIsUnique
     }));
-
     if (wasUnique) {
       return true;
     }
-
     return 'Slug is already in use';
   });
-
   return function slugValidator(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
-
 exports.slugValidator = slugValidator;

package/lib/validators/stringValidator.js

@@ -4,54 +4,41 @@ 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 DUMMY_ORIGIN = 'http://sanity';
 var emailRegex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-
 var isRelativeUrl = url => /^\.*\//.test(url);
-
 var stringValidators = _objectSpread(_objectSpread({}, _genericValidator.default), {}, {
   min: (minLength, value, message) => {
     if (!value || value.length >= minLength) {
       return true;
     }
-
     return message || "Must be at least ".concat(minLength, " characters long");
   },
   max: (maxLength, value, message) => {
     if (!value || value.length <= maxLength) {
       return true;
     }
-
     return message || "Must be at most ".concat(maxLength, " characters long");
   },
   length: (wantedLength, value, message) => {
     var strValue = value || '';
-
     if (strValue.length === wantedLength) {
       return true;
     }
-
     return message || "Must be exactly ".concat(wantedLength, " characters long");
   },
   uri: (constraints, value, message) => {
     var strValue = value || '';
     var options = constraints.options;
     var allowCredentials = options.allowCredentials,
-        relativeOnly = options.relativeOnly;
+      relativeOnly = options.relativeOnly;
     var allowRelative = options.allowRelative || relativeOnly;
     var url;
-
     try {
       // WARNING: Safari checks for a given `base` param by looking at the length of arguments passed
       // to new URL(str, base), and will fail if invoked with new URL(strValue, undefined)
@@ -59,73 +46,58 @@ var stringValidators = _objectSpread(_objectSpread({}, _genericValidator.default
     } catch (err) {
       return message || 'Not a valid URL';
     }
-
     if (relativeOnly && url.origin !== DUMMY_ORIGIN) {
       return message || 'Only relative URLs are allowed';
     }
-
     if (!allowRelative && url.origin === DUMMY_ORIGIN && isRelativeUrl(strValue)) {
       return message || 'Relative URLs are not allowed';
     }
-
     if (!allowCredentials && (url.username || url.password)) {
       return message || "Username/password not allowed";
     }
-
     var urlScheme = url.protocol.replace(/:$/, '');
     var matchesAllowedScheme = options.scheme.some(scheme => scheme.test(urlScheme));
-
     if (!matchesAllowedScheme) {
       return message || 'Does not match allowed protocols/schemes';
     }
-
     return true;
   },
   stringCasing: (casing, value, message) => {
     var strValue = value || '';
-
     if (casing === 'uppercase' && strValue !== strValue.toLocaleUpperCase()) {
       return message || "Must be all uppercase letters";
     }
-
     if (casing === 'lowercase' && strValue !== strValue.toLocaleLowerCase()) {
       return message || "Must be all lowercase letters";
     }
-
     return true;
   },
   presence: (flag, value, message) => {
     if (flag === 'required' && !value) {
       return message || 'Required';
     }
-
     return true;
   },
   regex: (options, value, message) => {
     var pattern = options.pattern,
-        name = options.name,
-        invert = options.invert;
+      name = options.name,
+      invert = options.invert;
     var regName = name || "\"".concat(pattern.toString(), "\"");
     var strValue = value || '';
     var matches = pattern.test(strValue);
-
     if (!invert && !matches || invert && matches) {
       var defaultMessage = invert ? "Should not match ".concat(regName, "-pattern") : "Does not match ".concat(regName, "-pattern");
       return message || defaultMessage;
     }
-
     return true;
   },
   email: (_unused, value, message) => {
     var strValue = "".concat(value || '').trim();
-
     if (!strValue || emailRegex.test(strValue)) {
       return true;
     }
-
     return message || 'Must be a valid email address';
   }
 });
-
 var _default = stringValidators;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/validation",
-  "version": "2.33.4-shopify.8+b3097f8c9",
+  "version": "2.34.1-canary.0+b3e58b8893",
   "description": "Validation and warning infrastructure for Sanity projects",
   "main": "./lib/index.js",
   "types": "./dist/dts",
@@ -33,12 +33,13 @@
   },
   "devDependencies": {
     "@sanity/client": "^3.3.3",
-    "@sanity/schema": "2.33.4-shopify.8+b3097f8c9"
+    "@sanity/schema": "2.34.1-canary.0+b3e58b8893"
   },
   "dependencies": {
-    "@sanity/types": "2.33.4-shopify.8+b3097f8c9",
+    "@sanity/types": "2.34.1-canary.0+b3e58b8893",
     "date-fns": "^2.16.1",
-    "lodash": "^4.17.15"
+    "lodash": "^4.17.15",
+    "rxjs": "^6.5.3"
   },
-  "gitHead": "b3097f8c9ec8d874b3fd86005a17b0cb5eaf136c"
+  "gitHead": "b3e58b8893c9573844279488896df2313df914f1"
 }

package/src/index.ts

@@ -5,3 +5,5 @@ import inferFromSchemaType from './inferFromSchemaType'
 
 export default {Rule: RuleClass, validateDocument, inferFromSchema, inferFromSchemaType}
 export {RuleClass as Rule, validateDocument, inferFromSchema, inferFromSchemaType}
+
+export {validateDocumentObservable} from './validateDocument'

package/src/util/requestIdleCallback.ts

@@ -0,0 +1,29 @@
+/**
+ * Simple requestIdleCallback polyfill
+ * Can be removed when all browsers support requestIdleCallback: https://caniuse.com/requestidlecallback
+ * @param callback
+ * @param options
+ */
+const requestIdleCallbackShim: typeof window.requestIdleCallback = function requestIdleCallbackShim(
+  callback,
+  options?
+): number {
+  const start = Date.now()
+  return window.setTimeout(() => {
+    callback({
+      didTimeout: false,
+      timeRemaining() {
+        return Math.max(0, Date.now() - start)
+      },
+    })
+  }, 0)
+}
+
+const cancelIdleCallbackShim: typeof window.cancelIdleCallback = function cancelIdleCallbackShim(
+  handle: number
+): void {
+  return window.clearTimeout(handle)
+}
+
+export const requestIdleCallback = window.requestIdleCallback || requestIdleCallbackShim
+export const cancelIdleCallback = window.cancelIdleCallback || cancelIdleCallbackShim