@sanity/validation 2.33.3-performance-opts.9 → 2.33.3-performance-opts.14

package/dist/dts/index.d.ts

@@ -10,4 +10,5 @@ declare const _default: {
 };
 export default _default;
 export { RuleClass as Rule, validateDocument, inferFromSchema, inferFromSchemaType };
+export { validateDocumentObservable } from './validateDocument';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,QAAQ,CAAA;AAC9B,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,eAAe,MAAM,mBAAmB,CAAA;AAC/C,OAAO,mBAAmB,MAAM,uBAAuB,CAAA;;;;;;;AAEvD,wBAAwF;AACxF,OAAO,EAAC,SAAS,IAAI,IAAI,EAAE,gBAAgB,EAAE,eAAe,EAAE,mBAAmB,EAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,QAAQ,CAAA;AAC9B,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,eAAe,MAAM,mBAAmB,CAAA;AAC/C,OAAO,mBAAmB,MAAM,uBAAuB,CAAA;;;;;;;AAEvD,wBAAwF;AACxF,OAAO,EAAC,SAAS,IAAI,IAAI,EAAE,gBAAgB,EAAE,eAAe,EAAE,mBAAmB,EAAC,CAAA;AAElF,OAAO,EAAC,0BAA0B,EAAC,MAAM,oBAAoB,CAAA"}

package/dist/dts/util/requestIdleCallback.d.ts

@@ -0,0 +1,9 @@
+export declare const requestIdleCallback: {
+    (callback: IdleRequestCallback, options?: IdleRequestOptions | undefined): number;
+    (callback: (deadline: IdleDeadline) => void, options?: IdleRequestOptions | undefined): number;
+} & typeof globalThis.requestIdleCallback;
+export declare const cancelIdleCallback: {
+    (handle: number): void;
+    (handle: number): void;
+} & typeof globalThis.cancelIdleCallback;
+//# sourceMappingURL=requestIdleCallback.d.ts.map

package/dist/dts/util/requestIdleCallback.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestIdleCallback.d.ts","sourceRoot":"","sources":["../../../src/util/requestIdleCallback.ts"],"names":[],"mappings":"AA2BA,eAAO,MAAM,mBAAmB;;;yCAAwD,CAAA;AACxF,eAAO,MAAM,kBAAkB;;;wCAAsD,CAAA"}

package/dist/dts/validateDocument.d.ts

@@ -4,7 +4,8 @@ import { Observable } from 'rxjs';
  * @internal
  */
 export declare function resolveTypeForArrayItem(item: unknown, candidates: SchemaType[]): SchemaType | undefined;
