@sanity/validation 3.3.0 → 3.4.0

package/src/validateDocument.test.ts

@@ -1,11 +1,11 @@
-import type {SanityClient} from '@sanity/client'
 import {
+  ArraySchemaType,
+  PortableTextTextBlock,
   Rule,
-  SchemaType,
   SanityDocument,
   Schema,
-  ArraySchemaType,
-  PortableTextTextBlock,
+  SchemaType,
+  ValidationContext,
 } from '@sanity/types'
 import {createSchema} from '../test/createSchema'
 import {createMockSanityClient} from '../test/mocks/mockSanityClient'
@@ -25,7 +25,7 @@ beforeEach(() => {
 })
 
 // mock client
-const client = createMockSanityClient() as any as SanityClient
+const client = createMockSanityClient() as any as ReturnType<ValidationContext['getClient']>
 const getClient = (options: {apiVersion: string}) => client
 
 describe('resolveTypeForArrayItem', () => {
@@ -176,7 +176,6 @@ describe('validateItem', () => {
 
     await expect(
       validateItem({
-        client,
         getClient,
         schema,
         value: {},
@@ -247,7 +246,6 @@ describe('validateItem', () => {
 
     await expect(
       validateItem({
-        client,
         getClient,
         schema,
         document: undefined,
@@ -415,7 +413,6 @@ describe('validateItem', () => {
     }
 
     const result = await validateItem({
-      client,
       getClient,
       schema,
       document: document,
@@ -519,7 +516,6 @@ describe('validateItem', () => {
 
     await expect(
       validateItem({
-        client,
         getClient,
         schema,
         document: undefined,
@@ -619,7 +615,6 @@ describe('validateItem', () => {
 
     await expect(
       validateItem({
-        client,
         getClient,
         schema,
         value,

package/src/validateDocument.ts

@@ -10,10 +10,9 @@ import {
   isSpanSchemaType,
   isPortableTextTextBlock,
 } from '@sanity/types'
-import {concat, defer, firstValueFrom, lastValueFrom, merge, Observable, of} from 'rxjs'
+import {concat, defer, lastValueFrom, merge, Observable, of} from 'rxjs'
 import {catchError, map, mergeAll, mergeMap, toArray} from 'rxjs/operators'
 import {flatten, uniqBy} from 'lodash'
-import type {SanityClient} from '@sanity/client'
 import typeString from './util/typeString'
 import {cancelIdleCallback, requestIdleCallback} from './util/requestIdleCallback'
 import ValidationErrorClass from './ValidationError'
@@ -52,7 +51,7 @@ export function resolveTypeForArrayItem(
 const EMPTY_MARKERS: ValidationMarker[] = []
 
 export default async function validateDocument(
-  getClient: (options: {apiVersion: string}) => SanityClient,
+  getClient: ValidateItemOptions['getClient'],
   doc: SanityDocument,
   schema: Schema,
   context?: Pick<ValidationContext, 'getDocumentExists'>
@@ -61,7 +60,7 @@ export default async function validateDocument(
 }
 
 export function validateDocumentObservable(
-  getClient: (options: {apiVersion: string}) => SanityClient,
+  getClient: ValidateItemOptions['getClient'],
   doc: SanityDocument,
   schema: Schema,
   context?: Pick<ValidationContext, 'getDocumentExists'>
@@ -72,9 +71,7 @@ export function validateDocumentObservable(
     return of(EMPTY_MARKERS)
   }
 
-  const client = getClient({apiVersion: '2021-06-07'})
   const validationOptions: ValidateItemOptions = {
-    client,
     getClient,
     schema,
     parent: undefined,
@@ -85,29 +82,6 @@ export function validateDocumentObservable(
     getDocumentExists: context?.getDocumentExists,
   }
 
-  // <TEMPORARY UGLY HACK TO PRINT DEPRECATION WARNINGS ON USE>
-  /* eslint-disable no-proto */
-  const wrappedClient = client as any
-  validationOptions.client = [
-    ...Object.keys(client),
-    ...Object.keys(wrappedClient.__proto__),
-  ].reduce((acc, key) => {
-    const original = Object.hasOwnProperty.call(client, key)
-      ? wrappedClient[key]
-      : wrappedClient.__proto__[key]
-
-    return Object.defineProperty(acc, key, {
-      get() {
-        console.warn(
-          '`configContext.client` is deprecated and will be removed in the next release! Use `context.getClient({apiVersion: "2021-06-07"})` instead'
-        )
-        return original
-      },
-    })
-  }, {}) as any as SanityClient
-  /* eslint-enable no-proto */
-  // </TEMPORARY UGLY HACK TO PRINT DEPRECATION WARNINGS ON USE>
-
   return validateItemObservable(validationOptions).pipe(
     catchError((err) => {
       console.error(err)