payload 4.0.0-internal.fa345ef → 4.0.0-internal.ff27d6e

package/dist/utilities/cloneValidationRequest.js

@@ -0,0 +1,153 @@
+const sharedValidationRequestProperties = new Set([
+    'i18n',
+    'payload',
+    'server',
+    'signal',
+    't',
+    'transactionID'
+]);
+export function cloneValidationContext({ context }) {
+    return cloneValidationValue(context);
+}
+export function cloneValidationData({ data }) {
+    return cloneValidationValue(data);
+}
+export function cloneValidationRequest({ request }) {
+    if (!request) {
+        return {};
+    }
+    const payloadRequest = request;
+    const fetchRequest = typeof Request !== 'undefined' && request instanceof Request ? request : undefined;
+    const canCloneFetchRequest = fetchRequest && !fetchRequest.bodyUsed;
+    let clonedRequest;
+    if (canCloneFetchRequest) {
+        clonedRequest = fetchRequest.clone();
+    } else {
+        clonedRequest = {};
+    }
+    for (const [key, value] of Object.entries(payloadRequest)){
+        if (key === 'payloadDataLoader') {
+            continue;
+        }
+        if (key === 'file') {
+            clonedRequest.file = cloneValidationFile(payloadRequest.file);
+            continue;
+        }
+        if (key === 'files') {
+            clonedRequest.files = cloneValidationFiles(payloadRequest.files);
+            continue;
+        }
+        clonedRequest[key] = sharedValidationRequestProperties.has(key) ? value : cloneValidationValue(value);
+    }
+    Object.assign(clonedRequest, {
+        context: cloneValidationValue(payloadRequest.context ?? {}),
+        query: cloneValidationValue(payloadRequest.query ?? {}),
+        routeParams: cloneValidationValue(payloadRequest.routeParams ?? {})
+    });
+    if (!canCloneFetchRequest) {
+        Object.assign(clonedRequest, {
+            headers: cloneValidationValue(payloadRequest.headers),
+            method: payloadRequest.method,
+            signal: payloadRequest.signal,
+            url: payloadRequest.url
+        });
+    }
+    return clonedRequest;
+}
+export function cloneValidationUser({ user }) {
+    return cloneValidationValue(user);
+}
+function cloneValidationFile(file) {
+    if (!file) {
+        return file;
+    }
+    const { data, ...metadata } = file;
+    return {
+        ...cloneValidationValue(metadata),
+        data
+    };
+}
+function cloneValidationFiles(files) {
+    if (!files) {
+        return files;
+    }
+    return Object.fromEntries(Object.entries(files).map(([fieldName, fileOrFiles])=>[
+            fieldName,
+            Array.isArray(fileOrFiles) ? fileOrFiles.map((file)=>cloneValidationFile(file)) : cloneValidationFile(fileOrFiles)
+        ]));
+}
+function cloneValidationValue(value, cache = new WeakMap()) {
+    if (typeof value !== 'object' && typeof value !== 'function' || value === null) {
+        return value;
+    }
+    if (typeof value === 'function' || value instanceof Promise) {
+        return value;
+    }
+    const objectValue = value;
+    const cachedValue = cache.get(objectValue);
+    if (cachedValue) {
+        return cachedValue;
+    }
+    if (value instanceof Headers) {
+        return new Headers(value);
+    }
+    if (value instanceof URLSearchParams) {
+        return new URLSearchParams(value);
+    }
+    if (value instanceof URL) {
+        return new URL(value);
+    }
+    if (value instanceof Date) {
+        return new Date(value);
+    }
+    if (value instanceof RegExp) {
+        return new RegExp(value.source, value.flags);
+    }
+    if (value instanceof ArrayBuffer) {
+        return value.slice(0);
+    }
+    if (ArrayBuffer.isView(value)) {
+        if (Buffer.isBuffer(value)) {
+            return Buffer.from(value);
+        }
+        if (value instanceof DataView) {
+            return new DataView(value.buffer.slice(0), value.byteOffset, value.byteLength);
+        }
+        return new value.constructor(value);
+    }
+    if (value instanceof Map) {
+        const clonedMap = new Map();
+        cache.set(objectValue, clonedMap);
+        for (const [key, mapValue] of value){
+            clonedMap.set(cloneValidationValue(key, cache), cloneValidationValue(mapValue, cache));
+        }
+        return clonedMap;
+    }
+    if (value instanceof Set) {
+        const clonedSet = new Set();
+        cache.set(objectValue, clonedSet);
+        for (const setValue of value){
+            clonedSet.add(cloneValidationValue(setValue, cache));
+        }
+        return clonedSet;
+    }
+    if (typeof Blob !== 'undefined' && value instanceof Blob) {
+        return value;
+    }
+    const prototype = Object.getPrototypeOf(value);
+    if (!Array.isArray(value) && prototype !== Object.prototype && prototype !== null) {
+        return value;
+    }
+    const clonedValue = Array.isArray(value) ? [] : Object.create(prototype);
+    cache.set(objectValue, clonedValue);
+    for (const key of Reflect.ownKeys(value)){
+        const descriptor = Object.getOwnPropertyDescriptor(value, key);
+        if (descriptor?.enumerable) {
+            ;
+            clonedValue[key] = cloneValidationValue(value[key], cache);
+        }
+    }
+    return clonedValue;
+}
+
+//# sourceMappingURL=cloneValidationRequest.js.map

