fix(richtext-lexical): Blocks: generated output schema is not fully correct (#5259)

packages/payload/src/admin/RichText.ts

@@ -37,10 +37,14 @@ type RichTextAdapterBase<
     schemaPath: string
   }) => Map<string, Field[]>
   outputSchema?: ({
+    collectionIDFieldTypes,
+    config,
     field,
     interfaceNameDefinitions,
     isRequired,
   }: {
+    collectionIDFieldTypes: { [key: string]: 'number' | 'string' }
+    config?: SanitizedConfig
     field: RichTextField<Value, AdapterProps, ExtraFieldProperties>
     /**
      * Allows you to define new top-level interfaces that can be re-used in the output schema.

packages/payload/src/exports/utilities.ts

@@ -24,19 +24,20 @@ export { fieldSchemaToJSON } from '../utilities/fieldSchemaToJSON.js'
 export { default as flattenTopLevelFields } from '../utilities/flattenTopLevelFields.js'
 export { formatLabels, formatNames, toWords } from '../utilities/formatLabels.js'
 
-export { getIDType } from '../utilities/getIDType.js'
+export { getCollectionIDFieldTypes } from '../utilities/getCollectionIDFieldTypes.js'
 
+export { getIDType } from '../utilities/getIDType.js'
 export { getObjectDotNotation } from '../utilities/getObjectDotNotation.js'
 export { default as getUniqueListBy } from '../utilities/getUniqueListBy.js'
 export { isEntityHidden } from '../utilities/isEntityHidden.js'
 export { isNumber } from '../utilities/isNumber.js'
+
 export { isValidID } from '../utilities/isValidID.js'
 
 export { default as isolateObjectProperty } from '../utilities/isolateObjectProperty.js'
 
 export { setsAreEqual } from '../utilities/setsAreEqual.js'
-
 export { default as toKebabCase } from '../utilities/toKebabCase.js'
-export { default as wait } from '../utilities/wait.js'
 
+export { default as wait } from '../utilities/wait.js'
 export { default as wordBoundariesRegex } from '../utilities/wordBoundariesRegex.js'

packages/payload/src/utilities/configToJSONSchema.ts

@@ -11,6 +11,7 @@ import type { SanitizedGlobalConfig } from '../globals/config/types.d.ts'
 import { fieldAffectsData, tabHasName } from '../fields/config/types.js'
 import { deepCopyObject } from './deepCopyObject.js'
 import { toWords } from './formatLabels.js'
+import { getCollectionIDFieldTypes } from './getCollectionIDFieldTypes.js'
 
 const fieldIsRequired = (field: Field) => {
   const isConditional = Boolean(field?.admin && field?.admin?.condition)
@@ -80,12 +81,18 @@ export function withNullableJSONSchemaType(
 }
 
 export function fieldsToJSONSchema(
+  /**
+   * Used for relationship fields, to determine whether to use a string or number type for the ID.
+   * While there is a default ID field type set by the db adapter, they can differ on a collection-level
+   * if they have custom ID fields.
+   */
   collectionIDFieldTypes: { [key: string]: 'number' | 'string' },
   fields: Field[],
   /**
    * Allows you to define new top-level interfaces that can be re-used in the output schema.
    */
   interfaceNameDefinitions: Map<string, JSONSchema4>,
+  config?: SanitizedConfig,
 ): {
   properties: {
     [k: string]: JSONSchema4
@@ -147,6 +154,8 @@ export function fieldsToJSONSchema(
           case 'richText': {
             if (field.editor.outputSchema) {
               fieldSchema = field.editor.outputSchema({
+                collectionIDFieldTypes,
+                config,
                 field,
                 interfaceNameDefinitions,
                 isRequired,
@@ -324,6 +333,7 @@ export function fieldsToJSONSchema(
                     collectionIDFieldTypes,
                     block.fields,
                     interfaceNameDefinitions,
+                    config,
                   )
 
                   const blockSchema: JSONSchema4 = {
@@ -363,6 +373,7 @@ export function fieldsToJSONSchema(
                   collectionIDFieldTypes,
                   field.fields,
                   interfaceNameDefinitions,
+                  config,
                 ),
               },
             }
@@ -383,6 +394,7 @@ export function fieldsToJSONSchema(
               collectionIDFieldTypes,
               field.fields,
               interfaceNameDefinitions,
+              config,
             )
             Object.entries(childSchema.properties).forEach(([propName, propSchema]) => {
               fieldSchemas.set(propName, propSchema)
@@ -399,6 +411,7 @@ export function fieldsToJSONSchema(
                 collectionIDFieldTypes,
                 tab.fields,
                 interfaceNameDefinitions,
+                config,
               )
               if (tabHasName(tab)) {
                 // could have interface
@@ -424,7 +437,12 @@ export function fieldsToJSONSchema(
             fieldSchema = {
               type: 'object',
               additionalProperties: false,
-              ...fieldsToJSONSchema(collectionIDFieldTypes, field.fields, interfaceNameDefinitions),
+              ...fieldsToJSONSchema(
+                collectionIDFieldTypes,
+                field.fields,
+                interfaceNameDefinitions,
+                config,
+              ),
             }
 
             if (field.interfaceName) {
@@ -496,29 +514,14 @@ export function entityToJSONSchema(
     })
   }
 
-  // used for relationship fields, to determine whether to use a string or number type for the ID
+  //  Used for relationship fields, to determine whether to use a string or number type for the ID.
-  const collectionIDFieldTypes: { [key: string]: 'number' | 'string' } = config.collections.reduce(
+  const collectionIDFieldTypes = getCollectionIDFieldTypes({ config, defaultIDType })
-    (acc, collection) => {
-      const customCollectionIdField = collection.fields.find(
-        (field) => 'name' in field && field.name === 'id',
-      )
-
-      acc[collection.slug] = defaultIDType === 'text' ? 'string' : 'number'
-
-      if (customCollectionIdField) {
-        acc[collection.slug] = customCollectionIdField.type === 'number' ? 'number' : 'string'
-      }
-
-      return acc
-    },
-    {},
-  )
 
   return {
     type: 'object',
     additionalProperties: false,
     title,
-    ...fieldsToJSONSchema(collectionIDFieldTypes, entity.fields, interfaceNameDefinitions),
+    ...fieldsToJSONSchema(collectionIDFieldTypes, entity.fields, interfaceNameDefinitions, config),
   }
 }
 

packages/payload/src/utilities/getCollectionIDFieldTypes.ts

@@ -0,0 +1,28 @@
+import type { SanitizedConfig } from '../config/types.js'
+
+/**
+ *  While the default ID is determined by the db adapter, it can still differ for a collection if they
+ *  define a custom ID field. This builds a map of collection slugs to their ID field type.
+ * @param defaultIDType as defined by the database adapter
+ */
+export function getCollectionIDFieldTypes({
+  config,
+  defaultIDType,
+}: {
+  config: SanitizedConfig
+  defaultIDType: 'number' | 'text'
+}): { [key: string]: 'number' | 'string' } {
+  return config.collections.reduce((acc, collection) => {
+    const customCollectionIdField = collection.fields.find(
+      (field) => 'name' in field && field.name === 'id',
+    )
+
+    acc[collection.slug] = defaultIDType === 'text' ? 'string' : 'number'
+
+    if (customCollectionIdField) {
+      acc[collection.slug] = customCollectionIdField.type === 'number' ? 'number' : 'string'
+    }
+
+    return acc
+  }, {})
+}

packages/richtext-lexical/src/field/features/blocks/feature.server.ts

@@ -6,6 +6,7 @@ import { fieldsToJSONSchema, formatLabels } from 'payload/utilities'
 import type { FeatureProviderProviderServer } from '../types.js'
 import type { BlocksFeatureClientProps } from './feature.client.js'
 
+import { cloneDeep } from '../../lexical/utils/cloneDeep.js'
 import { BlocksFeatureClientComponent } from './feature.client.js'
 import { BlockNode } from './nodes/BlocksNode.js'
 import { blockPopulationPromiseHOC } from './populationPromise.js'
@@ -23,10 +24,12 @@ export const BlocksFeature: FeatureProviderProviderServer<
 
   if (props?.blocks?.length) {
     props.blocks = props.blocks.map((block) => {
+      const blockCopy = cloneDeep(block)
+
       return {
-        ...block,
+        ...blockCopy,
-        fields: block.fields.concat(baseBlockFields),
+        fields: blockCopy.fields.concat(baseBlockFields),
-        labels: !block.labels ? formatLabels(block.slug) : block.labels,
+        labels: !blockCopy.labels ? formatLabels(blockCopy.slug) : blockCopy.labels,
       }
     })
     //  unSanitizedBlock.fields are sanitized in the React component and not here.
@@ -74,15 +77,45 @@ export const BlocksFeature: FeatureProviderProviderServer<
           return schemaMap
         },
         generatedTypes: {
-          modifyOutputSchema: ({ currentSchema, field, interfaceNameDefinitions }) => {
+          modifyOutputSchema: ({
+            collectionIDFieldTypes,
+            config,
+            currentSchema,
+            field,
+            interfaceNameDefinitions,
+          }) => {
+            if (!props?.blocks?.length) {
+              return currentSchema
+            }
+
+            // sanitize blocks
+            const validRelationships = config.collections.map((c) => c.slug) || []
+
+            const sanitizedBlocks = props.blocks.map((block) => {
+              const blockCopy = cloneDeep(block)
+              return {
+                ...blockCopy,
+                fields: sanitizeFields({
+                  config,
+                  fields: blockCopy.fields,
+                  validRelationships,
+                }),
+              }
+            })
+
             const blocksField: BlockField = {
               name: field?.name + '_lexical_blocks',
               type: 'blocks',
-              blocks: props.blocks,
+              blocks: sanitizedBlocks,
             }
             // This is only done so that interfaceNameDefinitions sets those block's interfaceNames.
             // we don't actually use the JSON Schema itself in the generated types yet.
-            fieldsToJSONSchema({}, [blocksField], interfaceNameDefinitions)
+            fieldsToJSONSchema(
+              collectionIDFieldTypes,
+              [blocksField],
+              interfaceNameDefinitions,
+              config,
+            )
 
             return currentSchema
           },

packages/richtext-lexical/src/field/features/types.ts

@@ -193,11 +193,15 @@ export type ServerFeature<ServerProps, ClientFeatureProps> = {
   }
   generatedTypes?: {
     modifyOutputSchema: ({
+      collectionIDFieldTypes,
+      config,
       currentSchema,
       field,
       interfaceNameDefinitions,
       isRequired,
     }: {
+      collectionIDFieldTypes: { [key: string]: 'number' | 'string' }
+      config?: SanitizedConfig
       /**
        * Current schema which will be modified by this function.
        */
@@ -298,11 +302,15 @@ export type SanitizedServerFeatures = Required<
   generatedTypes: {
     modifyOutputSchemas: Array<
       ({
+        collectionIDFieldTypes,
+        config,
         currentSchema,
         field,
         interfaceNameDefinitions,
         isRequired,
       }: {
+        collectionIDFieldTypes: { [key: string]: 'number' | 'string' }
+        config?: SanitizedConfig
         /**
          * Current schema which will be modified by this function.
          */

packages/richtext-lexical/src/index.ts

@@ -123,7 +123,13 @@ export function lexicalEditor(props?: LexicalEditorProps): LexicalRichTextAdapte
     generateSchemaMap: getGenerateSchemaMap({
       resolvedFeatureMap,
     }),
-    outputSchema: ({ field, interfaceNameDefinitions, isRequired }) => {
+    outputSchema: ({
+      collectionIDFieldTypes,
+      config,
+      field,
+      interfaceNameDefinitions,
+      isRequired,
+    }) => {
       let outputSchema: JSONSchema4 = {
         // This schema matches the SerializedEditorState type so far, that it's possible to cast SerializedEditorState to this schema without any errors.
         // In the future, we should
@@ -183,6 +189,8 @@ export function lexicalEditor(props?: LexicalEditorProps): LexicalRichTextAdapte
       for (const modifyOutputSchema of finalSanitizedEditorConfig.features.generatedTypes
         .modifyOutputSchemas) {
         outputSchema = modifyOutputSchema({
+          collectionIDFieldTypes,
+          config,
           currentSchema: outputSchema,
           field,
           interfaceNameDefinitions,

test/fields/payload-types.ts

@@ -6,6 +6,17 @@
  * and re-run `payload generate:types` to regenerate this file.
  */
 
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "BlockColumns".
+ */
+export type BlockColumns =
+  | {
+      text?: string | null
+      id?: string | null
+    }[]
+  | null
+
 export interface Config {
   collections: {
     'lexical-fields': LexicalField
@@ -40,11 +51,16 @@ export interface Config {
     tabsWithRichText: TabsWithRichText
   }
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "lexical-fields".
+ */
 export interface LexicalField {
   id: string
   title: string
   lexicalSimple?: {
     root: {
+      type: string
       children: {
         type: string
         version: number
@@ -53,13 +69,13 @@ export interface LexicalField {
       direction: ('ltr' | 'rtl') | null
       format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
       indent: number
-      type: string
       version: number
     }
     [k: string]: unknown
   } | null
   lexicalWithBlocks: {
     root: {
+      type: string
       children: {
         type: string
         version: number
@@ -68,7 +84,6 @@ export interface LexicalField {
       direction: ('ltr' | 'rtl') | null
       format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
       indent: number
-      type: string
       version: number
     }
     [k: string]: unknown
@@ -76,11 +91,16 @@ export interface LexicalField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "lexical-migrate-fields".
+ */
 export interface LexicalMigrateField {
   id: string
   title: string
   lexicalWithLexicalPluginData?: {
     root: {
+      type: string
       children: {
         type: string
         version: number
@@ -89,13 +109,13 @@ export interface LexicalMigrateField {
       direction: ('ltr' | 'rtl') | null
       format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
       indent: number
-      type: string
       version: number
     }
     [k: string]: unknown
   } | null
   lexicalWithSlateData?: {
     root: {
+      type: string
       children: {
         type: string
         version: number
@@ -104,13 +124,13 @@ export interface LexicalMigrateField {
       direction: ('ltr' | 'rtl') | null
       format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
       indent: number
-      type: string
       version: number
     }
     [k: string]: unknown
   } | null
   lexicalSimple?: {
     root: {
+      type: string
       children: {
         type: string
         version: number
@@ -119,7 +139,6 @@ export interface LexicalMigrateField {
       direction: ('ltr' | 'rtl') | null
       format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
       indent: number
-      type: string
       version: number
     }
     [k: string]: unknown
@@ -128,6 +147,7 @@ export interface LexicalMigrateField {
   groupWithLexicalField?: {
     lexicalInGroupField?: {
       root: {
+        type: string
         children: {
           type: string
           version: number
@@ -136,7 +156,6 @@ export interface LexicalMigrateField {
         direction: ('ltr' | 'rtl') | null
         format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
         indent: number
-        type: string
         version: number
       }
       [k: string]: unknown
@@ -147,6 +166,7 @@ export interface LexicalMigrateField {
     | {
         lexicalInArrayField?: {
           root: {
+            type: string
             children: {
               type: string
               version: number
@@ -155,7 +175,6 @@ export interface LexicalMigrateField {
             direction: ('ltr' | 'rtl') | null
             format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
             indent: number
-            type: string
             version: number
           }
           [k: string]: unknown
@@ -167,6 +186,10 @@ export interface LexicalMigrateField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
   id: string
   canViewConditionalField?: boolean | null
@@ -181,11 +204,16 @@ export interface User {
   lockUntil?: string | null
   password: string | null
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "array-fields".
+ */
 export interface ArrayField {
   id: string
   title?: string | null
   items: {
     text: string
+    localizedText?: string | null
     subArray?:
       | {
           text?: string | null
@@ -240,6 +268,10 @@ export interface ArrayField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "block-fields".
+ */
 export interface BlockField {
   id: string
   blocks: (
@@ -289,6 +321,53 @@ export interface BlockField {
         blockType: 'tabs'
       }
   )[]
+  duplicate: (
+    | {
+        text: string
+        richText?:
+          | {
+              [k: string]: unknown
+            }[]
+          | null
+        id?: string | null
+        blockName?: string | null
+        blockType: 'content'
+      }
+    | {
+        number: number
+        id?: string | null
+        blockName?: string | null
+        blockType: 'number'
+      }
+    | {
+        subBlocks?:
+          | (
+              | {
+                  text: string
+                  id?: string | null
+                  blockName?: string | null
+                  blockType: 'text'
+                }
+              | {
+                  number: number
+                  id?: string | null
+                  blockName?: string | null
+                  blockType: 'number'
+                }
+            )[]
+          | null
+        id?: string | null
+        blockName?: string | null
+        blockType: 'subBlocks'
+      }
+    | {
+        textInCollapsible?: string | null
+        textInRow?: string | null
+        id?: string | null
+        blockName?: string | null
+        blockType: 'tabs'
+      }
+  )[]
   collapsedByDefaultBlocks: (
     | {
         text: string
@@ -415,6 +494,37 @@ export interface BlockField {
             blockName?: string | null
             blockType: 'block-b'
           }
+        | {
+            group?: {
+              text?: string | null
+            }
+            id?: string | null
+            blockName?: string | null
+            blockType: 'group-block'
+          }
+      )[]
+    | null
+  blocksWithSimilarGroup?:
+    | (
+        | {
+            group?: {
+              text?: string | null
+            }
+            id?: string | null
+            blockName?: string | null
+            blockType: 'group-block'
+          }
+        | {
+            items?:
+              | {
+                  title2: string
+                  id?: string | null
+                }[]
+              | null
+            id?: string | null
+            blockName?: string | null
+            blockType: 'block-b'
+          }
       )[]
     | null
   blocksWithMinRows?:
@@ -452,6 +562,10 @@ export interface BlockField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "text-fields".
+ */
 export interface TextField {
   id: string
   text: string
@@ -473,12 +587,20 @@ export interface TextField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "checkbox-fields".
+ */
 export interface CheckboxField {
   id: string
   checkbox: boolean
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "code-fields".
+ */
 export interface CodeField {
   id: string
   javascript?: string | null
@@ -489,6 +611,10 @@ export interface CodeField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "collapsible-fields".
+ */
 export interface CollapsibleField {
   id: string
   text: string
@@ -517,6 +643,10 @@ export interface CollapsibleField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "conditional-logic".
+ */
 export interface ConditionalLogic {
   id: string
   text: string
@@ -538,6 +668,10 @@ export interface ConditionalLogic {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "date-fields".
+ */
 export interface DateField {
   id: string
   default: string
@@ -549,12 +683,20 @@ export interface DateField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "radio-fields".
+ */
 export interface RadioField {
   id: string
   radio?: ('one' | 'two' | 'three') | null
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "group-fields".
+ */
 export interface GroupField {
   id: string
   group: {
@@ -571,6 +713,14 @@ export interface GroupField {
         | null
     }
   }
+  arrayOfGroups?:
+    | {
+        groupItem?: {
+          text?: string | null
+        }
+        id?: string | null
+      }[]
+    | null
   potentiallyEmptyGroup?: {
     text?: string | null
   }
@@ -601,6 +751,10 @@ export interface GroupField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "row-fields".
+ */
 export interface RowField {
   id: string
   title: string
@@ -611,10 +765,15 @@ export interface RowField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "indexed-fields".
+ */
 export interface IndexedField {
   id: string
   text: string
   uniqueText?: string | null
+  uniqueRequiredText: string
   /**
    * @minItems 2
    * @maxItems 2
@@ -634,6 +793,10 @@ export interface IndexedField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "json-fields".
+ */
 export interface JsonField {
   id: string
   json?:
@@ -648,6 +811,10 @@ export interface JsonField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "number-fields".
+ */
 export interface NumberField {
   id: string
   number?: number | null
@@ -665,6 +832,10 @@ export interface NumberField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "point-fields".
+ */
 export interface PointField {
   id: string
   /**
@@ -687,6 +858,10 @@ export interface PointField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relationship-fields".
+ */
 export interface RelationshipField {
   id: string
   text?: string | null
@@ -736,11 +911,16 @@ export interface RelationshipField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "rich-text-fields".
+ */
 export interface RichTextField {
   id: string
   title: string
   lexicalCustomFields: {
     root: {
+      type: string
       children: {
         type: string
         version: number
@@ -749,7 +929,6 @@ export interface RichTextField {
       direction: ('ltr' | 'rtl') | null
       format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
       indent: number
-      type: string
       version: number
     }
     [k: string]: unknown
@@ -757,6 +936,7 @@ export interface RichTextField {
   lexicalCustomFields_html?: string | null
   lexical?: {
     root: {
+      type: string
       children: {
         type: string
         version: number
@@ -765,7 +945,6 @@ export interface RichTextField {
       direction: ('ltr' | 'rtl') | null
       format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
       indent: number
-      type: string
       version: number
     }
     [k: string]: unknown
@@ -807,6 +986,10 @@ export interface RichTextField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "select-fields".
+ */
 export interface SelectField {
   id: string
   select?: ('one' | 'two' | 'three') | null
@@ -821,6 +1004,10 @@ export interface SelectField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "tabs-fields".
+ */
 export interface TabsField {
   id: string
   sidebarField?: string | null
@@ -920,6 +1107,10 @@ export interface TabsField {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "uploads".
+ */
 export interface Upload {
   id: string
   text?: string | null
@@ -938,6 +1129,10 @@ export interface Upload {
   width?: number | null
   height?: number | null
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "uploads2".
+ */
 export interface Uploads2 {
   id: string
   text?: string | null
@@ -951,6 +1146,10 @@ export interface Uploads2 {
   width?: number | null
   height?: number | null
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "uploads3".
+ */
 export interface Uploads3 {
   id: string
   media?: string | Uploads3 | null
@@ -968,6 +1167,10 @@ export interface Uploads3 {
   width?: number | null
   height?: number | null
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
   id: string
   user: {
@@ -987,6 +1190,10 @@ export interface PayloadPreference {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
   id: string
   name?: string | null
@@ -994,11 +1201,16 @@ export interface PayloadMigration {
   updatedAt: string
   createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "tabsWithRichText".
+ */
 export interface TabsWithRichText {
   id: string
   tab1: {
     rt1?: {
       root: {
+        type: string
         children: {
           type: string
           version: number
@@ -1007,7 +1219,6 @@ export interface TabsWithRichText {
         direction: ('ltr' | 'rtl') | null
         format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
         indent: number
-        type: string
         version: number
       }
       [k: string]: unknown
@@ -1016,6 +1227,7 @@ export interface TabsWithRichText {
   tab2: {
     rt2?: {
       root: {
+        type: string
         children: {
           type: string
           version: number
@@ -1024,7 +1236,6 @@ export interface TabsWithRichText {
         direction: ('ltr' | 'rtl') | null
         format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | ''
         indent: number
-        type: string
         version: number
       }
       [k: string]: unknown
@@ -1033,6 +1244,16 @@ export interface TabsWithRichText {
   updatedAt?: string | null
   createdAt?: string | null
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "LexicalBlocksRadioButtonsBlock".
+ */
+export interface LexicalBlocksRadioButtonsBlock {
+  radioButtons?: ('option1' | 'option2' | 'option3') | null
+  id?: string | null
+  blockName?: string | null
+  blockType: 'radioButtons'
+}
 
 declare module 'payload' {
   export interface GeneratedTypes extends Config {}