@sanity/validation 3.0.7-canary.7 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/validation",
-  "version": "3.0.7-canary.7+5827f2126",
+  "version": "3.1.0",
   "description": "Validation and warning infrastructure for Sanity projects",
   "types": "./lib/dts/src/index.d.ts",
   "source": "./src/index.ts",
@@ -43,17 +43,17 @@
     "directory": "packages/@sanity/validation"
   },
   "dependencies": {
-    "@sanity/types": "3.0.7-canary.7+5827f2126",
+    "@sanity/types": "3.1.0",
     "date-fns": "^2.26.1",
     "lodash": "^4.17.21",
     "rxjs": "^6.5.3"
   },
   "devDependencies": {
     "@sanity/client": "^3.4.1",
-    "@sanity/schema": "3.0.7-canary.7+5827f2126"
+    "@sanity/schema": "3.1.0"
   },
   "peerDependencies": {
     "@sanity/client": "^3.4.1"
   },
-  "gitHead": "5827f2126326ad677d3733c3565f16e4ae80c1aa"
+  "gitHead": "2ac9ccf6c91d452c86e89b450e8a545b13cc69c8"
 }

package/src/Rule.ts

@@ -10,7 +10,6 @@ import {
   ValidationMarker,
   RuleTypeConstraint,
   Validator,
-  Block,
 } from '@sanity/types'
 import {cloneDeep, get} from 'lodash'
 import ValidationErrorClass from './ValidationError'
@@ -226,13 +225,6 @@ const Rule: RuleClass = class Rule implements IRule {
     return this.cloneWithRules([{flag: 'custom', constraint: fn as CustomValidator}])
   }
 
-  /**
-   * @deprecated use `Rule.custom` instead
-   */
-  block(fn: CustomValidator<Block>): Rule {
-    return this.cloneWithRules([{flag: 'custom', constraint: fn as CustomValidator}])
-  }
-
   min(len: number): Rule {
     return this.cloneWithRules([{flag: 'min', constraint: len}])
   }

package/src/validateDocument.test.ts

@@ -1,5 +1,12 @@
 import type {SanityClient} from '@sanity/client'
-import {Rule, SchemaType, SanityDocument, Schema, ArraySchemaType, Block} from '@sanity/types'
+import {
+  Rule,
+  SchemaType,
+  SanityDocument,
+  Schema,
+  ArraySchemaType,
+  PortableTextTextBlock,
+} from '@sanity/types'
 import {createSchema} from '../test/createSchema'
 import {createMockSanityClient} from '../test/mocks/mockSanityClient'
 import validateDocument, {resolveTypeForArrayItem, validateItem} from './validateDocument'
@@ -346,7 +353,7 @@ describe('validateItem', () => {
 
     expect(schema._validation).toHaveLength(0)
 
-    const nestedBlock: Block = {
+    const nestedBlock: PortableTextTextBlock = {
       _type: 'block',
       _key: 'nested-block-key',
       children: [
@@ -367,7 +374,7 @@ describe('validateItem', () => {
       style: 'normal',
     }
 
-    const block: Block = {
+    const block: PortableTextTextBlock = {
       _key: 'block-key',
       _type: 'block',
       children: [

package/src/validateDocument.ts

@@ -6,9 +6,9 @@ import {
   ValidationMarker,
   isKeyedObject,
   isTypedObject,
-  isBlock,
   isBlockSchemaType,
   isSpanSchemaType,
+  isPortableTextTextBlock,
 } from '@sanity/types'
 import {concat, defer, merge, Observable, of} from 'rxjs'
 import {catchError, map, mergeAll, mergeMap, toArray} from 'rxjs/operators'
@@ -239,7 +239,7 @@ function validateItemObservable({
   // markDefs also do no run nested validation if the parent object is undefined
   // for a similar reason to arrays
   const shouldRunNestedValidationForMarkDefs =
-    isBlock(value) && value.markDefs.length && isBlockSchemaType(type)
+    isPortableTextTextBlock(value) && value.markDefs?.length && isBlockSchemaType(type)
 
   if (shouldRunNestedValidationForMarkDefs) {
     const [spanChildrenField] = type.fields
@@ -254,7 +254,7 @@ function validateItemObservable({
     )
 
     nestedChecks = nestedChecks.concat(
-      value.markDefs.map((markDef) =>
+      (value.markDefs || []).map((markDef) =>
         validateItemObservable({
           ...restOfContext,
           parent: value,