-export default function validateDocument(doc: SanityDocument, schema: Schema, context?: Pick<ValidationContext, 'getDocumentExists'>): Observable<ValidationMarker[]>;
+export default function validateDocument(doc: SanityDocument, schema: Schema, context?: Pick<ValidationContext, 'getDocumentExists'>): Promise<ValidationMarker[]>;
+export declare function validateDocumentObservable(doc: SanityDocument, schema: Schema, context?: Pick<ValidationContext, 'getDocumentExists'>): Observable<ValidationMarker[]>;
 /**
  * this is used make optional properties required by replacing optionals with
  * `T[P] | undefined`. this is used to prevent errors in `validateItem` where
@@ -18,6 +19,6 @@ declare type ExplicitUndefined<T> = {
 declare type ValidateItemOptions = {
     value: unknown;
 } & ExplicitUndefined<ValidationContext>;
-export declare function validateItem({ value, type, path, parent, ...restOfContext }: ValidateItemOptions): Observable<ValidationMarker[]>;
+export declare function validateItem(opts: ValidateItemOptions): Promise<ValidationMarker[]>;
 export {};
 //# sourceMappingURL=validateDocument.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"validateDocument.d.ts","sourceRoot":"","sources":["../../src/validateDocument.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,cAAc,EACd,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAuB,UAAU,EAAK,MAAM,MAAM,CAAA;AAuBzD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,EAAE,GACvB,UAAU,GAAG,SAAS,CAiBxB;AAGD,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,GACrD,UAAU,CAAC,gBAAgB,EAAE,CAAC,CA2BhC;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,wBAAgB,YAAY,CAAC,EAC3B,KAAK,EACL,IAAI,EACJ,IAAS,EACT,MAAM,EACN,GAAG,aAAa,EACjB,EAAE,mBAAmB,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAsItD"}
+{"version":3,"file":"validateDocument.d.ts","sourceRoot":"","sources":["../../src/validateDocument.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,cAAc,EACd,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAuB,UAAU,EAAK,MAAM,MAAM,CAAA;AAczD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,EAAE,GACvB,UAAU,GAAG,SAAS,CAiBxB;AAGD,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,GACrD,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAE7B;AAED,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,GACrD,UAAU,CAAC,gBAAgB,EAAE,CAAC,CA2BhC;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,wBAAgB,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAEnF"}

package/lib/index.js

@@ -28,15 +28,25 @@ Object.defineProperty(exports, "validateDocument", {
     return _validateDocument.default;
   }
 });
+Object.defineProperty(exports, "validateDocumentObservable", {
+  enumerable: true,
+  get: function get() {
+    return _validateDocument.validateDocumentObservable;
+  }
+});
 
 var _Rule = _interopRequireDefault(require("./Rule"));
 
-var _validateDocument = _interopRequireDefault(require("./validateDocument"));
+var _validateDocument = _interopRequireWildcard(require("./validateDocument"));
 
 var _inferFromSchema = _interopRequireDefault(require("./inferFromSchema"));
 
 var _inferFromSchemaType = _interopRequireDefault(require("./inferFromSchemaType"));
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _default = {

package/lib/util/requestIdleCallback.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.requestIdleCallback = exports.cancelIdleCallback = void 0;
+
+/**
+ * Simple requestIdleCallback polyfill
+ * Can be removed when all browsers support requestIdleCallback: https://caniuse.com/requestidlecallback
+ * @param callback
+ * @param options
+ */
+var requestIdleCallbackShim = function requestIdleCallbackShim(callback, options) {
+  var start = Date.now();
+  return window.setTimeout(() => {
+    callback({
+      didTimeout: false,
+
+      timeRemaining() {
+        return Math.max(0, Date.now() - start);
+      }
+
+    });
+  }, 0);
+};
+
+var cancelIdleCallbackShim = function cancelIdleCallbackShim(handle) {
+  return window.clearTimeout(handle);
+};
+
+var requestIdleCallback = window.requestIdleCallback || requestIdleCallbackShim;
+exports.requestIdleCallback = requestIdleCallback;
+var cancelIdleCallback = window.cancelIdleCallback || cancelIdleCallbackShim;
+exports.cancelIdleCallback = cancelIdleCallback;

package/lib/validateDocument.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = validateDocument;
 exports.resolveTypeForArrayItem = resolveTypeForArrayItem;
+exports.validateDocumentObservable = validateDocumentObservable;
 exports.validateItem = validateItem;
 
 var _uniqBy2 = _interopRequireDefault(require("lodash/uniqBy"));
@@ -19,6 +20,8 @@ var _operators = require("rxjs/operators");
 
 var _typeString = _interopRequireDefault(require("./util/typeString"));
 
+var _requestIdleCallback = require("./util/requestIdleCallback");
+
 var _ValidationError = _interopRequireDefault(require("./ValidationError"));
 
 var _normalizeValidationRules = _interopRequireDefault(require("./util/normalizeValidationRules"));
