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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
{{#allParams.0}}
export interface {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request {
{{#allParams}}
{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{#hasReadOnly}}Omit<{{{dataType}}}, {{#readOnlyVars}}'{{baseName}}'{{^-last}}|{{/-last}}{{/readOnlyVars}}>{{/hasReadOnly}}{{^hasReadOnly}}{{{dataType}}}{{/hasReadOnly}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}};
{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{#hasReadOnly}}Omit<{{{dataType}}}, {{#readOnlyVars}}'{{name}}'{{^-last}}|{{/-last}}{{/readOnlyVars}}>{{/hasReadOnly}}{{^hasReadOnly}}{{{dataType}}}{{/hasReadOnly}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}};
{{/allParams}}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,20 @@ public void testIssue23380_OmitUsesCorrectPropertyName() throws Exception {
TestUtils.assertFileContains(modelPath, "export function MissionToJSONTyped(value?: Omit<Mission, 'id'|'taskName'|'singleCar'> | null, ignoreDiscriminator: boolean = false): any {");
}

@Test(description = "Verify Omit uses the camelCase property name instead of the baseName for readOnly fields in API requests")
public void testIssue19572_OmitUsesCorrectPropertyNameInApi() throws Exception {
File output = generate(
Collections.emptyMap(),
"src/test/resources/3_0/typescript-fetch/issue_19572.yaml"
);

Path modelPath = Paths.get(output + "/apis/DefaultApi.ts");
TestUtils.assertFileExists(modelPath);
// Ensure Omit uses camelCase names like 'createdAt' and 'updatedAt' instead of snake_case 'created_at' and 'updated_at'
TestUtils.assertFileContains(modelPath, "export interface FinancingOptionCreateRequest {");
TestUtils.assertFileContains(modelPath, " financingOption?: Omit<FinancingOption, 'id'|'createdAt'|'updatedAt'|'foo'|'bar'>;");
}

private static File generate(
Map<String, Object> properties
) throws IOException {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
openapi: 3.0.0
info:
title: Test API
version: 1.0.0
paths:
/financing-options:
post:
operationId: financingOptionCreate
requestBody:
content:
application/json:
schema:
$ref: '#/components/schemas/FinancingOption'
responses:
'200':
description: OK
components:
schemas:
FinancingOption:
type: object
properties:
id:
type: string
readOnly: true
created_at:
type: string
format: date-time
readOnly: true
updated_at:
type: string
format: date-time
readOnly: true
foo:
type: string
readOnly: true
bar:
type: string
readOnly: true
Loading