@sanity/validation 3.3.1 → 3.4.0

package/lib/dts/src/index.d.ts

@@ -1,12 +1,22 @@
 import {Observable} from 'rxjs'
 import {RuleClass} from '@sanity/types'
-import type {SanityClient} from '@sanity/client'
 import {SanityDocument} from '@sanity/types'
 import {Schema} from '@sanity/types'
 import {SchemaType} from '@sanity/types'
 import {ValidationContext} from '@sanity/types'
 import {ValidationMarker} from '@sanity/types'
 
+/**
+ * this is used make optional properties required by replacing optionals with
+ * `T[P] | undefined`. this is used to prevent errors in `validateItem` where
+ * an option from a previous invocation would be incorrectly passed down.
+ *
+ * https://medium.com/terria/typescript-transforming-optional-properties-to-required-properties-that-may-be-undefined-7482cb4e1585
+ */
+declare type ExplicitUndefined<T> = {
+  [P in keyof Required<T>]: Pick<T, P> extends Required<Pick<T, P>> ? T[P] : T[P] | undefined
+}
+
 export declare function inferFromSchema(schema: Schema): Schema
 
 export declare function inferFromSchemaType(
@@ -20,17 +30,21 @@ export declare function inferFromSchemaType(typeDef: SchemaType): SchemaType
 export declare const Rule: RuleClass
 
 export declare function validateDocument(
-  getClient: (options: {apiVersion: string}) => SanityClient,
+  getClient: ValidateItemOptions['getClient'],
   doc: SanityDocument,
   schema: Schema,
   context?: Pick<ValidationContext, 'getDocumentExists'>
 ): Promise<ValidationMarker[]>
 
 export declare function validateDocumentObservable(
-  getClient: (options: {apiVersion: string}) => SanityClient,
+  getClient: ValidateItemOptions['getClient'],
   doc: SanityDocument,
   schema: Schema,
   context?: Pick<ValidationContext, 'getDocumentExists'>
 ): Observable<ValidationMarker[]>
 
+declare type ValidateItemOptions = {
+  value: unknown
+} & ExplicitUndefined<ValidationContext>
+
 export {}

package/lib/index.cjs.mjs

@@ -5,3 +5,5 @@ export const inferFromSchema = cjs.inferFromSchema;
 export const inferFromSchemaType = cjs.inferFromSchemaType;
 export const validateDocument = cjs.validateDocument;
 export const validateDocumentObservable = cjs.validateDocumentObservable;
+
+export default cjs.default;

package/lib/index.esm.js

@@ -520,7 +520,7 @@ const getFormattedDate = function () {
 function parseDate(date) {
   let throwOnError = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (!date) return null;
-  if (date === "now") return new Date();
+  if (date === "now") return /* @__PURE__ */new Date();
   const parsed = new Date(date);
   const isInvalid = isNaN(parsed.getTime());
   if (isInvalid && throwOnError) {
@@ -1117,11 +1117,7 @@ function validateDocumentObservable(getClient, doc, schema, context) {
     console.warn('Schema type for object type "%s" not found, skipping validation', doc._type);
     return of(EMPTY_MARKERS);
   }
-  const client = getClient({
-    apiVersion: "2021-06-07"
-  });
   const validationOptions = {
-    client,
     getClient,
     schema,
     parent: void 0,
@@ -1131,16 +1127,6 @@ function validateDocumentObservable(getClient, doc, schema, context) {
     type: documentType,
     getDocumentExists: context == null ? void 0 : context.getDocumentExists
   };
-  const wrappedClient = client;
-  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;
-      }
-    });
-  }, {});
   return validateItemObservable(validationOptions).pipe(catchError(err => {
     console.error(err);
     return of([{
@@ -1171,7 +1157,12 @@ function validateItemObservable(_ref) {
   const selfIsRequired = rules.some(rule => rule.isRequired());
   const shouldRunNestedObjectValidation =
   // run nested validation for objects
-  (type == null ? void 0 : type.jsonType) === "object" && (!!value || (value === null || value === void 0) && selfIsRequired);
+  (type == null ? 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 === void 0) && selfIsRequired);
   if (shouldRunNestedObjectValidation) {
     const fieldTypes = type.fields.reduce((acc, field) => {
       acc[field.name] = field.type;