@@ -79,6 +82,10 @@ function resolveTypeForArrayItem(item, candidates) {
 var EMPTY_MARKERS = [];
 
 function validateDocument(doc, schema, context) {
+  return validateDocumentObservable(doc, schema, context).toPromise();
+}
+
+function validateDocumentObservable(doc, schema, context) {
   var documentType = schema.get(doc._type);
 
   if (!documentType) {
@@ -86,7 +93,7 @@ function validateDocument(doc, schema, context) {
     return (0, _rxjs.of)(EMPTY_MARKERS);
   }
 
-  return validateItem({
+  return validateItemObservable({
     parent: undefined,
     value: doc,
     path: [],
@@ -112,7 +119,11 @@ function validateDocument(doc, schema, context) {
  */
 
 
-function validateItem(_ref) {
+function validateItem(opts) {
+  return validateItemObservable(opts).toPromise();
+}
+
+function validateItemObservable(_ref) {
   var value = _ref.value,
       type = _ref.type,
       _ref$path = _ref.path,
@@ -160,7 +171,7 @@ function validateItem(_ref) {
       });
     })); // Validation from each field's schema `validation: Rule => {/* ... */}` function
 
-    fieldChecks = fieldChecks.concat(type.fields.map(field => validateItem(_objectSpread(_objectSpread({}, restOfContext), {}, {
+    fieldChecks = fieldChecks.concat(type.fields.map(field => validateItemObservable(_objectSpread(_objectSpread({}, restOfContext), {}, {
       parent: value,
       value: isRecord(value) ? value[field.name] : undefined,
       path: path.concat(field.name),
@@ -175,7 +186,7 @@ function validateItem(_ref) {
   var shouldRunNestedValidationForArrays = (type === null || type === void 0 ? void 0 : type.jsonType) === 'array' && Array.isArray(value);
 
   if (shouldRunNestedValidationForArrays) {
-    fieldChecks = fieldChecks.concat(value.map(item => validateItem(_objectSpread(_objectSpread({}, restOfContext), {}, {
+    fieldChecks = fieldChecks.concat(value.map(item => validateItemObservable(_objectSpread(_objectSpread({}, restOfContext), {}, {
       parent: value,
       value: item,
       path: path.concat((0, _types.isKeyedObject)(item) ? {
@@ -194,11 +205,11 @@ function validateItem(_ref) {
         spanChildrenField = _type$fields[0];
 
     var spanType = spanChildrenField.type.of.find(_types.isSpanSchemaType);
-    var annotations = ((spanType === null || spanType === void 0 ? void 0 : spanType.annotations) || []).reduce((map, annotationType) => {
-      map.set(annotationType.name, annotationType);
-      return map;
+    var annotations = ((spanType === null || spanType === void 0 ? void 0 : spanType.annotations) || []).reduce((acc, annotationType) => {
+      acc.set(annotationType.name, annotationType);
+      return acc;
     }, new Map());
-    fieldChecks = fieldChecks.concat(value.markDefs.map(markDef => validateItem(_objectSpread(_objectSpread({}, restOfContext), {}, {
+    fieldChecks = fieldChecks.concat(value.markDefs.map(markDef => validateItemObservable(_objectSpread(_objectSpread({}, restOfContext), {}, {
       parent: value,
       value: markDef,
       path: path.concat(['markDefs', {
@@ -208,7 +219,7 @@ function validateItem(_ref) {
     }))));
   }
 
-  return (0, _rxjs.defer)(() => (0, _rxjs.merge)([...selfChecks, ...fieldChecks])).pipe((0, _operators.mergeMap)(validateNode => (0, _rxjs.concat)(idle(), validateNode), 40), (0, _operators.mergeAll)(), (0, _operators.toArray)(), (0, _operators.filter)(arr => arr.length > 0), (0, _operators.map)(_flatten2.default), (0, _operators.map)(results => {
+  return (0, _rxjs.defer)(() => (0, _rxjs.merge)([...selfChecks, ...fieldChecks])).pipe((0, _operators.mergeMap)(validateNode => (0, _rxjs.concat)(idle(), validateNode), 40), (0, _operators.mergeAll)(), (0, _operators.toArray)(), (0, _operators.map)(_flatten2.default), (0, _operators.map)(results => {
     // run `uniqBy` if `_fieldRules` are present because they can
     // cause repeat markers
     if (rules.some(rule => rule._fieldRules)) {
@@ -216,16 +227,16 @@ function validateItem(_ref) {
     }
 
     return results;
-  }), (0, _operators.filter)(arr => arr.length > 0));
+  }));
 }
 
 function idle(timeout) {
   return new _rxjs.Observable(observer => {
-    var handle = requestIdleCallback(() => {
+    var handle = (0, _requestIdleCallback.requestIdleCallback)(() => {
       observer.complete();
     }, timeout ? {
       timeout
     } : undefined);
-    return () => cancelIdleCallback(handle);
+    return () => (0, _requestIdleCallback.cancelIdleCallback)(handle);
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/validation",
-  "version": "2.33.3-performance-opts.9+6ea72536ea",
+  "version": "2.33.3-performance-opts.14+691c5016e3",
   "description": "Validation and warning infrastructure for Sanity projects",
   "main": "./lib/index.js",
   "types": "./dist/dts",
@@ -33,13 +33,13 @@
   },
   "devDependencies": {
     "@sanity/client": "^3.3.3",
-    "@sanity/schema": "2.33.3-performance-opts.9+6ea72536ea"
+    "@sanity/schema": "2.33.3-performance-opts.14+691c5016e3"
   },
   "dependencies": {
-    "@sanity/types": "2.33.3-performance-opts.9+6ea72536ea",
+    "@sanity/types": "2.33.3-performance-opts.14+691c5016e3",
     "date-fns": "^2.16.1",
     "lodash": "^4.17.15",
     "rxjs": "^6.5.3"
   },
-  "gitHead": "6ea72536ea8c9aaebb1c57b304fc23f1e6705a67"
+  "gitHead": "691c5016e3cc91918d378614efb574125504ffc5"
 }

package/src/index.ts

@@ -5,3 +5,5 @@ import inferFromSchemaType from './inferFromSchemaType'
 
 export default {Rule: RuleClass, validateDocument, inferFromSchema, inferFromSchemaType}
 export {RuleClass as Rule, validateDocument, inferFromSchema, inferFromSchemaType}
+
+export {validateDocumentObservable} from './validateDocument'

package/src/util/requestIdleCallback.ts

@@ -0,0 +1,29 @@
+/**
+ * Simple requestIdleCallback polyfill
+ * Can be removed when all browsers support requestIdleCallback: https://caniuse.com/requestidlecallback
+ * @param callback
+ * @param options
+ */
+const requestIdleCallbackShim: typeof window.requestIdleCallback = function requestIdleCallbackShim(
+  callback,
+  options?
+): number {
+  const start = Date.now()
+  return window.setTimeout(() => {
+    callback({
+      didTimeout: false,
+      timeRemaining() {
+        return Math.max(0, Date.now() - start)
+      },
+    })
+  }, 0)
+}
+
+const cancelIdleCallbackShim: typeof window.cancelIdleCallback = function cancelIdleCallbackShim(
+  handle: number
+): void {
+  return window.clearTimeout(handle)
+}
+
+export const requestIdleCallback = window.requestIdleCallback || requestIdleCallbackShim
+export const cancelIdleCallback = window.cancelIdleCallback || cancelIdleCallbackShim

package/src/validateDocument.test.ts

@@ -687,81 +687,4 @@ describe('validateItem', () => {
       },
     ])
   })
-
-  it('runs all nested validation checks concurrently', async () => {
-    type Resolver = (value: true) => void
-    const resolvers = new Set<Resolver>()
-    const customValidationFn = () => new Promise<true>((resolve) => resolvers.add(resolve))
-
-    const schema: Schema = createSchema({
-      types: [
-        {
-          name: 'root',
-          type: 'object',
-          fields: [
-            {
-              name: 'level1Object',
-              type: 'object',
-              validation: (rule: Rule) => [
-                rule.custom(customValidationFn),
-                rule.fields({
-                  level2String: (r) => r.custom(customValidationFn),
-                }),
-              ],
-              fields: [
-                {
-                  name: 'level2String',
-                  type: 'string',
-                  validation: (rule: Rule) => rule.custom(customValidationFn),
-                },
-              ],
-            },
-            {
-              name: 'level1Array',
-              type: 'array',
-              validation: (rule: Rule) => rule.custom(customValidationFn),
-              of: [
-                {
-                  type: 'object',
-                  fields: [
-                    {
-                      name: 'level2Number',
-                      type: 'number',
-                      validation: (rule: Rule) => rule.custom(customValidationFn),
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-          validation: (rule: Rule) => rule.custom(customValidationFn),
-        },
-      ],
-    })
-
-    const value = {
-      level1Object: {level3String: 'a string'},
-      level1Array: [{level2Number: 5}],
-    }
-
-    const resultPromise = validateItem({
-      value,
-      document: undefined,
-      parent: undefined,
-      path: undefined,
-      type: schema.get('root'),
-      getDocumentExists: undefined,
-    })
-
-    // after `validateItem(...)` has been initiated, all of the custom
-    // validation calls should have fired so the resolver size should equal the
-    // amount of total fields
-    expect(resolvers.size).toBe(6)
-
-    for (const resolver of resolvers) {
-      resolver(true)
-    }
-
-    await resultPromise
-  })
 })

package/src/validateDocument.ts

@@ -11,19 +11,10 @@ import {
   ValidationMarker,
 } from '@sanity/types'
 import {concat, defer, merge, Observable, of} from 'rxjs'
-import {
-  catchError,
-  combineAll,
-  concatMap,
-  filter,
-  map,
-  mergeAll,
-  mergeMap,
-  tap,
-  toArray,
-} from 'rxjs/operators'
+import {catchError, map, mergeAll, mergeMap, toArray} from 'rxjs/operators'
 import {flatten, uniqBy} from 'lodash'
 import typeString from './util/typeString'
+import {requestIdleCallback, cancelIdleCallback} from './util/requestIdleCallback'
 import ValidationErrorClass from './ValidationError'
 import normalizeValidationRules from './util/normalizeValidationRules'
 
@@ -63,6 +54,14 @@ export default function validateDocument(
   doc: SanityDocument,
   schema: Schema,
   context?: Pick<ValidationContext, 'getDocumentExists'>
+): Promise<ValidationMarker[]> {
+  return validateDocumentObservable(doc, schema, context).toPromise()
+}
+
+export function validateDocumentObservable(
+  doc: SanityDocument,
+  schema: Schema,
+  context?: Pick<ValidationContext, 'getDocumentExists'>
 ): Observable<ValidationMarker[]> {
   const documentType = schema.get(doc._type)
   if (!documentType) {
@@ -70,7 +69,7 @@ export default function validateDocument(
     return of(EMPTY_MARKERS)
   }
 
-  return validateItem({
+  return validateItemObservable({
     parent: undefined,
     value: doc,
     path: [],
@@ -107,7 +106,11 @@ type ValidateItemOptions = {
   value: unknown
 } & ExplicitUndefined<ValidationContext>
 
-export function validateItem({
+export function validateItem(opts: ValidateItemOptions): Promise<ValidationMarker[]> {
+  return validateItemObservable(opts).toPromise()
+}
+
+function validateItemObservable({
   value,
   type,
   path = [],
@@ -170,7 +173,7 @@ export function validateItem({
     // Validation from each field's schema `validation: Rule => {/* ... */}` function
     fieldChecks = fieldChecks.concat(
       type.fields.map((field) =>
-        validateItem({
+        validateItemObservable({
           ...restOfContext,
           parent: value,
           value: isRecord(value) ? value[field.name] : undefined,
@@ -190,7 +193,7 @@ export function validateItem({
   if (shouldRunNestedValidationForArrays) {
     fieldChecks = fieldChecks.concat(
       value.map((item) =>
-        validateItem({
+        validateItemObservable({
           ...restOfContext,
           parent: value,
           value: item,
@@ -211,16 +214,16 @@ export function validateItem({
     const spanType = spanChildrenField.type.of.find(isSpanSchemaType)
 
     const annotations = (spanType?.annotations || []).reduce<Map<string, SchemaType>>(
-      (map, annotationType) => {
-        map.set(annotationType.name, annotationType)
-        return map
+      (acc, annotationType) => {
+        acc.set(annotationType.name, annotationType)
+        return acc
       },
       new Map()
     )
 
     fieldChecks = fieldChecks.concat(
       value.markDefs.map((markDef) =>
-        validateItem({
+        validateItemObservable({
           ...restOfContext,
           parent: value,
           value: markDef,
@@ -235,7 +238,6 @@ export function validateItem({
     mergeMap((validateNode) => concat(idle(), validateNode), 40),
     mergeAll(),
     toArray(),
-    filter((arr) => arr.length > 0),
     map(flatten),
     map((results) => {
       // run `uniqBy` if `_fieldRules` are present because they can
@@ -244,8 +246,7 @@ export function validateItem({
         return uniqBy(results, (rule) => JSON.stringify(rule))
       }
       return results
-    }),
-    filter((arr) => arr.length > 0)
+    })
   )
 }