diff --git a/docs/generators/javascript-flowtyped.md b/docs/generators/javascript-flowtyped.md index b0c81d51a4fe..56f4be405504 100644 --- a/docs/generators/javascript-flowtyped.md +++ b/docs/generators/javascript-flowtyped.md @@ -36,6 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|stringEnums|Generate string enums instead of objects for enum values.| |false| |supportsES6|Generate code that conforms to ES6.| |false| ## IMPORT MAPPING diff --git a/docs/generators/typescript-aurelia.md b/docs/generators/typescript-aurelia.md index a4c3819c4dd0..370202d626c8 100644 --- a/docs/generators/typescript-aurelia.md +++ b/docs/generators/typescript-aurelia.md @@ -35,6 +35,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|stringEnums|Generate string enums instead of objects for enum values.| |false| |supportsES6|Generate code that conforms to ES6.| |false| ## IMPORT MAPPING diff --git a/docs/generators/typescript-inversify.md b/docs/generators/typescript-inversify.md index b38c0ff9afb7..856a54a1a342 100644 --- a/docs/generators/typescript-inversify.md +++ b/docs/generators/typescript-inversify.md @@ -36,6 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|stringEnums|Generate string enums instead of objects for enum values.| |false| |supportsES6|Generate code that conforms to ES6.| |false| |taggedUnions|Use discriminators to create tagged unions instead of extending interfaces.| |false| |usePromise|Setting this property to use promise instead of observable inside every service.| |false| diff --git a/docs/generators/typescript-jquery.md b/docs/generators/typescript-jquery.md index 626ac5a920f5..ec2f20ab6811 100644 --- a/docs/generators/typescript-jquery.md +++ b/docs/generators/typescript-jquery.md @@ -37,6 +37,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|stringEnums|Generate string enums instead of objects for enum values.| |false| |supportsES6|Generate code that conforms to ES6.| |false| ## IMPORT MAPPING diff --git a/docs/generators/typescript-node.md b/docs/generators/typescript-node.md index f19a9f34e5a3..2631cd76565f 100644 --- a/docs/generators/typescript-node.md +++ b/docs/generators/typescript-node.md @@ -36,6 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|stringEnums|Generate string enums instead of objects for enum values.| |false| |supportsES6|Generate code that conforms to ES6.| |false| ## IMPORT MAPPING diff --git a/docs/generators/typescript-redux-query.md b/docs/generators/typescript-redux-query.md index 0e0aa2ec3ce3..f92f94727c00 100644 --- a/docs/generators/typescript-redux-query.md +++ b/docs/generators/typescript-redux-query.md @@ -36,6 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|stringEnums|Generate string enums instead of objects for enum values.| |false| |supportsES6|Generate code that conforms to ES6.| |false| |useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.| |true| |withInterfaces|Setting this property to true will generate interfaces next to the default class implementations.| |false| diff --git a/docs/generators/typescript-rxjs.md b/docs/generators/typescript-rxjs.md index b5cdf9fe8a7a..f6041f170a35 100644 --- a/docs/generators/typescript-rxjs.md +++ b/docs/generators/typescript-rxjs.md @@ -36,6 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|stringEnums|Generate string enums instead of objects for enum values.| |false| |supportsES6|Generate code that conforms to ES6.| |false| |withProgressSubscriber|Setting this property to true will generate API controller methods with support for subscribing to request progress.| |false| diff --git a/docs/generators/typescript.md b/docs/generators/typescript.md index ed7612a0cea4..a38eef9bdfba 100644 --- a/docs/generators/typescript.md +++ b/docs/generators/typescript.md @@ -40,6 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| +|stringEnums|Generate string enums instead of objects for enum values.| |false| |supportsES6|Generate code that conforms to ES6.| |false| |useInversify|Enable this to generate decorators and service identifiers for the InversifyJS inversion of control container. If you set 'deno' as 'platform', the generator will process this value as 'disable'.| |false| |useObjectParameters|Use aggregate parameter objects as function arguments for api operations instead of passing each parameter as a separate function argument.| |false| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index cc5a4d319211..c7c349c7b196 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -236,6 +236,9 @@ protected String nullableQuotedJSString(@Nullable String string) { public static final String NULL_SAFE_ADDITIONAL_PROPS = "nullSafeAdditionalProps"; public static final String NULL_SAFE_ADDITIONAL_PROPS_DESC = "Set to make additional properties types declare that their indexer may return undefined"; + public static final String STRING_ENUMS = "stringEnums"; + public static final String STRING_ENUMS_DESC = "Generate string enums instead of objects for enum values."; + // NOTE: SimpleDateFormat is not thread-safe and may not be static unless it is thread-local @SuppressWarnings("squid:S5164") protected static final ThreadLocal SNAPSHOT_SUFFIX_FORMAT = ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT)); @@ -248,6 +251,7 @@ protected String nullableQuotedJSString(@Nullable String string) { protected Boolean supportsES6 = false; @Getter @Setter protected Boolean nullSafeAdditionalProps = false; + @Getter @Setter protected Boolean stringEnums = false; protected HashSet languageGenericTypes; @Getter @Setter protected String npmName = null; @@ -369,6 +373,7 @@ public AbstractTypeScriptClientCodegen() { "When setting this property to true, the version will be suffixed with -SNAPSHOT." + SNAPSHOT_SUFFIX_FORMAT.get().toPattern(), false)); this.cliOptions.add(new CliOption(NULL_SAFE_ADDITIONAL_PROPS, NULL_SAFE_ADDITIONAL_PROPS_DESC).defaultValue(String.valueOf(this.getNullSafeAdditionalProps()))); + this.cliOptions.add(new CliOption(STRING_ENUMS, STRING_ENUMS_DESC).defaultValue(String.valueOf(this.getStringEnums()))); this.cliOptions.add(CliOption.newBoolean(ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR, ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR_DESC, false)); } @@ -413,6 +418,11 @@ public void processOpts() { setNullSafeAdditionalProps(Boolean.valueOf(additionalProperties.get(NULL_SAFE_ADDITIONAL_PROPS).toString())); } + if (additionalProperties.containsKey(STRING_ENUMS)) { + setStringEnums(convertPropertyToBoolean(STRING_ENUMS)); + additionalProperties.put("stringEnums", getStringEnums()); + } + if (additionalProperties.containsKey(NPM_NAME)) { this.setNpmName(additionalProperties.get(NPM_NAME).toString()); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 18d4051c9c0a..10f2da98789c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -72,8 +72,6 @@ public static enum PROVIDED_IN_LEVEL {none, root, any, platform} public static final String MODEL_SUFFIX = "modelSuffix"; public static final String MODEL_FILE_SUFFIX = "modelFileSuffix"; public static final String FILE_NAMING = "fileNaming"; - public static final String STRING_ENUMS = "stringEnums"; - public static final String STRING_ENUMS_DESC = "Generate string enums instead of objects for enum values."; public static final String QUERY_PARAM_OBJECT_FORMAT = "queryParamObjectFormat"; public static final String USE_SQUARE_BRACKETS_IN_ARRAY_NAMES = "useSquareBracketsInArrayNames"; @@ -86,7 +84,6 @@ public static enum PROVIDED_IN_LEVEL {none, root, any, platform} protected String modelSuffix = ""; protected String modelFileSuffix = ""; protected String fileNaming = "camelCase"; - @Getter protected Boolean stringEnums = false; protected QUERY_PARAM_OBJECT_FORMAT_TYPE queryParamObjectFormat = QUERY_PARAM_OBJECT_FORMAT_TYPE.dot; protected PROVIDED_IN_LEVEL providedIn = PROVIDED_IN_LEVEL.root; @@ -141,7 +138,6 @@ public TypeScriptAngularClientCodegen() { this.cliOptions.add(new CliOption(MODEL_SUFFIX, "The suffix of the generated model.")); this.cliOptions.add(new CliOption(MODEL_FILE_SUFFIX, "The suffix of the file of the generated model (model.ts).")); this.cliOptions.add(new CliOption(FILE_NAMING, "Naming convention for the output files: 'camelCase', 'kebab-case'.").defaultValue(this.fileNaming)); - this.cliOptions.add(new CliOption(STRING_ENUMS, STRING_ENUMS_DESC).defaultValue(String.valueOf(this.stringEnums))); this.cliOptions.add(new CliOption(QUERY_PARAM_OBJECT_FORMAT, "The format for query param objects: 'dot', 'json', 'key'.").defaultValue(this.queryParamObjectFormat.name())); this.cliOptions.add(CliOption.newBoolean(USE_SQUARE_BRACKETS_IN_ARRAY_NAMES, "Setting this property to true will add brackets to array attribute names, e.g. my_values[].", false)); } @@ -197,12 +193,8 @@ public void processOpts() { addNpmPackageGeneration(ngVersion); } - if (additionalProperties.containsKey(STRING_ENUMS)) { - setStringEnums(Boolean.parseBoolean(additionalProperties.get(STRING_ENUMS).toString())); - additionalProperties.put("stringEnums", getStringEnums()); - if (getStringEnums()) { - classEnumSeparator = ""; - } + if (additionalProperties.containsKey(STRING_ENUMS) && getStringEnums()) { + classEnumSeparator = ""; } if (additionalProperties.containsKey(WITH_INTERFACES)) { @@ -415,10 +407,6 @@ private String getIndexDirectory() { return indexPackage.replace('.', File.separatorChar); } - public void setStringEnums(boolean value) { - stringEnums = value; - } - public boolean getQueryParamObjectFormatDot() { return QUERY_PARAM_OBJECT_FORMAT_TYPE.dot.equals(queryParamObjectFormat); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java index 6bc4ecfb373a..7ff0e7724204 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java @@ -41,15 +41,12 @@ public class TypeScriptAxiosClientCodegen extends AbstractTypeScriptClientCodege public static final String WITHOUT_PREFIX_ENUMS = "withoutPrefixEnums"; public static final String USE_SINGLE_REQUEST_PARAMETER = "useSingleRequestParameter"; public static final String WITH_NODE_IMPORTS = "withNodeImports"; - public static final String STRING_ENUMS = "stringEnums"; - public static final String STRING_ENUMS_DESC = "Generate string enums instead of objects for enum values."; public static final String USE_SQUARE_BRACKETS_IN_ARRAY_NAMES = "useSquareBracketsInArrayNames"; public static final String AXIOS_VERSION = "axiosVersion"; public static final String DEFAULT_AXIOS_VERSION = "^1.6.1"; @Getter @Setter protected String npmRepository = null; - protected Boolean stringEnums = false; @Getter @Setter protected String axiosVersion = DEFAULT_AXIOS_VERSION; @@ -80,7 +77,6 @@ public TypeScriptAxiosClientCodegen() { this.cliOptions.add(new CliOption(WITHOUT_PREFIX_ENUMS, "Don't prefix enum names with class names", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(USE_SINGLE_REQUEST_PARAMETER, "Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(WITH_NODE_IMPORTS, "Setting this property to true adds imports for NodeJS", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); - this.cliOptions.add(new CliOption(STRING_ENUMS, STRING_ENUMS_DESC).defaultValue(String.valueOf(this.stringEnums))); this.cliOptions.add(new CliOption(USE_SQUARE_BRACKETS_IN_ARRAY_NAMES, "Setting this property to true will add brackets to array attribute names, e.g. my_values[].", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(AXIOS_VERSION, "Use this property to override the axios version in package.json").defaultValue(DEFAULT_AXIOS_VERSION)); // Templates have no mapping between formatted property names and original base names so use only "original" and remove this option @@ -145,11 +141,6 @@ public void processOpts() { } } - if (additionalProperties.containsKey(STRING_ENUMS)) { - this.stringEnums = Boolean.parseBoolean(additionalProperties.get(STRING_ENUMS).toString()); - additionalProperties.put("stringEnums", this.stringEnums); - } - if (additionalProperties.containsKey(NPM_NAME)) { addNpmPackageGeneration(); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index ae6cbce2f0c7..b61ae03ad395 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -51,8 +51,6 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege public static final String USE_SINGLE_REQUEST_PARAMETER = "useSingleRequestParameter"; public static final String PREFIX_PARAMETER_INTERFACES = "prefixParameterInterfaces"; public static final String WITHOUT_RUNTIME_CHECKS = "withoutRuntimeChecks"; - public static final String STRING_ENUMS = "stringEnums"; - public static final String STRING_ENUMS_DESC = "Generate string enums instead of objects for enum values."; public static final String IMPORT_FILE_EXTENSION_SWITCH = "importFileExtension"; public static final String IMPORT_FILE_EXTENSION_SWITCH_DESC = "File extension to use with relative imports. Set it to '.js' or '.mjs' when using [ESM](https://nodejs.org/api/esm.html)."; public static final String FILE_NAMING = "fileNaming"; @@ -70,7 +68,6 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege protected boolean addedApiIndex = false; protected boolean addedModelIndex = false; protected boolean withoutRuntimeChecks = false; - protected boolean stringEnums = false; protected String fileNaming = PASCAL_CASE; // "Saga and Record" mode. @@ -119,7 +116,6 @@ public TypeScriptFetchClientCodegen() { this.cliOptions.add(new CliOption(PREFIX_PARAMETER_INTERFACES, "Setting this property to true will generate parameter interface declarations prefixed with API class name to avoid name conflicts.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(WITHOUT_RUNTIME_CHECKS, "Setting this property to true will remove any runtime checks on the request and response payloads. Payloads will be casted to their expected types.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(SAGAS_AND_RECORDS, "Setting this property to true will generate additional files for use with redux-saga and immutablejs.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); - this.cliOptions.add(new CliOption(STRING_ENUMS, STRING_ENUMS_DESC, SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(IMPORT_FILE_EXTENSION_SWITCH, IMPORT_FILE_EXTENSION_SWITCH_DESC).defaultValue("")); this.cliOptions.add(new CliOption(FILE_NAMING, "Naming convention for the output files: 'PascalCase', 'camelCase', 'kebab-case'.").defaultValue(this.fileNaming)); this.cliOptions.add(new CliOption(USE_SQUARE_BRACKETS_IN_ARRAY_NAMES, "Setting this property to true will add brackets to array attribute names, e.g. my_values[].", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); @@ -169,13 +165,6 @@ public void setWithoutRuntimeChecks(Boolean withoutRuntimeChecks) { this.withoutRuntimeChecks = withoutRuntimeChecks; } - public Boolean getStringEnums() { - return this.stringEnums; - } - public void setStringEnums(Boolean stringEnums) { - this.stringEnums = stringEnums; - } - /** * Set the file naming type. * @@ -264,10 +253,6 @@ public void processOpts() { this.setWithoutRuntimeChecks(convertPropertyToBoolean(WITHOUT_RUNTIME_CHECKS)); } - if (additionalProperties.containsKey(STRING_ENUMS)) { - this.setStringEnums(convertPropertyToBoolean(STRING_ENUMS)); - } - if (additionalProperties.containsKey(FILE_NAMING)) { this.setFileNaming(additionalProperties.get(FILE_NAMING).toString()); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java index 520d69e2d62d..612a827c63ec 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsClientCodegen.java @@ -53,8 +53,6 @@ public class TypeScriptNestjsClientCodegen extends AbstractTypeScriptClientCodeg public static final String MODEL_SUFFIX = "modelSuffix"; public static final String MODEL_FILE_SUFFIX = "modelFileSuffix"; public static final String FILE_NAMING = "fileNaming"; - public static final String STRING_ENUMS = "stringEnums"; - public static final String STRING_ENUMS_DESC = "Generate string enums instead of objects for enum values."; public static final String USE_SINGLE_REQUEST_PARAMETER = "useSingleRequestParameter"; protected String nestVersion = "8.0.0"; @@ -65,7 +63,6 @@ public class TypeScriptNestjsClientCodegen extends AbstractTypeScriptClientCodeg protected String modelSuffix = ""; protected String modelFileSuffix = ""; protected String fileNaming = "camelCase"; - @Getter protected Boolean stringEnums = false; private boolean taggedUnions = false; @@ -102,7 +99,6 @@ public TypeScriptNestjsClientCodegen() { this.cliOptions.add(new CliOption(MODEL_SUFFIX, "The suffix of the generated model.")); this.cliOptions.add(new CliOption(MODEL_FILE_SUFFIX, "The suffix of the file of the generated model (model.ts).")); this.cliOptions.add(new CliOption(FILE_NAMING, "Naming convention for the output files: 'camelCase', 'kebab-case'.").defaultValue(this.fileNaming)); - this.cliOptions.add(new CliOption(STRING_ENUMS, STRING_ENUMS_DESC).defaultValue(String.valueOf(this.stringEnums))); this.cliOptions.add(new CliOption(USE_SINGLE_REQUEST_PARAMETER, "Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.").defaultValue(Boolean.FALSE.toString())); } @@ -152,13 +148,9 @@ public void processOpts() { addNpmPackageGeneration(nestVersion); } - if (additionalProperties.containsKey(STRING_ENUMS)) { - setStringEnums(Boolean.parseBoolean(additionalProperties.get(STRING_ENUMS).toString())); - additionalProperties.put("stringEnums", getStringEnums()); - if (getStringEnums()) { - enumSuffix = ""; - classEnumSeparator = ""; - } + if (additionalProperties.containsKey(STRING_ENUMS) && getStringEnums()) { + enumSuffix = ""; + classEnumSeparator = ""; } if (additionalProperties.containsKey(WITH_INTERFACES)) { @@ -217,10 +209,6 @@ private String getIndexDirectory() { return indexPackage.replace('.', File.separatorChar); } - public void setStringEnums(boolean value) { - stringEnums = value; - } - @Override public boolean isDataTypeFile(final String dataType) { return "Blob".equals(dataType); diff --git a/modules/openapi-generator/src/main/resources/typescript-angularjs/model.mustache b/modules/openapi-generator/src/main/resources/typescript-angularjs/model.mustache index 90e55b66903d..92146d8bc1c5 100644 --- a/modules/openapi-generator/src/main/resources/typescript-angularjs/model.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-angularjs/model.mustache @@ -23,6 +23,7 @@ export interface {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{ export namespace {{classname}} { {{#vars}} {{#isEnum}} +{{#stringEnums}} export enum {{enumName}} { {{#allowableValues}} {{#enumVars}} @@ -30,6 +31,18 @@ export namespace {{classname}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} + export type {{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + + export const {{enumName}} = { + {{#allowableValues}} + {{#enumVars}} + {{name}}: {{{value}}} as {{enumName}}{{^-last}},{{/-last}} + {{/enumVars}} + {{/allowableValues}} + }; +{{/stringEnums}} {{/isEnum}} {{/vars}} } diff --git a/modules/openapi-generator/src/main/resources/typescript-jquery/modelEnum.mustache b/modules/openapi-generator/src/main/resources/typescript-jquery/modelEnum.mustache index a8870037fa09..5629c9351d12 100644 --- a/modules/openapi-generator/src/main/resources/typescript-jquery/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-jquery/modelEnum.mustache @@ -3,10 +3,23 @@ * {{{.}}} */ {{/description}} +{{#stringEnums}} export enum {{classname}} { {{#allowableValues}} {{#enumVars}} {{{name}}} = {{{value}}}{{^-last}},{{/-last}} {{/enumVars}} {{/allowableValues}} -} \ No newline at end of file +} +{{/stringEnums}} +{{^stringEnums}} +export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{classname}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{classname}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} diff --git a/modules/openapi-generator/src/main/resources/typescript-jquery/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-jquery/modelGeneric.mustache index 2d0c18223600..8b5c9ab9c3dc 100644 --- a/modules/openapi-generator/src/main/resources/typescript-jquery/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-jquery/modelGeneric.mustache @@ -16,6 +16,7 @@ export interface {{classname}} {{#parent}}extends models.{{{.}}} {{/parent}}{ export namespace {{classname}} { {{#vars}} {{#isEnum}} + {{#stringEnums}} export enum {{enumName}} { {{#allowableValues}} {{#enumVars}} @@ -23,6 +24,18 @@ export namespace {{classname}} { {{/enumVars}} {{/allowableValues}} } + {{/stringEnums}} + {{^stringEnums}} + export type {{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + + export const {{enumName}} = { + {{#allowableValues}} + {{#enumVars}} + {{name}}: {{{value}}} as {{enumName}}{{^-last}},{{/-last}} + {{/enumVars}} + {{/allowableValues}} + }; + {{/stringEnums}} {{/isEnum}} {{/vars}} -}{{/hasEnums}} \ No newline at end of file +}{{/hasEnums}} diff --git a/modules/openapi-generator/src/main/resources/typescript-node/model.mustache b/modules/openapi-generator/src/main/resources/typescript-node/model.mustache index 5b2d594a99ad..58617853b18f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-node/model.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-node/model.mustache @@ -56,6 +56,7 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{ export namespace {{classname}} { {{#vars}} {{#isEnum}} +{{#stringEnums}} export enum {{enumName}} { {{#allowableValues}} {{#enumVars}} @@ -63,12 +64,25 @@ export namespace {{classname}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} + export type {{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + + export const {{enumName}} = { + {{#allowableValues}} + {{#enumVars}} + {{name}}: {{{value}}} as {{enumName}}{{^-last}},{{/-last}} + {{/enumVars}} + {{/allowableValues}} + }; +{{/stringEnums}} {{/isEnum}} {{/vars}} } {{/hasEnums}} {{/isEnum}} {{#isEnum}} +{{#stringEnums}} export enum {{classname}} { {{#allowableValues}} {{#enumVars}} @@ -76,6 +90,18 @@ export enum {{classname}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} +export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{classname}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{classname}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} {{/isEnum}} {{/model}} {{/models}} diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache index 1cbe325491e7..bc0e0f6b67ab 100644 --- a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache @@ -241,6 +241,7 @@ export function {{nickname}}({{#allParams.0}}requestParameters: {{operationId {{#operation}} {{#allParams}} {{#isEnum}} +{{#stringEnums}} /** * @export * @enum {string} @@ -252,6 +253,21 @@ export enum {{operationIdCamelCase}}{{enumName}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} +/** + * @export + */ +export type {{operationIdCamelCase}}{{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{operationIdCamelCase}}{{enumName}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{operationIdCamelCase}}{{enumName}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} {{/isEnum}} {{/allParams}} {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/modelEnum.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/modelEnum.mustache index f3ded52fdb59..8831f64956b7 100644 --- a/modules/openapi-generator/src/main/resources/typescript-redux-query/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/modelEnum.mustache @@ -1,3 +1,4 @@ +{{#stringEnums}} /** * {{{description}}} * @export @@ -10,6 +11,22 @@ export enum {{classname}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} +/** + * {{{description}}} + * @export + */ +export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{classname}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{classname}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} export function {{classname}}FromJSON(json: any): {{classname}} { return json as {{classname}}; diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/modelGeneric.mustache index 893131f90f8a..99f205a79903 100644 --- a/modules/openapi-generator/src/main/resources/typescript-redux-query/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/modelGeneric.mustache @@ -124,6 +124,7 @@ export function {{classname}}ToJSON(value?: {{classname}}): any { {{#hasEnums}} {{#vars}} {{#isEnum}} +{{#stringEnums}} /** * @export * @enum {string} @@ -135,6 +136,21 @@ export enum {{classname}}{{enumName}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} +/** + * @export + */ +export type {{classname}}{{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{classname}}{{enumName}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{classname}}{{enumName}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} {{/isEnum}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache index 8c63db19fb11..96b825a19a48 100644 --- a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache @@ -228,6 +228,7 @@ export class {{classname}} extends BaseAPI { {{#operation}} {{#allParams}} {{#isEnum}} +{{#stringEnums}} /** * @export * @enum {string} @@ -239,6 +240,21 @@ export enum {{operationIdCamelCase}}{{enumName}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} +/** + * @export + */ +export type {{operationIdCamelCase}}{{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{operationIdCamelCase}}{{enumName}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{operationIdCamelCase}}{{enumName}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} {{/isEnum}} {{/allParams}} {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/modelEnum.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/modelEnum.mustache index dc04cb0bd63d..bc67aee2c401 100644 --- a/modules/openapi-generator/src/main/resources/typescript-rxjs/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/modelEnum.mustache @@ -1,3 +1,4 @@ +{{#stringEnums}} /** * {{{description}}} * @export @@ -10,3 +11,19 @@ export enum {{classname}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} +/** + * {{{description}}} + * @export + */ +export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{classname}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{classname}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache index a12ceb35c3dc..b8fb3deabee0 100644 --- a/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache @@ -27,6 +27,7 @@ export interface {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{ {{#vars}} {{#isEnum}} +{{#stringEnums}} /** * @export * @enum {string} @@ -38,6 +39,21 @@ export enum {{classname}}{{enumName}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} +/** + * @export + */ +export type {{classname}}{{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{classname}}{{enumName}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{classname}}{{enumName}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} {{/isEnum}} {{/vars}} -{{/hasEnums}} \ No newline at end of file +{{/hasEnums}} diff --git a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache index 7e763409ab3f..d6c683da7f14 100644 --- a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache @@ -60,7 +60,7 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory { .replace('{' + '{{baseName}}' + '}', encodeURIComponent(String({{paramName}}))){{/pathParams}}; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.{{httpMethod}}); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, {{#stringEnums}}HttpMethod.{{/stringEnums}}{{^stringEnums}}"{{/stringEnums}}{{httpMethod}}{{^stringEnums}}"{{/stringEnums}}); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") {{#queryParams}} @@ -161,7 +161,7 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory { await authMethod?.applySecurityAuthentication(requestContext); } {{/authMethods}} - + {{^useInversify}} const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { diff --git a/modules/openapi-generator/src/main/resources/typescript/http/http.mustache b/modules/openapi-generator/src/main/resources/typescript/http/http.mustache index 2d28a40190d0..4b1b07cafb66 100644 --- a/modules/openapi-generator/src/main/resources/typescript/http/http.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/http/http.mustache @@ -22,6 +22,7 @@ export * from './jquery{{importFileExtension}}'; {{/deno}} {{/platforms}} +{{#stringEnums}} /** * Represents an HTTP method. */ @@ -36,6 +37,25 @@ export enum HttpMethod { TRACE = "TRACE", PATCH = "PATCH" } +{{/stringEnums}} +{{^stringEnums}} +/** + * Represents an HTTP method. + */ +export type HttpMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH"; + +export const HttpMethod = { + GET: "GET" as HttpMethod, + HEAD: "HEAD" as HttpMethod, + POST: "POST" as HttpMethod, + PUT: "PUT" as HttpMethod, + DELETE: "DELETE" as HttpMethod, + CONNECT: "CONNECT" as HttpMethod, + OPTIONS: "OPTIONS" as HttpMethod, + TRACE: "TRACE" as HttpMethod, + PATCH: "PATCH" as HttpMethod +} +{{/stringEnums}} /** * Represents an HTTP file which will be transferred from or to a server. @@ -163,7 +183,7 @@ export class RequestContext { } {{#platforms}} {{#node}} - + public setAgent(agent: http.Agent | https.Agent) { this.agent = agent; } 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 798297cba063..f46ad160e0d7 100644 --- a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache @@ -71,6 +71,7 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{ {{#vars}} {{#isEnum}} +{{#stringEnums}} export enum {{classname}}{{enumName}} { {{#allowableValues}} {{#enumVars}} @@ -78,12 +79,25 @@ export enum {{classname}}{{enumName}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} +export type {{classname}}{{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{classname}}{{enumName}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{classname}}{{enumName}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} {{/isEnum}} {{/vars}} {{/hasEnums}} {{/isEnum}} {{#isEnum}} +{{#stringEnums}} export enum {{classname}} { {{#allowableValues}} {{#enumVars}} @@ -91,6 +105,18 @@ export enum {{classname}} { {{/enumVars}} {{/allowableValues}} } +{{/stringEnums}} +{{^stringEnums}} +export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}}; + +export const {{classname}} = { +{{#allowableValues}} +{{#enumVars}} + {{name}}: {{{value}}} as {{classname}}{{^-last}},{{/-last}} +{{/enumVars}} +{{/allowableValues}} +}; +{{/stringEnums}} {{/isEnum}} {{/model}} -{{/models}} \ No newline at end of file +{{/models}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java index 2ffc324fc830..f690cbcaa612 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularClientOptionsProvider.java @@ -71,7 +71,7 @@ public Map createOptions() { .put(AbstractTypeScriptClientCodegen.NULL_SAFE_ADDITIONAL_PROPS, NULL_SAFE_ADDITIONAL_PROPS_VALUE) .put(AbstractTypeScriptClientCodegen.ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR, ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR_VALUE) .put(CodegenConstants.ENUM_NAME_SUFFIX, ENUM_NAME_SUFFIX) - .put(TypeScriptAngularClientCodegen.STRING_ENUMS, STRING_ENUMS_VALUE) + .put(AbstractTypeScriptClientCodegen.STRING_ENUMS, STRING_ENUMS_VALUE) .put(TypeScriptAngularClientCodegen.NPM_NAME, NPM_NAME) .put(TypeScriptAngularClientCodegen.NPM_VERSION, NPM_VERSION) .put(TypeScriptAngularClientCodegen.SNAPSHOT, Boolean.FALSE.toString()) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularJsClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularJsClientOptionsProvider.java index fd62de4e03b8..5721ed502278 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularJsClientOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAngularJsClientOptionsProvider.java @@ -27,6 +27,7 @@ public class TypeScriptAngularJsClientOptionsProvider implements OptionsProvider public static final String SUPPORTS_ES6_VALUE = "false"; public static final String NULL_SAFE_ADDITIONAL_PROPS_VALUE = "false"; public static final String ENUM_NAME_SUFFIX = "Enum"; + public static final String STRING_ENUMS_VALUE = "false"; public static final String SORT_PARAMS_VALUE = "false"; public static final String SORT_MODEL_PROPERTIES_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -50,6 +51,7 @@ public Map createOptions() { .put(CodegenConstants.SUPPORTS_ES6, SUPPORTS_ES6_VALUE) .put(AbstractTypeScriptClientCodegen.NULL_SAFE_ADDITIONAL_PROPS, NULL_SAFE_ADDITIONAL_PROPS_VALUE) .put(CodegenConstants.ENUM_NAME_SUFFIX, ENUM_NAME_SUFFIX) + .put(AbstractTypeScriptClientCodegen.STRING_ENUMS, STRING_ENUMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .put(CodegenConstants.ENUM_PROPERTY_NAMING, ENUM_PROPERTY_NAMING_VALUE) .put(CodegenConstants.MODEL_PROPERTY_NAMING, MODEL_PROPERTY_NAMING_VALUE) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAureliaClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAureliaClientOptionsProvider.java index e975525974a6..c89918c5bb42 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAureliaClientOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptAureliaClientOptionsProvider.java @@ -31,6 +31,7 @@ public class TypeScriptAureliaClientOptionsProvider implements OptionsProvider { public static final Boolean SUPPORTS_ES6_VALUE = false; public static final Boolean NULL_SAFE_ADDITIONAL_PROPS_VALUE = false; public static final String ENUM_NAME_SUFFIX = "Enum"; + public static final String STRING_ENUMS_VALUE = "false"; public static final String ENUM_PROPERTY_NAMING_VALUE = "PascalCase"; public static final String MODEL_PROPERTY_NAMING_VALUE = "camelCase"; public static final String PARAM_NAMING_VALUE = "camelCase"; @@ -59,6 +60,7 @@ public Map createOptions() { .put(AbstractTypeScriptClientCodegen.NULL_SAFE_ADDITIONAL_PROPS, String.valueOf(NULL_SAFE_ADDITIONAL_PROPS_VALUE)) .put(AbstractTypeScriptClientCodegen.ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR, ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR_VALUE) .put(CodegenConstants.ENUM_NAME_SUFFIX, ENUM_NAME_SUFFIX) + .put(AbstractTypeScriptClientCodegen.STRING_ENUMS, STRING_ENUMS_VALUE) .put(TypeScriptAureliaClientCodegen.NPM_NAME, NPM_NAME) .put(TypeScriptAureliaClientCodegen.NPM_VERSION, NPM_VERSION) .put(TypeScriptAureliaClientCodegen.SNAPSHOT, Boolean.FALSE.toString()) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptFetchClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptFetchClientOptionsProvider.java index 2ac10fa6f327..6a0d667fb115 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptFetchClientOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptFetchClientOptionsProvider.java @@ -84,7 +84,7 @@ public Map createOptions() { .put(CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR, "true") .put(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT, "true") .put(CodegenConstants.ENUM_UNKNOWN_DEFAULT_CASE, ENUM_UNKNOWN_DEFAULT_CASE_VALUE) - .put(TypeScriptFetchClientCodegen.STRING_ENUMS, STRING_ENUMS) + .put(AbstractTypeScriptClientCodegen.STRING_ENUMS, STRING_ENUMS) .put(TypeScriptFetchClientCodegen.USE_SQUARE_BRACKETS_IN_ARRAY_NAMES, Boolean.FALSE.toString()) .build(); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptNestjsClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptNestjsClientOptionsProvider.java index 8c89e824f241..8be67b2b4fd7 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptNestjsClientOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptNestjsClientOptionsProvider.java @@ -68,7 +68,7 @@ public Map createOptions() { .put(AbstractTypeScriptClientCodegen.NULL_SAFE_ADDITIONAL_PROPS, NULL_SAFE_ADDITIONAL_PROPS_VALUE) .put(AbstractTypeScriptClientCodegen.ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR, ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR_VALUE) .put(CodegenConstants.ENUM_NAME_SUFFIX, ENUM_NAME_SUFFIX) - .put(TypeScriptNestjsClientCodegen.STRING_ENUMS, STRING_ENUMS_VALUE) + .put(AbstractTypeScriptClientCodegen.STRING_ENUMS, STRING_ENUMS_VALUE) .put(TypeScriptNestjsClientCodegen.NPM_NAME, NMP_NAME) .put(TypeScriptNestjsClientCodegen.NPM_VERSION, NMP_VERSION) .put(TypeScriptNestjsClientCodegen.SNAPSHOT, Boolean.FALSE.toString()) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptNodeClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptNodeClientOptionsProvider.java index fca76c379aef..d9f52686a233 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptNodeClientOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptNodeClientOptionsProvider.java @@ -29,6 +29,7 @@ public class TypeScriptNodeClientOptionsProvider implements OptionsProvider { public static final String SUPPORTS_ES6_VALUE = "false"; public static final String NULL_SAFE_ADDITIONAL_PROPS_VALUE = "false"; public static final String ENUM_NAME_SUFFIX = "Enum"; + public static final String STRING_ENUMS_VALUE = "false"; public static final String SORT_PARAMS_VALUE = "false"; public static final String SORT_MODEL_PROPERTIES_VALUE = "false"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; @@ -58,6 +59,7 @@ public Map createOptions() { .put(AbstractTypeScriptClientCodegen.NULL_SAFE_ADDITIONAL_PROPS, NULL_SAFE_ADDITIONAL_PROPS_VALUE) .put(AbstractTypeScriptClientCodegen.ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR, ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR_VALUE) .put(CodegenConstants.ENUM_NAME_SUFFIX, ENUM_NAME_SUFFIX) + .put(AbstractTypeScriptClientCodegen.STRING_ENUMS, STRING_ENUMS_VALUE) .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) .put(CodegenConstants.ENUM_PROPERTY_NAMING, ENUM_PROPERTY_NAMING_VALUE) .put(CodegenConstants.MODEL_PROPERTY_NAMING, MODEL_PROPERTY_NAMING_VALUE) diff --git a/samples/client/others/typescript/builds/with-unique-items/apis/DefaultApi.ts b/samples/client/others/typescript/builds/with-unique-items/apis/DefaultApi.ts index db62475226d0..e071c025c201 100644 --- a/samples/client/others/typescript/builds/with-unique-items/apis/DefaultApi.ts +++ b/samples/client/others/typescript/builds/with-unique-items/apis/DefaultApi.ts @@ -24,11 +24,11 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/unique-items'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/client/others/typescript/builds/with-unique-items/http/http.ts b/samples/client/others/typescript/builds/with-unique-items/http/http.ts index 4f24155ea4fe..8912147e1aba 100644 --- a/samples/client/others/typescript/builds/with-unique-items/http/http.ts +++ b/samples/client/others/typescript/builds/with-unique-items/http/http.ts @@ -5,16 +5,18 @@ export * from './isomorphic-fetch'; /** * Represents an HTTP method. */ -export enum HttpMethod { - GET = "GET", - HEAD = "HEAD", - POST = "POST", - PUT = "PUT", - DELETE = "DELETE", - CONNECT = "CONNECT", - OPTIONS = "OPTIONS", - TRACE = "TRACE", - PATCH = "PATCH" +export type HttpMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH"; + +export const HttpMethod = { + GET: "GET" as HttpMethod, + HEAD: "HEAD" as HttpMethod, + POST: "POST" as HttpMethod, + PUT: "PUT" as HttpMethod, + DELETE: "DELETE" as HttpMethod, + CONNECT: "CONNECT" as HttpMethod, + OPTIONS: "OPTIONS" as HttpMethod, + TRACE: "TRACE" as HttpMethod, + PATCH: "PATCH" as HttpMethod } /** diff --git a/samples/client/petstore/typescript-jquery/default/model/ApiResponse.ts b/samples/client/petstore/typescript-jquery/default/model/ApiResponse.ts index 7bd581816768..ac6f340b6fd2 100644 --- a/samples/client/petstore/typescript-jquery/default/model/ApiResponse.ts +++ b/samples/client/petstore/typescript-jquery/default/model/ApiResponse.ts @@ -23,3 +23,4 @@ export interface ApiResponse { message?: string; } + diff --git a/samples/client/petstore/typescript-jquery/default/model/Category.ts b/samples/client/petstore/typescript-jquery/default/model/Category.ts index 17778c4e0ddf..2d2a7e7a26ed 100644 --- a/samples/client/petstore/typescript-jquery/default/model/Category.ts +++ b/samples/client/petstore/typescript-jquery/default/model/Category.ts @@ -21,3 +21,4 @@ export interface Category { name?: string; } + diff --git a/samples/client/petstore/typescript-jquery/default/model/Order.ts b/samples/client/petstore/typescript-jquery/default/model/Order.ts index af5570597c88..ac1bfac2a2ab 100644 --- a/samples/client/petstore/typescript-jquery/default/model/Order.ts +++ b/samples/client/petstore/typescript-jquery/default/model/Order.ts @@ -33,9 +33,12 @@ export interface Order { } export namespace Order { - export enum StatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' - } + export type StatusEnum = 'placed' | 'approved' | 'delivered'; + + export const StatusEnum = { + Placed: 'placed' as StatusEnum, + Approved: 'approved' as StatusEnum, + Delivered: 'delivered' as StatusEnum + }; } + diff --git a/samples/client/petstore/typescript-jquery/default/model/Pet.ts b/samples/client/petstore/typescript-jquery/default/model/Pet.ts index e941295cd23a..cae4aa49795e 100644 --- a/samples/client/petstore/typescript-jquery/default/model/Pet.ts +++ b/samples/client/petstore/typescript-jquery/default/model/Pet.ts @@ -33,9 +33,12 @@ export interface Pet { } export namespace Pet { - export enum StatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' - } + export type StatusEnum = 'available' | 'pending' | 'sold'; + + export const StatusEnum = { + Available: 'available' as StatusEnum, + Pending: 'pending' as StatusEnum, + Sold: 'sold' as StatusEnum + }; } + diff --git a/samples/client/petstore/typescript-jquery/default/model/Tag.ts b/samples/client/petstore/typescript-jquery/default/model/Tag.ts index ef1c3660ee37..708d829ba55a 100644 --- a/samples/client/petstore/typescript-jquery/default/model/Tag.ts +++ b/samples/client/petstore/typescript-jquery/default/model/Tag.ts @@ -21,3 +21,4 @@ export interface Tag { name?: string; } + diff --git a/samples/client/petstore/typescript-jquery/default/model/User.ts b/samples/client/petstore/typescript-jquery/default/model/User.ts index 775fd23a8c46..eeb672e372e9 100644 --- a/samples/client/petstore/typescript-jquery/default/model/User.ts +++ b/samples/client/petstore/typescript-jquery/default/model/User.ts @@ -36,3 +36,4 @@ export interface User { userStatus?: number; } + diff --git a/samples/client/petstore/typescript-jquery/npm/model/ApiResponse.ts b/samples/client/petstore/typescript-jquery/npm/model/ApiResponse.ts index 7bd581816768..ac6f340b6fd2 100644 --- a/samples/client/petstore/typescript-jquery/npm/model/ApiResponse.ts +++ b/samples/client/petstore/typescript-jquery/npm/model/ApiResponse.ts @@ -23,3 +23,4 @@ export interface ApiResponse { message?: string; } + diff --git a/samples/client/petstore/typescript-jquery/npm/model/Category.ts b/samples/client/petstore/typescript-jquery/npm/model/Category.ts index 17778c4e0ddf..2d2a7e7a26ed 100644 --- a/samples/client/petstore/typescript-jquery/npm/model/Category.ts +++ b/samples/client/petstore/typescript-jquery/npm/model/Category.ts @@ -21,3 +21,4 @@ export interface Category { name?: string; } + diff --git a/samples/client/petstore/typescript-jquery/npm/model/Order.ts b/samples/client/petstore/typescript-jquery/npm/model/Order.ts index af5570597c88..ac1bfac2a2ab 100644 --- a/samples/client/petstore/typescript-jquery/npm/model/Order.ts +++ b/samples/client/petstore/typescript-jquery/npm/model/Order.ts @@ -33,9 +33,12 @@ export interface Order { } export namespace Order { - export enum StatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' - } + export type StatusEnum = 'placed' | 'approved' | 'delivered'; + + export const StatusEnum = { + Placed: 'placed' as StatusEnum, + Approved: 'approved' as StatusEnum, + Delivered: 'delivered' as StatusEnum + }; } + diff --git a/samples/client/petstore/typescript-jquery/npm/model/Pet.ts b/samples/client/petstore/typescript-jquery/npm/model/Pet.ts index e941295cd23a..cae4aa49795e 100644 --- a/samples/client/petstore/typescript-jquery/npm/model/Pet.ts +++ b/samples/client/petstore/typescript-jquery/npm/model/Pet.ts @@ -33,9 +33,12 @@ export interface Pet { } export namespace Pet { - export enum StatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' - } + export type StatusEnum = 'available' | 'pending' | 'sold'; + + export const StatusEnum = { + Available: 'available' as StatusEnum, + Pending: 'pending' as StatusEnum, + Sold: 'sold' as StatusEnum + }; } + diff --git a/samples/client/petstore/typescript-jquery/npm/model/Tag.ts b/samples/client/petstore/typescript-jquery/npm/model/Tag.ts index ef1c3660ee37..708d829ba55a 100644 --- a/samples/client/petstore/typescript-jquery/npm/model/Tag.ts +++ b/samples/client/petstore/typescript-jquery/npm/model/Tag.ts @@ -21,3 +21,4 @@ export interface Tag { name?: string; } + diff --git a/samples/client/petstore/typescript-jquery/npm/model/User.ts b/samples/client/petstore/typescript-jquery/npm/model/User.ts index 775fd23a8c46..eeb672e372e9 100644 --- a/samples/client/petstore/typescript-jquery/npm/model/User.ts +++ b/samples/client/petstore/typescript-jquery/npm/model/User.ts @@ -36,3 +36,4 @@ export interface User { userStatus?: number; } + diff --git a/samples/client/petstore/typescript-node/default/model/order.ts b/samples/client/petstore/typescript-node/default/model/order.ts index f3af391f88d2..9702040cfcda 100644 --- a/samples/client/petstore/typescript-node/default/model/order.ts +++ b/samples/client/petstore/typescript-node/default/model/order.ts @@ -66,9 +66,11 @@ export class Order { } export namespace Order { - export enum StatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' - } + export type StatusEnum = 'placed' | 'approved' | 'delivered'; + + export const StatusEnum = { + Placed: 'placed' as StatusEnum, + Approved: 'approved' as StatusEnum, + Delivered: 'delivered' as StatusEnum + }; } diff --git a/samples/client/petstore/typescript-node/default/model/pet.ts b/samples/client/petstore/typescript-node/default/model/pet.ts index 10fd0c33207b..acbf5bd55ccd 100644 --- a/samples/client/petstore/typescript-node/default/model/pet.ts +++ b/samples/client/petstore/typescript-node/default/model/pet.ts @@ -68,9 +68,11 @@ export class Pet { } export namespace Pet { - export enum StatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' - } + export type StatusEnum = 'available' | 'pending' | 'sold'; + + export const StatusEnum = { + Available: 'available' as StatusEnum, + Pending: 'pending' as StatusEnum, + Sold: 'sold' as StatusEnum + }; } diff --git a/samples/client/petstore/typescript-node/npm/model/order.ts b/samples/client/petstore/typescript-node/npm/model/order.ts index f3af391f88d2..9702040cfcda 100644 --- a/samples/client/petstore/typescript-node/npm/model/order.ts +++ b/samples/client/petstore/typescript-node/npm/model/order.ts @@ -66,9 +66,11 @@ export class Order { } export namespace Order { - export enum StatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' - } + export type StatusEnum = 'placed' | 'approved' | 'delivered'; + + export const StatusEnum = { + Placed: 'placed' as StatusEnum, + Approved: 'approved' as StatusEnum, + Delivered: 'delivered' as StatusEnum + }; } diff --git a/samples/client/petstore/typescript-node/npm/model/pet.ts b/samples/client/petstore/typescript-node/npm/model/pet.ts index 10fd0c33207b..acbf5bd55ccd 100644 --- a/samples/client/petstore/typescript-node/npm/model/pet.ts +++ b/samples/client/petstore/typescript-node/npm/model/pet.ts @@ -68,9 +68,11 @@ export class Pet { } export namespace Pet { - export enum StatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' - } + export type StatusEnum = 'available' | 'pending' | 'sold'; + + export const StatusEnum = { + Available: 'available' as StatusEnum, + Pending: 'pending' as StatusEnum, + Sold: 'sold' as StatusEnum + }; } diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/PetApi.ts b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/PetApi.ts index e2f23063bb37..2d4b9472f500 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/apis/PetApi.ts @@ -479,11 +479,12 @@ export function uploadFile(requestParameters: UploadFileRequest, requestConfi /** - * @export - * @enum {string} - */ -export enum FindPetsByStatusStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} + * @export + */ +export type FindPetsByStatusStatusEnum = 'available' | 'pending' | 'sold'; + +export const FindPetsByStatusStatusEnum = { + Available: 'available' as FindPetsByStatusStatusEnum, + Pending: 'pending' as FindPetsByStatusStatusEnum, + Sold: 'sold' as FindPetsByStatusStatusEnum +}; diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/models/Order.ts b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/models/Order.ts index ff701de3c3b2..8d274780ec7d 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/models/Order.ts +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/models/Order.ts @@ -82,13 +82,14 @@ export function OrderToJSON(value?: Order): any { } /** -* @export -* @enum {string} -*/ -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} + * @export + */ +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/models/Pet.ts b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/models/Pet.ts index b0b21c2a3bf3..556ff751a5b1 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/models/Pet.ts +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/src/models/Pet.ts @@ -91,13 +91,14 @@ export function PetToJSON(value?: Pet): any { } /** -* @export -* @enum {string} -*/ -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} + * @export + */ +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts index 7745f081c8bb..0ccd90709448 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts @@ -288,10 +288,11 @@ export class PetApi extends BaseAPI { /** * @export - * @enum {string} */ -export enum FindPetsByStatusStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type FindPetsByStatusStatusEnum = 'available' | 'pending' | 'sold'; + +export const FindPetsByStatusStatusEnum = { + Available: 'available' as FindPetsByStatusStatusEnum, + Pending: 'pending' as FindPetsByStatusStatusEnum, + Sold: 'sold' as FindPetsByStatusStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts index c6b7790d7024..e1d367941b97 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts +++ b/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts @@ -52,11 +52,12 @@ export interface Order { /** * @export - * @enum {string} */ -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/default/models/Pet.ts b/samples/client/petstore/typescript-rxjs/builds/default/models/Pet.ts index 3d20bc0a87d9..4a373562f13c 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/models/Pet.ts +++ b/samples/client/petstore/typescript-rxjs/builds/default/models/Pet.ts @@ -57,11 +57,12 @@ export interface Pet { /** * @export - * @enum {string} */ -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts index 7745f081c8bb..0ccd90709448 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts @@ -288,10 +288,11 @@ export class PetApi extends BaseAPI { /** * @export - * @enum {string} */ -export enum FindPetsByStatusStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type FindPetsByStatusStatusEnum = 'available' | 'pending' | 'sold'; + +export const FindPetsByStatusStatusEnum = { + Available: 'available' as FindPetsByStatusStatusEnum, + Pending: 'pending' as FindPetsByStatusStatusEnum, + Sold: 'sold' as FindPetsByStatusStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts index c6b7790d7024..e1d367941b97 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts @@ -52,11 +52,12 @@ export interface Order { /** * @export - * @enum {string} */ -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Pet.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Pet.ts index 3d20bc0a87d9..4a373562f13c 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Pet.ts +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Pet.ts @@ -57,11 +57,12 @@ export interface Pet { /** * @export - * @enum {string} */ -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts index 7745f081c8bb..0ccd90709448 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts @@ -288,10 +288,11 @@ export class PetApi extends BaseAPI { /** * @export - * @enum {string} */ -export enum FindPetsByStatusStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type FindPetsByStatusStatusEnum = 'available' | 'pending' | 'sold'; + +export const FindPetsByStatusStatusEnum = { + Available: 'available' as FindPetsByStatusStatusEnum, + Pending: 'pending' as FindPetsByStatusStatusEnum, + Sold: 'sold' as FindPetsByStatusStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts index c6b7790d7024..e1d367941b97 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts @@ -52,11 +52,12 @@ export interface Order { /** * @export - * @enum {string} */ -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Pet.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Pet.ts index 3d20bc0a87d9..4a373562f13c 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Pet.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Pet.ts @@ -57,11 +57,12 @@ export interface Pet { /** * @export - * @enum {string} */ -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/PetApi.ts index 1fd55eca4bcf..d061bc2ba6f2 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/PetApi.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/apis/PetApi.ts @@ -304,10 +304,11 @@ export class PetApi extends BaseAPI { /** * @export - * @enum {string} */ -export enum FindPetsByStatusStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type FindPetsByStatusStatusEnum = 'available' | 'pending' | 'sold'; + +export const FindPetsByStatusStatusEnum = { + Available: 'available' as FindPetsByStatusStatusEnum, + Pending: 'pending' as FindPetsByStatusStatusEnum, + Sold: 'sold' as FindPetsByStatusStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Order.ts index c6b7790d7024..e1d367941b97 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Order.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Order.ts @@ -52,11 +52,12 @@ export interface Order { /** * @export - * @enum {string} */ -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Pet.ts b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Pet.ts index 3d20bc0a87d9..4a373562f13c 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Pet.ts +++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/models/Pet.ts @@ -57,11 +57,12 @@ export interface Pet { /** * @export - * @enum {string} */ -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts index b8a08514c5c6..56a13aba59bf 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts @@ -34,7 +34,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -57,7 +57,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -87,7 +87,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -100,7 +100,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -127,7 +127,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -142,7 +142,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -169,7 +169,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -184,7 +184,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -212,7 +212,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -222,7 +222,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -249,7 +249,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -272,7 +272,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -304,7 +304,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -343,7 +343,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -375,7 +375,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -416,7 +416,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/browser/apis/StoreApi.ts index 6474ad8a3044..f73f70e7144c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/apis/StoreApi.ts @@ -34,11 +34,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -58,7 +58,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -68,7 +68,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -96,11 +96,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -127,7 +127,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -142,7 +142,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/browser/apis/UserApi.ts index 70aee8ce5e2f..6a6ac9230a39 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/apis/UserApi.ts @@ -33,7 +33,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -54,7 +54,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -81,7 +81,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -102,7 +102,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -129,7 +129,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -150,7 +150,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -178,7 +178,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -188,7 +188,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -216,11 +216,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -254,7 +254,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -268,7 +268,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -288,7 +288,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -298,7 +298,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -333,7 +333,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -354,7 +354,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/browser/http/http.ts index 4f24155ea4fe..8912147e1aba 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/http/http.ts @@ -5,16 +5,18 @@ export * from './isomorphic-fetch'; /** * Represents an HTTP method. */ -export enum HttpMethod { - GET = "GET", - HEAD = "HEAD", - POST = "POST", - PUT = "PUT", - DELETE = "DELETE", - CONNECT = "CONNECT", - OPTIONS = "OPTIONS", - TRACE = "TRACE", - PATCH = "PATCH" +export type HttpMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH"; + +export const HttpMethod = { + GET: "GET" as HttpMethod, + HEAD: "HEAD" as HttpMethod, + POST: "POST" as HttpMethod, + PUT: "PUT" as HttpMethod, + DELETE: "DELETE" as HttpMethod, + CONNECT: "CONNECT" as HttpMethod, + OPTIONS: "OPTIONS" as HttpMethod, + TRACE: "TRACE" as HttpMethod, + PATCH: "PATCH" as HttpMethod } /** 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 4d80550bb2af..71c30ca8cf10 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts @@ -75,9 +75,11 @@ export class Order { } -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; 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 ecaefffea4ff..5c02f9d97bc9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts @@ -77,9 +77,11 @@ export class Pet { } -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts index 6cb63372a676..9db404248807 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts @@ -28,7 +28,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/file'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -43,7 +43,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -63,7 +63,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pets-filtered'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PATCH); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PATCH"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -78,7 +78,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -98,7 +98,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pets'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PATCH); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PATCH"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -113,7 +113,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts index 4f24155ea4fe..8912147e1aba 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/http/http.ts @@ -5,16 +5,18 @@ export * from './isomorphic-fetch'; /** * Represents an HTTP method. */ -export enum HttpMethod { - GET = "GET", - HEAD = "HEAD", - POST = "POST", - PUT = "PUT", - DELETE = "DELETE", - CONNECT = "CONNECT", - OPTIONS = "OPTIONS", - TRACE = "TRACE", - PATCH = "PATCH" +export type HttpMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH"; + +export const HttpMethod = { + GET: "GET" as HttpMethod, + HEAD: "HEAD" as HttpMethod, + POST: "POST" as HttpMethod, + PUT: "PUT" as HttpMethod, + DELETE: "DELETE" as HttpMethod, + CONNECT: "CONNECT" as HttpMethod, + OPTIONS: "OPTIONS" as HttpMethod, + TRACE: "TRACE" as HttpMethod, + PATCH: "PATCH" as HttpMethod } /** 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 4d83c9db7549..8cc064ee858d 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,10 +41,12 @@ export class Dog { } -export enum DogBreedEnum { - Dingo = 'Dingo', - Husky = 'Husky', - Retriever = 'Retriever', - Shepherd = 'Shepherd' -} +export type DogBreedEnum = 'Dingo' | 'Husky' | 'Retriever' | 'Shepherd'; + +export const DogBreedEnum = { + Dingo: 'Dingo' as DogBreedEnum, + Husky: 'Husky' as DogBreedEnum, + Retriever: 'Retriever' as DogBreedEnum, + Shepherd: 'Shepherd' as DogBreedEnum +}; 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 4306e8ead938..cf88269972b6 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,8 +41,10 @@ export class PetByType { } -export enum PetByTypePetTypeEnum { - Cat = 'Cat', - Dog = 'Dog' -} +export type PetByTypePetTypeEnum = 'Cat' | 'Dog'; + +export const PetByTypePetTypeEnum = { + Cat: 'Cat' as PetByTypePetTypeEnum, + Dog: 'Dog' as PetByTypePetTypeEnum +}; 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 4eaec36a60c6..5948905ac5ab 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,8 +57,10 @@ export class PetsFilteredPatchRequest { } -export enum PetsFilteredPatchRequestPetTypeEnum { - Cat = 'Cat', - Dog = 'Dog' -} +export type PetsFilteredPatchRequestPetTypeEnum = 'Cat' | 'Dog'; + +export const PetsFilteredPatchRequestPetTypeEnum = { + Cat: 'Cat' as PetsFilteredPatchRequestPetTypeEnum, + Dog: 'Dog' as PetsFilteredPatchRequestPetTypeEnum +}; 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 7c1009e3d515..8f350672dffd 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,10 +58,12 @@ export class PetsPatchRequest { } -export enum PetsPatchRequestBreedEnum { - Dingo = 'Dingo', - Husky = 'Husky', - Retriever = 'Retriever', - Shepherd = 'Shepherd' -} +export type PetsPatchRequestBreedEnum = 'Dingo' | 'Husky' | 'Retriever' | 'Shepherd'; + +export const PetsPatchRequestBreedEnum = { + Dingo: 'Dingo' as PetsPatchRequestBreedEnum, + Husky: 'Husky' as PetsPatchRequestBreedEnum, + Retriever: 'Retriever' as PetsPatchRequestBreedEnum, + Shepherd: 'Shepherd' as PetsPatchRequestBreedEnum +}; diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts index 02f9d230affe..df6123359e10 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts @@ -36,7 +36,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -59,7 +59,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -89,7 +89,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -102,7 +102,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -129,7 +129,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -144,7 +144,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -171,7 +171,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -186,7 +186,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -214,7 +214,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -224,7 +224,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -251,7 +251,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -274,7 +274,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -306,7 +306,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -345,7 +345,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -377,7 +377,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -418,7 +418,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts index f4861af0df0c..4febc920eb86 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/StoreApi.ts @@ -36,11 +36,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -60,7 +60,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -70,7 +70,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -98,11 +98,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -129,7 +129,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -144,7 +144,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts index b8f2c3313e26..5929c86f11a1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/UserApi.ts @@ -35,7 +35,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -56,7 +56,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -83,7 +83,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -104,7 +104,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -131,7 +131,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -152,7 +152,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -180,7 +180,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -190,7 +190,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -218,11 +218,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -256,7 +256,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -270,7 +270,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -290,7 +290,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -300,7 +300,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -335,7 +335,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -356,7 +356,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts index 77fb4a789dbb..010fab7cb516 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/http/http.ts @@ -10,16 +10,18 @@ export * from './isomorphic-fetch'; /** * Represents an HTTP method. */ -export enum HttpMethod { - GET = "GET", - HEAD = "HEAD", - POST = "POST", - PUT = "PUT", - DELETE = "DELETE", - CONNECT = "CONNECT", - OPTIONS = "OPTIONS", - TRACE = "TRACE", - PATCH = "PATCH" +export type HttpMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH"; + +export const HttpMethod = { + GET: "GET" as HttpMethod, + HEAD: "HEAD" as HttpMethod, + POST: "POST" as HttpMethod, + PUT: "PUT" as HttpMethod, + DELETE: "DELETE" as HttpMethod, + CONNECT: "CONNECT" as HttpMethod, + OPTIONS: "OPTIONS" as HttpMethod, + TRACE: "TRACE" as HttpMethod, + PATCH: "PATCH" as HttpMethod } /** @@ -128,7 +130,7 @@ export class RequestContext { public setHeaderParam(key: string, value: string): void { this.headers[key] = value; } - + public setAgent(agent: http.Agent | https.Agent) { this.agent = agent; } 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 4d80550bb2af..71c30ca8cf10 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts @@ -75,9 +75,11 @@ export class Order { } -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; 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 ecaefffea4ff..5c02f9d97bc9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts @@ -77,9 +77,11 @@ export class Pet { } -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts index 4e3e8d09e837..1b5d4367c513 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts @@ -34,7 +34,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -57,7 +57,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -87,7 +87,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -100,7 +100,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -127,7 +127,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -142,7 +142,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -169,7 +169,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -184,7 +184,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -212,7 +212,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -222,7 +222,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -249,7 +249,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -272,7 +272,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -304,7 +304,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -343,7 +343,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -375,7 +375,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -416,7 +416,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts index a4eab6982ce6..59120d25415d 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/StoreApi.ts @@ -34,11 +34,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -58,7 +58,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -68,7 +68,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -96,11 +96,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -127,7 +127,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -142,7 +142,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts index ed456958be92..29b028ada8d8 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/UserApi.ts @@ -33,7 +33,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -54,7 +54,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -81,7 +81,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -102,7 +102,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -129,7 +129,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -150,7 +150,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -178,7 +178,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -188,7 +188,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -216,11 +216,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -254,7 +254,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -268,7 +268,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -288,7 +288,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -298,7 +298,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -333,7 +333,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -354,7 +354,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts index 29fc7c39f619..3e30038f4e4f 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/http/http.ts @@ -4,16 +4,18 @@ import { Observable, from } from '../rxjsStub.ts'; /** * Represents an HTTP method. */ -export enum HttpMethod { - GET = "GET", - HEAD = "HEAD", - POST = "POST", - PUT = "PUT", - DELETE = "DELETE", - CONNECT = "CONNECT", - OPTIONS = "OPTIONS", - TRACE = "TRACE", - PATCH = "PATCH" +export type HttpMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH"; + +export const HttpMethod = { + GET: "GET" as HttpMethod, + HEAD: "HEAD" as HttpMethod, + POST: "POST" as HttpMethod, + PUT: "PUT" as HttpMethod, + DELETE: "DELETE" as HttpMethod, + CONNECT: "CONNECT" as HttpMethod, + OPTIONS: "OPTIONS" as HttpMethod, + TRACE: "TRACE" as HttpMethod, + PATCH: "PATCH" as HttpMethod } /** 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 63e6b8fe3f12..1b66a54e7960 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts @@ -75,9 +75,11 @@ export class Order { } -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; 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 1404661b6de0..29236126fead 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts @@ -77,9 +77,11 @@ export class Pet { } -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts index f1a6e270e0b2..d06bf7f84020 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts @@ -38,7 +38,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -61,7 +61,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -87,7 +87,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -100,7 +100,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -123,7 +123,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -138,7 +138,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -161,7 +161,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -176,7 +176,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -200,7 +200,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -210,7 +210,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -233,7 +233,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -256,7 +256,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -284,7 +284,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -323,7 +323,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -351,7 +351,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -392,7 +392,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts index 40898f29d80d..e43878a69a35 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts @@ -38,11 +38,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + return requestContext; } @@ -58,7 +58,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -68,7 +68,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -92,11 +92,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + return requestContext; } @@ -119,7 +119,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -134,7 +134,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - + return requestContext; } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts index 766707c7b9b8..5fc3af1646cb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts @@ -37,7 +37,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -58,7 +58,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -81,7 +81,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -102,7 +102,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -125,7 +125,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -146,7 +146,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -170,7 +170,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -180,7 +180,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -204,11 +204,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + return requestContext; } @@ -238,7 +238,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -252,7 +252,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } - + return requestContext; } @@ -268,7 +268,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -278,7 +278,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } @@ -309,7 +309,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -330,7 +330,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + return requestContext; } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts index 77fb4a789dbb..010fab7cb516 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts @@ -10,16 +10,18 @@ export * from './isomorphic-fetch'; /** * Represents an HTTP method. */ -export enum HttpMethod { - GET = "GET", - HEAD = "HEAD", - POST = "POST", - PUT = "PUT", - DELETE = "DELETE", - CONNECT = "CONNECT", - OPTIONS = "OPTIONS", - TRACE = "TRACE", - PATCH = "PATCH" +export type HttpMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH"; + +export const HttpMethod = { + GET: "GET" as HttpMethod, + HEAD: "HEAD" as HttpMethod, + POST: "POST" as HttpMethod, + PUT: "PUT" as HttpMethod, + DELETE: "DELETE" as HttpMethod, + CONNECT: "CONNECT" as HttpMethod, + OPTIONS: "OPTIONS" as HttpMethod, + TRACE: "TRACE" as HttpMethod, + PATCH: "PATCH" as HttpMethod } /** @@ -128,7 +130,7 @@ export class RequestContext { public setHeaderParam(key: string, value: string): void { this.headers[key] = value; } - + public setAgent(agent: http.Agent | https.Agent) { this.agent = agent; } 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 4d80550bb2af..71c30ca8cf10 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts @@ -75,9 +75,11 @@ export class Order { } -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; 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 ecaefffea4ff..5c02f9d97bc9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts @@ -77,9 +77,11 @@ export class Pet { } -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts index b8a08514c5c6..56a13aba59bf 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts @@ -34,7 +34,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -57,7 +57,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -87,7 +87,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -100,7 +100,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -127,7 +127,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -142,7 +142,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -169,7 +169,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -184,7 +184,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -212,7 +212,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -222,7 +222,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -249,7 +249,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -272,7 +272,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -304,7 +304,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -343,7 +343,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -375,7 +375,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -416,7 +416,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts index 6474ad8a3044..f73f70e7144c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/StoreApi.ts @@ -34,11 +34,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -58,7 +58,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -68,7 +68,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -96,11 +96,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -127,7 +127,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -142,7 +142,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts index 70aee8ce5e2f..6a6ac9230a39 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/UserApi.ts @@ -33,7 +33,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -54,7 +54,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -81,7 +81,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -102,7 +102,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -129,7 +129,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -150,7 +150,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -178,7 +178,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -188,7 +188,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -216,11 +216,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -254,7 +254,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -268,7 +268,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -288,7 +288,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -298,7 +298,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -333,7 +333,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -354,7 +354,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts index a433d76ffa2a..7d784302e6a1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/http/http.ts @@ -5,16 +5,18 @@ export * from './jquery'; /** * Represents an HTTP method. */ -export enum HttpMethod { - GET = "GET", - HEAD = "HEAD", - POST = "POST", - PUT = "PUT", - DELETE = "DELETE", - CONNECT = "CONNECT", - OPTIONS = "OPTIONS", - TRACE = "TRACE", - PATCH = "PATCH" +export type HttpMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH"; + +export const HttpMethod = { + GET: "GET" as HttpMethod, + HEAD: "HEAD" as HttpMethod, + POST: "POST" as HttpMethod, + PUT: "PUT" as HttpMethod, + DELETE: "DELETE" as HttpMethod, + CONNECT: "CONNECT" as HttpMethod, + OPTIONS: "OPTIONS" as HttpMethod, + TRACE: "TRACE" as HttpMethod, + PATCH: "PATCH" as HttpMethod } /** 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 4d80550bb2af..71c30ca8cf10 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts @@ -75,9 +75,11 @@ export class Order { } -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; 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 ecaefffea4ff..5c02f9d97bc9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts @@ -77,9 +77,11 @@ export class Pet { } -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +}; diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts index 02f9d230affe..df6123359e10 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts @@ -36,7 +36,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -59,7 +59,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -89,7 +89,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Header Params @@ -102,7 +102,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -129,7 +129,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByStatus'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -144,7 +144,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -171,7 +171,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet/findByTags'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -186,7 +186,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -214,7 +214,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -224,7 +224,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -251,7 +251,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/pet'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -274,7 +274,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -306,7 +306,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -345,7 +345,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -377,7 +377,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'petId' + '}', encodeURIComponent(String(petId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Form Params @@ -418,7 +418,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts index f4861af0df0c..4febc920eb86 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/StoreApi.ts @@ -36,11 +36,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -60,7 +60,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/inventory'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -70,7 +70,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -98,11 +98,11 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'orderId' + '}', encodeURIComponent(String(orderId))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -129,7 +129,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/store/order'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -144,7 +144,7 @@ export class StoreApiRequestFactory extends BaseAPIRequestFactory { ); requestContext.setBody(serializedBody); - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts index b8f2c3313e26..5929c86f11a1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/UserApi.ts @@ -35,7 +35,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -56,7 +56,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -83,7 +83,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithArray'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -104,7 +104,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -131,7 +131,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/createWithList'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.POST); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "POST"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -152,7 +152,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -180,7 +180,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.DELETE); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "DELETE"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -190,7 +190,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -218,11 +218,11 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -256,7 +256,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/login'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") // Query Params @@ -270,7 +270,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -290,7 +290,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { const localVarPath = '/user/logout'; // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.GET); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "GET"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -300,7 +300,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); @@ -335,7 +335,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { .replace('{' + 'username' + '}', encodeURIComponent(String(username))); // Make Request Context - const requestContext = _config.baseServer.makeRequestContext(localVarPath, HttpMethod.PUT); + const requestContext = _config.baseServer.makeRequestContext(localVarPath, "PUT"); requestContext.setHeaderParam("Accept", "application/json, */*;q=0.8") @@ -356,7 +356,7 @@ export class UserApiRequestFactory extends BaseAPIRequestFactory { if (authMethod?.applySecurityAuthentication) { await authMethod?.applySecurityAuthentication(requestContext); } - + const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default if (defaultAuth?.applySecurityAuthentication) { await defaultAuth?.applySecurityAuthentication(requestContext); diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts index 77fb4a789dbb..010fab7cb516 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/http/http.ts @@ -10,16 +10,18 @@ export * from './isomorphic-fetch'; /** * Represents an HTTP method. */ -export enum HttpMethod { - GET = "GET", - HEAD = "HEAD", - POST = "POST", - PUT = "PUT", - DELETE = "DELETE", - CONNECT = "CONNECT", - OPTIONS = "OPTIONS", - TRACE = "TRACE", - PATCH = "PATCH" +export type HttpMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH"; + +export const HttpMethod = { + GET: "GET" as HttpMethod, + HEAD: "HEAD" as HttpMethod, + POST: "POST" as HttpMethod, + PUT: "PUT" as HttpMethod, + DELETE: "DELETE" as HttpMethod, + CONNECT: "CONNECT" as HttpMethod, + OPTIONS: "OPTIONS" as HttpMethod, + TRACE: "TRACE" as HttpMethod, + PATCH: "PATCH" as HttpMethod } /** @@ -128,7 +130,7 @@ export class RequestContext { public setHeaderParam(key: string, value: string): void { this.headers[key] = value; } - + public setAgent(agent: http.Agent | https.Agent) { this.agent = agent; } 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 4d80550bb2af..71c30ca8cf10 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,9 +75,11 @@ export class Order { } -export enum OrderStatusEnum { - Placed = 'placed', - Approved = 'approved', - Delivered = 'delivered' -} +export type OrderStatusEnum = 'placed' | 'approved' | 'delivered'; + +export const OrderStatusEnum = { + Placed: 'placed' as OrderStatusEnum, + Approved: 'approved' as OrderStatusEnum, + Delivered: 'delivered' as OrderStatusEnum +}; 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 ecaefffea4ff..5c02f9d97bc9 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,9 +77,11 @@ export class Pet { } -export enum PetStatusEnum { - Available = 'available', - Pending = 'pending', - Sold = 'sold' -} +export type PetStatusEnum = 'available' | 'pending' | 'sold'; + +export const PetStatusEnum = { + Available: 'available' as PetStatusEnum, + Pending: 'pending' as PetStatusEnum, + Sold: 'sold' as PetStatusEnum +};