tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

feat: improves required type accuracy

Browse Source
This commit is contained in:
James
2023-04-03 22:30:24 -04:00
parent b6dec7af1c
commit a9cd23a883
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/utilities/entityToJSONSchema.ts
View File

@@ -8,9 +8,19 @@ import deepCopyObject from './deepCopyObject';
import { toWords } from './formatLabels';
import { SanitizedConfig } from '../config/types';
const propertyIsRequired = (field: Field) => {
if (fieldAffectsData(field) && (('required' in field && field.required === true))) return true;
const propertyIsOptional = (field: Field) => {
return fieldAffectsData(field) && (('required' in field && field.required === true));
if ('fields' in field) {
if (field.admin?.condition || field.access?.read) return false;
return field.fields.find((subField) => propertyIsRequired(subField));
}
if (field.type === 'tabs') {
return field.tabs.some((tab) => 'name' in tab && tab.fields.find((subField) => propertyIsRequired(subField)));
}
return false;
};
function getCollectionIDType(collections: SanitizedCollectionConfig[], slug: string): 'string' | 'number' {
@@ -371,7 +381,7 @@ function generateFieldTypes(config: SanitizedConfig, fields: Field[]): {
),
required: [
...fields
.filter(propertyIsOptional)
.filter(propertyIsRequired)
.map((field) => (fieldAffectsData(field) ? field.name : '')),
...requiredTopLevelProps,
],