package/dist/utilities/cloneValidationRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/cloneValidationRequest.ts"],"sourcesContent":["import type { RequestContext, User } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\n\nconst sharedValidationRequestProperties = new Set([\n  'i18n',\n  'payload',\n  'server',\n  'signal',\n  't',\n  'transactionID',\n])\n\nexport function cloneValidationContext({\n  context,\n}: {\n  context: RequestContext | undefined\n}): RequestContext | undefined {\n  return cloneValidationValue(context)\n}\n\nexport function cloneValidationData<TData>({ data }: { data: TData }): TData {\n  return cloneValidationValue(data)\n}\n\nexport function cloneValidationRequest({\n  request,\n}: {\n  request: Partial<PayloadRequest> | undefined\n}): Partial<PayloadRequest> {\n  if (!request) {\n    return {}\n  }\n\n  const payloadRequest: Partial<PayloadRequest> = request\n  const fetchRequest: Request | undefined =\n    typeof Request !== 'undefined' && request instanceof Request ? request : undefined\n  const canCloneFetchRequest = fetchRequest && !fetchRequest.bodyUsed\n  let clonedRequest: Record<string, unknown>\n\n  if (canCloneFetchRequest) {\n    clonedRequest = fetchRequest.clone() as unknown as Record<string, unknown>\n  } else {\n    clonedRequest = {}\n  }\n\n  for (const [key, value] of Object.entries(payloadRequest)) {\n    if (key === 'payloadDataLoader') {\n      continue\n    }\n\n    if (key === 'file') {\n      clonedRequest.file = cloneValidationFile(payloadRequest.file)\n      continue\n    }\n\n    if (key === 'files') {\n      clonedRequest.files = cloneValidationFiles(payloadRequest.files)\n      continue\n    }\n\n    clonedRequest[key] = sharedValidationRequestProperties.has(key)\n      ? value\n      : cloneValidationValue(value)\n  }\n\n  Object.assign(clonedRequest, {\n    context: cloneValidationValue(payloadRequest.context ?? {}),\n    query: cloneValidationValue(payloadRequest.query ?? {}),\n    routeParams: cloneValidationValue(payloadRequest.routeParams ?? {}),\n  })\n\n  if (!canCloneFetchRequest) {\n    Object.assign(clonedRequest, {\n      headers: cloneValidationValue(payloadRequest.headers),\n      method: payloadRequest.method,\n      signal: payloadRequest.signal,\n      url: payloadRequest.url,\n    })\n  }\n\n  return clonedRequest\n}\n\nexport function cloneValidationUser({\n  user,\n}: {\n  user: null | undefined | User\n}): null | undefined | User {\n  return cloneValidationValue(user)\n}\n\nfunction cloneValidationFile(file: PayloadRequest['file']): PayloadRequest['file'] {\n  if (!file) {\n    return file\n  }\n\n  const { data, ...metadata } = file\n\n  return {\n    ...cloneValidationValue(metadata),\n    data,\n  }\n}\n\nfunction cloneValidationFiles(files: PayloadRequest['files']): PayloadRequest['files'] {\n  if (!files) {\n    return files\n  }\n\n  return Object.fromEntries(\n    Object.entries(files).map(([fieldName, fileOrFiles]) => [\n      fieldName,\n      Array.isArray(fileOrFiles)\n        ? fileOrFiles.map((file) => cloneValidationFile(file)!)\n        : cloneValidationFile(fileOrFiles)!,\n    ]),\n  )\n}\n\nfunction cloneValidationValue<T>(value: T, cache = new WeakMap<object, unknown>()): T {\n  if ((typeof value !== 'object' && typeof value !== 'function') || value === null) {\n    return value\n  }\n\n  if (typeof value === 'function' || value instanceof Promise) {\n    return value\n  }\n\n  const objectValue = value as object\n  const cachedValue = cache.get(objectValue)\n\n  if (cachedValue) {\n    return cachedValue as T\n  }\n\n  if (value instanceof Headers) {\n    return new Headers(value) as T\n  }\n\n  if (value instanceof URLSearchParams) {\n    return new URLSearchParams(value) as T\n  }\n\n  if (value instanceof URL) {\n    return new URL(value) as T\n  }\n\n  if (value instanceof Date) {\n    return new Date(value) as T\n  }\n\n  if (value instanceof RegExp) {\n    return new RegExp(value.source, value.flags) as T\n  }\n\n  if (value instanceof ArrayBuffer) {\n    return value.slice(0) as T\n  }\n\n  if (ArrayBuffer.isView(value)) {\n    if (Buffer.isBuffer(value)) {\n      return Buffer.from(value) as T\n    }\n\n    if (value instanceof DataView) {\n      return new DataView(value.buffer.slice(0), value.byteOffset, value.byteLength) as T\n    }\n\n    return new (value.constructor as new (input: typeof value) => typeof value)(value)\n  }\n\n  if (value instanceof Map) {\n    const clonedMap = new Map()\n    cache.set(objectValue, clonedMap)\n    for (const [key, mapValue] of value) {\n      clonedMap.set(cloneValidationValue(key, cache), cloneValidationValue(mapValue, cache))\n    }\n    return clonedMap as T\n  }\n\n  if (value instanceof Set) {\n    const clonedSet = new Set()\n    cache.set(objectValue, clonedSet)\n    for (const setValue of value) {\n      clonedSet.add(cloneValidationValue(setValue, cache))\n    }\n    return clonedSet as T\n  }\n\n  if (typeof Blob !== 'undefined' && value instanceof Blob) {\n    return value\n  }\n\n  const prototype = Object.getPrototypeOf(value)\n\n  if (!Array.isArray(value) && prototype !== Object.prototype && prototype !== null) {\n    return value\n  }\n\n  const clonedValue: Record<PropertyKey, unknown> | unknown[] = Array.isArray(value)\n    ? []\n    : Object.create(prototype)\n  cache.set(objectValue, clonedValue)\n\n  for (const key of Reflect.ownKeys(value)) {\n    const descriptor = Object.getOwnPropertyDescriptor(value, key)\n\n    if (descriptor?.enumerable) {\n      ;(clonedValue as Record<PropertyKey, unknown>)[key] = cloneValidationValue(\n        (value as Record<PropertyKey, unknown>)[key],\n        cache,\n      )\n    }\n  }\n\n  return clonedValue as T\n}\n"],"names":["sharedValidationRequestProperties","Set","cloneValidationContext","context","cloneValidationValue","cloneValidationData","data","cloneValidationRequest","request","payloadRequest","fetchRequest","Request","undefined","canCloneFetchRequest","bodyUsed","clonedRequest","clone","key","value","Object","entries","file","cloneValidationFile","files","cloneValidationFiles","has","assign","query","routeParams","headers","method","signal","url","cloneValidationUser","user","metadata","fromEntries","map","fieldName","fileOrFiles","Array","isArray","cache","WeakMap","Promise","objectValue","cachedValue","get","Headers","URLSearchParams","URL","Date","RegExp","source","flags","ArrayBuffer","slice","isView","Buffer","isBuffer","from","DataView","buffer","byteOffset","byteLength","Map","clonedMap","set","mapValue","clonedSet","setValue","add","Blob","prototype","getPrototypeOf","clonedValue","create","Reflect","ownKeys","descriptor","getOwnPropertyDescriptor","enumerable"],"mappings":"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"}

