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

Merge pull request #1147 from abaco/fix/refine-relationship-typegen

Browse Source 
fix: refine type generation for relationships
This commit is contained in:
James Mikrut
2022-09-23 09:51:36 -07:00
committed by GitHub
parent 25006d44e8 ef83bdb709
commit f87c68f310
1 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/bin/generateTypes.ts
View File

@@ -131,33 +131,50 @@ function generateFieldTypes(config: SanitizedConfig, fields: Field[]): {
if (Array.isArray(field.relationTo)) {
if (field.hasMany) {
fieldSchema = {
type: 'array',
items: {
oneOf: field.relationTo.map((relation) => {
const idFieldType = getCollectionIDType(config.collections, relation);
oneOf: [
{
type: 'array',
items: {
oneOf: field.relationTo.map((relation) => {
const idFieldType = getCollectionIDType(config.collections, relation);
return {
type: 'object',
additionalProperties: false,
properties: {
value: {
oneOf: [
{
return {
type: 'object',
additionalProperties: false,
properties: {
value: {
type: idFieldType,
},
{
relationTo: {
const: relation,
},
},
required: ['value', 'relationTo'],
};
}),
},
},
{
type: 'array',
items: {
oneOf: field.relationTo.map((relation) => {
return {
type: 'object',
additionalProperties: false,
properties: {
value: {
$ref: `#/definitions/${relation}`,
},
],
},
relationTo: {
const: relation,
},
},
required: ['value', 'relationTo'],
};
}),
},
relationTo: {
const: relation,
},
},
required: ['value', 'relationTo'],
};
}),
},
},
],
};
} else {
fieldSchema = {
@@ -192,17 +209,20 @@ function generateFieldTypes(config: SanitizedConfig, fields: Field[]): {
if (field.hasMany) {
fieldSchema = {
type: 'array',
items: {
oneOf: [
{
oneOf: [
{
type: 'array',
items: {
type: idFieldType,
},
{
},
{
type: 'array',
items: {
$ref: `#/definitions/${field.relationTo}`,
},
],
},
},
],
};
} else {
fieldSchema = {