From c97ffd5b8394593541edc8a7f0f8d83a09d20d99 Mon Sep 17 00:00:00 2001
From: ksvirkou-hubspot <ksvirkou@hubspot.com>
Date: Wed, 1 Feb 2023 10:54:19 +0300
Subject: [PATCH 1/7] Enum s types to enums

---
 .../languages/TypeScriptClientCodegen.java    | 31 ++++++++++++++++---
 .../resources/typescript/model/model.mustache | 16 ++++++++--
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
index b6c868f89685..3c5529132a6d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
@@ -30,6 +30,7 @@
 import io.swagger.v3.oas.models.parameters.Parameter;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
+import org.openapitools.codegen.CodegenConstants.ENUM_PROPERTY_NAMING_TYPE;
 import org.openapitools.codegen.CodegenDiscriminator.MappedModel;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
@@ -102,6 +103,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo
     protected String npmName = null;
     protected String npmVersion = "1.0.0";
     protected String modelPropertyNaming = "camelCase";
+    protected ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = ENUM_PROPERTY_NAMING_TYPE.PascalCase;
     protected HashSet<String> languageGenericTypes;
 
     private DateTimeFormatter iso8601Date = DateTimeFormatter.ISO_DATE;
@@ -648,12 +650,12 @@ public String toEnumDefaultValue(String value, String datatype) {
     @Override
     public String toEnumVarName(String name, String datatype) {
         if (name.length() == 0) {
-            return "Empty";
+            return getNameUsingEnumPropertyNaming("empty");
         }
 
         // for symbol, e.g. $, #
         if (getSymbolName(name) != null) {
-            return camelize(getSymbolName(name));
+            return getNameUsingEnumPropertyNaming(getSymbolName(name));
         }
 
         // number
@@ -671,9 +673,7 @@ public String toEnumVarName(String name, String datatype) {
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
 
-        // camelize the enum variable name
-        // ref: https://basarat.gitbooks.io/typescript/content/docs/enums.html
-        enumName = camelize(enumName);
+        enumName = getNameUsingEnumPropertyNaming(enumName);
 
         if (enumName.matches("\\d.*")) { // starts with number
             return "_" + enumName;
@@ -682,6 +682,27 @@ public String toEnumVarName(String name, String datatype) {
         }
     }
 
+    protected ENUM_PROPERTY_NAMING_TYPE getEnumPropertyNaming() {
+        return enumPropertyNaming;
+    }
+
+    private String getNameUsingEnumPropertyNaming(String name) {
+        switch (getEnumPropertyNaming()) {
+            case original:
+                return name;
+            case camelCase:
+                return camelize(underscore(name), LOWERCASE_FIRST_LETTER);
+            case PascalCase:
+                return camelize(underscore(name));
+            case snake_case:
+                return underscore(name);
+            case UPPERCASE:
+                return underscore(name).toUpperCase(Locale.ROOT);
+            default:
+                throw new IllegalArgumentException("Unsupported enum property naming: '" + name);
+        }
+    }
+
     @Override
     public String toEnumName(CodegenProperty property) {
         String enumName = toModelName(property.name) + "Enum";
diff --git a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache
index bff4adc5f799..ce1fb60b21e3 100644
--- a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache
@@ -71,14 +71,26 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
 
 {{#vars}}
 {{#isEnum}}
-export type {{classname}}{{enumName}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
+export enum {{classname}}{{enumName}} {
+    {{#allowableValues}}
+    {{#enumVars}}
+    {{name}} = <any> {{{value}}}{{^-last}},{{/-last}}
+    {{/enumVars}}
+    {{/allowableValues}}
+}
 {{/isEnum}}
 {{/vars}}
 
 {{/hasEnums}}
 {{/isEnum}}
 {{#isEnum}}
-export type {{classname}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
+export enum {{classname}} {
+    {{#allowableValues}}
+    {{#enumVars}}
+    {{name}} = <any> {{{value}}}{{^-last}},{{/-last}}
+    {{/enumVars}}
+    {{/allowableValues}}
+}
 {{/isEnum}}
 {{/model}}
 {{/models}}
\ No newline at end of file

From cb817909a0e50499bd7bb2672c6e164484731da2 Mon Sep 17 00:00:00 2001
From: ksvirkou-hubspot <ksvirkou@hubspot.com>
Date: Wed, 1 Feb 2023 11:19:05 +0300
Subject: [PATCH 2/7] regenerate samples

---
 .../petstore/typescript/builds/browser/models/Order.ts     | 6 +++++-
 .../petstore/typescript/builds/browser/models/Pet.ts       | 6 +++++-
 .../typescript/builds/composed-schemas/models/Dog.ts       | 7 ++++++-
 .../typescript/builds/composed-schemas/models/DogAllOf.ts  | 7 ++++++-
 .../typescript/builds/composed-schemas/models/PetByType.ts | 5 ++++-
 .../composed-schemas/models/PetsFilteredPatchRequest.ts    | 5 ++++-
 .../builds/composed-schemas/models/PetsPatchRequest.ts     | 7 ++++++-
 .../petstore/typescript/builds/default/models/Order.ts     | 6 +++++-
 .../petstore/typescript/builds/default/models/Pet.ts       | 6 +++++-
 .../client/petstore/typescript/builds/deno/models/Order.ts | 6 +++++-
 .../client/petstore/typescript/builds/deno/models/Pet.ts   | 6 +++++-
 .../petstore/typescript/builds/inversify/models/Order.ts   | 6 +++++-
 .../petstore/typescript/builds/inversify/models/Pet.ts     | 6 +++++-
 .../petstore/typescript/builds/jquery/models/Order.ts      | 6 +++++-
 .../client/petstore/typescript/builds/jquery/models/Pet.ts | 6 +++++-
 .../typescript/builds/object_params/models/Order.ts        | 6 +++++-
 .../petstore/typescript/builds/object_params/models/Pet.ts | 6 +++++-
 17 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts
index a2f84555ff1e..ec5656d85887 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts
@@ -75,5 +75,9 @@ export class Order {
 }
 
 
-export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+export enum OrderStatusEnum {
+    Placed = <any> 'placed',
+    Approved = <any> 'approved',
+    Delivered = <any> 'delivered'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts
index b3a7ddb9f719..f0e8883e538d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts
@@ -77,5 +77,9 @@ export class Pet {
 }
 
 
-export type PetStatusEnum = "available" | "pending" | "sold" ;
+export enum PetStatusEnum {
+    Available = <any> 'available',
+    Pending = <any> 'pending',
+    Sold = <any> 'sold'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts
index dd2380572f68..978125291b2f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts
@@ -41,5 +41,10 @@ export class Dog {
 }
 
 
-export type DogBreedEnum = "Dingo" | "Husky" | "Retriever" | "Shepherd" ;
+export enum DogBreedEnum {
+    Dingo = <any> 'Dingo',
+    Husky = <any> 'Husky',
+    Retriever = <any> 'Retriever',
+    Shepherd = <any> 'Shepherd'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts
index 5bc68d788891..593080907b70 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts
@@ -41,5 +41,10 @@ export class DogAllOf {
 }
 
 
-export type DogAllOfBreedEnum = "Dingo" | "Husky" | "Retriever" | "Shepherd" ;
+export enum DogAllOfBreedEnum {
+    Dingo = <any> 'Dingo',
+    Husky = <any> 'Husky',
+    Retriever = <any> 'Retriever',
+    Shepherd = <any> 'Shepherd'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts
index aef39d9d6018..66a8181b3505 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts
@@ -41,5 +41,8 @@ export class PetByType {
 }
 
 
-export type PetByTypePetTypeEnum = "Cat" | "Dog" ;
+export enum PetByTypePetTypeEnum {
+    Cat = <any> 'Cat',
+    Dog = <any> 'Dog'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts
index 12ae18d6b74e..e00d2a19026d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts
@@ -57,5 +57,8 @@ export class PetsFilteredPatchRequest {
 }
 
 
-export type PetsFilteredPatchRequestPetTypeEnum = "Cat" | "Dog" ;
+export enum PetsFilteredPatchRequestPetTypeEnum {
+    Cat = <any> 'Cat',
+    Dog = <any> 'Dog'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts
index c68b69a32965..7546ef268a00 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts
@@ -58,5 +58,10 @@ export class PetsPatchRequest {
 }
 
 
-export type PetsPatchRequestBreedEnum = "Dingo" | "Husky" | "Retriever" | "Shepherd" ;
+export enum PetsPatchRequestBreedEnum {
+    Dingo = <any> 'Dingo',
+    Husky = <any> 'Husky',
+    Retriever = <any> 'Retriever',
+    Shepherd = <any> 'Shepherd'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
index a2f84555ff1e..ec5656d85887 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
@@ -75,5 +75,9 @@ export class Order {
 }
 
 
-export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+export enum OrderStatusEnum {
+    Placed = <any> 'placed',
+    Approved = <any> 'approved',
+    Delivered = <any> 'delivered'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
index b3a7ddb9f719..f0e8883e538d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
@@ -77,5 +77,9 @@ export class Pet {
 }
 
 
-export type PetStatusEnum = "available" | "pending" | "sold" ;
+export enum PetStatusEnum {
+    Available = <any> 'available',
+    Pending = <any> 'pending',
+    Sold = <any> 'sold'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
index 644657299f36..4398ee780087 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
@@ -75,5 +75,9 @@ export class Order {
 }
 
 
-export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+export enum OrderStatusEnum {
+    Placed = <any> 'placed',
+    Approved = <any> 'approved',
+    Delivered = <any> 'delivered'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
index 229681feacde..3b65ed3af366 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
@@ -77,5 +77,9 @@ export class Pet {
 }
 
 
-export type PetStatusEnum = "available" | "pending" | "sold" ;
+export enum PetStatusEnum {
+    Available = <any> 'available',
+    Pending = <any> 'pending',
+    Sold = <any> 'sold'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
index a2f84555ff1e..ec5656d85887 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
@@ -75,5 +75,9 @@ export class Order {
 }
 
 
-export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+export enum OrderStatusEnum {
+    Placed = <any> 'placed',
+    Approved = <any> 'approved',
+    Delivered = <any> 'delivered'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
index b3a7ddb9f719..f0e8883e538d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
@@ -77,5 +77,9 @@ export class Pet {
 }
 
 
-export type PetStatusEnum = "available" | "pending" | "sold" ;
+export enum PetStatusEnum {
+    Available = <any> 'available',
+    Pending = <any> 'pending',
+    Sold = <any> 'sold'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
index a2f84555ff1e..ec5656d85887 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
@@ -75,5 +75,9 @@ export class Order {
 }
 
 
-export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+export enum OrderStatusEnum {
+    Placed = <any> 'placed',
+    Approved = <any> 'approved',
+    Delivered = <any> 'delivered'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
index b3a7ddb9f719..f0e8883e538d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
@@ -77,5 +77,9 @@ export class Pet {
 }
 
 
-export type PetStatusEnum = "available" | "pending" | "sold" ;
+export enum PetStatusEnum {
+    Available = <any> 'available',
+    Pending = <any> 'pending',
+    Sold = <any> 'sold'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
index a2f84555ff1e..ec5656d85887 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
@@ -75,5 +75,9 @@ export class Order {
 }
 
 
-export type OrderStatusEnum = "placed" | "approved" | "delivered" ;
+export enum OrderStatusEnum {
+    Placed = <any> 'placed',
+    Approved = <any> 'approved',
+    Delivered = <any> 'delivered'
+}
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
index b3a7ddb9f719..f0e8883e538d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
@@ -77,5 +77,9 @@ export class Pet {
 }
 
 
-export type PetStatusEnum = "available" | "pending" | "sold" ;
+export enum PetStatusEnum {
+    Available = <any> 'available',
+    Pending = <any> 'pending',
+    Sold = <any> 'sold'
+}
 

From 7a626b9349ca31e6a982608ff482b04ed1c978c5 Mon Sep 17 00:00:00 2001
From: ksvirkou-hubspot <ksvirkou@hubspot.com>
Date: Wed, 1 Feb 2023 12:25:17 +0300
Subject: [PATCH 3/7] Tests update

---
 .../typescript/tests/browser/package-lock.json         |  4 ++--
 .../typescript/tests/browser/test/PetApi.test.ts       |  4 ++--
 .../typescript/tests/default/test/api/PetApi.test.ts   |  4 ++--
 .../tests/default/test/models/ObjectSerializer.test.ts | 10 +++++-----
 .../typescript/tests/deno/test/api/PetApi_test.ts      |  4 ++--
 .../typescript/tests/jquery/test/api/PetApi.test.ts    |  4 ++--
 .../tests/object_params/test/api/PetApi.test.ts        |  4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/samples/openapi3/client/petstore/typescript/tests/browser/package-lock.json b/samples/openapi3/client/petstore/typescript/tests/browser/package-lock.json
index ab8a207c1e32..aeac35c9cbd6 100644
--- a/samples/openapi3/client/petstore/typescript/tests/browser/package-lock.json
+++ b/samples/openapi3/client/petstore/typescript/tests/browser/package-lock.json
@@ -29,7 +29,7 @@
       },
       "devDependencies": {
         "@types/url-parse": "1.4.4",
-        "typescript": "^3.9.3"
+        "typescript": "^4.0"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -5792,7 +5792,7 @@
       "requires": {
         "@types/url-parse": "1.4.4",
         "es6-promise": "^4.2.4",
-        "typescript": "^3.9.3",
+        "typescript": "^4.0",
         "url-parse": "^1.4.3",
         "whatwg-fetch": "^3.0.0"
       }
diff --git a/samples/openapi3/client/petstore/typescript/tests/browser/test/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/browser/test/PetApi.test.ts
index a4334fe7457a..88e0a850894f 100644
--- a/samples/openapi3/client/petstore/typescript/tests/browser/test/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/browser/test/PetApi.test.ts
@@ -1,5 +1,5 @@
 import { expect } from '@esm-bundle/chai';
-import { ServerConfiguration, createConfiguration, PetApi, Tag, Pet, ApiException, RequiredError } from 'ts-petstore-client'
+import { ServerConfiguration, createConfiguration, PetApi, Tag, Pet, PetStatusEnum, ApiException, RequiredError } from 'ts-petstore-client'
 import image from "./pet";
 
 const configuration = createConfiguration({
@@ -20,7 +20,7 @@ function createPet() {
     pet.id = Math.floor(Math.random() * 100000)
     pet.name = "PetName"
     pet.photoUrls = []
-    pet.status = 'available'
+    pet.status = PetStatusEnum.Available
     pet.tags = [ tag ]
     return pet as Required<Pet>;
 }
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
index dd6cfbc3763c..1c8793031dae 100644
--- a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
@@ -18,7 +18,7 @@ describe("PetApi", () => {
         pet.id = Math.floor(Math.random() * 100000)
         pet.name = "PetName"
         pet.photoUrls = []
-        pet.status = 'available'
+        pet.status = petstore.Pet.Available
         pet.tags = [ tag ]
 
         await petApi.addPet(pet);
@@ -77,7 +77,7 @@ describe("PetApi", () => {
     })
 
     it("findPetsByStatus", async () => {
-        const pets = await petApi.findPetsByStatus(["available"]);
+        const pets = await petApi.findPetsByStatus([petstore.Pet.Available]);
         expect(pets.length).to.be.at.least(1);
     })
 
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts
index 3562c97eb949..13217fb5bad1 100644
--- a/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts
@@ -80,7 +80,7 @@ describe("ObjectSerializer", () => {
             pet.category = category
             pet.name = "PetName"
             pet.photoUrls = [ "url", "other url"] 
-            pet.status = "available"
+            pet.status = petstore.Pet.Available
             pet.tags = tags
 
             expect(ObjectSerializer.serialize(pet, "Pet", "")).to.deep.equal({
@@ -91,7 +91,7 @@ describe("ObjectSerializer", () => {
                     "name": category.name
                 },
                 "photoUrls": [ "url", "other url"],
-                "status": "available",
+                "status": petstore.Pet.Available,
                 "tags": tagResult
             })
         })
@@ -162,7 +162,7 @@ describe("ObjectSerializer", () => {
 
         it ("Enum", () => {
             const input = "available"
-            expect(ObjectSerializer.deserialize("available", "Pet.StatusEnum", "")).to.equal(input)
+            expect(ObjectSerializer.deserialize(petstore.Pet.Available, "Pet.StatusEnum", "")).to.equal(input)
         })
 
         it("Complex Class", () => {
@@ -187,7 +187,7 @@ describe("ObjectSerializer", () => {
             pet.category = category
             pet.name = "PetName"
             pet.photoUrls = [ "url", "other url"] 
-            pet.status = "available"
+            pet.status = petstore.Pet.Available
             pet.tags = tags
 
             const deserialized = ObjectSerializer.deserialize({
@@ -198,7 +198,7 @@ describe("ObjectSerializer", () => {
                     "name": category.name
                 },
                 "photoUrls": [ "url", "other url"],
-                "status": "available",
+                "status": petstore.Pet.Available,
                 "tags": tagResult
             }, "Pet", "") as petstore.Pet
 
diff --git a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
index a9575fa8dbbb..9d5a33cad379 100644
--- a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
@@ -17,7 +17,7 @@ const petId = Math.floor(Math.random() * 100000);
 pet.id = petId;
 pet.name = "PetName";
 pet.photoUrls = [];
-pet.status = "available";
+pet.status = petstore.Pet.Available;
 pet.tags = [tag];
 
 Deno.test({
@@ -51,7 +51,7 @@ Deno.test({
   fn: async () => {
     try {
       await petApi.addPet(pet);
-      const pets = await petApi.findPetsByStatus(["available"]);
+      const pets = await petApi.findPetsByStatus([petstore.Pet.Available]);
       assert(pets.length > 0);
     } catch (err) {
       fail(err);
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
index ef3882f9e573..aad62097cd3d 100644
--- a/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
@@ -16,7 +16,7 @@ const pet = new petstore.Pet()
 pet.id = Math.floor(Math.random() * 100000)
 pet.name = "PetName"
 pet.photoUrls = []
-pet.status = 'available'
+pet.status = petstore.Pet.Available
 pet.tags = [ tag ]
 
 QUnit.module("PetApi")
@@ -49,7 +49,7 @@ QUnit.test("deletePet", (assert: any) => {
 
 QUnit.test("findPetsByStatus", (assert: any) => {
     return petApi.addPet(pet).then(() => {
-        return petApi.findPetsByStatus(["available"])
+        return petApi.findPetsByStatus([petstore.Pet.Available])
     }).then((pets: petstore.Pet[]) => {
         assert.ok(pets.length >= 1, "Found at least one pet.");
     })
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
index 302304492bbc..b10297f28b22 100644
--- a/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
@@ -15,7 +15,7 @@ const pet = new petstore.Pet()
 pet.id = Math.floor(Math.random() * 100000)
 pet.name = "PetName"
 pet.photoUrls = []
-pet.status = 'available'
+pet.status = petstore.Pet.Available
 pet.tags = [ tag ]
 
 describe("PetApi", () =>{ 
@@ -48,7 +48,7 @@ describe("PetApi", () =>{
 
     it("findPetsByStatus", (done) => {
         petApi.addPet({ pet: pet}).then(() => {
-            return petApi.findPetsByStatus({ status: ["available"]})
+            return petApi.findPetsByStatus({ status: [petstore.Pet.Available]})
         }).then((pets: petstore.Pet[]) => {
             expect(pets.length).to.be.at.least(1);
             done();

From 56e95cc07dc23b27fe8d0a00ca87080c44382e57 Mon Sep 17 00:00:00 2001
From: ksvirkou-hubspot <ksvirkou@hubspot.com>
Date: Wed, 1 Feb 2023 12:56:20 +0300
Subject: [PATCH 4/7] fix tests

---
 .../typescript/tests/default/test/api/PetApi.test.ts   |  4 ++--
 .../tests/default/test/models/ObjectSerializer.test.ts | 10 +++++-----
 .../typescript/tests/deno/test/api/PetApi_test.ts      |  4 ++--
 .../typescript/tests/jquery/test/api/PetApi.test.ts    |  4 ++--
 .../tests/object_params/test/api/PetApi.test.ts        |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
index 1c8793031dae..d4249cbba21c 100644
--- a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
@@ -18,7 +18,7 @@ describe("PetApi", () => {
         pet.id = Math.floor(Math.random() * 100000)
         pet.name = "PetName"
         pet.photoUrls = []
-        pet.status = petstore.Pet.Available
+        pet.status = petstore.PetStatusEnum.Available
         pet.tags = [ tag ]
 
         await petApi.addPet(pet);
@@ -77,7 +77,7 @@ describe("PetApi", () => {
     })
 
     it("findPetsByStatus", async () => {
-        const pets = await petApi.findPetsByStatus([petstore.Pet.Available]);
+        const pets = await petApi.findPetsByStatus([petstore.PetStatusEnum.Available]);
         expect(pets.length).to.be.at.least(1);
     })
 
diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts
index 13217fb5bad1..13d41de39e50 100644
--- a/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/models/ObjectSerializer.test.ts
@@ -80,7 +80,7 @@ describe("ObjectSerializer", () => {
             pet.category = category
             pet.name = "PetName"
             pet.photoUrls = [ "url", "other url"] 
-            pet.status = petstore.Pet.Available
+            pet.status = petstore.PetStatusEnum.Available
             pet.tags = tags
 
             expect(ObjectSerializer.serialize(pet, "Pet", "")).to.deep.equal({
@@ -91,7 +91,7 @@ describe("ObjectSerializer", () => {
                     "name": category.name
                 },
                 "photoUrls": [ "url", "other url"],
-                "status": petstore.Pet.Available,
+                "status": petstore.PetStatusEnum.Available,
                 "tags": tagResult
             })
         })
@@ -162,7 +162,7 @@ describe("ObjectSerializer", () => {
 
         it ("Enum", () => {
             const input = "available"
-            expect(ObjectSerializer.deserialize(petstore.Pet.Available, "Pet.StatusEnum", "")).to.equal(input)
+            expect(ObjectSerializer.deserialize(petstore.PetStatusEnum.Available, "Pet.StatusEnum", "")).to.equal(input)
         })
 
         it("Complex Class", () => {
@@ -187,7 +187,7 @@ describe("ObjectSerializer", () => {
             pet.category = category
             pet.name = "PetName"
             pet.photoUrls = [ "url", "other url"] 
-            pet.status = petstore.Pet.Available
+            pet.status = petstore.PetStatusEnum.Available
             pet.tags = tags
 
             const deserialized = ObjectSerializer.deserialize({
@@ -198,7 +198,7 @@ describe("ObjectSerializer", () => {
                     "name": category.name
                 },
                 "photoUrls": [ "url", "other url"],
-                "status": petstore.Pet.Available,
+                "status": petstore.PetStatusEnum.Available,
                 "tags": tagResult
             }, "Pet", "") as petstore.Pet
 
diff --git a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
index 9d5a33cad379..e86e78faed0b 100644
--- a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
@@ -17,7 +17,7 @@ const petId = Math.floor(Math.random() * 100000);
 pet.id = petId;
 pet.name = "PetName";
 pet.photoUrls = [];
-pet.status = petstore.Pet.Available;
+pet.status = petstore.PetStatusEnum.Available;
 pet.tags = [tag];
 
 Deno.test({
@@ -51,7 +51,7 @@ Deno.test({
   fn: async () => {
     try {
       await petApi.addPet(pet);
-      const pets = await petApi.findPetsByStatus([petstore.Pet.Available]);
+      const pets = await petApi.findPetsByStatus([petstore.PetStatusEnum.Available]);
       assert(pets.length > 0);
     } catch (err) {
       fail(err);
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
index aad62097cd3d..689b8bcce773 100644
--- a/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
@@ -16,7 +16,7 @@ const pet = new petstore.Pet()
 pet.id = Math.floor(Math.random() * 100000)
 pet.name = "PetName"
 pet.photoUrls = []
-pet.status = petstore.Pet.Available
+pet.status = petstore.PetStatusEnum.Available
 pet.tags = [ tag ]
 
 QUnit.module("PetApi")
@@ -49,7 +49,7 @@ QUnit.test("deletePet", (assert: any) => {
 
 QUnit.test("findPetsByStatus", (assert: any) => {
     return petApi.addPet(pet).then(() => {
-        return petApi.findPetsByStatus([petstore.Pet.Available])
+        return petApi.findPetsByStatus([petstore.PetStatusEnum.Available])
     }).then((pets: petstore.Pet[]) => {
         assert.ok(pets.length >= 1, "Found at least one pet.");
     })
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
index b10297f28b22..e5478d81739f 100644
--- a/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
@@ -15,7 +15,7 @@ const pet = new petstore.Pet()
 pet.id = Math.floor(Math.random() * 100000)
 pet.name = "PetName"
 pet.photoUrls = []
-pet.status = petstore.Pet.Available
+pet.status = petstore.PetStatusEnum.Available
 pet.tags = [ tag ]
 
 describe("PetApi", () =>{ 
@@ -48,7 +48,7 @@ describe("PetApi", () =>{
 
     it("findPetsByStatus", (done) => {
         petApi.addPet({ pet: pet}).then(() => {
-            return petApi.findPetsByStatus({ status: [petstore.Pet.Available]})
+            return petApi.findPetsByStatus({ status: [petstore.PetStatusEnum.Available]})
         }).then((pets: petstore.Pet[]) => {
             expect(pets.length).to.be.at.least(1);
             done();

From b02b765972168ad8a34d087d4fd220ed3d9453ba Mon Sep 17 00:00:00 2001
From: ksvirkou-hubspot <ksvirkou@hubspot.com>
Date: Wed, 1 Feb 2023 13:31:12 +0300
Subject: [PATCH 5/7] fix default tests

---
 .../petstore/typescript/tests/default/test/api/PetApi.test.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
index d4249cbba21c..2b215ee28aea 100644
--- a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts
@@ -77,7 +77,7 @@ describe("PetApi", () => {
     })
 
     it("findPetsByStatus", async () => {
-        const pets = await petApi.findPetsByStatus([petstore.PetStatusEnum.Available]);
+        const pets = await petApi.findPetsByStatus(["available"]);
         expect(pets.length).to.be.at.least(1);
     })
 

From 788ca2cdc408047fb3d1036f0c54ddcf2fef004a Mon Sep 17 00:00:00 2001
From: ksvirkou-hubspot <ksvirkou@hubspot.com>
Date: Wed, 1 Feb 2023 13:54:23 +0300
Subject: [PATCH 6/7] fix findPetsByStatus in tests

---
 .../petstore/typescript/tests/deno/test/api/PetApi_test.ts      | 2 +-
 .../petstore/typescript/tests/jquery/test/api/PetApi.test.ts    | 2 +-
 .../typescript/tests/object_params/test/api/PetApi.test.ts      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
index e86e78faed0b..9b8e652ce76b 100644
--- a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts
@@ -51,7 +51,7 @@ Deno.test({
   fn: async () => {
     try {
       await petApi.addPet(pet);
-      const pets = await petApi.findPetsByStatus([petstore.PetStatusEnum.Available]);
+      const pets = await petApi.findPetsByStatus(["available"]);
       assert(pets.length > 0);
     } catch (err) {
       fail(err);
diff --git a/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
index 689b8bcce773..b061610023ca 100644
--- a/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/jquery/test/api/PetApi.test.ts
@@ -49,7 +49,7 @@ QUnit.test("deletePet", (assert: any) => {
 
 QUnit.test("findPetsByStatus", (assert: any) => {
     return petApi.addPet(pet).then(() => {
-        return petApi.findPetsByStatus([petstore.PetStatusEnum.Available])
+        return petApi.findPetsByStatus(["available"])
     }).then((pets: petstore.Pet[]) => {
         assert.ok(pets.length >= 1, "Found at least one pet.");
     })
diff --git a/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
index e5478d81739f..2e2c311634da 100644
--- a/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
+++ b/samples/openapi3/client/petstore/typescript/tests/object_params/test/api/PetApi.test.ts
@@ -48,7 +48,7 @@ describe("PetApi", () =>{
 
     it("findPetsByStatus", (done) => {
         petApi.addPet({ pet: pet}).then(() => {
-            return petApi.findPetsByStatus({ status: [petstore.PetStatusEnum.Available]})
+            return petApi.findPetsByStatus({ status: ["available"]})
         }).then((pets: petstore.Pet[]) => {
             expect(pets.length).to.be.at.least(1);
             done();

From 79a0d21951281a78496d4623c9e211f73533e0be Mon Sep 17 00:00:00 2001
From: ksvirkou-hubspot <ksvirkou@hubspot.com>
Date: Tue, 7 Feb 2023 12:48:41 +0300
Subject: [PATCH 7/7] rm any

---
 .../src/main/resources/typescript/model/model.mustache    | 4 ++--
 .../petstore/typescript/builds/browser/models/Order.ts    | 6 +++---
 .../petstore/typescript/builds/browser/models/Pet.ts      | 6 +++---
 .../typescript/builds/composed-schemas/models/Dog.ts      | 8 ++++----
 .../typescript/builds/composed-schemas/models/DogAllOf.ts | 8 ++++----
 .../builds/composed-schemas/models/PetByType.ts           | 4 ++--
 .../composed-schemas/models/PetsFilteredPatchRequest.ts   | 4 ++--
 .../builds/composed-schemas/models/PetsPatchRequest.ts    | 8 ++++----
 .../petstore/typescript/builds/default/models/Order.ts    | 6 +++---
 .../petstore/typescript/builds/default/models/Pet.ts      | 6 +++---
 .../petstore/typescript/builds/deno/models/Order.ts       | 6 +++---
 .../client/petstore/typescript/builds/deno/models/Pet.ts  | 6 +++---
 .../petstore/typescript/builds/inversify/models/Order.ts  | 6 +++---
 .../petstore/typescript/builds/inversify/models/Pet.ts    | 6 +++---
 .../petstore/typescript/builds/jquery/models/Order.ts     | 6 +++---
 .../petstore/typescript/builds/jquery/models/Pet.ts       | 6 +++---
 .../typescript/builds/object_params/models/Order.ts       | 6 +++---
 .../typescript/builds/object_params/models/Pet.ts         | 6 +++---
 18 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache
index ce1fb60b21e3..4f09ee74ebbc 100644
--- a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache
@@ -74,7 +74,7 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
 export enum {{classname}}{{enumName}} {
     {{#allowableValues}}
     {{#enumVars}}
-    {{name}} = <any> {{{value}}}{{^-last}},{{/-last}}
+    {{name}} = {{{value}}}{{^-last}},{{/-last}}
     {{/enumVars}}
     {{/allowableValues}}
 }
@@ -87,7 +87,7 @@ export enum {{classname}}{{enumName}} {
 export enum {{classname}} {
     {{#allowableValues}}
     {{#enumVars}}
-    {{name}} = <any> {{{value}}}{{^-last}},{{/-last}}
+    {{name}} = {{{value}}}{{^-last}},{{/-last}}
     {{/enumVars}}
     {{/allowableValues}}
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts
index ec5656d85887..4d80550bb2af 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts
@@ -76,8 +76,8 @@ export class Order {
 
 
 export enum OrderStatusEnum {
-    Placed = <any> 'placed',
-    Approved = <any> 'approved',
-    Delivered = <any> 'delivered'
+    Placed = 'placed',
+    Approved = 'approved',
+    Delivered = 'delivered'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts
index f0e8883e538d..ecaefffea4ff 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts
@@ -78,8 +78,8 @@ export class Pet {
 
 
 export enum PetStatusEnum {
-    Available = <any> 'available',
-    Pending = <any> 'pending',
-    Sold = <any> 'sold'
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts
index 978125291b2f..4d83c9db7549 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts
@@ -42,9 +42,9 @@ export class Dog {
 
 
 export enum DogBreedEnum {
-    Dingo = <any> 'Dingo',
-    Husky = <any> 'Husky',
-    Retriever = <any> 'Retriever',
-    Shepherd = <any> 'Shepherd'
+    Dingo = 'Dingo',
+    Husky = 'Husky',
+    Retriever = 'Retriever',
+    Shepherd = 'Shepherd'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts
index 593080907b70..704fced815f2 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts
@@ -42,9 +42,9 @@ export class DogAllOf {
 
 
 export enum DogAllOfBreedEnum {
-    Dingo = <any> 'Dingo',
-    Husky = <any> 'Husky',
-    Retriever = <any> 'Retriever',
-    Shepherd = <any> 'Shepherd'
+    Dingo = 'Dingo',
+    Husky = 'Husky',
+    Retriever = 'Retriever',
+    Shepherd = 'Shepherd'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts
index 66a8181b3505..4306e8ead938 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts
@@ -42,7 +42,7 @@ export class PetByType {
 
 
 export enum PetByTypePetTypeEnum {
-    Cat = <any> 'Cat',
-    Dog = <any> 'Dog'
+    Cat = 'Cat',
+    Dog = 'Dog'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts
index e00d2a19026d..4eaec36a60c6 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts
@@ -58,7 +58,7 @@ export class PetsFilteredPatchRequest {
 
 
 export enum PetsFilteredPatchRequestPetTypeEnum {
-    Cat = <any> 'Cat',
-    Dog = <any> 'Dog'
+    Cat = 'Cat',
+    Dog = 'Dog'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts
index 7546ef268a00..7c1009e3d515 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts
@@ -59,9 +59,9 @@ export class PetsPatchRequest {
 
 
 export enum PetsPatchRequestBreedEnum {
-    Dingo = <any> 'Dingo',
-    Husky = <any> 'Husky',
-    Retriever = <any> 'Retriever',
-    Shepherd = <any> 'Shepherd'
+    Dingo = 'Dingo',
+    Husky = 'Husky',
+    Retriever = 'Retriever',
+    Shepherd = 'Shepherd'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
index ec5656d85887..4d80550bb2af 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
@@ -76,8 +76,8 @@ export class Order {
 
 
 export enum OrderStatusEnum {
-    Placed = <any> 'placed',
-    Approved = <any> 'approved',
-    Delivered = <any> 'delivered'
+    Placed = 'placed',
+    Approved = 'approved',
+    Delivered = 'delivered'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
index f0e8883e538d..ecaefffea4ff 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
@@ -78,8 +78,8 @@ export class Pet {
 
 
 export enum PetStatusEnum {
-    Available = <any> 'available',
-    Pending = <any> 'pending',
-    Sold = <any> 'sold'
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
index 4398ee780087..63e6b8fe3f12 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
@@ -76,8 +76,8 @@ export class Order {
 
 
 export enum OrderStatusEnum {
-    Placed = <any> 'placed',
-    Approved = <any> 'approved',
-    Delivered = <any> 'delivered'
+    Placed = 'placed',
+    Approved = 'approved',
+    Delivered = 'delivered'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
index 3b65ed3af366..1404661b6de0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
@@ -78,8 +78,8 @@ export class Pet {
 
 
 export enum PetStatusEnum {
-    Available = <any> 'available',
-    Pending = <any> 'pending',
-    Sold = <any> 'sold'
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
index ec5656d85887..4d80550bb2af 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
@@ -76,8 +76,8 @@ export class Order {
 
 
 export enum OrderStatusEnum {
-    Placed = <any> 'placed',
-    Approved = <any> 'approved',
-    Delivered = <any> 'delivered'
+    Placed = 'placed',
+    Approved = 'approved',
+    Delivered = 'delivered'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
index f0e8883e538d..ecaefffea4ff 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
@@ -78,8 +78,8 @@ export class Pet {
 
 
 export enum PetStatusEnum {
-    Available = <any> 'available',
-    Pending = <any> 'pending',
-    Sold = <any> 'sold'
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
index ec5656d85887..4d80550bb2af 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
@@ -76,8 +76,8 @@ export class Order {
 
 
 export enum OrderStatusEnum {
-    Placed = <any> 'placed',
-    Approved = <any> 'approved',
-    Delivered = <any> 'delivered'
+    Placed = 'placed',
+    Approved = 'approved',
+    Delivered = 'delivered'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
index f0e8883e538d..ecaefffea4ff 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
@@ -78,8 +78,8 @@ export class Pet {
 
 
 export enum PetStatusEnum {
-    Available = <any> 'available',
-    Pending = <any> 'pending',
-    Sold = <any> 'sold'
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
index ec5656d85887..4d80550bb2af 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
@@ -76,8 +76,8 @@ export class Order {
 
 
 export enum OrderStatusEnum {
-    Placed = <any> 'placed',
-    Approved = <any> 'approved',
-    Delivered = <any> 'delivered'
+    Placed = 'placed',
+    Approved = 'approved',
+    Delivered = 'delivered'
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
index f0e8883e538d..ecaefffea4ff 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
@@ -78,8 +78,8 @@ export class Pet {
 
 
 export enum PetStatusEnum {
-    Available = <any> 'available',
-    Pending = <any> 'pending',
-    Sold = <any> 'sold'
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
 }