@sanity/validation 2.21.8-reference-updates.21 → 2.21.10-shopify.4

package/dist/dts/validateDocument.d.ts

@@ -3,7 +3,7 @@ import { SanityDocument, Schema, SchemaType, ValidationContext, ValidationMarker
  * @internal
  */
 export declare function resolveTypeForArrayItem(item: unknown, candidates: SchemaType[]): SchemaType | undefined;
-export default function validateDocument(doc: SanityDocument, schema: Schema, context?: Pick<ValidationContext, 'getDocumentExists'>): Promise<ValidationMarker[]>;
+export default function validateDocument(doc: SanityDocument, schema: Schema): Promise<ValidationMarker[]>;
 /**
  * this is used make optional properties required by replacing optionals with
  * `T[P] | undefined`. this is used to prevent errors in `validateItem` where

package/dist/dts/validateDocument.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateDocument.d.ts","sourceRoot":"","sources":["../../src/validateDocument.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,eAAe,CAAA;AAYtB;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,EAAE,GACvB,UAAU,GAAG,SAAS,CAiBxB;AAED,wBAA8B,gBAAgB,CAC5C,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,GACrD,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA2B7B;AAED;;;;;;GAMG;AACH,aAAK,iBAAiB,CAAC,CAAC,IAAI;KACzB,CAAC,IAAI,MAAM,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;CAC5F,CAAA;AAED,aAAK,mBAAmB,GAAG;IACzB,KAAK,EAAE,OAAO,CAAA;CACf,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;AAExC,wBAAsB,YAAY,CAAC,EACjC,KAAK,EACL,IAAI,EACJ,IAAS,EACT,MAAM,EACN,GAAG,aAAa,EACjB,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA8FnD"}
+{"version":3,"file":"validateDocument.d.ts","sourceRoot":"","sources":["../../src/validateDocument.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,eAAe,CAAA;AAYtB;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,EAAE,GACvB,UAAU,GAAG,SAAS,CAiBxB;AAED,wBAA8B,gBAAgB,CAC5C,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA0B7B;AAED;;;;;;GAMG;AACH,aAAK,iBAAiB,CAAC,CAAC,IAAI;KACzB,CAAC,IAAI,MAAM,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;CAC5F,CAAA;AAED,aAAK,mBAAmB,GAAG;IACzB,KAAK,EAAE,OAAO,CAAA;CACf,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;AAExC,wBAAsB,YAAY,CAAC,EACjC,KAAK,EACL,IAAI,EACJ,IAAS,EACT,MAAM,EACN,GAAG,aAAa,EACjB,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA8FnD"}

package/dist/dts/validators/blockValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blockValidator.d.ts","sourceRoot":"","sources":["../../../src/validators/blockValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,cAAc,EAAC,MAAM,eAAe,CAAA;AAG9D,eAAO,MAAM,cAAc,EAAE,cAmD5B,CAAA"}
+{"version":3,"file":"blockValidator.d.ts","sourceRoot":"","sources":["../../../src/validators/blockValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,cAAc,EAAC,MAAM,eAAe,CAAA;AAG9D,eAAO,MAAM,cAAc,EAAE,cAkD5B,CAAA"}

package/dist/dts/validators/objectValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"objectValidator.d.ts","sourceRoot":"","sources":["../../../src/validators/objectValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAc,MAAM,eAAe,CAAA;AAKrD,QAAA,MAAM,gBAAgB,EAAE,UAkEvB,CAAA;AAED,eAAe,gBAAgB,CAAA"}
+{"version":3,"file":"objectValidator.d.ts","sourceRoot":"","sources":["../../../src/validators/objectValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAA;AAKxC,QAAA,MAAM,gBAAgB,EAAE,UA8CvB,CAAA;AAED,eAAe,gBAAgB,CAAA"}

package/lib/index.js

@@ -9,12 +9,7 @@ Object.defineProperty(exports, "Rule", {
     return _Rule.default;
   }
 });
-Object.defineProperty(exports, "validateDocument", {
-  enumerable: true,
-  get: function get() {
-    return _validateDocument.default;
-  }
-});
+exports.default = void 0;
 Object.defineProperty(exports, "inferFromSchema", {
   enumerable: true,
   get: function get() {
@@ -27,7 +22,12 @@ Object.defineProperty(exports, "inferFromSchemaType", {
     return _inferFromSchemaType.default;
   }
 });
-exports.default = void 0;
+Object.defineProperty(exports, "validateDocument", {
+  enumerable: true,
+  get: function get() {
+    return _validateDocument.default;
+  }
+});
 
 var _Rule = _interopRequireDefault(require("./Rule"));
 

package/lib/util/convertToValidationMarker.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isNonNullable = isNonNullable;
 exports.default = convertToValidationMarker;
+exports.isNonNullable = isNonNullable;
 
 var _ValidationError = _interopRequireDefault(require("../ValidationError"));
 

package/lib/validateDocument.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resolveTypeForArrayItem = resolveTypeForArrayItem;
 exports.default = validateDocument;
+exports.resolveTypeForArrayItem = resolveTypeForArrayItem;
 exports.validateItem = validateItem;
 
 var _uniqBy2 = _interopRequireDefault(require("lodash/uniqBy"));
@@ -74,7 +74,7 @@ function resolveTypeForArrayItem(item, candidates) {
   }) || candidates.find(candidate => candidate.name === itemType) || candidates.find(candidate => candidate.name === 'object' && primitive === 'object');
 }
 
-function validateDocument(_x, _x2, _x3) {
+function validateDocument(_x, _x2) {
   return _validateDocument.apply(this, arguments);
 }
 /**
@@ -87,7 +87,7 @@ function validateDocument(_x, _x2, _x3) {
 
 
 function _validateDocument() {
-  _validateDocument = _asyncToGenerator(function* (doc, schema, context) {
+  _validateDocument = _asyncToGenerator(function* (doc, schema) {
     var documentType = schema.get(doc._type);
 
     if (!documentType) {
@@ -101,8 +101,7 @@ function _validateDocument() {
         value: doc,
         path: [],
         document: doc,
-        type: documentType,
-        getDocumentExists: context === null || context === void 0 ? void 0 : context.getDocumentExists
+        type: documentType
       });
     } catch (err) {
       console.error(err);
@@ -117,7 +116,7 @@ function _validateDocument() {
   return _validateDocument.apply(this, arguments);
 }
 
-function validateItem(_x4) {
+function validateItem(_x3) {
   return _validateItem.apply(this, arguments);
 }
 
@@ -141,7 +140,10 @@ function _validateItem() {
     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' && (!!value || (value === null || value === undefined) && selfIsRequired);
+    (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) => {

package/lib/validators/blockValidator.js

@@ -44,8 +44,7 @@ var blockValidator = /*#__PURE__*/function () {
         path: (context.path || []).concat(['markDefs', {
           _key: markDef._key
         }]),
-        parent: value,
-        getDocumentExists: context.getDocumentExists
+        parent: value
       });
       annotationValidations.push(validations);
     });

