@sanity/validation 3.0.0-dev-preview.15 → 3.0.0-dev-preview.16

package/src/validateDocument.ts

@@ -11,7 +11,7 @@ import {
   isSpanSchemaType,
 } from '@sanity/types'
 import {uniqBy} from 'lodash'
-import {SanityClient} from '@sanity/client'
+import type {SanityClient} from '@sanity/client'
 import typeString from './util/typeString'
 import ValidationErrorClass from './ValidationError'
 import normalizeValidationRules from './util/normalizeValidationRules'
@@ -48,7 +48,7 @@ export function resolveTypeForArrayItem(
 }
 
 export default async function validateDocument(
-  client: SanityClient,
+  getClient: (options: {apiVersion: string}) => SanityClient,
   doc: SanityDocument,
   schema: Schema,
   context?: Pick<ValidationContext, 'getDocumentExists'>
@@ -59,16 +59,44 @@ export default async function validateDocument(
     return []
   }
 
-  try {
-    return await validateItem({
-      client,
-      parent: undefined,
-      value: doc,
-      path: [],
-      document: doc,
-      type: documentType,
-      getDocumentExists: context?.getDocumentExists,
+  const client = getClient({apiVersion: '2021-06-07'})
+  const validationOptions: ValidateItemOptions = {
+    client,
+    getClient,
+    schema,
+    parent: undefined,
+    value: doc,
+    path: [],
+    document: doc,
+    type: documentType,
+    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>
+
+  try {
+    return await validateItem(validationOptions)
   } catch (err) {
     console.error(err)
     return [

package/src/validators/slugValidator.ts

@@ -23,7 +23,7 @@ function serializePath(path: Path): string {
 }
 
 const defaultIsUnique: SlugIsUniqueValidator = (slug, context) => {
-  const {client, document, path, type} = context
+  const {getClient, document, path, type} = context
   const schemaOptions = type?.options as {disableArrayWarning?: boolean} | undefined
 
   if (!document) {
@@ -48,7 +48,7 @@ const defaultIsUnique: SlugIsUniqueValidator = (slug, context) => {
     `${atPath} == $slug`,
   ].join(' && ')
 
-  return client.fetch<boolean>(
+  return getClient({apiVersion: '2022-09-09'}).fetch<boolean>(
     `!defined(*[${constraints}][0]._id)`,
     {
       docType,