package/dist/utilities/commitTransaction.d.ts

@@ -1,5 +1,9 @@
 import type { MarkRequired } from 'ts-essentials';
 import type { PayloadRequest } from '../types/index.js';
+export declare const isUnknownTransactionCommitResult: (error: unknown) => boolean;
+export declare const shouldRollbackTransactionArtifacts: ({ error }: {
+    error: unknown;
+}) => boolean;
 /**
  * complete a transaction calling adapter db.commitTransaction and delete the transactionID from req
  */

package/dist/utilities/commitTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commitTransaction.d.ts","sourceRoot":"","sources":["../../src/utilities/commitTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,GACpD,OAAO,CAAC,IAAI,CAAC,CAKf"}
+{"version":3,"file":"commitTransaction.d.ts","sourceRoot":"","sources":["../../src/utilities/commitTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AASvD,eAAO,MAAM,gCAAgC,UAAW,OAAO,KAAG,OAcjE,CAAA;AAED,eAAO,MAAM,kCAAkC,cAAe;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,KAAG,OACzC,CAAA;AAE1C;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,GACpD,OAAO,CAAC,IAAI,CAAC,CA4Bf"}

package/dist/utilities/commitTransaction.js

@@ -1,9 +1,56 @@
+import { commitFileOperations } from '../uploads/fileVersioning/fileOperationManager.js';
+import { clearTransactionCommitCallbacks, clearTransactionRollbackCallbacks, runTransactionCommitCallbacks } from './transactionCallbacks.js';
+export const isUnknownTransactionCommitResult = (error)=>{
+    if (!error || typeof error !== 'object') {
+        return false;
+    }
+    const labeledError = error;
+    return labeledError.hasErrorLabel?.('UnknownTransactionCommitResult') === true || labeledError.errorLabels?.includes('UnknownTransactionCommitResult') === true;
+};
+export const shouldRollbackTransactionArtifacts = ({ error })=>!isUnknownTransactionCommitResult(error);
 /**
  * complete a transaction calling adapter db.commitTransaction and delete the transactionID from req
  */ export async function commitTransaction(req) {
     const { payload, transactionID } = req;
-    await payload.db.commitTransaction(transactionID);
+    const resolvedTransactionID = await transactionID;
+    try {
+        await payload.db.commitTransaction(resolvedTransactionID);
+    } catch (error) {
+        if (isUnknownTransactionCommitResult(error)) {
+            delete req.transactionID;
+            clearTransactionCommitCallbacks({
+                req,
+                transactionID: resolvedTransactionID
+            });
+            clearTransactionRollbackCallbacks({
+                req,
+                transactionID: resolvedTransactionID
+            });
+        }
+        throw error;
+    }
     delete req.transactionID;
+    try {
+        await commitFileOperations({
+            req: req
+        });
+    } finally{
+        clearTransactionRollbackCallbacks({
+            req,
+            transactionID: resolvedTransactionID
+        });
+        try {
+            await runTransactionCommitCallbacks({
+                req,
+                transactionID: resolvedTransactionID
+            });
+        } catch (err) {
+            payload.logger.error({
+                err,
+                msg: 'A post-commit cleanup task failed.'
+            });
+        }
+    }
 }
 
 //# sourceMappingURL=commitTransaction.js.map

package/dist/utilities/commitTransaction.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/commitTransaction.ts"],"sourcesContent":["import type { MarkRequired } from 'ts-essentials'\n\nimport type { PayloadRequest } from '../types/index.js'\n\n/**\n * complete a transaction calling adapter db.commitTransaction and delete the transactionID from req\n */\nexport async function commitTransaction(\n  req: MarkRequired<Partial<PayloadRequest>, 'payload'>,\n): Promise<void> {\n  const { payload, transactionID } = req\n\n  await payload.db.commitTransaction(transactionID!)\n  delete req.transactionID\n}\n"],"names":["commitTransaction","req","payload","transactionID","db"],"mappings":"AAIA;;CAEC,GACD,OAAO,eAAeA,kBACpBC,GAAqD;IAErD,MAAM,EAAEC,OAAO,EAAEC,aAAa,EAAE,GAAGF;IAEnC,MAAMC,QAAQE,EAAE,CAACJ,iBAAiB,CAACG;IACnC,OAAOF,IAAIE,aAAa;AAC1B"}
+{"version":3,"sources":["../../src/utilities/commitTransaction.ts"],"sourcesContent":["import type { MarkRequired } from 'ts-essentials'\n\nimport type { PayloadRequest } from '../types/index.js'\n\nimport { commitFileOperations } from '../uploads/fileVersioning/fileOperationManager.js'\nimport {\n  clearTransactionCommitCallbacks,\n  clearTransactionRollbackCallbacks,\n  runTransactionCommitCallbacks,\n} from './transactionCallbacks.js'\n\nexport const isUnknownTransactionCommitResult = (error: unknown): boolean => {\n  if (!error || typeof error !== 'object') {\n    return false\n  }\n\n  const labeledError = error as {\n    errorLabels?: string[]\n    hasErrorLabel?: (label: string) => boolean\n  }\n\n  return (\n    labeledError.hasErrorLabel?.('UnknownTransactionCommitResult') === true ||\n    labeledError.errorLabels?.includes('UnknownTransactionCommitResult') === true\n  )\n}\n\nexport const shouldRollbackTransactionArtifacts = ({ error }: { error: unknown }): boolean =>\n  !isUnknownTransactionCommitResult(error)\n\n/**\n * complete a transaction calling adapter db.commitTransaction and delete the transactionID from req\n */\nexport async function commitTransaction(\n  req: MarkRequired<Partial<PayloadRequest>, 'payload'>,\n): Promise<void> {\n  const { payload, transactionID } = req\n  const resolvedTransactionID = await transactionID!\n\n  try {\n    await payload.db.commitTransaction(resolvedTransactionID)\n  } catch (error) {\n    if (isUnknownTransactionCommitResult(error)) {\n      delete req.transactionID\n      clearTransactionCommitCallbacks({ req, transactionID: resolvedTransactionID })\n      clearTransactionRollbackCallbacks({ req, transactionID: resolvedTransactionID })\n    }\n\n    throw error\n  }\n\n  delete req.transactionID\n  try {\n    await commitFileOperations({ req: req as PayloadRequest })\n  } finally {\n    clearTransactionRollbackCallbacks({ req, transactionID: resolvedTransactionID })\n\n    try {\n      await runTransactionCommitCallbacks({ req, transactionID: resolvedTransactionID })\n    } catch (err) {\n      payload.logger.error({ err, msg: 'A post-commit cleanup task failed.' })\n    }\n  }\n}\n"],"names":["commitFileOperations","clearTransactionCommitCallbacks","clearTransactionRollbackCallbacks","runTransactionCommitCallbacks","isUnknownTransactionCommitResult","error","labeledError","hasErrorLabel","errorLabels","includes","shouldRollbackTransactionArtifacts","commitTransaction","req","payload","transactionID","resolvedTransactionID","db","err","logger","msg"],"mappings":"AAIA,SAASA,oBAAoB,QAAQ,oDAAmD;AACxF,SACEC,+BAA+B,EAC/BC,iCAAiC,EACjCC,6BAA6B,QACxB,4BAA2B;AAElC,OAAO,MAAMC,mCAAmC,CAACC;IAC/C,IAAI,CAACA,SAAS,OAAOA,UAAU,UAAU;QACvC,OAAO;IACT;IAEA,MAAMC,eAAeD;IAKrB,OACEC,aAAaC,aAAa,GAAG,sCAAsC,QACnED,aAAaE,WAAW,EAAEC,SAAS,sCAAsC;AAE7E,EAAC;AAED,OAAO,MAAMC,qCAAqC,CAAC,EAAEL,KAAK,EAAsB,GAC9E,CAACD,iCAAiCC,OAAM;AAE1C;;CAEC,GACD,OAAO,eAAeM,kBACpBC,GAAqD;IAErD,MAAM,EAAEC,OAAO,EAAEC,aAAa,EAAE,GAAGF;IACnC,MAAMG,wBAAwB,MAAMD;IAEpC,IAAI;QACF,MAAMD,QAAQG,EAAE,CAACL,iBAAiB,CAACI;IACrC,EAAE,OAAOV,OAAO;QACd,IAAID,iCAAiCC,QAAQ;YAC3C,OAAOO,IAAIE,aAAa;YACxBb,gCAAgC;gBAAEW;gBAAKE,eAAeC;YAAsB;YAC5Eb,kCAAkC;gBAAEU;gBAAKE,eAAeC;YAAsB;QAChF;QAEA,MAAMV;IACR;IAEA,OAAOO,IAAIE,aAAa;IACxB,IAAI;QACF,MAAMd,qBAAqB;YAAEY,KAAKA;QAAsB;IAC1D,SAAU;QACRV,kCAAkC;YAAEU;YAAKE,eAAeC;QAAsB;QAE9E,IAAI;YACF,MAAMZ,8BAA8B;gBAAES;gBAAKE,eAAeC;YAAsB;QAClF,EAAE,OAAOE,KAAK;YACZJ,QAAQK,MAAM,CAACb,KAAK,CAAC;gBAAEY;gBAAKE,KAAK;YAAqC;QACxE;IACF;AACF"}

package/dist/utilities/configToJSONSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configToJSONSchema.d.ts","sourceRoot":"","sources":["../../src/utilities/configToJSONSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configToJSONSchema.d.ts","sourceRoot":"","sources":["../../src/utilities/configToJSONSchema.ts"],"names":[],"mappings":"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"}

package/dist/utilities/configToJSONSchema.js

@@ -364,6 +364,7 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                 baseFieldSchema.description = fieldDescription;
             }
             let fieldSchema;