package/lib/validators/dateValidator.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isRecord = isRecord;
 exports.default = void 0;
+exports.isRecord = isRecord;
 
 var _format = _interopRequireDefault(require("date-fns/format"));
 

package/lib/validators/objectValidator.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _types = require("@sanity/types");
-
 var _genericValidator = _interopRequireDefault(require("./genericValidator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -37,48 +35,17 @@ var objectValidators = _objectSpread(_objectSpread({}, _genericValidator.default
 
     return true;
   },
-  reference: function () {
-    var _reference = _asyncToGenerator(function* (_unused, value, message, context) {
-      if (!value) {
-        return true;
-      }
-
-      if (!(0, _types.isReference)(value)) {
-        return message || 'Must be a reference to a document';
-      }
-
-      var type = context.type,
-          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
-      }); // TODO: this error message copy may need improvement
-
-      if (!exists) {
-        return 'The referenced document is not yet published. Fix this error by opening the referenced document and publishing it';
-      }
-
+  reference: (_unused, value, message) => {
+    if (!value) {
       return true;
-    });
+    }
 
-    function reference(_x, _x2, _x3, _x4) {
-      return _reference.apply(this, arguments);
+    if (typeof value._ref !== 'string') {
+      return message || 'Must be a reference to a document';
     }
 
-    return reference;
-  }(),
+    return true;
+  },
   block: function () {
     var _block = _asyncToGenerator(function* (validateBlock, value, message, context) {
       var result = yield validateBlock(value, context);
@@ -90,7 +57,7 @@ var objectValidators = _objectSpread(_objectSpread({}, _genericValidator.default
       return result;
     });
 
-    function block(_x5, _x6, _x7, _x8) {
+    function block(_x, _x2, _x3, _x4) {
       return _block.apply(this, arguments);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/validation",
-  "version": "2.21.8-reference-updates.21+76b1a1bcf7",
+  "version": "2.21.10-shopify.4+dffdee67c",
   "description": "Validation and warning infrastructure for Sanity projects",
   "main": "./lib/index.js",
   "types": "./dist/dts",
@@ -32,8 +32,8 @@
     "directory": "packages/@sanity/validation"
   },
   "devDependencies": {
-    "@sanity/client": "2.21.8-reference-updates.21+76b1a1bcf7",
-    "@sanity/schema": "2.21.8-reference-updates.21+76b1a1bcf7"
+    "@sanity/client": "2.21.10-shopify.4+dffdee67c",
+    "@sanity/schema": "2.21.10-shopify.4+dffdee67c"
   },
   "peerDependencies": {
     "@sanity/client": "^2.0.0"
@@ -44,9 +44,9 @@
     }
   },
   "dependencies": {
-    "@sanity/types": "2.21.8-reference-updates.21+76b1a1bcf7",
+    "@sanity/types": "2.21.10-shopify.4+dffdee67c",
     "date-fns": "^2.16.1",
     "lodash": "^4.17.15"
   },
-  "gitHead": "76b1a1bcf77ac4684d042147b5d41de20a6a3ff7"
+  "gitHead": "dffdee67c802813521a57f917f2ec1df732f3d61"
 }

package/src/validateDocument.test.ts

@@ -165,7 +165,6 @@ describe('validateItem', () => {
         path: [],
         parent: undefined,
         type: schema.get('testObj'),
-        getDocumentExists: undefined,
       })
     ).resolves.toMatchObject([
       {
@@ -236,7 +235,6 @@ describe('validateItem', () => {
         path: undefined,
         type: schema.get('testObj'),
         value: {foo: 5},
-        getDocumentExists: undefined,
       })
     ).resolves.toMatchObject([
       {
@@ -287,7 +285,6 @@ describe('validateItem', () => {
         path: [],
         type: schema.get('values'),
         value: values,
-        getDocumentExists: undefined,
       })
     ).resolves.toEqual([
       {
@@ -380,7 +377,6 @@ describe('validateItem', () => {
         document,
         parent: document,
         path: undefined,
-        getDocumentExists: undefined,
       })
     ).resolves.toMatchObject([
       {
@@ -521,7 +517,6 @@ describe('validateItem', () => {
       parent: undefined,
       path: undefined,
       type: schema.get('root'),
-      getDocumentExists: undefined,
     })
 
     // after `validateItem(...)` has been initiated, all of the custom

package/src/validateDocument.ts

@@ -45,8 +45,7 @@ export function resolveTypeForArrayItem(
 
 export default async function validateDocument(
   doc: SanityDocument,
-  schema: Schema,
-  context?: Pick<ValidationContext, 'getDocumentExists'>
+  schema: Schema
 ): Promise<ValidationMarker[]> {
   const documentType = schema.get(doc._type)
   if (!documentType) {
@@ -61,7 +60,6 @@ export default async function validateDocument(
       path: [],
       document: doc,
       type: documentType,
-      getDocumentExists: context?.getDocumentExists,
     })
   } catch (err) {
     console.error(err)

package/src/validators/blockValidator.ts

@@ -38,7 +38,6 @@ export const blockValidator: BlockValidator = async (value, context) => {
       type: annotationType,
       path: (context.path || []).concat(['markDefs', {_key: markDef._key}]),
       parent: value,
-      getDocumentExists: context.getDocumentExists,
     })
     annotationValidations.push(validations)
   })

package/src/validators/objectValidator.ts

@@ -1,4 +1,4 @@
-import {Validators, isReference} from '@sanity/types'
+import {Validators} from '@sanity/types'
 import genericValidator from './genericValidator'
 
 const metaKeys = ['_key', '_type', '_weak']
@@ -20,35 +20,15 @@ const objectValidators: Validators = {
     return true
   },
 
-  reference: async (_unused, value: unknown, message, context) => {
+  reference: (_unused, value, message) => {
     if (!value) {
       return true
     }
 
-    if (!isReference(value)) {
+    if (typeof value._ref !== 'string') {
       return message || 'Must be a reference to a document'
     }
 
-    const {type, getDocumentExists} = context
-
-    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`)
-    }
-
-    const exists = await getDocumentExists({id: value._ref})
-    // TODO: this error message copy may need improvement
-    if (!exists) {
-      return 'The referenced document is not yet published. Fix this error by opening the referenced document and publishing it'
-    }
-
     return true
   },