diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache index 2a92bd1d87eb..a8ee51b3cc4a 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache @@ -451,7 +451,7 @@ export enum {{operationIdCamelCase}}{{enumName}} { export const {{operationIdCamelCase}}{{enumName}} = { {{#allowableValues}} {{#enumVars}} - {{{name}}}: {{{value}}}{{^-last}},{{/-last}} + {{{name}}}: {{{value}}}, {{/enumVars}} {{/allowableValues}} } as const; diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/modelGeneric.mustache index 16d43b58d66b..0eab9701aa38 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/modelGeneric.mustache @@ -53,7 +53,7 @@ export const {{enumName}} = { * {{.}} */ {{/enumDescription}} - {{{name}}}: {{{value}}}{{^-last}},{{/-last}} + {{{name}}}: {{{value}}}, {{/enumVars}} {{/allowableValues}} } as const; diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/modelObjectEnum.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/modelObjectEnum.mustache index ce2c8208f37c..cea65a10efea 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/modelObjectEnum.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/modelObjectEnum.mustache @@ -6,7 +6,7 @@ export const {{classname}} = { * {{.}} */ {{/enumDescription}} - {{{name}}}: {{{value}}}{{^-last}},{{/-last}} + {{{name}}}: {{{value}}}, {{/enumVars}} {{/allowableValues}} } as const; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/axios/TypeScriptAxiosClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/axios/TypeScriptAxiosClientCodegenTest.java index 1713e2ca4a4d..e9a3e21e2c39 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/axios/TypeScriptAxiosClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/axios/TypeScriptAxiosClientCodegenTest.java @@ -178,4 +178,40 @@ public void testDeprecatedArrayAttribute() throws Exception { // Verify the non-deprecated array property 'nicknames' is also present TestUtils.assertFileContains(file, "'nicknames'?: Array"); } + + @Test + public void generatesTrailingCommasInAsConstEnumObjects() throws Exception { + final File output = Files.createTempDirectory("typescript_axios_trailing_commas_").toFile(); + output.deleteOnExit(); + + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("typescript-axios") + .setInputSpec("src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml") + .setOutputDir(output.getAbsolutePath().replace("\\", "/")); + + final ClientOptInput clientOptInput = configurator.toClientOptInput(); + final DefaultGenerator generator = new DefaultGenerator(); + final List files = generator.opts(clientOptInput).generate(); + files.forEach(File::deleteOnExit); + + Path file = Paths.get(output + "/api.ts"); + String content = Files.readString(file); + + assertThat(content).contains( + "export const ChildCatPetTypeEnum = {\n" + + " ChildCat: 'ChildCat',\n" + + "} as const;"); + assertThat(content).contains( + "export const OuterEnum = {\n" + + " Placed: 'placed',\n" + + " Approved: 'approved',\n" + + " Delivered: 'delivered',\n" + + "} as const;"); + assertThat(content).contains( + "export const TestEnumParametersEnumHeaderStringEnum = {\n" + + " Abc: '_abc',\n" + + " Efg: '-efg',\n" + + " Xyz: '(xyz)',\n" + + "} as const;"); + } } diff --git a/samples/client/echo_api/typescript-axios/build/api.ts b/samples/client/echo_api/typescript-axios/build/api.ts index 89ad20f49d80..3c66401a6f49 100644 --- a/samples/client/echo_api/typescript-axios/build/api.ts +++ b/samples/client/echo_api/typescript-axios/build/api.ts @@ -64,7 +64,7 @@ export interface DefaultValue { export const DefaultValueArrayStringEnumDefaultEnum = { Success: 'success', Failure: 'failure', - Unclassified: 'unclassified' + Unclassified: 'unclassified', } as const; export type DefaultValueArrayStringEnumDefaultEnum = typeof DefaultValueArrayStringEnumDefaultEnum[keyof typeof DefaultValueArrayStringEnumDefaultEnum]; @@ -89,7 +89,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -105,7 +105,7 @@ export interface Query { export const QueryOutcomesEnum = { Success: 'SUCCESS', Failure: 'FAILURE', - Skipped: 'SKIPPED' + Skipped: 'SKIPPED', } as const; export type QueryOutcomesEnum = typeof QueryOutcomesEnum[keyof typeof QueryOutcomesEnum]; @@ -114,7 +114,7 @@ export type QueryOutcomesEnum = typeof QueryOutcomesEnum[keyof typeof QueryOutco export const StringEnumRef = { Success: 'success', Failure: 'failure', - Unclassified: 'unclassified' + Unclassified: 'unclassified', } as const; export type StringEnumRef = typeof StringEnumRef[keyof typeof StringEnumRef]; @@ -1454,7 +1454,7 @@ export class HeaderApi extends BaseAPI { export const TestHeaderIntegerBooleanStringEnumsEnumNonrefStringHeaderEnum = { Success: 'success', Failure: 'failure', - Unclassified: 'unclassified' + Unclassified: 'unclassified', } as const; export type TestHeaderIntegerBooleanStringEnumsEnumNonrefStringHeaderEnum = typeof TestHeaderIntegerBooleanStringEnumsEnumNonrefStringHeaderEnum[keyof typeof TestHeaderIntegerBooleanStringEnumsEnumNonrefStringHeaderEnum]; @@ -1582,7 +1582,7 @@ export class PathApi extends BaseAPI { export const TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathEnum = { Success: 'success', Failure: 'failure', - Unclassified: 'unclassified' + Unclassified: 'unclassified', } as const; export type TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathEnum = typeof TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathEnum[keyof typeof TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathEnum]; @@ -2442,7 +2442,7 @@ export class QueryApi extends BaseAPI { export const TestEnumRefStringEnumNonrefStringQueryEnum = { Success: 'success', Failure: 'failure', - Unclassified: 'unclassified' + Unclassified: 'unclassified', } as const; export type TestEnumRefStringEnumNonrefStringQueryEnum = typeof TestEnumRefStringEnumNonrefStringQueryEnum[keyof typeof TestEnumRefStringEnumNonrefStringQueryEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts index 53c2afbbc9be..eeb417819705 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts @@ -39,7 +39,7 @@ export const DogBreedEnum = { Dingo: 'Dingo', Husky: 'Husky', Retriever: 'Retriever', - Shepherd: 'Shepherd' + Shepherd: 'Shepherd', } as const; export type DogBreedEnum = typeof DogBreedEnum[keyof typeof DogBreedEnum]; @@ -58,7 +58,7 @@ export interface PetByType { export const PetByTypePetTypeEnum = { Cat: 'Cat', - Dog: 'Dog' + Dog: 'Dog', } as const; export type PetByTypePetTypeEnum = typeof PetByTypePetTypeEnum[keyof typeof PetByTypePetTypeEnum]; @@ -72,7 +72,7 @@ export interface PetsFilteredPatchRequest { export const PetsFilteredPatchRequestPetTypeEnum = { Cat: 'Cat', - Dog: 'Dog' + Dog: 'Dog', } as const; export type PetsFilteredPatchRequestPetTypeEnum = typeof PetsFilteredPatchRequestPetTypeEnum[keyof typeof PetsFilteredPatchRequestPetTypeEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/default/api.ts b/samples/client/petstore/typescript-axios/builds/default/api.ts index 99e14d8a5de0..2ac2e4d0d2cc 100644 --- a/samples/client/petstore/typescript-axios/builds/default/api.ts +++ b/samples/client/petstore/typescript-axios/builds/default/api.ts @@ -56,7 +56,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -79,7 +79,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -770,7 +770,7 @@ export class PetApi extends BaseAPI { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts index 99e14d8a5de0..2ac2e4d0d2cc 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts @@ -56,7 +56,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -79,7 +79,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -770,7 +770,7 @@ export class PetApi extends BaseAPI { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts index ec42b08ab36f..6eaa5a2f77cc 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts @@ -125,7 +125,7 @@ export interface ChildCat extends ParentPet { } export const ChildCatPetTypeEnum = { - ChildCat: 'ChildCat' + ChildCat: 'ChildCat', } as const; export type ChildCatPetTypeEnum = typeof ChildCatPetTypeEnum[keyof typeof ChildCatPetTypeEnum]; @@ -167,13 +167,13 @@ export interface EnumArrays { export const EnumArraysJustSymbolEnum = { GreaterThanOrEqualTo: '>=', - Dollar: '$' + Dollar: '$', } as const; export type EnumArraysJustSymbolEnum = typeof EnumArraysJustSymbolEnum[keyof typeof EnumArraysJustSymbolEnum]; export const EnumArraysArrayEnumEnum = { Fish: 'fish', - Crab: 'crab' + Crab: 'crab', } as const; export type EnumArraysArrayEnumEnum = typeof EnumArraysArrayEnumEnum[keyof typeof EnumArraysArrayEnumEnum]; @@ -182,7 +182,7 @@ export type EnumArraysArrayEnumEnum = typeof EnumArraysArrayEnumEnum[keyof typeo export const EnumClass = { Abc: '_abc', Efg: '-efg', - Xyz: '(xyz)' + Xyz: '(xyz)', } as const; export type EnumClass = typeof EnumClass[keyof typeof EnumClass]; @@ -203,32 +203,32 @@ export interface EnumTest { export const EnumTestEnumStringEnum = { Upper: 'UPPER', Lower: 'lower', - Empty: '' + Empty: '', } as const; export type EnumTestEnumStringEnum = typeof EnumTestEnumStringEnum[keyof typeof EnumTestEnumStringEnum]; export const EnumTestEnumStringRequiredEnum = { Upper: 'UPPER', Lower: 'lower', - Empty: '' + Empty: '', } as const; export type EnumTestEnumStringRequiredEnum = typeof EnumTestEnumStringRequiredEnum[keyof typeof EnumTestEnumStringRequiredEnum]; export const EnumTestEnumIntegerEnum = { NUMBER_1: 1, - NUMBER_MINUS_1: -1 + NUMBER_MINUS_1: -1, } as const; export type EnumTestEnumIntegerEnum = typeof EnumTestEnumIntegerEnum[keyof typeof EnumTestEnumIntegerEnum]; export const EnumTestEnumIntegerOnlyEnum = { NUMBER_2: 2, - NUMBER_MINUS_2: -2 + NUMBER_MINUS_2: -2, } as const; export type EnumTestEnumIntegerOnlyEnum = typeof EnumTestEnumIntegerOnlyEnum[keyof typeof EnumTestEnumIntegerOnlyEnum]; export const EnumTestEnumNumberEnum = { NUMBER_1_DOT_1: 1.1, - NUMBER_MINUS_1_DOT_2: -1.2 + NUMBER_MINUS_1_DOT_2: -1.2, } as const; export type EnumTestEnumNumberEnum = typeof EnumTestEnumNumberEnum[keyof typeof EnumTestEnumNumberEnum]; @@ -322,7 +322,7 @@ export interface MammalAnyof { export const MammalAnyofTypeEnum = { Plains: 'plains', Mountain: 'mountain', - Grevys: 'grevys' + Grevys: 'grevys', } as const; export type MammalAnyofTypeEnum = typeof MammalAnyofTypeEnum[keyof typeof MammalAnyofTypeEnum]; @@ -336,7 +336,7 @@ export interface MapTest { export const MapTestMapOfEnumStringEnum = { Upper: 'UPPER', - Lower: 'lower' + Lower: 'lower', } as const; export type MapTestMapOfEnumStringEnum = typeof MapTestMapOfEnumStringEnum[keyof typeof MapTestMapOfEnumStringEnum]; @@ -426,7 +426,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -440,7 +440,7 @@ export interface OuterComposite { export const OuterEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OuterEnum = typeof OuterEnum[keyof typeof OuterEnum]; @@ -450,7 +450,7 @@ export type OuterEnum = typeof OuterEnum[keyof typeof OuterEnum]; export const OuterEnumDefaultValue = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OuterEnumDefaultValue = typeof OuterEnumDefaultValue[keyof typeof OuterEnumDefaultValue]; @@ -460,7 +460,7 @@ export type OuterEnumDefaultValue = typeof OuterEnumDefaultValue[keyof typeof Ou export const OuterEnumInteger = { NUMBER_0: 0, NUMBER_1: 1, - NUMBER_2: 2 + NUMBER_2: 2, } as const; export type OuterEnumInteger = typeof OuterEnumInteger[keyof typeof OuterEnumInteger]; @@ -470,7 +470,7 @@ export type OuterEnumInteger = typeof OuterEnumInteger[keyof typeof OuterEnumInt export const OuterEnumIntegerDefaultValue = { NUMBER_0: 0, NUMBER_1: 1, - NUMBER_2: 2 + NUMBER_2: 2, } as const; export type OuterEnumIntegerDefaultValue = typeof OuterEnumIntegerDefaultValue[keyof typeof OuterEnumIntegerDefaultValue]; @@ -493,7 +493,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -608,7 +608,7 @@ export interface Zebra { export const ZebraTypeEnum = { Plains: 'plains', Mountain: 'mountain', - Grevys: 'grevys' + Grevys: 'grevys', } as const; export type ZebraTypeEnum = typeof ZebraTypeEnum[keyof typeof ZebraTypeEnum]; @@ -2380,45 +2380,45 @@ export class FakeApi extends BaseAPI { export const TestEnumParametersEnumHeaderStringArrayEnum = { GreaterThan: '>', - Dollar: '$' + Dollar: '$', } as const; export type TestEnumParametersEnumHeaderStringArrayEnum = typeof TestEnumParametersEnumHeaderStringArrayEnum[keyof typeof TestEnumParametersEnumHeaderStringArrayEnum]; export const TestEnumParametersEnumHeaderStringEnum = { Abc: '_abc', Efg: '-efg', - Xyz: '(xyz)' + Xyz: '(xyz)', } as const; export type TestEnumParametersEnumHeaderStringEnum = typeof TestEnumParametersEnumHeaderStringEnum[keyof typeof TestEnumParametersEnumHeaderStringEnum]; export const TestEnumParametersEnumQueryStringArrayEnum = { GreaterThan: '>', - Dollar: '$' + Dollar: '$', } as const; export type TestEnumParametersEnumQueryStringArrayEnum = typeof TestEnumParametersEnumQueryStringArrayEnum[keyof typeof TestEnumParametersEnumQueryStringArrayEnum]; export const TestEnumParametersEnumQueryStringEnum = { Abc: '_abc', Efg: '-efg', - Xyz: '(xyz)' + Xyz: '(xyz)', } as const; export type TestEnumParametersEnumQueryStringEnum = typeof TestEnumParametersEnumQueryStringEnum[keyof typeof TestEnumParametersEnumQueryStringEnum]; export const TestEnumParametersEnumQueryIntegerEnum = { NUMBER_1: 1, - NUMBER_MINUS_2: -2 + NUMBER_MINUS_2: -2, } as const; export type TestEnumParametersEnumQueryIntegerEnum = typeof TestEnumParametersEnumQueryIntegerEnum[keyof typeof TestEnumParametersEnumQueryIntegerEnum]; export const TestEnumParametersEnumQueryDoubleEnum = { NUMBER_1_DOT_1: 1.1, - NUMBER_MINUS_1_DOT_2: -1.2 + NUMBER_MINUS_1_DOT_2: -1.2, } as const; export type TestEnumParametersEnumQueryDoubleEnum = typeof TestEnumParametersEnumQueryDoubleEnum[keyof typeof TestEnumParametersEnumQueryDoubleEnum]; export const TestEnumParametersEnumFormStringArrayEnum = { GreaterThan: '>', - Dollar: '$' + Dollar: '$', } as const; export type TestEnumParametersEnumFormStringArrayEnum = typeof TestEnumParametersEnumFormStringArrayEnum[keyof typeof TestEnumParametersEnumFormStringArrayEnum]; export const TestEnumParametersEnumFormStringEnum = { Abc: '_abc', Efg: '-efg', - Xyz: '(xyz)' + Xyz: '(xyz)', } as const; export type TestEnumParametersEnumFormStringEnum = typeof TestEnumParametersEnumFormStringEnum[keyof typeof TestEnumParametersEnumFormStringEnum]; @@ -3291,7 +3291,7 @@ export class PetApi extends BaseAPI { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts index 834fcd2d23d7..9207c4572143 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts @@ -41,7 +41,7 @@ export interface Category { export const MediaType = { ApplicationJson: 'application/json', - ApplicationXml: 'application/xml' + ApplicationXml: 'application/xml', } as const; export type MediaType = typeof MediaType[keyof typeof MediaType]; @@ -65,7 +65,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -88,7 +88,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -812,7 +812,7 @@ export class PetApi extends BaseAPI { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts index 5eed4da6f370..878ff210cc1d 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts @@ -100,13 +100,13 @@ export interface EnumArrays { export const EnumArraysJustSymbolEnum = { GreaterThanOrEqualTo: '>=', - Dollar: '$' + Dollar: '$', } as const; export type EnumArraysJustSymbolEnum = typeof EnumArraysJustSymbolEnum[keyof typeof EnumArraysJustSymbolEnum]; export const EnumArraysArrayEnumEnum = { Fish: 'fish', - Crab: 'crab' + Crab: 'crab', } as const; export type EnumArraysArrayEnumEnum = typeof EnumArraysArrayEnumEnum[keyof typeof EnumArraysArrayEnumEnum]; @@ -115,7 +115,7 @@ export type EnumArraysArrayEnumEnum = typeof EnumArraysArrayEnumEnum[keyof typeo export const EnumClass = { Abc: '_abc', Efg: '-efg', - Xyz: '(xyz)' + Xyz: '(xyz)', } as const; export type EnumClass = typeof EnumClass[keyof typeof EnumClass]; @@ -135,26 +135,26 @@ export interface EnumTest { export const EnumTestEnumStringEnum = { Upper: 'UPPER', Lower: 'lower', - Empty: '' + Empty: '', } as const; export type EnumTestEnumStringEnum = typeof EnumTestEnumStringEnum[keyof typeof EnumTestEnumStringEnum]; export const EnumTestEnumStringRequiredEnum = { Upper: 'UPPER', Lower: 'lower', - Empty: '' + Empty: '', } as const; export type EnumTestEnumStringRequiredEnum = typeof EnumTestEnumStringRequiredEnum[keyof typeof EnumTestEnumStringRequiredEnum]; export const EnumTestEnumIntegerEnum = { NUMBER_1: 1, - NUMBER_MINUS_1: -1 + NUMBER_MINUS_1: -1, } as const; export type EnumTestEnumIntegerEnum = typeof EnumTestEnumIntegerEnum[keyof typeof EnumTestEnumIntegerEnum]; export const EnumTestEnumNumberEnum = { NUMBER_1_DOT_1: 1.1, - NUMBER_MINUS_1_DOT_2: -1.2 + NUMBER_MINUS_1_DOT_2: -1.2, } as const; export type EnumTestEnumNumberEnum = typeof EnumTestEnumNumberEnum[keyof typeof EnumTestEnumNumberEnum]; @@ -234,7 +234,7 @@ export interface MapTest { export const MapTestMapOfEnumStringEnum = { Upper: 'UPPER', - Lower: 'lower' + Lower: 'lower', } as const; export type MapTestMapOfEnumStringEnum = typeof MapTestMapOfEnumStringEnum[keyof typeof MapTestMapOfEnumStringEnum]; @@ -303,7 +303,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -317,7 +317,7 @@ export interface OuterComposite { export const OuterEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OuterEnum = typeof OuterEnum[keyof typeof OuterEnum]; @@ -327,7 +327,7 @@ export type OuterEnum = typeof OuterEnum[keyof typeof OuterEnum]; export const OuterEnumDefaultValue = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OuterEnumDefaultValue = typeof OuterEnumDefaultValue[keyof typeof OuterEnumDefaultValue]; @@ -337,7 +337,7 @@ export type OuterEnumDefaultValue = typeof OuterEnumDefaultValue[keyof typeof Ou export const OuterEnumInteger = { NUMBER_0: 0, NUMBER_1: 1, - NUMBER_2: 2 + NUMBER_2: 2, } as const; export type OuterEnumInteger = typeof OuterEnumInteger[keyof typeof OuterEnumInteger]; @@ -347,7 +347,7 @@ export type OuterEnumInteger = typeof OuterEnumInteger[keyof typeof OuterEnumInt export const OuterEnumIntegerDefaultValue = { NUMBER_0: 0, NUMBER_1: 1, - NUMBER_2: 2 + NUMBER_2: 2, } as const; export type OuterEnumIntegerDefaultValue = typeof OuterEnumIntegerDefaultValue[keyof typeof OuterEnumIntegerDefaultValue]; @@ -369,7 +369,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -447,7 +447,7 @@ export interface Zebra { export const ZebraTypeEnum = { Plains: 'plains', Mountain: 'mountain', - Grevys: 'grevys' + Grevys: 'grevys', } as const; export type ZebraTypeEnum = typeof ZebraTypeEnum[keyof typeof ZebraTypeEnum]; @@ -2169,45 +2169,45 @@ export class FakeApi extends BaseAPI { export const TestEnumParametersEnumHeaderStringArrayEnum = { GreaterThan: '>', - Dollar: '$' + Dollar: '$', } as const; export type TestEnumParametersEnumHeaderStringArrayEnum = typeof TestEnumParametersEnumHeaderStringArrayEnum[keyof typeof TestEnumParametersEnumHeaderStringArrayEnum]; export const TestEnumParametersEnumHeaderStringEnum = { Abc: '_abc', Efg: '-efg', - Xyz: '(xyz)' + Xyz: '(xyz)', } as const; export type TestEnumParametersEnumHeaderStringEnum = typeof TestEnumParametersEnumHeaderStringEnum[keyof typeof TestEnumParametersEnumHeaderStringEnum]; export const TestEnumParametersEnumQueryStringArrayEnum = { GreaterThan: '>', - Dollar: '$' + Dollar: '$', } as const; export type TestEnumParametersEnumQueryStringArrayEnum = typeof TestEnumParametersEnumQueryStringArrayEnum[keyof typeof TestEnumParametersEnumQueryStringArrayEnum]; export const TestEnumParametersEnumQueryStringEnum = { Abc: '_abc', Efg: '-efg', - Xyz: '(xyz)' + Xyz: '(xyz)', } as const; export type TestEnumParametersEnumQueryStringEnum = typeof TestEnumParametersEnumQueryStringEnum[keyof typeof TestEnumParametersEnumQueryStringEnum]; export const TestEnumParametersEnumQueryIntegerEnum = { NUMBER_1: 1, - NUMBER_MINUS_2: -2 + NUMBER_MINUS_2: -2, } as const; export type TestEnumParametersEnumQueryIntegerEnum = typeof TestEnumParametersEnumQueryIntegerEnum[keyof typeof TestEnumParametersEnumQueryIntegerEnum]; export const TestEnumParametersEnumQueryDoubleEnum = { NUMBER_1_DOT_1: 1.1, - NUMBER_MINUS_1_DOT_2: -1.2 + NUMBER_MINUS_1_DOT_2: -1.2, } as const; export type TestEnumParametersEnumQueryDoubleEnum = typeof TestEnumParametersEnumQueryDoubleEnum[keyof typeof TestEnumParametersEnumQueryDoubleEnum]; export const TestEnumParametersEnumFormStringArrayEnum = { GreaterThan: '>', - Dollar: '$' + Dollar: '$', } as const; export type TestEnumParametersEnumFormStringArrayEnum = typeof TestEnumParametersEnumFormStringArrayEnum[keyof typeof TestEnumParametersEnumFormStringArrayEnum]; export const TestEnumParametersEnumFormStringEnum = { Abc: '_abc', Efg: '-efg', - Xyz: '(xyz)' + Xyz: '(xyz)', } as const; export type TestEnumParametersEnumFormStringEnum = typeof TestEnumParametersEnumFormStringEnum[keyof typeof TestEnumParametersEnumFormStringEnum]; @@ -3080,7 +3080,7 @@ export class PetApi extends BaseAPI { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/api.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/api.ts index b79f703d415c..dd6137586c99 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces-and-with-single-request-param/api.ts @@ -56,7 +56,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -79,7 +79,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -941,7 +941,7 @@ export class PetApi extends BaseAPI implements PetApiInterface { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts index 59a6c9b3970a..7aa0130c6bbe 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts @@ -56,7 +56,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -79,7 +79,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -854,7 +854,7 @@ export class PetApi extends BaseAPI implements PetApiInterface { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts index cb194ad518fb..36335eab642e 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts @@ -60,7 +60,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -83,7 +83,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -774,7 +774,7 @@ export class PetApi extends BaseAPI { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts index 44693eb589a6..7dc28894571d 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts @@ -687,6 +687,6 @@ export class PetApi extends BaseAPI { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts index 4ffbce0f9e16..dd8b5d3eb547 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/order.ts @@ -32,7 +32,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts index ee25eb132d0c..028b7141b2ef 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/model/some/levels/deep/pet.ts @@ -38,7 +38,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts index 99e14d8a5de0..2ac2e4d0d2cc 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts @@ -56,7 +56,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -79,7 +79,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -770,7 +770,7 @@ export class PetApi extends BaseAPI { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum]; diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts index 9161b99729bf..58a68b44497f 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts @@ -56,7 +56,7 @@ export interface Order { export const OrderStatusEnum = { Placed: 'placed', Approved: 'approved', - Delivered: 'delivered' + Delivered: 'delivered', } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; @@ -79,7 +79,7 @@ export interface Pet { export const PetStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type PetStatusEnum = typeof PetStatusEnum[keyof typeof PetStatusEnum]; @@ -862,7 +862,7 @@ export class PetApi extends BaseAPI { export const FindPetsByStatusStatusEnum = { Available: 'available', Pending: 'pending', - Sold: 'sold' + Sold: 'sold', } as const; export type FindPetsByStatusStatusEnum = typeof FindPetsByStatusStatusEnum[keyof typeof FindPetsByStatusStatusEnum];