Merge pull request Kimiyori#4 from Kimiyori/fix-default-value-for-enum

fix default value for enum

Author: Kimiyori

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.27.2",
+    "version": "0.27.3",
     "description": "Library that generates Typescript clients based on the OpenAPI specification.",
     "homepage": "https://github.com/kimiyori/openapi-typescript-codegen",
     "license": "MIT",

package.json

@@ -74,7 +74,6 @@ export const generate = async ({
         useUnionTypes,
         useOptions,
     });
-
     switch (openApiVersion) {
         case OpenApiVersion.V2: {
             const client = parseV2(openApi);

src/index.ts

@@ -1,4 +1,5 @@
 import type { Client } from '../../client/interfaces/Client';
+import { Model } from '../../client/interfaces/Model';
 import type { OpenApi } from './interfaces/OpenApi';
 import { getModels } from './parser/getModels';
 import { getServer } from './parser/getServer';
@@ -10,10 +11,11 @@ import { getServiceVersion } from './parser/getServiceVersion';
  * all the models, services and schema's we should output.
  * @param openApi The OpenAPI spec  that we have loaded from disk.
  */
+export let models: Model[] = [];
 export const parse = (openApi: OpenApi): Client => {
     const version = getServiceVersion(openApi.info.version);
     const server = getServer(openApi);
-    const models = getModels(openApi);
+    models = getModels(openApi);
     const services = getServices(openApi);
 
     return { version, server, models, services };

src/openApi/v3/index.ts

@@ -1,4 +1,5 @@
 import type { Model } from '../../../client/interfaces/Model';
+import { models } from '..';
 import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 
 export const getModelDefault = (definition: OpenApiSchema, model?: Model): string | undefined => {
@@ -25,6 +26,14 @@ export const getModelDefault = (definition: OpenApiSchema, model?: Model): strin
             return JSON.stringify(definition.default);
 
         case 'string':
+            const modelName = definition.$ref?.split('/').pop();
+            const foundModel = models.find(m => m.name === modelName);
+            if (foundModel) {
+                const foundDefault = foundModel.enum.find(en => en.value === `'${definition.default}'`);
+                if (foundDefault) {
+                    return `${modelName}.${foundDefault.name.replace(/^'(.*)'$/, '$1')}`;
+                }
+            }
             return `'${definition.default}'`;
 
         case 'object':

src/openApi/v3/parser/getModelDefault.ts

@@ -13,7 +13,7 @@ import type { Observable } from 'rxjs';
 {{/equals}}
 {{#if imports}}
 {{#each imports}}
-import type { {{{this}}} } from '../models/{{{this}}}';
+import { {{{this}}} } from '../models/{{{this}}}';
 {{/each}}
 
 {{/if}}

src/templates/exportService.hbs

@@ -4,9 +4,9 @@ import { EOL } from 'os';
 
 import type { Enum } from '../client/interfaces/Enum';
 import type { Model } from '../client/interfaces/Model';
+import { OperationParameter } from '../client/interfaces/OperationParameter';
 import type { HttpClient } from '../HttpClient';
 import { unique } from './unique';
-import { OperationParameter } from '../client/interfaces/OperationParameter';
 
 export const registerHandlebarHelpers = (root: {
     httpClient: HttpClient;