+            let shouldWrapRichTextSchema = false;
             switch(field.type){
                 case 'array':
                     {
@@ -450,6 +451,7 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                 case 'code':
                 case 'date':
                 case 'email':
+                case 'slug':
                 case 'textarea':
                     {
                         fieldSchema = {
@@ -546,7 +548,15 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                     }
                 case 'json':
                     {
-                        fieldSchema = field.jsonSchema?.schema || {
+                        const jsonFieldSchema = field.jsonSchema?.schema;
+                        fieldSchema = jsonFieldSchema ? isRequired ? jsonFieldSchema : {
+                            anyOf: [
+                                jsonFieldSchema,
+                                {
+                                    type: 'null'
+                                }
+                            ]
+                        } : {
                             ...baseFieldSchema,
                             type: [
                                 'object',
@@ -717,7 +727,7 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                             throw new Error('Attempted to access unsanitized rich text editor.');
                         }
                         if (field.editor.jsonSchema) {
-                            fieldSchema = {
+                            const richTextSchema = {
                                 ...baseFieldSchema,
                                 ...field.editor.jsonSchema({
                                     collectionIDFieldTypes,
@@ -730,6 +740,8 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                                     variant
                                 })
                             };
+                            fieldSchema = richTextSchema;
+                            shouldWrapRichTextSchema = !isRequired;
                         } else {
                             // Maintain backwards compatibility with existing rich text editors
                             fieldSchema = {
@@ -833,7 +845,7 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                         break;
                     }
             }
-            if ('jsonSchema' in field && field?.jsonSchema?.length) {
+            if ('jsonSchema' in field && Array.isArray(field.jsonSchema)) {
                 for (const schema of field.jsonSchema){
                     fieldSchema = schema({
                         jsonSchema: fieldSchema,
@@ -841,6 +853,16 @@ export function fieldsToJSONSchema({ collectionIDFieldTypes, config, fields, for
                     });
                 }
             }
+            if (shouldWrapRichTextSchema) {
+                fieldSchema = {
+                    anyOf: [
+                        fieldSchema,
+                        {
+                            type: 'null'
+                        }
+                    ]
+                };
+            }
             if (fieldSchema && fieldAffectsData(field)) {
                 if (isRequired && !isOptionalOnInput && fieldSchema.required !== false) {
                     requiredFieldNames.add(field.name);
@@ -883,8 +905,8 @@ export function entityToJSONSchema(config, entity, interfaceNameDefinitions, def
         mutableFields.unshift(idField);
     }
     if (isInput) {
-        // Managed by Payload, not set by a client.
-        mutableFields = mutableFields.filter((field)=>field.name !== 'createdAt' && field.name !== 'updatedAt' && field.name !== '_status');
+        // Timestamps are managed by Payload. `_status` remains because create/update accept it.
+        mutableFields = mutableFields.filter((field)=>field.name !== 'createdAt' && field.name !== 'updatedAt');
     } else if ('timestamps' in entity && entity.timestamps !== false) {
         // mark timestamp fields required
         mutableFields = mutableFields.map((field)=>{