Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {type SchemaValidationProblem} from '@sanity/types'

import {groupProblems} from './groupProblems'
import {validateSchema} from './validateSchema'
import {validateNoCallbacks} from './validation/utils/validateNoCallbacks'

function unsupportedTypeValidator(typeLabel: string) {
return function () {
Expand All @@ -16,6 +17,13 @@ function unsupportedTypeValidator(typeLabel: string) {
}
}

function noCallbacksVisitor(typeDef: any, visitorContext: any) {
return {
...typeDef,
_problems: validateNoCallbacks(typeDef),
}
}

/**
* Ensure that the provided value is a valid Media Library asset aspect that can be safely deployed.
*
Expand All @@ -27,6 +35,7 @@ export function validateMediaLibraryAssetAspect(
const input = [maybeAspect]

const validated = validateSchema(input, {
transformCommonVisitors: (visitors) => [...visitors, noCallbacksVisitor],
transformTypeVisitors: (typeVisitors) => ({
...typeVisitors,
document: unsupportedTypeValidator('document'),
Expand Down
13 changes: 10 additions & 3 deletions packages/@sanity/schema/src/sanity/validateSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,18 @@ function combine(...visitors: any) {

interface Options {
transformTypeVisitors?: (visitors: typeof typeVisitors) => Partial<typeof typeVisitors>
transformCommonVisitors?: (visitors: any[]) => any[]
}

/**
* @internal
*/
export function validateSchema(
schemaTypes: _FIXME_,
{transformTypeVisitors = (visitors) => visitors}: Options = {},
{
transformTypeVisitors = (visitors) => visitors,
transformCommonVisitors = (visitors) => visitors,
}: Options = {},
) {
return traverseSanitySchema(schemaTypes, (schemaDef, visitorContext) => {
const typeVisitor =
Expand All @@ -65,10 +69,13 @@ export function validateSchema(
(transformTypeVisitors(typeVisitors) as any)[schemaDef.type]) ||
getNoopVisitor(visitorContext)

// Transform common visitors for extensibility
const commonVisitors = transformCommonVisitors([common])

if (visitorContext.isRoot) {
return combine(rootType, common, typeVisitor)(schemaDef, visitorContext)
return combine(rootType, ...commonVisitors, typeVisitor)(schemaDef, visitorContext)
}

return combine(common, typeVisitor)(schemaDef, visitorContext)
return combine(...commonVisitors, typeVisitor)(schemaDef, visitorContext)
})
}
Loading
Loading