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
8 changes: 4 additions & 4 deletions src/generator/04-services/endpoints/some.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const resolveArrayReferenceProperties = (
([property, propertyMetaData]): ObjectProperty[] => {
if (propertyMetaData.type === 'array') {
if (propertyMetaData.entity === 'onlyId') {
return [{ key: property, value: [{ key: 'id', value: 'boolean' }] }];
return [{ key: property, value: [{ key: 'id', value: 'boolean', optional: true }], optional: true }];
}

if (!propertyMetaData.entity) {
Expand All @@ -85,11 +85,11 @@ const resolveArrayReferenceProperties = (
return [];
}

return [{ key: property, value: nestedProperties }];
return [{ key: property, value: nestedProperties, optional: true }];
}

if (property.endsWith('Id')) {
return [{ key: property, value: 'boolean' }];
return [{ key: property, value: 'boolean', optional: true }];
}

return [];
Expand All @@ -114,7 +114,7 @@ const resolveReferences = (entity: string, entities: Map<string, GeneratedEntity
if (propertyMetaData.entity === 'onlyId') {
references.push({
name: property,
type: generateObject([{ key: 'id', value: 'boolean' }])
type: generateObject([{ key: 'id', value: 'boolean', optional: true }])
});
} else {
const nestedProperties = resolveArrayReferenceProperties(propertyMetaData.entity || '', entities);
Expand Down
17 changes: 17 additions & 0 deletions src/ts/generateObject.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,21 @@ describe('generateObject', () => {
expect(result).toContain('/** A number */');
expect(result).toContain('x: 1');
});

it('renders optional properties with a question mark', () => {
const result = generateObject([{ key: 'x', value: 1, optional: true }]);
expect(result).toContain('x?: 1');
});

it('does not render question mark when optional is false', () => {
const result = generateObject([{ key: 'x', value: 1, optional: false }]);
expect(result).toContain('x: 1');
expect(result).not.toContain('x?');
});

it('does not render question mark when optional is not set', () => {
const result = generateObject([{ key: 'x', value: 1 }]);
expect(result).toContain('x: 1');
expect(result).not.toContain('x?');
});
});
9 changes: 6 additions & 3 deletions src/ts/generateObject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ export interface ObjectProperty {
key: string;
value: string | number | undefined | null | boolean | ObjectProperty[];
comment?: string;
optional?: boolean;
}

export const generateObject = (properties: ObjectProperty[]): string => {
const body = [];

for (const { key, value, comment } of properties) {
for (const { key, value, comment, optional } of properties) {
if (value === undefined) {
continue;
}
Expand All @@ -19,10 +20,12 @@ export const generateObject = (properties: ObjectProperty[]): string => {
const str = generateObject(value);

if (str.length > 2) {
body.push(`${comment ? generateInlineComment(comment) + '\n' : ''}${key}: ${str}`);
body.push(`${comment ? generateInlineComment(comment) + '\n' : ''}${key}${optional ? '?' : ''}: ${str}`);
}
} else {
body.push(`${comment ? generateInlineComment(comment) + '\n' : ''}${key}: ${String(value)}`);
body.push(
`${comment ? generateInlineComment(comment) + '\n' : ''}${key}${optional ? '?' : ''}: ${String(value)}`
);
}
}

Expand Down
Loading