From 7d044b84778dce68ebd323c67b73cdc73fc8ae71 Mon Sep 17 00:00:00 2001 From: Ferdi Koomen Date: Wed, 11 Dec 2019 10:54:04 +0100 Subject: [PATCH] - Eslint and cleanup --- src/client/interfaces/Model.d.ts | 2 +- src/openApi/v2/index.ts | 12 +- src/openApi/v2/interfaces/OpenApi.d.ts | 20 +- src/openApi/v2/interfaces/OpenApiHeader.d.ts | 4 +- src/openApi/v2/interfaces/OpenApiInfo.d.ts | 4 +- .../v2/interfaces/OpenApiOperation.d.ts | 8 +- .../v2/interfaces/OpenApiParameter.d.ts | 6 +- src/openApi/v2/interfaces/OpenApiPath.d.ts | 6 +- .../v2/interfaces/OpenApiResponse.d.ts | 10 +- .../v2/interfaces/OpenApiResponses.d.ts | 2 +- src/openApi/v2/interfaces/OpenApiSchema.d.ts | 8 +- .../v2/interfaces/OpenApiSecurityScheme.d.ts | 2 +- src/openApi/v2/interfaces/OpenApiTag.d.ts | 2 +- src/openApi/v2/parser/getComment.ts | 2 +- src/openApi/v2/parser/getEnum.ts | 4 +- .../v2/parser/getEnumFromDescription.ts | 4 +- src/openApi/v2/parser/getEnumValues.ts | 2 +- src/openApi/v2/parser/getMappedType.spec.ts | 2 +- src/openApi/v2/parser/getMappedType.ts | 2 +- src/openApi/v2/parser/getModel.ts | 18 +- src/openApi/v2/parser/getModelProperties.ts | 12 +- .../v2/parser/getModelTemplate.spec.ts | 2 +- src/openApi/v2/parser/getModelTemplate.ts | 2 +- src/openApi/v2/parser/getModels.ts | 8 +- src/openApi/v2/parser/getOperation.ts | 22 +- src/openApi/v2/parser/getOperationErrors.ts | 4 +- .../v2/parser/getOperationName.spec.ts | 2 +- .../v2/parser/getOperationParameter.ts | 22 +- .../v2/parser/getOperationParameterDefault.ts | 4 +- .../v2/parser/getOperationParameters.ts | 12 +- .../v2/parser/getOperationPath.spec.ts | 2 +- src/openApi/v2/parser/getOperationResponse.ts | 14 +- .../v2/parser/getOperationResponses.ts | 14 +- src/openApi/v2/parser/getOperationResults.ts | 6 +- src/openApi/v2/parser/getRef.ts | 4 +- src/openApi/v2/parser/getServer.spec.ts | 2 +- src/openApi/v2/parser/getServer.ts | 2 +- .../v2/parser/getServiceClassName.spec.ts | 2 +- src/openApi/v2/parser/getServiceClassName.ts | 2 +- .../v2/parser/getServiceVersion.spec.ts | 2 +- src/openApi/v2/parser/getServices.ts | 8 +- src/openApi/v2/parser/getType.spec.ts | 2 +- src/openApi/v2/parser/getType.ts | 8 +- src/openApi/v2/parser/isPrimaryType.spec.ts | 2 +- src/openApi/v2/parser/isPrimaryType.ts | 2 +- src/openApi/v2/parser/stripNamespace.spec.ts | 2 +- src/openApi/v3/index.ts | 12 +- src/openApi/v3/interfaces/OpenApi.d.ts | 14 +- .../v3/interfaces/OpenApiCallback.d.ts | 4 +- .../v3/interfaces/OpenApiComponents.d.ts | 20 +- .../v3/interfaces/OpenApiDiscriminator.d.ts | 2 +- .../v3/interfaces/OpenApiEncoding.d.ts | 4 +- src/openApi/v3/interfaces/OpenApiExample.d.ts | 2 +- src/openApi/v3/interfaces/OpenApiHeader.d.ts | 8 +- src/openApi/v3/interfaces/OpenApiInfo.d.ts | 4 +- src/openApi/v3/interfaces/OpenApiLink.d.ts | 6 +- .../v3/interfaces/OpenApiMediaType.d.ts | 10 +- .../v3/interfaces/OpenApiOAuthFlow.d.ts | 2 +- .../v3/interfaces/OpenApiOAuthFlows.d.ts | 2 +- .../v3/interfaces/OpenApiOperation.d.ts | 16 +- .../v3/interfaces/OpenApiParameter.d.ts | 8 +- src/openApi/v3/interfaces/OpenApiPath.d.ts | 6 +- src/openApi/v3/interfaces/OpenApiPaths.d.ts | 2 +- .../v3/interfaces/OpenApiRequestBody.d.ts | 6 +- .../v3/interfaces/OpenApiResponse.d.ts | 10 +- .../v3/interfaces/OpenApiResponses.d.ts | 4 +- src/openApi/v3/interfaces/OpenApiSchema.d.ts | 10 +- .../v3/interfaces/OpenApiSecurityScheme.d.ts | 4 +- src/openApi/v3/interfaces/OpenApiServer.d.ts | 4 +- src/openApi/v3/interfaces/OpenApiTag.d.ts | 2 +- src/openApi/v3/parser/getComment.ts | 2 +- src/openApi/v3/parser/getContent.ts | 10 +- src/openApi/v3/parser/getEnum.ts | 4 +- .../v3/parser/getEnumFromDescription.ts | 4 +- src/openApi/v3/parser/getEnumValues.ts | 2 +- src/openApi/v3/parser/getMappedType.spec.ts | 2 +- src/openApi/v3/parser/getMappedType.ts | 2 +- src/openApi/v3/parser/getModel.ts | 20 +- src/openApi/v3/parser/getModelDefault.ts | 4 +- src/openApi/v3/parser/getModelProperties.ts | 12 +- .../v3/parser/getModelTemplate.spec.ts | 2 +- src/openApi/v3/parser/getModelTemplate.ts | 2 +- src/openApi/v3/parser/getModels.ts | 8 +- src/openApi/v3/parser/getOperation.ts | 24 +- src/openApi/v3/parser/getOperationErrors.ts | 4 +- .../v3/parser/getOperationName.spec.ts | 2 +- .../v3/parser/getOperationParameter.ts | 18 +- .../v3/parser/getOperationParameters.ts | 12 +- .../v3/parser/getOperationPath.spec.ts | 2 +- .../v3/parser/getOperationRequestBody.ts | 16 +- src/openApi/v3/parser/getOperationResponse.ts | 16 +- .../v3/parser/getOperationResponses.ts | 14 +- src/openApi/v3/parser/getOperationResults.ts | 6 +- src/openApi/v3/parser/getRef.ts | 4 +- src/openApi/v3/parser/getServer.spec.ts | 2 +- src/openApi/v3/parser/getServer.ts | 2 +- .../v3/parser/getServiceClassName.spec.ts | 2 +- src/openApi/v3/parser/getServiceClassName.ts | 2 +- .../v3/parser/getServiceVersion.spec.ts | 2 +- src/openApi/v3/parser/getServices.ts | 8 +- src/openApi/v3/parser/getType.spec.ts | 2 +- src/openApi/v3/parser/getType.ts | 8 +- src/openApi/v3/parser/isPrimaryType.spec.ts | 2 +- src/openApi/v3/parser/isPrimaryType.ts | 2 +- src/openApi/v3/parser/stripNamespace.spec.ts | 2 +- src/utils/getFilteredModels.ts | 13 - src/utils/getFilteredServices.ts | 11 - src/utils/writeClient.ts | 6 - test/__snapshots__/index.spec.js.snap | 2964 +++++++++++++++-- 109 files changed, 3095 insertions(+), 571 deletions(-) delete mode 100644 src/utils/getFilteredModels.ts delete mode 100644 src/utils/getFilteredServices.ts diff --git a/src/client/interfaces/Model.d.ts b/src/client/interfaces/Model.d.ts index fb84771c..c3181614 100644 --- a/src/client/interfaces/Model.d.ts +++ b/src/client/interfaces/Model.d.ts @@ -1,5 +1,5 @@ import { Enum } from './Enum'; -import {Schema} from "./Schema"; +import { Schema } from './Schema'; export interface Model extends Schema { name: string; diff --git a/src/openApi/v2/index.ts b/src/openApi/v2/index.ts index e668f82e..734b80d4 100644 --- a/src/openApi/v2/index.ts +++ b/src/openApi/v2/index.ts @@ -1,9 +1,9 @@ -import {Client} from '../../client/interfaces/Client'; -import {OpenApi} from './interfaces/OpenApi'; -import {getModels} from './parser/getModels'; -import {getServer} from './parser/getServer'; -import {getServiceVersion} from './parser/getServiceVersion'; -import {getServices} from './parser/getServices'; +import { Client } from '../../client/interfaces/Client'; +import { OpenApi } from './interfaces/OpenApi'; +import { getModels } from './parser/getModels'; +import { getServer } from './parser/getServer'; +import { getServiceVersion } from './parser/getServiceVersion'; +import { getServices } from './parser/getServices'; /** * Parse the OpenAPI specification to a Client model that contains diff --git a/src/openApi/v2/interfaces/OpenApi.d.ts b/src/openApi/v2/interfaces/OpenApi.d.ts index 407a3f20..04629930 100644 --- a/src/openApi/v2/interfaces/OpenApi.d.ts +++ b/src/openApi/v2/interfaces/OpenApi.d.ts @@ -1,13 +1,13 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiExternalDocs} from './OpenApiExternalDocs'; -import {OpenApiInfo} from './OpenApiInfo'; -import {OpenApiParameter} from './OpenApiParameter'; -import {OpenApiPath} from './OpenApiPath'; -import {OpenApiResponse} from './OpenApiResponse'; -import {OpenApiSchema} from './OpenApiSchema'; -import {OpenApiSecurityRequirement} from './OpenApiSecurityRequirement'; -import {OpenApiSecurityScheme} from './OpenApiSecurityScheme'; -import {OpenApiTag} from './OpenApiTag'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiExternalDocs } from './OpenApiExternalDocs'; +import { OpenApiInfo } from './OpenApiInfo'; +import { OpenApiParameter } from './OpenApiParameter'; +import { OpenApiPath } from './OpenApiPath'; +import { OpenApiResponse } from './OpenApiResponse'; +import { OpenApiSchema } from './OpenApiSchema'; +import { OpenApiSecurityRequirement } from './OpenApiSecurityRequirement'; +import { OpenApiSecurityScheme } from './OpenApiSecurityScheme'; +import { OpenApiTag } from './OpenApiTag'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md diff --git a/src/openApi/v2/interfaces/OpenApiHeader.d.ts b/src/openApi/v2/interfaces/OpenApiHeader.d.ts index 5d9a8756..bd0c6087 100644 --- a/src/openApi/v2/interfaces/OpenApiHeader.d.ts +++ b/src/openApi/v2/interfaces/OpenApiHeader.d.ts @@ -1,5 +1,5 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiItems} from './OpenApiItems'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiItems } from './OpenApiItems'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#headerObject diff --git a/src/openApi/v2/interfaces/OpenApiInfo.d.ts b/src/openApi/v2/interfaces/OpenApiInfo.d.ts index a72f99ce..efa6d8ba 100644 --- a/src/openApi/v2/interfaces/OpenApiInfo.d.ts +++ b/src/openApi/v2/interfaces/OpenApiInfo.d.ts @@ -1,5 +1,5 @@ -import {OpenApiContact} from './OpenApiContact'; -import {OpenApiLicense} from './OpenApiLicense'; +import { OpenApiContact } from './OpenApiContact'; +import { OpenApiLicense } from './OpenApiLicense'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#infoObject diff --git a/src/openApi/v2/interfaces/OpenApiOperation.d.ts b/src/openApi/v2/interfaces/OpenApiOperation.d.ts index 587c795d..d3881e88 100644 --- a/src/openApi/v2/interfaces/OpenApiOperation.d.ts +++ b/src/openApi/v2/interfaces/OpenApiOperation.d.ts @@ -1,7 +1,7 @@ -import {OpenApiExternalDocs} from './OpenApiExternalDocs'; -import {OpenApiParameter} from './OpenApiParameter'; -import {OpenApiResponses} from './OpenApiResponses'; -import {OpenApiSecurityRequirement} from './OpenApiSecurityRequirement'; +import { OpenApiExternalDocs } from './OpenApiExternalDocs'; +import { OpenApiParameter } from './OpenApiParameter'; +import { OpenApiResponses } from './OpenApiResponses'; +import { OpenApiSecurityRequirement } from './OpenApiSecurityRequirement'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#operationObject diff --git a/src/openApi/v2/interfaces/OpenApiParameter.d.ts b/src/openApi/v2/interfaces/OpenApiParameter.d.ts index 9359705d..d6b56960 100644 --- a/src/openApi/v2/interfaces/OpenApiParameter.d.ts +++ b/src/openApi/v2/interfaces/OpenApiParameter.d.ts @@ -1,6 +1,6 @@ -import {OpenApiItems} from './OpenApiItems'; -import {OpenApiReference} from './OpenApiReference'; -import {OpenApiSchema} from './OpenApiSchema'; +import { OpenApiItems } from './OpenApiItems'; +import { OpenApiReference } from './OpenApiReference'; +import { OpenApiSchema } from './OpenApiSchema'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#parameterObject diff --git a/src/openApi/v2/interfaces/OpenApiPath.d.ts b/src/openApi/v2/interfaces/OpenApiPath.d.ts index 07fab176..4e9fcd79 100644 --- a/src/openApi/v2/interfaces/OpenApiPath.d.ts +++ b/src/openApi/v2/interfaces/OpenApiPath.d.ts @@ -1,6 +1,6 @@ -import {OpenApiOperation} from './OpenApiOperation'; -import {OpenApiParameter} from './OpenApiParameter'; -import {OpenApiReference} from './OpenApiReference'; +import { OpenApiOperation } from './OpenApiOperation'; +import { OpenApiParameter } from './OpenApiParameter'; +import { OpenApiReference } from './OpenApiReference'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#pathItemObject diff --git a/src/openApi/v2/interfaces/OpenApiResponse.d.ts b/src/openApi/v2/interfaces/OpenApiResponse.d.ts index 6e20af74..6b42777c 100644 --- a/src/openApi/v2/interfaces/OpenApiResponse.d.ts +++ b/src/openApi/v2/interfaces/OpenApiResponse.d.ts @@ -1,8 +1,8 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiExample} from './OpenApiExample'; -import {OpenApiHeader} from './OpenApiHeader'; -import {OpenApiReference} from './OpenApiReference'; -import {OpenApiSchema} from './OpenApiSchema'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiExample } from './OpenApiExample'; +import { OpenApiHeader } from './OpenApiHeader'; +import { OpenApiReference } from './OpenApiReference'; +import { OpenApiSchema } from './OpenApiSchema'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#responseObject diff --git a/src/openApi/v2/interfaces/OpenApiResponses.d.ts b/src/openApi/v2/interfaces/OpenApiResponses.d.ts index 90703505..5d35b944 100644 --- a/src/openApi/v2/interfaces/OpenApiResponses.d.ts +++ b/src/openApi/v2/interfaces/OpenApiResponses.d.ts @@ -1,4 +1,4 @@ -import {OpenApiResponse} from './OpenApiResponse'; +import { OpenApiResponse } from './OpenApiResponse'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#responsesObject diff --git a/src/openApi/v2/interfaces/OpenApiSchema.d.ts b/src/openApi/v2/interfaces/OpenApiSchema.d.ts index e00fc181..7f36b6fa 100644 --- a/src/openApi/v2/interfaces/OpenApiSchema.d.ts +++ b/src/openApi/v2/interfaces/OpenApiSchema.d.ts @@ -1,7 +1,7 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiExternalDocs} from './OpenApiExternalDocs'; -import {OpenApiReference} from './OpenApiReference'; -import {OpenApiXml} from './OpenApiXml'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiExternalDocs } from './OpenApiExternalDocs'; +import { OpenApiReference } from './OpenApiReference'; +import { OpenApiXml } from './OpenApiXml'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#schemaObject diff --git a/src/openApi/v2/interfaces/OpenApiSecurityScheme.d.ts b/src/openApi/v2/interfaces/OpenApiSecurityScheme.d.ts index bf370f9c..0e94a7ef 100644 --- a/src/openApi/v2/interfaces/OpenApiSecurityScheme.d.ts +++ b/src/openApi/v2/interfaces/OpenApiSecurityScheme.d.ts @@ -1,4 +1,4 @@ -import {Dictionary} from '../../../utils/types'; +import { Dictionary } from '../../../utils/types'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#securitySchemeObject diff --git a/src/openApi/v2/interfaces/OpenApiTag.d.ts b/src/openApi/v2/interfaces/OpenApiTag.d.ts index 0428b158..7b935e78 100644 --- a/src/openApi/v2/interfaces/OpenApiTag.d.ts +++ b/src/openApi/v2/interfaces/OpenApiTag.d.ts @@ -1,4 +1,4 @@ -import {OpenApiExternalDocs} from './OpenApiExternalDocs'; +import { OpenApiExternalDocs } from './OpenApiExternalDocs'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#tagObject diff --git a/src/openApi/v2/parser/getComment.ts b/src/openApi/v2/parser/getComment.ts index d382a1c4..d9af7afa 100644 --- a/src/openApi/v2/parser/getComment.ts +++ b/src/openApi/v2/parser/getComment.ts @@ -1,4 +1,4 @@ -import {EOL} from 'os'; +import { EOL } from 'os'; export function getComment(comment?: string): string | null { if (comment) { diff --git a/src/openApi/v2/parser/getEnum.ts b/src/openApi/v2/parser/getEnum.ts index 10e0e5c1..094a552d 100644 --- a/src/openApi/v2/parser/getEnum.ts +++ b/src/openApi/v2/parser/getEnum.ts @@ -1,5 +1,5 @@ -import {Enum} from '../../../client/interfaces/Enum'; -import {PrimaryType} from './constants'; +import { Enum } from '../../../client/interfaces/Enum'; +import { PrimaryType } from './constants'; export function getEnum(values?: (string | number)[]): Enum[] { if (Array.isArray(values)) { diff --git a/src/openApi/v2/parser/getEnumFromDescription.ts b/src/openApi/v2/parser/getEnumFromDescription.ts index 3af003fd..60696e7e 100644 --- a/src/openApi/v2/parser/getEnumFromDescription.ts +++ b/src/openApi/v2/parser/getEnumFromDescription.ts @@ -1,5 +1,5 @@ -import {Enum} from '../../../client/interfaces/Enum'; -import {PrimaryType} from './constants'; +import { Enum } from '../../../client/interfaces/Enum'; +import { PrimaryType } from './constants'; export function getEnumFromDescription(description: string): Enum[] { // Check if we can find this special format string: diff --git a/src/openApi/v2/parser/getEnumValues.ts b/src/openApi/v2/parser/getEnumValues.ts index ece088dc..348208fe 100644 --- a/src/openApi/v2/parser/getEnumValues.ts +++ b/src/openApi/v2/parser/getEnumValues.ts @@ -1,4 +1,4 @@ -import {Enum} from '../../../client/interfaces/Enum'; +import { Enum } from '../../../client/interfaces/Enum'; export function getEnumValues(enumerators: Enum[]): string[] { // Fetch values from the symbols, just to be sure we filter out diff --git a/src/openApi/v2/parser/getMappedType.spec.ts b/src/openApi/v2/parser/getMappedType.spec.ts index e0a8bf5a..b437f85d 100644 --- a/src/openApi/v2/parser/getMappedType.spec.ts +++ b/src/openApi/v2/parser/getMappedType.spec.ts @@ -1,4 +1,4 @@ -import {getMappedType} from './getMappedType'; +import { getMappedType } from './getMappedType'; describe('getMappedType', () => { it('should map types to the basics', () => { diff --git a/src/openApi/v2/parser/getMappedType.ts b/src/openApi/v2/parser/getMappedType.ts index 3b6c122a..ca11fa7e 100644 --- a/src/openApi/v2/parser/getMappedType.ts +++ b/src/openApi/v2/parser/getMappedType.ts @@ -1,4 +1,4 @@ -import {PrimaryType, TYPE_MAPPINGS} from './constants'; +import { PrimaryType, TYPE_MAPPINGS } from './constants'; /** * Get mapped type for given type to any basic Typescript/Javascript type. diff --git a/src/openApi/v2/parser/getModel.ts b/src/openApi/v2/parser/getModel.ts index 8e96974a..ed2f5605 100644 --- a/src/openApi/v2/parser/getModel.ts +++ b/src/openApi/v2/parser/getModel.ts @@ -1,12 +1,12 @@ -import {Model} from '../../../client/interfaces/Model'; -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiSchema} from '../interfaces/OpenApiSchema'; -import {PrimaryType} from './constants'; -import {getComment} from './getComment'; -import {getEnum} from './getEnum'; -import {getEnumFromDescription} from './getEnumFromDescription'; -import {getModelProperties} from './getModelProperties'; -import {getType} from './getType'; +import { Model } from '../../../client/interfaces/Model'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiSchema } from '../interfaces/OpenApiSchema'; +import { PrimaryType } from './constants'; +import { getComment } from './getComment'; +import { getEnum } from './getEnum'; +import { getEnumFromDescription } from './getEnumFromDescription'; +import { getModelProperties } from './getModelProperties'; +import { getType } from './getType'; export function getModel(openApi: OpenApi, definition: OpenApiSchema, isProperty: boolean = false, name: string = ''): Model { const model: Model = { diff --git a/src/openApi/v2/parser/getModelProperties.ts b/src/openApi/v2/parser/getModelProperties.ts index b6bb6f75..67354713 100644 --- a/src/openApi/v2/parser/getModelProperties.ts +++ b/src/openApi/v2/parser/getModelProperties.ts @@ -1,9 +1,9 @@ -import {Model} from '../../../client/interfaces/Model'; -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiSchema} from '../interfaces/OpenApiSchema'; -import {getComment} from './getComment'; -import {getModel} from './getModel'; -import {getType} from './getType'; +import { Model } from '../../../client/interfaces/Model'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiSchema } from '../interfaces/OpenApiSchema'; +import { getComment } from './getComment'; +import { getModel } from './getModel'; +import { getType } from './getType'; export function getModelProperties(openApi: OpenApi, definition: OpenApiSchema): Model[] { const models: Model[] = []; diff --git a/src/openApi/v2/parser/getModelTemplate.spec.ts b/src/openApi/v2/parser/getModelTemplate.spec.ts index d8922bf1..67e46f54 100644 --- a/src/openApi/v2/parser/getModelTemplate.spec.ts +++ b/src/openApi/v2/parser/getModelTemplate.spec.ts @@ -1,4 +1,4 @@ -import {getModelTemplate} from './getModelTemplate'; +import { getModelTemplate } from './getModelTemplate'; describe('getModelTemplate', () => { it('should return generic for template type', () => { diff --git a/src/openApi/v2/parser/getModelTemplate.ts b/src/openApi/v2/parser/getModelTemplate.ts index 9f8e2f24..f472e784 100644 --- a/src/openApi/v2/parser/getModelTemplate.ts +++ b/src/openApi/v2/parser/getModelTemplate.ts @@ -1,4 +1,4 @@ -import {Type} from '../../../client/interfaces/Type'; +import { Type } from '../../../client/interfaces/Type'; /** * If our model has a template type, then we want to generalize that! diff --git a/src/openApi/v2/parser/getModels.ts b/src/openApi/v2/parser/getModels.ts index 49780e2e..d654151d 100644 --- a/src/openApi/v2/parser/getModels.ts +++ b/src/openApi/v2/parser/getModels.ts @@ -1,7 +1,7 @@ -import {Model} from '../../../client/interfaces/Model'; -import {OpenApi} from '../interfaces/OpenApi'; -import {getModel} from './getModel'; -import {getType} from './getType'; +import { Model } from '../../../client/interfaces/Model'; +import { OpenApi } from '../interfaces/OpenApi'; +import { getModel } from './getModel'; +import { getType } from './getType'; export function getModels(openApi: OpenApi): Model[] { const models = new Map(); diff --git a/src/openApi/v2/parser/getOperation.ts b/src/openApi/v2/parser/getOperation.ts index 8e9fe611..558523d7 100644 --- a/src/openApi/v2/parser/getOperation.ts +++ b/src/openApi/v2/parser/getOperation.ts @@ -1,14 +1,14 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiOperation} from '../interfaces/OpenApiOperation'; -import {Operation} from '../../../client/interfaces/Operation'; -import {getComment} from './getComment'; -import {getOperationErrors} from './getOperationErrors'; -import {getOperationName} from './getOperationName'; -import {getOperationParameters} from './getOperationParameters'; -import {getOperationPath} from './getOperationPath'; -import {getOperationResponses} from './getOperationResponses'; -import {getOperationResults} from './getOperationResults'; -import {getServiceClassName} from './getServiceClassName'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiOperation } from '../interfaces/OpenApiOperation'; +import { Operation } from '../../../client/interfaces/Operation'; +import { getComment } from './getComment'; +import { getOperationErrors } from './getOperationErrors'; +import { getOperationName } from './getOperationName'; +import { getOperationParameters } from './getOperationParameters'; +import { getOperationPath } from './getOperationPath'; +import { getOperationResponses } from './getOperationResponses'; +import { getOperationResults } from './getOperationResults'; +import { getServiceClassName } from './getServiceClassName'; export function getOperation(openApi: OpenApi, url: string, method: string, op: OpenApiOperation): Operation { const serviceName = (op.tags && op.tags[0]) || 'Service'; diff --git a/src/openApi/v2/parser/getOperationErrors.ts b/src/openApi/v2/parser/getOperationErrors.ts index b96c0449..ab6edbb6 100644 --- a/src/openApi/v2/parser/getOperationErrors.ts +++ b/src/openApi/v2/parser/getOperationErrors.ts @@ -1,5 +1,5 @@ -import {OperationError} from '../../../client/interfaces/OperationError'; -import {OperationResponse} from '../../../client/interfaces/OperationResponse'; +import { OperationError } from '../../../client/interfaces/OperationError'; +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; export function getOperationErrors(operationResponses: OperationResponse[]): OperationError[] { return operationResponses diff --git a/src/openApi/v2/parser/getOperationName.spec.ts b/src/openApi/v2/parser/getOperationName.spec.ts index e01e4cb0..ba8a5d3d 100644 --- a/src/openApi/v2/parser/getOperationName.spec.ts +++ b/src/openApi/v2/parser/getOperationName.spec.ts @@ -1,4 +1,4 @@ -import {getOperationName} from './getOperationName'; +import { getOperationName } from './getOperationName'; describe('getOperationName', () => { it('should produce correct result', () => { diff --git a/src/openApi/v2/parser/getOperationParameter.ts b/src/openApi/v2/parser/getOperationParameter.ts index fb241c41..cb34a305 100644 --- a/src/openApi/v2/parser/getOperationParameter.ts +++ b/src/openApi/v2/parser/getOperationParameter.ts @@ -1,14 +1,14 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiParameter} from '../interfaces/OpenApiParameter'; -import {OperationParameter} from '../../../client/interfaces/OperationParameter'; -import {PrimaryType} from './constants'; -import {getComment} from './getComment'; -import {getEnum} from './getEnum'; -import {getEnumFromDescription} from './getEnumFromDescription'; -import {getModel} from './getModel'; -import {getOperationParameterDefault} from './getOperationParameterDefault'; -import {getOperationParameterName} from './getOperationParameterName'; -import {getType} from './getType'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiParameter } from '../interfaces/OpenApiParameter'; +import { OperationParameter } from '../../../client/interfaces/OperationParameter'; +import { PrimaryType } from './constants'; +import { getComment } from './getComment'; +import { getEnum } from './getEnum'; +import { getEnumFromDescription } from './getEnumFromDescription'; +import { getModel } from './getModel'; +import { getOperationParameterDefault } from './getOperationParameterDefault'; +import { getOperationParameterName } from './getOperationParameterName'; +import { getType } from './getType'; export function getOperationParameter(openApi: OpenApi, parameter: OpenApiParameter): OperationParameter { const operationParameter: OperationParameter = { diff --git a/src/openApi/v2/parser/getOperationParameterDefault.ts b/src/openApi/v2/parser/getOperationParameterDefault.ts index f7aae92c..4420dd96 100644 --- a/src/openApi/v2/parser/getOperationParameterDefault.ts +++ b/src/openApi/v2/parser/getOperationParameterDefault.ts @@ -1,5 +1,5 @@ -import {OpenApiParameter} from '../interfaces/OpenApiParameter'; -import {OperationParameter} from '../../../client/interfaces/OperationParameter'; +import { OpenApiParameter } from '../interfaces/OpenApiParameter'; +import { OperationParameter } from '../../../client/interfaces/OperationParameter'; export function getOperationParameterDefault(parameter: OpenApiParameter, operationParameter: OperationParameter): string | null { if (parameter.default === null) { diff --git a/src/openApi/v2/parser/getOperationParameters.ts b/src/openApi/v2/parser/getOperationParameters.ts index 71fbc0f4..63346fba 100644 --- a/src/openApi/v2/parser/getOperationParameters.ts +++ b/src/openApi/v2/parser/getOperationParameters.ts @@ -1,9 +1,9 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiParameter} from '../interfaces/OpenApiParameter'; -import {OperationParameter} from '../../../client/interfaces/OperationParameter'; -import {OperationParameters} from '../../../client/interfaces/OperationParameters'; -import {getOperationParameter} from './getOperationParameter'; -import {getRef} from './getRef'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiParameter } from '../interfaces/OpenApiParameter'; +import { OperationParameter } from '../../../client/interfaces/OperationParameter'; +import { OperationParameters } from '../../../client/interfaces/OperationParameters'; +import { getOperationParameter } from './getOperationParameter'; +import { getRef } from './getRef'; function sortByRequired(a: OperationParameter, b: OperationParameter): number { return a.isRequired && !b.isRequired ? -1 : !a.isRequired && b.isRequired ? 1 : 0; diff --git a/src/openApi/v2/parser/getOperationPath.spec.ts b/src/openApi/v2/parser/getOperationPath.spec.ts index c84d9827..4ede28f4 100644 --- a/src/openApi/v2/parser/getOperationPath.spec.ts +++ b/src/openApi/v2/parser/getOperationPath.spec.ts @@ -1,4 +1,4 @@ -import {getOperationPath} from './getOperationPath'; +import { getOperationPath } from './getOperationPath'; describe('getOperationPath', () => { it('should produce correct result', () => { diff --git a/src/openApi/v2/parser/getOperationResponse.ts b/src/openApi/v2/parser/getOperationResponse.ts index 864b3d74..aa8a9e4a 100644 --- a/src/openApi/v2/parser/getOperationResponse.ts +++ b/src/openApi/v2/parser/getOperationResponse.ts @@ -1,10 +1,10 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiResponse} from '../interfaces/OpenApiResponse'; -import {OperationResponse} from '../../../client/interfaces/OperationResponse'; -import {PrimaryType} from './constants'; -import {getComment} from './getComment'; -import {getModel} from './getModel'; -import {getType} from './getType'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiResponse } from '../interfaces/OpenApiResponse'; +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; +import { PrimaryType } from './constants'; +import { getComment } from './getComment'; +import { getModel } from './getModel'; +import { getType } from './getType'; export function getOperationResponse(openApi: OpenApi, response: OpenApiResponse, responseCode: number): OperationResponse { const operationResponse: OperationResponse = { diff --git a/src/openApi/v2/parser/getOperationResponses.ts b/src/openApi/v2/parser/getOperationResponses.ts index 656262b0..87621291 100644 --- a/src/openApi/v2/parser/getOperationResponses.ts +++ b/src/openApi/v2/parser/getOperationResponses.ts @@ -1,10 +1,10 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiResponse} from '../interfaces/OpenApiResponse'; -import {OpenApiResponses} from '../interfaces/OpenApiResponses'; -import {OperationResponse} from '../../../client/interfaces/OperationResponse'; -import {getOperationResponse} from './getOperationResponse'; -import {getOperationResponseCode} from './getOperationResponseCode'; -import {getRef} from './getRef'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiResponse } from '../interfaces/OpenApiResponse'; +import { OpenApiResponses } from '../interfaces/OpenApiResponses'; +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; +import { getOperationResponse } from './getOperationResponse'; +import { getOperationResponseCode } from './getOperationResponseCode'; +import { getRef } from './getRef'; export function getOperationResponses(openApi: OpenApi, responses: OpenApiResponses): OperationResponse[] { const operationResponses: OperationResponse[] = []; diff --git a/src/openApi/v2/parser/getOperationResults.ts b/src/openApi/v2/parser/getOperationResults.ts index 5870d8ca..fdb76359 100644 --- a/src/openApi/v2/parser/getOperationResults.ts +++ b/src/openApi/v2/parser/getOperationResults.ts @@ -1,6 +1,6 @@ -import {Model} from '../../../client/interfaces/Model'; -import {OperationResponse} from '../../../client/interfaces/OperationResponse'; -import {PrimaryType} from './constants'; +import { Model } from '../../../client/interfaces/Model'; +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; +import { PrimaryType } from './constants'; function areEqual(a: Model, b: Model): boolean { const equal = a.type === b.type && a.base === b.base && a.template === b.template; diff --git a/src/openApi/v2/parser/getRef.ts b/src/openApi/v2/parser/getRef.ts index 4f0439f4..303382ba 100644 --- a/src/openApi/v2/parser/getRef.ts +++ b/src/openApi/v2/parser/getRef.ts @@ -1,5 +1,5 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiReference} from '../interfaces/OpenApiReference'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiReference } from '../interfaces/OpenApiReference'; export function getRef(openApi: OpenApi, item: T & OpenApiReference): T { if (item.$ref) { diff --git a/src/openApi/v2/parser/getServer.spec.ts b/src/openApi/v2/parser/getServer.spec.ts index dc26919b..4eddc72c 100644 --- a/src/openApi/v2/parser/getServer.spec.ts +++ b/src/openApi/v2/parser/getServer.spec.ts @@ -1,4 +1,4 @@ -import {getServer} from './getServer'; +import { getServer } from './getServer'; describe('getServer', () => { it('should produce correct result', () => { diff --git a/src/openApi/v2/parser/getServer.ts b/src/openApi/v2/parser/getServer.ts index 4b33e9d8..6037e0c5 100644 --- a/src/openApi/v2/parser/getServer.ts +++ b/src/openApi/v2/parser/getServer.ts @@ -1,4 +1,4 @@ -import {OpenApi} from '../interfaces/OpenApi'; +import { OpenApi } from '../interfaces/OpenApi'; /** * Get the base server url. diff --git a/src/openApi/v2/parser/getServiceClassName.spec.ts b/src/openApi/v2/parser/getServiceClassName.spec.ts index dd22c0e6..9bcf6e15 100644 --- a/src/openApi/v2/parser/getServiceClassName.spec.ts +++ b/src/openApi/v2/parser/getServiceClassName.spec.ts @@ -1,4 +1,4 @@ -import {getServiceClassName} from './getServiceClassName'; +import { getServiceClassName } from './getServiceClassName'; describe('getServiceClassName', () => { it('should produce correct result', () => { diff --git a/src/openApi/v2/parser/getServiceClassName.ts b/src/openApi/v2/parser/getServiceClassName.ts index 0682802d..94131a3d 100644 --- a/src/openApi/v2/parser/getServiceClassName.ts +++ b/src/openApi/v2/parser/getServiceClassName.ts @@ -6,7 +6,7 @@ import camelCase from 'camelcase'; */ export function getServiceClassName(value: string): string { const clean = value.replace(/[^\w\s\-]+/g, '_').trim(); - const name = camelCase(clean, {pascalCase: true}); + const name = camelCase(clean, { pascalCase: true }); if (name && !name.endsWith('Service')) { return `${name}Service`; } diff --git a/src/openApi/v2/parser/getServiceVersion.spec.ts b/src/openApi/v2/parser/getServiceVersion.spec.ts index bfe819d3..3e72898b 100644 --- a/src/openApi/v2/parser/getServiceVersion.spec.ts +++ b/src/openApi/v2/parser/getServiceVersion.spec.ts @@ -1,4 +1,4 @@ -import {getServiceVersion} from './getServiceVersion'; +import { getServiceVersion } from './getServiceVersion'; describe('getServiceVersion', () => { it('should produce correct result', () => { diff --git a/src/openApi/v2/parser/getServices.ts b/src/openApi/v2/parser/getServices.ts index 184fb91a..ac61a2c8 100644 --- a/src/openApi/v2/parser/getServices.ts +++ b/src/openApi/v2/parser/getServices.ts @@ -1,7 +1,7 @@ -import {Method} from './constants'; -import {OpenApi} from '../interfaces/OpenApi'; -import {Service} from '../../../client/interfaces/Service'; -import {getOperation} from './getOperation'; +import { Method } from './constants'; +import { OpenApi } from '../interfaces/OpenApi'; +import { Service } from '../../../client/interfaces/Service'; +import { getOperation } from './getOperation'; /** * Get the OpenAPI services diff --git a/src/openApi/v2/parser/getType.spec.ts b/src/openApi/v2/parser/getType.spec.ts index 6cdc92fb..9f4ab9a4 100644 --- a/src/openApi/v2/parser/getType.spec.ts +++ b/src/openApi/v2/parser/getType.spec.ts @@ -1,4 +1,4 @@ -import {getType} from './getType'; +import { getType } from './getType'; describe('getType', () => { it('should convert int', () => { diff --git a/src/openApi/v2/parser/getType.ts b/src/openApi/v2/parser/getType.ts index 3a324caa..617d68fd 100644 --- a/src/openApi/v2/parser/getType.ts +++ b/src/openApi/v2/parser/getType.ts @@ -1,7 +1,7 @@ -import {PrimaryType} from './constants'; -import {Type} from '../../../client/interfaces/Type'; -import {getMappedType, hasMappedType} from './getMappedType'; -import {stripNamespace} from './stripNamespace'; +import { PrimaryType } from './constants'; +import { Type } from '../../../client/interfaces/Type'; +import { getMappedType, hasMappedType } from './getMappedType'; +import { stripNamespace } from './stripNamespace'; /** * Parse any string value into a type object. diff --git a/src/openApi/v2/parser/isPrimaryType.spec.ts b/src/openApi/v2/parser/isPrimaryType.spec.ts index d5659ca1..ed3e1774 100644 --- a/src/openApi/v2/parser/isPrimaryType.spec.ts +++ b/src/openApi/v2/parser/isPrimaryType.spec.ts @@ -1,4 +1,4 @@ -import {isPrimaryType} from './isPrimaryType'; +import { isPrimaryType } from './isPrimaryType'; describe('isPrimaryType', () => { it('should return true for primary types', () => { diff --git a/src/openApi/v2/parser/isPrimaryType.ts b/src/openApi/v2/parser/isPrimaryType.ts index 383e9ad8..dfb9e778 100644 --- a/src/openApi/v2/parser/isPrimaryType.ts +++ b/src/openApi/v2/parser/isPrimaryType.ts @@ -1,4 +1,4 @@ -import {PrimaryType} from './constants'; +import { PrimaryType } from './constants'; /** * Check if given type is a primary type. diff --git a/src/openApi/v2/parser/stripNamespace.spec.ts b/src/openApi/v2/parser/stripNamespace.spec.ts index 3b86a405..796386e2 100644 --- a/src/openApi/v2/parser/stripNamespace.spec.ts +++ b/src/openApi/v2/parser/stripNamespace.spec.ts @@ -1,4 +1,4 @@ -import {stripNamespace} from './stripNamespace'; +import { stripNamespace } from './stripNamespace'; describe('stripNamespace', () => { it('should strip namespace', () => { diff --git a/src/openApi/v3/index.ts b/src/openApi/v3/index.ts index e668f82e..734b80d4 100644 --- a/src/openApi/v3/index.ts +++ b/src/openApi/v3/index.ts @@ -1,9 +1,9 @@ -import {Client} from '../../client/interfaces/Client'; -import {OpenApi} from './interfaces/OpenApi'; -import {getModels} from './parser/getModels'; -import {getServer} from './parser/getServer'; -import {getServiceVersion} from './parser/getServiceVersion'; -import {getServices} from './parser/getServices'; +import { Client } from '../../client/interfaces/Client'; +import { OpenApi } from './interfaces/OpenApi'; +import { getModels } from './parser/getModels'; +import { getServer } from './parser/getServer'; +import { getServiceVersion } from './parser/getServiceVersion'; +import { getServices } from './parser/getServices'; /** * Parse the OpenAPI specification to a Client model that contains diff --git a/src/openApi/v3/interfaces/OpenApi.d.ts b/src/openApi/v3/interfaces/OpenApi.d.ts index 836cbbb6..2d598349 100644 --- a/src/openApi/v3/interfaces/OpenApi.d.ts +++ b/src/openApi/v3/interfaces/OpenApi.d.ts @@ -1,10 +1,10 @@ -import {OpenApiComponents} from './OpenApiComponents'; -import {OpenApiExternalDocs} from './OpenApiExternalDocs'; -import {OpenApiInfo} from './OpenApiInfo'; -import {OpenApiPaths} from './OpenApiPaths'; -import {OpenApiSecurityRequirement} from './OpenApiSecurityRequirement'; -import {OpenApiServer} from './OpenApiServer'; -import {OpenApiTag} from './OpenApiTag'; +import { OpenApiComponents } from './OpenApiComponents'; +import { OpenApiExternalDocs } from './OpenApiExternalDocs'; +import { OpenApiInfo } from './OpenApiInfo'; +import { OpenApiPaths } from './OpenApiPaths'; +import { OpenApiSecurityRequirement } from './OpenApiSecurityRequirement'; +import { OpenApiServer } from './OpenApiServer'; +import { OpenApiTag } from './OpenApiTag'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md diff --git a/src/openApi/v3/interfaces/OpenApiCallback.d.ts b/src/openApi/v3/interfaces/OpenApiCallback.d.ts index f1861a97..897ce3a4 100644 --- a/src/openApi/v3/interfaces/OpenApiCallback.d.ts +++ b/src/openApi/v3/interfaces/OpenApiCallback.d.ts @@ -1,5 +1,5 @@ -import {OpenApiPath} from './OpenApiPath'; -import {OpenApiReference} from './OpenApiReference'; +import { OpenApiPath } from './OpenApiPath'; +import { OpenApiReference } from './OpenApiReference'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#callbackObject diff --git a/src/openApi/v3/interfaces/OpenApiComponents.d.ts b/src/openApi/v3/interfaces/OpenApiComponents.d.ts index 6cd81a88..d740bebb 100644 --- a/src/openApi/v3/interfaces/OpenApiComponents.d.ts +++ b/src/openApi/v3/interfaces/OpenApiComponents.d.ts @@ -1,13 +1,13 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiCallback} from './OpenApiCallback'; -import {OpenApiExample} from './OpenApiExample'; -import {OpenApiHeader} from './OpenApiHeader'; -import {OpenApiLink} from './OpenApiLink'; -import {OpenApiParameter} from './OpenApiParameter'; -import {OpenApiRequestBody} from './OpenApiRequestBody'; -import {OpenApiResponses} from './OpenApiResponses'; -import {OpenApiSchema} from './OpenApiSchema'; -import {OpenApiSecurityScheme} from './OpenApiSecurityScheme'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiCallback } from './OpenApiCallback'; +import { OpenApiExample } from './OpenApiExample'; +import { OpenApiHeader } from './OpenApiHeader'; +import { OpenApiLink } from './OpenApiLink'; +import { OpenApiParameter } from './OpenApiParameter'; +import { OpenApiRequestBody } from './OpenApiRequestBody'; +import { OpenApiResponses } from './OpenApiResponses'; +import { OpenApiSchema } from './OpenApiSchema'; +import { OpenApiSecurityScheme } from './OpenApiSecurityScheme'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#componentsObject diff --git a/src/openApi/v3/interfaces/OpenApiDiscriminator.d.ts b/src/openApi/v3/interfaces/OpenApiDiscriminator.d.ts index 8dd75d39..0655f90d 100644 --- a/src/openApi/v3/interfaces/OpenApiDiscriminator.d.ts +++ b/src/openApi/v3/interfaces/OpenApiDiscriminator.d.ts @@ -1,4 +1,4 @@ -import {Dictionary} from '../../../utils/types'; +import { Dictionary } from '../../../utils/types'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#discriminatorObject diff --git a/src/openApi/v3/interfaces/OpenApiEncoding.d.ts b/src/openApi/v3/interfaces/OpenApiEncoding.d.ts index 9144d393..5a60ccf3 100644 --- a/src/openApi/v3/interfaces/OpenApiEncoding.d.ts +++ b/src/openApi/v3/interfaces/OpenApiEncoding.d.ts @@ -1,5 +1,5 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiHeader} from './OpenApiHeader'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiHeader } from './OpenApiHeader'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#encodingObject diff --git a/src/openApi/v3/interfaces/OpenApiExample.d.ts b/src/openApi/v3/interfaces/OpenApiExample.d.ts index fb6b60d9..48f441d2 100644 --- a/src/openApi/v3/interfaces/OpenApiExample.d.ts +++ b/src/openApi/v3/interfaces/OpenApiExample.d.ts @@ -1,4 +1,4 @@ -import {OpenApiReference} from './OpenApiReference'; +import { OpenApiReference } from './OpenApiReference'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#exampleObject diff --git a/src/openApi/v3/interfaces/OpenApiHeader.d.ts b/src/openApi/v3/interfaces/OpenApiHeader.d.ts index ec83c315..9fb75b1a 100644 --- a/src/openApi/v3/interfaces/OpenApiHeader.d.ts +++ b/src/openApi/v3/interfaces/OpenApiHeader.d.ts @@ -1,7 +1,7 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiExample} from './OpenApiExample'; -import {OpenApiReference} from './OpenApiReference'; -import {OpenApiSchema} from './OpenApiSchema'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiExample } from './OpenApiExample'; +import { OpenApiReference } from './OpenApiReference'; +import { OpenApiSchema } from './OpenApiSchema'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#headerObject diff --git a/src/openApi/v3/interfaces/OpenApiInfo.d.ts b/src/openApi/v3/interfaces/OpenApiInfo.d.ts index d3de4172..d5b2985d 100644 --- a/src/openApi/v3/interfaces/OpenApiInfo.d.ts +++ b/src/openApi/v3/interfaces/OpenApiInfo.d.ts @@ -1,5 +1,5 @@ -import {OpenApiContact} from './OpenApiContact'; -import {OpenApiLicense} from './OpenApiLicense'; +import { OpenApiContact } from './OpenApiContact'; +import { OpenApiLicense } from './OpenApiLicense'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#infoObject diff --git a/src/openApi/v3/interfaces/OpenApiLink.d.ts b/src/openApi/v3/interfaces/OpenApiLink.d.ts index 719de8a5..9797217e 100644 --- a/src/openApi/v3/interfaces/OpenApiLink.d.ts +++ b/src/openApi/v3/interfaces/OpenApiLink.d.ts @@ -1,6 +1,6 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiReference} from './OpenApiReference'; -import {OpenApiServer} from './OpenApiServer'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiReference } from './OpenApiReference'; +import { OpenApiServer } from './OpenApiServer'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#linkObject diff --git a/src/openApi/v3/interfaces/OpenApiMediaType.d.ts b/src/openApi/v3/interfaces/OpenApiMediaType.d.ts index 18fa3426..fb11a7da 100644 --- a/src/openApi/v3/interfaces/OpenApiMediaType.d.ts +++ b/src/openApi/v3/interfaces/OpenApiMediaType.d.ts @@ -1,8 +1,8 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiEncoding} from './OpenApiEncoding'; -import {OpenApiExample} from './OpenApiExample'; -import {OpenApiReference} from './OpenApiReference'; -import {OpenApiSchema} from './OpenApiSchema'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiEncoding } from './OpenApiEncoding'; +import { OpenApiExample } from './OpenApiExample'; +import { OpenApiReference } from './OpenApiReference'; +import { OpenApiSchema } from './OpenApiSchema'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#mediaTypeObject diff --git a/src/openApi/v3/interfaces/OpenApiOAuthFlow.d.ts b/src/openApi/v3/interfaces/OpenApiOAuthFlow.d.ts index f2730702..6f1827aa 100644 --- a/src/openApi/v3/interfaces/OpenApiOAuthFlow.d.ts +++ b/src/openApi/v3/interfaces/OpenApiOAuthFlow.d.ts @@ -1,4 +1,4 @@ -import {Dictionary} from '../../../utils/types'; +import { Dictionary } from '../../../utils/types'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#oauthFlowObject diff --git a/src/openApi/v3/interfaces/OpenApiOAuthFlows.d.ts b/src/openApi/v3/interfaces/OpenApiOAuthFlows.d.ts index 9eefaecd..a03a6d3d 100644 --- a/src/openApi/v3/interfaces/OpenApiOAuthFlows.d.ts +++ b/src/openApi/v3/interfaces/OpenApiOAuthFlows.d.ts @@ -1,4 +1,4 @@ -import {OpenApiOAuthFlow} from './OpenApiOAuthFlow'; +import { OpenApiOAuthFlow } from './OpenApiOAuthFlow'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#oauthFlowsObject diff --git a/src/openApi/v3/interfaces/OpenApiOperation.d.ts b/src/openApi/v3/interfaces/OpenApiOperation.d.ts index 54e4b3e8..b2176049 100644 --- a/src/openApi/v3/interfaces/OpenApiOperation.d.ts +++ b/src/openApi/v3/interfaces/OpenApiOperation.d.ts @@ -1,11 +1,11 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiCallback} from './OpenApiCallback'; -import {OpenApiExternalDocs} from './OpenApiExternalDocs'; -import {OpenApiParameter} from './OpenApiParameter'; -import {OpenApiRequestBody} from './OpenApiRequestBody'; -import {OpenApiResponses} from './OpenApiResponses'; -import {OpenApiSecurityRequirement} from './OpenApiSecurityRequirement'; -import {OpenApiServer} from './OpenApiServer'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiCallback } from './OpenApiCallback'; +import { OpenApiExternalDocs } from './OpenApiExternalDocs'; +import { OpenApiParameter } from './OpenApiParameter'; +import { OpenApiRequestBody } from './OpenApiRequestBody'; +import { OpenApiResponses } from './OpenApiResponses'; +import { OpenApiSecurityRequirement } from './OpenApiSecurityRequirement'; +import { OpenApiServer } from './OpenApiServer'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#operationObject diff --git a/src/openApi/v3/interfaces/OpenApiParameter.d.ts b/src/openApi/v3/interfaces/OpenApiParameter.d.ts index ff4d9173..bb646a70 100644 --- a/src/openApi/v3/interfaces/OpenApiParameter.d.ts +++ b/src/openApi/v3/interfaces/OpenApiParameter.d.ts @@ -1,7 +1,7 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiExample} from './OpenApiExample'; -import {OpenApiReference} from './OpenApiReference'; -import {OpenApiSchema} from './OpenApiSchema'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiExample } from './OpenApiExample'; +import { OpenApiReference } from './OpenApiReference'; +import { OpenApiSchema } from './OpenApiSchema'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#parameterObject diff --git a/src/openApi/v3/interfaces/OpenApiPath.d.ts b/src/openApi/v3/interfaces/OpenApiPath.d.ts index 74caf301..047798c9 100644 --- a/src/openApi/v3/interfaces/OpenApiPath.d.ts +++ b/src/openApi/v3/interfaces/OpenApiPath.d.ts @@ -1,6 +1,6 @@ -import {OpenApiOperation} from './OpenApiOperation'; -import {OpenApiParameter} from './OpenApiParameter'; -import {OpenApiServer} from './OpenApiServer'; +import { OpenApiOperation } from './OpenApiOperation'; +import { OpenApiParameter } from './OpenApiParameter'; +import { OpenApiServer } from './OpenApiServer'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#pathItemObject diff --git a/src/openApi/v3/interfaces/OpenApiPaths.d.ts b/src/openApi/v3/interfaces/OpenApiPaths.d.ts index e9d0e197..1ad406c7 100644 --- a/src/openApi/v3/interfaces/OpenApiPaths.d.ts +++ b/src/openApi/v3/interfaces/OpenApiPaths.d.ts @@ -1,4 +1,4 @@ -import {OpenApiPath} from './OpenApiPath'; +import { OpenApiPath } from './OpenApiPath'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#pathsObject diff --git a/src/openApi/v3/interfaces/OpenApiRequestBody.d.ts b/src/openApi/v3/interfaces/OpenApiRequestBody.d.ts index 076761af..f4215ec4 100644 --- a/src/openApi/v3/interfaces/OpenApiRequestBody.d.ts +++ b/src/openApi/v3/interfaces/OpenApiRequestBody.d.ts @@ -1,6 +1,6 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiMediaType} from './OpenApiMediaType'; -import {OpenApiReference} from './OpenApiReference'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiMediaType } from './OpenApiMediaType'; +import { OpenApiReference } from './OpenApiReference'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#requestBodyObject diff --git a/src/openApi/v3/interfaces/OpenApiResponse.d.ts b/src/openApi/v3/interfaces/OpenApiResponse.d.ts index 780e2550..3918fc96 100644 --- a/src/openApi/v3/interfaces/OpenApiResponse.d.ts +++ b/src/openApi/v3/interfaces/OpenApiResponse.d.ts @@ -1,8 +1,8 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiHeader} from './OpenApiHeader'; -import {OpenApiLink} from './OpenApiLink'; -import {OpenApiMediaType} from './OpenApiMediaType'; -import {OpenApiReference} from './OpenApiReference'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiHeader } from './OpenApiHeader'; +import { OpenApiLink } from './OpenApiLink'; +import { OpenApiMediaType } from './OpenApiMediaType'; +import { OpenApiReference } from './OpenApiReference'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#responseObject diff --git a/src/openApi/v3/interfaces/OpenApiResponses.d.ts b/src/openApi/v3/interfaces/OpenApiResponses.d.ts index 4f884e2f..ecc829a7 100644 --- a/src/openApi/v3/interfaces/OpenApiResponses.d.ts +++ b/src/openApi/v3/interfaces/OpenApiResponses.d.ts @@ -1,5 +1,5 @@ -import {OpenApiReference} from './OpenApiReference'; -import {OpenApiResponse} from './OpenApiResponse'; +import { OpenApiReference } from './OpenApiReference'; +import { OpenApiResponse } from './OpenApiResponse'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#responsesObject diff --git a/src/openApi/v3/interfaces/OpenApiSchema.d.ts b/src/openApi/v3/interfaces/OpenApiSchema.d.ts index 9f38a5b8..01cceedc 100644 --- a/src/openApi/v3/interfaces/OpenApiSchema.d.ts +++ b/src/openApi/v3/interfaces/OpenApiSchema.d.ts @@ -1,8 +1,8 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiDiscriminator} from './OpenApiDiscriminator'; -import {OpenApiExternalDocs} from './OpenApiExternalDocs'; -import {OpenApiReference} from './OpenApiReference'; -import {OpenApiXml} from './OpenApiXml'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiDiscriminator } from './OpenApiDiscriminator'; +import { OpenApiExternalDocs } from './OpenApiExternalDocs'; +import { OpenApiReference } from './OpenApiReference'; +import { OpenApiXml } from './OpenApiXml'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#schemaObject diff --git a/src/openApi/v3/interfaces/OpenApiSecurityScheme.d.ts b/src/openApi/v3/interfaces/OpenApiSecurityScheme.d.ts index fb4c2c61..0a5a461d 100644 --- a/src/openApi/v3/interfaces/OpenApiSecurityScheme.d.ts +++ b/src/openApi/v3/interfaces/OpenApiSecurityScheme.d.ts @@ -1,5 +1,5 @@ -import {OpenApiOAuthFlows} from './OpenApiOAuthFlows'; -import {OpenApiReference} from './OpenApiReference'; +import { OpenApiOAuthFlows } from './OpenApiOAuthFlows'; +import { OpenApiReference } from './OpenApiReference'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#securitySchemeObject diff --git a/src/openApi/v3/interfaces/OpenApiServer.d.ts b/src/openApi/v3/interfaces/OpenApiServer.d.ts index ac4073ac..3220b554 100644 --- a/src/openApi/v3/interfaces/OpenApiServer.d.ts +++ b/src/openApi/v3/interfaces/OpenApiServer.d.ts @@ -1,5 +1,5 @@ -import {Dictionary} from '../../../utils/types'; -import {OpenApiServerVariable} from './OpenApiServerVariable'; +import { Dictionary } from '../../../utils/types'; +import { OpenApiServerVariable } from './OpenApiServerVariable'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#serverObject diff --git a/src/openApi/v3/interfaces/OpenApiTag.d.ts b/src/openApi/v3/interfaces/OpenApiTag.d.ts index 4088fcc2..8cbceb9c 100644 --- a/src/openApi/v3/interfaces/OpenApiTag.d.ts +++ b/src/openApi/v3/interfaces/OpenApiTag.d.ts @@ -1,4 +1,4 @@ -import {OpenApiExternalDocs} from './OpenApiExternalDocs'; +import { OpenApiExternalDocs } from './OpenApiExternalDocs'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#tagObject diff --git a/src/openApi/v3/parser/getComment.ts b/src/openApi/v3/parser/getComment.ts index d382a1c4..d9af7afa 100644 --- a/src/openApi/v3/parser/getComment.ts +++ b/src/openApi/v3/parser/getComment.ts @@ -1,4 +1,4 @@ -import {EOL} from 'os'; +import { EOL } from 'os'; export function getComment(comment?: string): string | null { if (comment) { diff --git a/src/openApi/v3/parser/getContent.ts b/src/openApi/v3/parser/getContent.ts index 54ca2827..9620b6b7 100644 --- a/src/openApi/v3/parser/getContent.ts +++ b/src/openApi/v3/parser/getContent.ts @@ -1,8 +1,8 @@ -import {ContentType} from './constants'; -import {Dictionary} from '../../../utils/types'; -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiMediaType} from '../interfaces/OpenApiMediaType'; -import {OpenApiSchema} from '../interfaces/OpenApiSchema'; +import { ContentType } from './constants'; +import { Dictionary } from '../../../utils/types'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiMediaType } from '../interfaces/OpenApiMediaType'; +import { OpenApiSchema } from '../interfaces/OpenApiSchema'; export function getContent(openApi: OpenApi, content: Dictionary): OpenApiSchema | null { /* prettier-ignore */ diff --git a/src/openApi/v3/parser/getEnum.ts b/src/openApi/v3/parser/getEnum.ts index 10e0e5c1..094a552d 100644 --- a/src/openApi/v3/parser/getEnum.ts +++ b/src/openApi/v3/parser/getEnum.ts @@ -1,5 +1,5 @@ -import {Enum} from '../../../client/interfaces/Enum'; -import {PrimaryType} from './constants'; +import { Enum } from '../../../client/interfaces/Enum'; +import { PrimaryType } from './constants'; export function getEnum(values?: (string | number)[]): Enum[] { if (Array.isArray(values)) { diff --git a/src/openApi/v3/parser/getEnumFromDescription.ts b/src/openApi/v3/parser/getEnumFromDescription.ts index 3af003fd..60696e7e 100644 --- a/src/openApi/v3/parser/getEnumFromDescription.ts +++ b/src/openApi/v3/parser/getEnumFromDescription.ts @@ -1,5 +1,5 @@ -import {Enum} from '../../../client/interfaces/Enum'; -import {PrimaryType} from './constants'; +import { Enum } from '../../../client/interfaces/Enum'; +import { PrimaryType } from './constants'; export function getEnumFromDescription(description: string): Enum[] { // Check if we can find this special format string: diff --git a/src/openApi/v3/parser/getEnumValues.ts b/src/openApi/v3/parser/getEnumValues.ts index ece088dc..348208fe 100644 --- a/src/openApi/v3/parser/getEnumValues.ts +++ b/src/openApi/v3/parser/getEnumValues.ts @@ -1,4 +1,4 @@ -import {Enum} from '../../../client/interfaces/Enum'; +import { Enum } from '../../../client/interfaces/Enum'; export function getEnumValues(enumerators: Enum[]): string[] { // Fetch values from the symbols, just to be sure we filter out diff --git a/src/openApi/v3/parser/getMappedType.spec.ts b/src/openApi/v3/parser/getMappedType.spec.ts index e0a8bf5a..b437f85d 100644 --- a/src/openApi/v3/parser/getMappedType.spec.ts +++ b/src/openApi/v3/parser/getMappedType.spec.ts @@ -1,4 +1,4 @@ -import {getMappedType} from './getMappedType'; +import { getMappedType } from './getMappedType'; describe('getMappedType', () => { it('should map types to the basics', () => { diff --git a/src/openApi/v3/parser/getMappedType.ts b/src/openApi/v3/parser/getMappedType.ts index 3b6c122a..ca11fa7e 100644 --- a/src/openApi/v3/parser/getMappedType.ts +++ b/src/openApi/v3/parser/getMappedType.ts @@ -1,4 +1,4 @@ -import {PrimaryType, TYPE_MAPPINGS} from './constants'; +import { PrimaryType, TYPE_MAPPINGS } from './constants'; /** * Get mapped type for given type to any basic Typescript/Javascript type. diff --git a/src/openApi/v3/parser/getModel.ts b/src/openApi/v3/parser/getModel.ts index 42a228e1..853eb29c 100644 --- a/src/openApi/v3/parser/getModel.ts +++ b/src/openApi/v3/parser/getModel.ts @@ -1,13 +1,13 @@ -import {Model} from '../../../client/interfaces/Model'; -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiSchema} from '../interfaces/OpenApiSchema'; -import {PrimaryType} from './constants'; -import {getComment} from './getComment'; -import {getEnum} from './getEnum'; -import {getEnumFromDescription} from './getEnumFromDescription'; -import {getModelDefault} from './getModelDefault'; -import {getModelProperties} from './getModelProperties'; -import {getType} from './getType'; +import { Model } from '../../../client/interfaces/Model'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiSchema } from '../interfaces/OpenApiSchema'; +import { PrimaryType } from './constants'; +import { getComment } from './getComment'; +import { getEnum } from './getEnum'; +import { getEnumFromDescription } from './getEnumFromDescription'; +import { getModelDefault } from './getModelDefault'; +import { getModelProperties } from './getModelProperties'; +import { getType } from './getType'; export function getModel(openApi: OpenApi, definition: OpenApiSchema, isProperty: boolean = false, name: string = ''): Model { const model: Model = { diff --git a/src/openApi/v3/parser/getModelDefault.ts b/src/openApi/v3/parser/getModelDefault.ts index 8a29e2fc..cfb317ab 100644 --- a/src/openApi/v3/parser/getModelDefault.ts +++ b/src/openApi/v3/parser/getModelDefault.ts @@ -1,5 +1,5 @@ -import {Model} from '../../../client/interfaces/Model'; -import {OpenApiSchema} from '../interfaces/OpenApiSchema'; +import { Model } from '../../../client/interfaces/Model'; +import { OpenApiSchema } from '../interfaces/OpenApiSchema'; export function getModelDefault(definition: OpenApiSchema, model?: Model): string | null { if (definition.default === null) { diff --git a/src/openApi/v3/parser/getModelProperties.ts b/src/openApi/v3/parser/getModelProperties.ts index 1296def9..b98ac8d6 100644 --- a/src/openApi/v3/parser/getModelProperties.ts +++ b/src/openApi/v3/parser/getModelProperties.ts @@ -1,9 +1,9 @@ -import {Model} from '../../../client/interfaces/Model'; -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiSchema} from '../interfaces/OpenApiSchema'; -import {getComment} from './getComment'; -import {getModel} from './getModel'; -import {getType} from './getType'; +import { Model } from '../../../client/interfaces/Model'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiSchema } from '../interfaces/OpenApiSchema'; +import { getComment } from './getComment'; +import { getModel } from './getModel'; +import { getType } from './getType'; export function getModelProperties(openApi: OpenApi, definition: OpenApiSchema): Model[] { const models: Model[] = []; diff --git a/src/openApi/v3/parser/getModelTemplate.spec.ts b/src/openApi/v3/parser/getModelTemplate.spec.ts index d8922bf1..67e46f54 100644 --- a/src/openApi/v3/parser/getModelTemplate.spec.ts +++ b/src/openApi/v3/parser/getModelTemplate.spec.ts @@ -1,4 +1,4 @@ -import {getModelTemplate} from './getModelTemplate'; +import { getModelTemplate } from './getModelTemplate'; describe('getModelTemplate', () => { it('should return generic for template type', () => { diff --git a/src/openApi/v3/parser/getModelTemplate.ts b/src/openApi/v3/parser/getModelTemplate.ts index 9f8e2f24..f472e784 100644 --- a/src/openApi/v3/parser/getModelTemplate.ts +++ b/src/openApi/v3/parser/getModelTemplate.ts @@ -1,4 +1,4 @@ -import {Type} from '../../../client/interfaces/Type'; +import { Type } from '../../../client/interfaces/Type'; /** * If our model has a template type, then we want to generalize that! diff --git a/src/openApi/v3/parser/getModels.ts b/src/openApi/v3/parser/getModels.ts index cc485c3b..4baa34af 100644 --- a/src/openApi/v3/parser/getModels.ts +++ b/src/openApi/v3/parser/getModels.ts @@ -1,7 +1,7 @@ -import {Model} from '../../../client/interfaces/Model'; -import {OpenApi} from '../interfaces/OpenApi'; -import {getModel} from './getModel'; -import {getType} from './getType'; +import { Model } from '../../../client/interfaces/Model'; +import { OpenApi } from '../interfaces/OpenApi'; +import { getModel } from './getModel'; +import { getType } from './getType'; export function getModels(openApi: OpenApi): Model[] { const models = new Map(); diff --git a/src/openApi/v3/parser/getOperation.ts b/src/openApi/v3/parser/getOperation.ts index 4707abef..20ff34fa 100644 --- a/src/openApi/v3/parser/getOperation.ts +++ b/src/openApi/v3/parser/getOperation.ts @@ -1,15 +1,15 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiOperation} from '../interfaces/OpenApiOperation'; -import {Operation} from '../../../client/interfaces/Operation'; -import {getComment} from './getComment'; -import {getOperationErrors} from './getOperationErrors'; -import {getOperationName} from './getOperationName'; -import {getOperationParameters} from './getOperationParameters'; -import {getOperationPath} from './getOperationPath'; -import {getOperationRequestBody} from './getOperationRequestBody'; -import {getOperationResponses} from './getOperationResponses'; -import {getOperationResults} from './getOperationResults'; -import {getServiceClassName} from './getServiceClassName'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiOperation } from '../interfaces/OpenApiOperation'; +import { Operation } from '../../../client/interfaces/Operation'; +import { getComment } from './getComment'; +import { getOperationErrors } from './getOperationErrors'; +import { getOperationName } from './getOperationName'; +import { getOperationParameters } from './getOperationParameters'; +import { getOperationPath } from './getOperationPath'; +import { getOperationRequestBody } from './getOperationRequestBody'; +import { getOperationResponses } from './getOperationResponses'; +import { getOperationResults } from './getOperationResults'; +import { getServiceClassName } from './getServiceClassName'; export function getOperation(openApi: OpenApi, url: string, method: string, op: OpenApiOperation): Operation { const serviceName = (op.tags && op.tags[0]) || 'Service'; diff --git a/src/openApi/v3/parser/getOperationErrors.ts b/src/openApi/v3/parser/getOperationErrors.ts index b96c0449..ab6edbb6 100644 --- a/src/openApi/v3/parser/getOperationErrors.ts +++ b/src/openApi/v3/parser/getOperationErrors.ts @@ -1,5 +1,5 @@ -import {OperationError} from '../../../client/interfaces/OperationError'; -import {OperationResponse} from '../../../client/interfaces/OperationResponse'; +import { OperationError } from '../../../client/interfaces/OperationError'; +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; export function getOperationErrors(operationResponses: OperationResponse[]): OperationError[] { return operationResponses diff --git a/src/openApi/v3/parser/getOperationName.spec.ts b/src/openApi/v3/parser/getOperationName.spec.ts index e01e4cb0..ba8a5d3d 100644 --- a/src/openApi/v3/parser/getOperationName.spec.ts +++ b/src/openApi/v3/parser/getOperationName.spec.ts @@ -1,4 +1,4 @@ -import {getOperationName} from './getOperationName'; +import { getOperationName } from './getOperationName'; describe('getOperationName', () => { it('should produce correct result', () => { diff --git a/src/openApi/v3/parser/getOperationParameter.ts b/src/openApi/v3/parser/getOperationParameter.ts index 018898cb..40517eec 100644 --- a/src/openApi/v3/parser/getOperationParameter.ts +++ b/src/openApi/v3/parser/getOperationParameter.ts @@ -1,12 +1,12 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiParameter} from '../interfaces/OpenApiParameter'; -import {OperationParameter} from '../../../client/interfaces/OperationParameter'; -import {PrimaryType} from './constants'; -import {getComment} from './getComment'; -import {getModel} from './getModel'; -import {getModelDefault} from './getModelDefault'; -import {getOperationParameterName} from './getOperationParameterName'; -import {getType} from './getType'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiParameter } from '../interfaces/OpenApiParameter'; +import { OperationParameter } from '../../../client/interfaces/OperationParameter'; +import { PrimaryType } from './constants'; +import { getComment } from './getComment'; +import { getModel } from './getModel'; +import { getModelDefault } from './getModelDefault'; +import { getOperationParameterName } from './getOperationParameterName'; +import { getType } from './getType'; export function getOperationParameter(openApi: OpenApi, parameter: OpenApiParameter): OperationParameter { const operationParameter: OperationParameter = { diff --git a/src/openApi/v3/parser/getOperationParameters.ts b/src/openApi/v3/parser/getOperationParameters.ts index 14f0e8cc..9ba08031 100644 --- a/src/openApi/v3/parser/getOperationParameters.ts +++ b/src/openApi/v3/parser/getOperationParameters.ts @@ -1,9 +1,9 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiParameter} from '../interfaces/OpenApiParameter'; -import {OperationParameter} from '../../../client/interfaces/OperationParameter'; -import {OperationParameters} from '../../../client/interfaces/OperationParameters'; -import {getOperationParameter} from './getOperationParameter'; -import {getRef} from './getRef'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiParameter } from '../interfaces/OpenApiParameter'; +import { OperationParameter } from '../../../client/interfaces/OperationParameter'; +import { OperationParameters } from '../../../client/interfaces/OperationParameters'; +import { getOperationParameter } from './getOperationParameter'; +import { getRef } from './getRef'; function sortByRequired(a: OperationParameter, b: OperationParameter): number { return a.isRequired && !b.isRequired ? -1 : !a.isRequired && b.isRequired ? 1 : 0; diff --git a/src/openApi/v3/parser/getOperationPath.spec.ts b/src/openApi/v3/parser/getOperationPath.spec.ts index c84d9827..4ede28f4 100644 --- a/src/openApi/v3/parser/getOperationPath.spec.ts +++ b/src/openApi/v3/parser/getOperationPath.spec.ts @@ -1,4 +1,4 @@ -import {getOperationPath} from './getOperationPath'; +import { getOperationPath } from './getOperationPath'; describe('getOperationPath', () => { it('should produce correct result', () => { diff --git a/src/openApi/v3/parser/getOperationRequestBody.ts b/src/openApi/v3/parser/getOperationRequestBody.ts index 58666ff6..682b6651 100644 --- a/src/openApi/v3/parser/getOperationRequestBody.ts +++ b/src/openApi/v3/parser/getOperationRequestBody.ts @@ -1,11 +1,11 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiRequestBody} from '../interfaces/OpenApiRequestBody'; -import {OperationParameter} from '../../../client/interfaces/OperationParameter'; -import {PrimaryType} from './constants'; -import {getComment} from './getComment'; -import {getContent} from './getContent'; -import {getModel} from './getModel'; -import {getType} from './getType'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiRequestBody } from '../interfaces/OpenApiRequestBody'; +import { OperationParameter } from '../../../client/interfaces/OperationParameter'; +import { PrimaryType } from './constants'; +import { getComment } from './getComment'; +import { getContent } from './getContent'; +import { getModel } from './getModel'; +import { getType } from './getType'; export function getOperationRequestBody(openApi: OpenApi, parameter: OpenApiRequestBody): OperationParameter { const requestBody: OperationParameter = { diff --git a/src/openApi/v3/parser/getOperationResponse.ts b/src/openApi/v3/parser/getOperationResponse.ts index 05ff99a9..91edb706 100644 --- a/src/openApi/v3/parser/getOperationResponse.ts +++ b/src/openApi/v3/parser/getOperationResponse.ts @@ -1,11 +1,11 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiResponse} from '../interfaces/OpenApiResponse'; -import {OperationResponse} from '../../../client/interfaces/OperationResponse'; -import {PrimaryType} from './constants'; -import {getComment} from './getComment'; -import {getContent} from './getContent'; -import {getModel} from './getModel'; -import {getType} from './getType'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiResponse } from '../interfaces/OpenApiResponse'; +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; +import { PrimaryType } from './constants'; +import { getComment } from './getComment'; +import { getContent } from './getContent'; +import { getModel } from './getModel'; +import { getType } from './getType'; export function getOperationResponse(openApi: OpenApi, response: OpenApiResponse, responseCode: number): OperationResponse { const operationResponse: OperationResponse = { diff --git a/src/openApi/v3/parser/getOperationResponses.ts b/src/openApi/v3/parser/getOperationResponses.ts index 656262b0..87621291 100644 --- a/src/openApi/v3/parser/getOperationResponses.ts +++ b/src/openApi/v3/parser/getOperationResponses.ts @@ -1,10 +1,10 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiResponse} from '../interfaces/OpenApiResponse'; -import {OpenApiResponses} from '../interfaces/OpenApiResponses'; -import {OperationResponse} from '../../../client/interfaces/OperationResponse'; -import {getOperationResponse} from './getOperationResponse'; -import {getOperationResponseCode} from './getOperationResponseCode'; -import {getRef} from './getRef'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiResponse } from '../interfaces/OpenApiResponse'; +import { OpenApiResponses } from '../interfaces/OpenApiResponses'; +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; +import { getOperationResponse } from './getOperationResponse'; +import { getOperationResponseCode } from './getOperationResponseCode'; +import { getRef } from './getRef'; export function getOperationResponses(openApi: OpenApi, responses: OpenApiResponses): OperationResponse[] { const operationResponses: OperationResponse[] = []; diff --git a/src/openApi/v3/parser/getOperationResults.ts b/src/openApi/v3/parser/getOperationResults.ts index 5870d8ca..fdb76359 100644 --- a/src/openApi/v3/parser/getOperationResults.ts +++ b/src/openApi/v3/parser/getOperationResults.ts @@ -1,6 +1,6 @@ -import {Model} from '../../../client/interfaces/Model'; -import {OperationResponse} from '../../../client/interfaces/OperationResponse'; -import {PrimaryType} from './constants'; +import { Model } from '../../../client/interfaces/Model'; +import { OperationResponse } from '../../../client/interfaces/OperationResponse'; +import { PrimaryType } from './constants'; function areEqual(a: Model, b: Model): boolean { const equal = a.type === b.type && a.base === b.base && a.template === b.template; diff --git a/src/openApi/v3/parser/getRef.ts b/src/openApi/v3/parser/getRef.ts index 4f0439f4..303382ba 100644 --- a/src/openApi/v3/parser/getRef.ts +++ b/src/openApi/v3/parser/getRef.ts @@ -1,5 +1,5 @@ -import {OpenApi} from '../interfaces/OpenApi'; -import {OpenApiReference} from '../interfaces/OpenApiReference'; +import { OpenApi } from '../interfaces/OpenApi'; +import { OpenApiReference } from '../interfaces/OpenApiReference'; export function getRef(openApi: OpenApi, item: T & OpenApiReference): T { if (item.$ref) { diff --git a/src/openApi/v3/parser/getServer.spec.ts b/src/openApi/v3/parser/getServer.spec.ts index 03db0634..46a1cc0b 100644 --- a/src/openApi/v3/parser/getServer.spec.ts +++ b/src/openApi/v3/parser/getServer.spec.ts @@ -1,4 +1,4 @@ -import {getServer} from './getServer'; +import { getServer } from './getServer'; describe('getServer', () => { it('should produce correct result', () => { diff --git a/src/openApi/v3/parser/getServer.ts b/src/openApi/v3/parser/getServer.ts index 3fb2b834..aa0180b6 100644 --- a/src/openApi/v3/parser/getServer.ts +++ b/src/openApi/v3/parser/getServer.ts @@ -1,4 +1,4 @@ -import {OpenApi} from '../interfaces/OpenApi'; +import { OpenApi } from '../interfaces/OpenApi'; export function getServer(openApi: OpenApi): string { const server = openApi.servers && openApi.servers[0]; diff --git a/src/openApi/v3/parser/getServiceClassName.spec.ts b/src/openApi/v3/parser/getServiceClassName.spec.ts index dd22c0e6..9bcf6e15 100644 --- a/src/openApi/v3/parser/getServiceClassName.spec.ts +++ b/src/openApi/v3/parser/getServiceClassName.spec.ts @@ -1,4 +1,4 @@ -import {getServiceClassName} from './getServiceClassName'; +import { getServiceClassName } from './getServiceClassName'; describe('getServiceClassName', () => { it('should produce correct result', () => { diff --git a/src/openApi/v3/parser/getServiceClassName.ts b/src/openApi/v3/parser/getServiceClassName.ts index 0682802d..94131a3d 100644 --- a/src/openApi/v3/parser/getServiceClassName.ts +++ b/src/openApi/v3/parser/getServiceClassName.ts @@ -6,7 +6,7 @@ import camelCase from 'camelcase'; */ export function getServiceClassName(value: string): string { const clean = value.replace(/[^\w\s\-]+/g, '_').trim(); - const name = camelCase(clean, {pascalCase: true}); + const name = camelCase(clean, { pascalCase: true }); if (name && !name.endsWith('Service')) { return `${name}Service`; } diff --git a/src/openApi/v3/parser/getServiceVersion.spec.ts b/src/openApi/v3/parser/getServiceVersion.spec.ts index bfe819d3..3e72898b 100644 --- a/src/openApi/v3/parser/getServiceVersion.spec.ts +++ b/src/openApi/v3/parser/getServiceVersion.spec.ts @@ -1,4 +1,4 @@ -import {getServiceVersion} from './getServiceVersion'; +import { getServiceVersion } from './getServiceVersion'; describe('getServiceVersion', () => { it('should produce correct result', () => { diff --git a/src/openApi/v3/parser/getServices.ts b/src/openApi/v3/parser/getServices.ts index 184fb91a..ac61a2c8 100644 --- a/src/openApi/v3/parser/getServices.ts +++ b/src/openApi/v3/parser/getServices.ts @@ -1,7 +1,7 @@ -import {Method} from './constants'; -import {OpenApi} from '../interfaces/OpenApi'; -import {Service} from '../../../client/interfaces/Service'; -import {getOperation} from './getOperation'; +import { Method } from './constants'; +import { OpenApi } from '../interfaces/OpenApi'; +import { Service } from '../../../client/interfaces/Service'; +import { getOperation } from './getOperation'; /** * Get the OpenAPI services diff --git a/src/openApi/v3/parser/getType.spec.ts b/src/openApi/v3/parser/getType.spec.ts index 3e574e93..a620b21a 100644 --- a/src/openApi/v3/parser/getType.spec.ts +++ b/src/openApi/v3/parser/getType.spec.ts @@ -1,4 +1,4 @@ -import {getType} from './getType'; +import { getType } from './getType'; describe('getType', () => { it('should convert int', () => { diff --git a/src/openApi/v3/parser/getType.ts b/src/openApi/v3/parser/getType.ts index 3a324caa..617d68fd 100644 --- a/src/openApi/v3/parser/getType.ts +++ b/src/openApi/v3/parser/getType.ts @@ -1,7 +1,7 @@ -import {PrimaryType} from './constants'; -import {Type} from '../../../client/interfaces/Type'; -import {getMappedType, hasMappedType} from './getMappedType'; -import {stripNamespace} from './stripNamespace'; +import { PrimaryType } from './constants'; +import { Type } from '../../../client/interfaces/Type'; +import { getMappedType, hasMappedType } from './getMappedType'; +import { stripNamespace } from './stripNamespace'; /** * Parse any string value into a type object. diff --git a/src/openApi/v3/parser/isPrimaryType.spec.ts b/src/openApi/v3/parser/isPrimaryType.spec.ts index d5659ca1..ed3e1774 100644 --- a/src/openApi/v3/parser/isPrimaryType.spec.ts +++ b/src/openApi/v3/parser/isPrimaryType.spec.ts @@ -1,4 +1,4 @@ -import {isPrimaryType} from './isPrimaryType'; +import { isPrimaryType } from './isPrimaryType'; describe('isPrimaryType', () => { it('should return true for primary types', () => { diff --git a/src/openApi/v3/parser/isPrimaryType.ts b/src/openApi/v3/parser/isPrimaryType.ts index 383e9ad8..dfb9e778 100644 --- a/src/openApi/v3/parser/isPrimaryType.ts +++ b/src/openApi/v3/parser/isPrimaryType.ts @@ -1,4 +1,4 @@ -import {PrimaryType} from './constants'; +import { PrimaryType } from './constants'; /** * Check if given type is a primary type. diff --git a/src/openApi/v3/parser/stripNamespace.spec.ts b/src/openApi/v3/parser/stripNamespace.spec.ts index 516f7ff9..6f6b668c 100644 --- a/src/openApi/v3/parser/stripNamespace.spec.ts +++ b/src/openApi/v3/parser/stripNamespace.spec.ts @@ -1,4 +1,4 @@ -import {stripNamespace} from './stripNamespace'; +import { stripNamespace } from './stripNamespace'; describe('stripNamespace', () => { it('should strip namespace', () => { diff --git a/src/utils/getFilteredModels.ts b/src/utils/getFilteredModels.ts deleted file mode 100644 index 17d0baf1..00000000 --- a/src/utils/getFilteredModels.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Language } from '../index'; -import { Model } from '../client/interfaces/Model'; - -export function getFilteredModels(models: Model[], language: Language): Model[] { - return models.filter(model => { - if (language === Language.JAVASCRIPT) { - const hasEnum = model.enum.length > 0; - const hasEnums = model.enums.length > 0; - return hasEnum || hasEnums; - } - return true; - }); -} diff --git a/src/utils/getFilteredServices.ts b/src/utils/getFilteredServices.ts deleted file mode 100644 index b844265a..00000000 --- a/src/utils/getFilteredServices.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Language } from '../index'; -import { Service } from '../client/interfaces/Service'; - -export function getFilteredServices(services: Service[], language: Language): Service[] { - return services.filter(service => { - if (language === Language.JAVASCRIPT) { - return service.operations.length > 0; - } - return service.operations.length; - }); -} diff --git a/src/utils/writeClient.ts b/src/utils/writeClient.ts index 65a3dfc5..b885b934 100644 --- a/src/utils/writeClient.ts +++ b/src/utils/writeClient.ts @@ -6,8 +6,6 @@ import * as rimraf from 'rimraf'; import { Client } from '../client/interfaces/Client'; import { HttpClient, Language } from '../index'; import { Templates } from './readHandlebarsTemplates'; -import { getFilteredModels } from './getFilteredModels'; -import { getFilteredServices } from './getFilteredServices'; import { writeClientIndex } from './writeClientIndex'; import { writeClientModels } from './writeClientModels'; import { writeClientServices } from './writeClientServices'; @@ -53,10 +51,6 @@ export function writeClient(client: Client, language: Language, httpClient: Http ); }); - // Filter unused models and services. - // client.models = getFilteredModels(client.models, language); - // client.services = getFilteredServices(client.services, language); - // Write the client files try { writeClientSettings(client, language, httpClient, templates, outputPathCore); diff --git a/test/__snapshots__/index.spec.js.snap b/test/__snapshots__/index.spec.js.snap index 8203ee0d..b8d8eb60 100644 --- a/test/__snapshots__/index.spec.js.snap +++ b/test/__snapshots__/index.spec.js.snap @@ -360,11 +360,43 @@ export { ApiError } from './core/ApiError'; export { isSuccess } from './core/isSuccess'; export { OpenAPI } from './core/OpenAPI'; +export { ArrayWithArray } from './models/ArrayWithArray'; +export { ArrayWithBooleans } from './models/ArrayWithBooleans'; +export { ArrayWithNumbers } from './models/ArrayWithNumbers'; +export { ArrayWithProperties } from './models/ArrayWithProperties'; +export { ArrayWithReferences } from './models/ArrayWithReferences'; +export { ArrayWithStrings } from './models/ArrayWithStrings'; +export { DictionaryWithArray } from './models/DictionaryWithArray'; +export { DictionaryWithDictionary } from './models/DictionaryWithDictionary'; +export { DictionaryWithProperties } from './models/DictionaryWithProperties'; +export { DictionaryWithReference } from './models/DictionaryWithReference'; +export { DictionaryWithString } from './models/DictionaryWithString'; export { EnumFromDescription } from './models/EnumFromDescription'; export { EnumWithNumbers } from './models/EnumWithNumbers'; export { EnumWithStrings } from './models/EnumWithStrings'; +export { ModelLink } from './models/ModelLink'; +export { ModelThatExtends } from './models/ModelThatExtends'; +export { ModelThatExtendsExtends } from './models/ModelThatExtendsExtends'; +export { ModelWithArray } from './models/ModelWithArray'; +export { ModelWithBoolean } from './models/ModelWithBoolean'; +export { ModelWithCircularReference } from './models/ModelWithCircularReference'; +export { ModelWithDictionary } from './models/ModelWithDictionary'; +export { ModelWithDuplicateImports } from './models/ModelWithDuplicateImports'; +export { ModelWithDuplicateProperties } from './models/ModelWithDuplicateProperties'; export { ModelWithEnum } from './models/ModelWithEnum'; export { ModelWithEnumFromDescription } from './models/ModelWithEnumFromDescription'; +export { ModelWithInteger } from './models/ModelWithInteger'; +export { ModelWithLink } from './models/ModelWithLink'; +export { ModelWithNestedEnums } from './models/ModelWithNestedEnums'; +export { ModelWithNestedProperties } from './models/ModelWithNestedProperties'; +export { ModelWithProperties } from './models/ModelWithProperties'; +export { ModelWithReference } from './models/ModelWithReference'; +export { ModelWithString } from './models/ModelWithString'; +export { SimpleBoolean } from './models/SimpleBoolean'; +export { SimpleFile } from './models/SimpleFile'; +export { SimpleInteger } from './models/SimpleInteger'; +export { SimpleReference } from './models/SimpleReference'; +export { SimpleString } from './models/SimpleString'; export { ComplexService } from './services/ComplexService'; export { DefaultsService } from './services/DefaultsService'; @@ -375,6 +407,268 @@ export { TypesService } from './services/TypesService'; " `; +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayWithArray.js): ./test/result/v2/javascript/models/ArrayWithArray.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a simple array containing an array + */ +export let ArrayWithArray; +(function (ArrayWithArray) { + + ArrayWithArray.schema = { + type: 'Array', + item: { + type: 'Array', + item: 'ModelWithString', + }, + }; + +})(ArrayWithArray || (ArrayWithArray = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayWithBooleans.js): ./test/result/v2/javascript/models/ArrayWithBooleans.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple array with booleans + */ +export let ArrayWithBooleans; +(function (ArrayWithBooleans) { + + ArrayWithBooleans.schema = { + type: 'Array', + item: { + type: 'boolean', + }, + }; + +})(ArrayWithBooleans || (ArrayWithBooleans = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayWithNumbers.js): ./test/result/v2/javascript/models/ArrayWithNumbers.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple array with numbers + */ +export let ArrayWithNumbers; +(function (ArrayWithNumbers) { + + ArrayWithNumbers.schema = { + type: 'Array', + item: { + type: 'number', + }, + }; + +})(ArrayWithNumbers || (ArrayWithNumbers = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayWithProperties.js): ./test/result/v2/javascript/models/ArrayWithProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple array with properties + */ +export let ArrayWithProperties; +(function (ArrayWithProperties) { + + ArrayWithProperties.schema = { + type: 'Array', + item: { + foo: { + type: 'string', + }, + bar: { + type: 'string', + }, + }, + }; + +})(ArrayWithProperties || (ArrayWithProperties = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayWithReferences.js): ./test/result/v2/javascript/models/ArrayWithReferences.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a simple array with references + */ +export let ArrayWithReferences; +(function (ArrayWithReferences) { + + ArrayWithReferences.schema = { + type: 'Array', + item: 'ModelWithString', + }; + +})(ArrayWithReferences || (ArrayWithReferences = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayWithStrings.js): ./test/result/v2/javascript/models/ArrayWithStrings.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple array with strings + */ +export let ArrayWithStrings; +(function (ArrayWithStrings) { + + ArrayWithStrings.schema = { + type: 'Array', + item: { + type: 'string', + }, + }; + +})(ArrayWithStrings || (ArrayWithStrings = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/DictionaryWithArray.js): ./test/result/v2/javascript/models/DictionaryWithArray.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a complex dictionary + */ +export let DictionaryWithArray; +(function (DictionaryWithArray) { + + DictionaryWithArray.schema = { + type: 'Dictionary', + item: { + type: 'Array', + item: 'ModelWithString', + }, + }; + +})(DictionaryWithArray || (DictionaryWithArray = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/DictionaryWithDictionary.js): ./test/result/v2/javascript/models/DictionaryWithDictionary.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a string dictionary + */ +export let DictionaryWithDictionary; +(function (DictionaryWithDictionary) { + + DictionaryWithDictionary.schema = { + type: 'Dictionary', + item: { + type: 'Dictionary', + item: { + type: 'string', + }, + }, + }; + +})(DictionaryWithDictionary || (DictionaryWithDictionary = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/DictionaryWithProperties.js): ./test/result/v2/javascript/models/DictionaryWithProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a complex dictionary + */ +export let DictionaryWithProperties; +(function (DictionaryWithProperties) { + + DictionaryWithProperties.schema = { + type: 'Dictionary', + item: { + foo: { + type: 'string', + }, + bar: { + type: 'string', + }, + }, + }; + +})(DictionaryWithProperties || (DictionaryWithProperties = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/DictionaryWithReference.js): ./test/result/v2/javascript/models/DictionaryWithReference.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a string reference + */ +export let DictionaryWithReference; +(function (DictionaryWithReference) { + + DictionaryWithReference.schema = { + type: 'Dictionary', + item: 'ModelWithString', + }; + +})(DictionaryWithReference || (DictionaryWithReference = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/DictionaryWithString.js): ./test/result/v2/javascript/models/DictionaryWithString.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a string dictionary + */ +export let DictionaryWithString; +(function (DictionaryWithString) { + + DictionaryWithString.schema = { + type: 'Dictionary', + item: { + type: 'string', + }, + }; + +})(DictionaryWithString || (DictionaryWithString = {}));" +`; + exports[`generation v2 javascript file(./test/result/v2/javascript/models/EnumFromDescription.js): ./test/result/v2/javascript/models/EnumFromDescription.js 1`] = ` "/* istanbul ignore file */ /* eslint-disable */ @@ -391,6 +685,10 @@ export let EnumFromDescription; EnumFromDescription.SUCCESS = 1; EnumFromDescription.WARNING = 2; + EnumFromDescription.schema = { + type: 'Enum', + }; + })(EnumFromDescription || (EnumFromDescription = {}));" `; @@ -410,6 +708,10 @@ export let EnumWithNumbers; EnumWithNumbers.NUM_2 = 2; EnumWithNumbers.NUM_3 = 3; + EnumWithNumbers.schema = { + type: 'Enum', + }; + })(EnumWithNumbers || (EnumWithNumbers = {}));" `; @@ -429,9 +731,237 @@ export let EnumWithStrings; EnumWithStrings.SUCCESS = 'Success'; EnumWithStrings.WARNING = 'Warning'; + EnumWithStrings.schema = { + type: 'Enum', + }; + })(EnumWithStrings || (EnumWithStrings = {}));" `; +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelLink.js): ./test/result/v2/javascript/models/ModelLink.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model that can have a template?? + */ +export let ModelLink; +(function (ModelLink) { + + ModelLink.schema = { + id: { + type: 'string', + }, + }; + +})(ModelLink || (ModelLink = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelThatExtends.js): ./test/result/v2/javascript/models/ModelThatExtends.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model that extends another model + */ +export let ModelThatExtends; +(function (ModelThatExtends) { + + ModelThatExtends.schema = { + propExtendsA: { + type: 'string', + }, + propExtendsB: { + type: 'ModelWithString', + }, + }; + +})(ModelThatExtends || (ModelThatExtends = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelThatExtendsExtends.js): ./test/result/v2/javascript/models/ModelThatExtendsExtends.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelThatExtends } from '../models/ModelThatExtends'; +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model that extends another model + */ +export let ModelThatExtendsExtends; +(function (ModelThatExtendsExtends) { + + ModelThatExtendsExtends.schema = { + propExtendsC: { + type: 'string', + }, + propExtendsD: { + type: 'ModelWithString', + }, + }; + +})(ModelThatExtendsExtends || (ModelThatExtendsExtends = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithArray.js): ./test/result/v2/javascript/models/ModelWithArray.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with one property containing an array + */ +export let ModelWithArray; +(function (ModelWithArray) { + + ModelWithArray.schema = { + prop: { + type: 'Array', + item: 'ModelWithString', + }, + propWithFile: { + type: 'Array', + item: { + type: 'File', + }, + }, + propWithNumber: { + type: 'Array', + item: { + type: 'number', + }, + }, + }; + +})(ModelWithArray || (ModelWithArray = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithBoolean.js): ./test/result/v2/javascript/models/ModelWithBoolean.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one boolean property + */ +export let ModelWithBoolean; +(function (ModelWithBoolean) { + + ModelWithBoolean.schema = { + prop: { + type: 'boolean', + }, + }; + +})(ModelWithBoolean || (ModelWithBoolean = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithCircularReference.js): ./test/result/v2/javascript/models/ModelWithCircularReference.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one property containing a circular reference + */ +export let ModelWithCircularReference; +(function (ModelWithCircularReference) { + + ModelWithCircularReference.schema = { + prop: { + type: 'ModelWithCircularReference', + }, + }; + +})(ModelWithCircularReference || (ModelWithCircularReference = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithDictionary.js): ./test/result/v2/javascript/models/ModelWithDictionary.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a model with one property containing a dictionary + */ +export let ModelWithDictionary; +(function (ModelWithDictionary) { + + ModelWithDictionary.schema = { + prop: { + type: 'Dictionary', + item: { + type: 'string', + }, + }, + }; + +})(ModelWithDictionary || (ModelWithDictionary = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithDuplicateImports.js): ./test/result/v2/javascript/models/ModelWithDuplicateImports.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with duplicated imports + */ +export let ModelWithDuplicateImports; +(function (ModelWithDuplicateImports) { + + ModelWithDuplicateImports.schema = { + propA: { + type: 'ModelWithString', + }, + propB: { + type: 'ModelWithString', + }, + propC: { + type: 'ModelWithString', + }, + }; + +})(ModelWithDuplicateImports || (ModelWithDuplicateImports = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithDuplicateProperties.js): ./test/result/v2/javascript/models/ModelWithDuplicateProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with duplicated properties + */ +export let ModelWithDuplicateProperties; +(function (ModelWithDuplicateProperties) { + + ModelWithDuplicateProperties.schema = { + prop: { + type: 'ModelWithString', + }, + }; + +})(ModelWithDuplicateProperties || (ModelWithDuplicateProperties = {}));" +`; + exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithEnum.js): ./test/result/v2/javascript/models/ModelWithEnum.js 1`] = ` "/* istanbul ignore file */ /* eslint-disable */ @@ -450,7 +980,13 @@ export let ModelWithEnum; ModelWithEnum.test = { SUCCESS: 'Success', WARNING: 'Warning', - ERROR: 'Error' + ERROR: 'Error', + }; + + ModelWithEnum.schema = { + test: { + type: 'Enum', + }, }; })(ModelWithEnum || (ModelWithEnum = {}));" @@ -474,12 +1010,315 @@ export let ModelWithEnumFromDescription; ModelWithEnumFromDescription.test = { SUCCESS: 1, WARNING: 2, - ERROR: 3 + ERROR: 3, + }; + + ModelWithEnumFromDescription.schema = { + test: { + type: 'Enum', + }, }; })(ModelWithEnumFromDescription || (ModelWithEnumFromDescription = {}));" `; +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithInteger.js): ./test/result/v2/javascript/models/ModelWithInteger.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one number property + */ +export let ModelWithInteger; +(function (ModelWithInteger) { + + ModelWithInteger.schema = { + prop: { + type: 'number', + }, + }; + +})(ModelWithInteger || (ModelWithInteger = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithLink.js): ./test/result/v2/javascript/models/ModelWithLink.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelLink } from '../models/ModelLink'; +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model that can have a template?? + */ +export let ModelWithLink; +(function (ModelWithLink) { + + ModelWithLink.schema = { + prop: { + type: 'ModelLink', + }, + }; + +})(ModelWithLink || (ModelWithLink = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithNestedEnums.js): ./test/result/v2/javascript/models/ModelWithNestedEnums.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a model with nested enums + */ +export let ModelWithNestedEnums; +(function (ModelWithNestedEnums) { + + ModelWithNestedEnums.schema = { + arrayWithDescription: { + type: 'Array', + item: { + type: 'Enum', + }, + }, + arrayWithEnum: { + type: 'Array', + item: { + type: 'Enum', + }, + }, + dictionaryWithEnum: { + type: 'Dictionary', + item: { + type: 'Enum', + }, + }, + dictionaryWithEnumFromDescription: { + type: 'Dictionary', + item: { + type: 'Enum', + }, + }, + }; + +})(ModelWithNestedEnums || (ModelWithNestedEnums = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithNestedProperties.js): ./test/result/v2/javascript/models/ModelWithNestedProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one nested property + */ +export let ModelWithNestedProperties; +(function (ModelWithNestedProperties) { + + ModelWithNestedProperties.schema = { + first: { + second: { + third: { + type: 'string', + isReadOnly: true, + isRequired: true, + }, + isReadOnly: true, + isRequired: true, + }, + isReadOnly: true, + isRequired: true, + }, + }; + +})(ModelWithNestedProperties || (ModelWithNestedProperties = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithProperties.js): ./test/result/v2/javascript/models/ModelWithProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with one nested property + */ +export let ModelWithProperties; +(function (ModelWithProperties) { + + ModelWithProperties.schema = { + boolean: { + type: 'boolean', + }, + number: { + type: 'number', + }, + reference: { + type: 'ModelWithString', + }, + required: { + type: 'string', + isRequired: true, + }, + requiredAndReadOnly: { + type: 'string', + isReadOnly: true, + isRequired: true, + }, + string: { + type: 'string', + }, + }; + +})(ModelWithProperties || (ModelWithProperties = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithReference.js): ./test/result/v2/javascript/models/ModelWithReference.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with one property containing a reference + */ +export let ModelWithReference; +(function (ModelWithReference) { + + ModelWithReference.schema = { + prop: { + type: 'ModelWithString', + }, + }; + +})(ModelWithReference || (ModelWithReference = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelWithString.js): ./test/result/v2/javascript/models/ModelWithString.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one string property + */ +export let ModelWithString; +(function (ModelWithString) { + + ModelWithString.schema = { + prop: { + type: 'string', + }, + }; + +})(ModelWithString || (ModelWithString = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/SimpleBoolean.js): ./test/result/v2/javascript/models/SimpleBoolean.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple boolean + */ +export let SimpleBoolean; +(function (SimpleBoolean) { + + SimpleBoolean.schema = { + type: 'boolean', + }; + +})(SimpleBoolean || (SimpleBoolean = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/SimpleFile.js): ./test/result/v2/javascript/models/SimpleFile.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple file + */ +export let SimpleFile; +(function (SimpleFile) { + + SimpleFile.schema = { + type: 'File', + }; + +})(SimpleFile || (SimpleFile = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/SimpleInteger.js): ./test/result/v2/javascript/models/SimpleInteger.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple number + */ +export let SimpleInteger; +(function (SimpleInteger) { + + SimpleInteger.schema = { + type: 'number', + }; + +})(SimpleInteger || (SimpleInteger = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/SimpleReference.js): ./test/result/v2/javascript/models/SimpleReference.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a simple reference + */ +export let SimpleReference; +(function (SimpleReference) { + + SimpleReference.schema = { + type: 'ModelWithString', + }; + +})(SimpleReference || (SimpleReference = {}));" +`; + +exports[`generation v2 javascript file(./test/result/v2/javascript/models/SimpleString.js): ./test/result/v2/javascript/models/SimpleString.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple string + */ +export let SimpleString; +(function (SimpleString) { + + SimpleString.schema = { + type: 'string', + }; + +})(SimpleString || (SimpleString = {}));" +`; + exports[`generation v2 javascript file(./test/result/v2/javascript/services/ComplexService.js): ./test/result/v2/javascript/services/ComplexService.js 1`] = ` "/* istanbul ignore file */ /* eslint-disable */ @@ -499,7 +1338,7 @@ export class ComplexService { */ static async complexTypes( parameterObject, - parameterReference + parameterReference, ) { const result = await $request({ @@ -507,8 +1346,8 @@ export class ComplexService { path: \`/api/v\${OpenAPI.VERSION}/complex\`, query: { 'parameterObject': parameterObject, - 'parameterReference': parameterReference - } + 'parameterReference': parameterReference, + }, }); if (!result.ok) { @@ -552,7 +1391,7 @@ export class DefaultsService { parameterEnum = 'Success', parameterModel = { \\"prop\\": \\"Hello World\\" - } + }, ) { const result = await $request({ @@ -563,8 +1402,8 @@ export class DefaultsService { 'parameterNumber': parameterNumber, 'parameterBoolean': parameterBoolean, 'parameterEnum': parameterEnum, - 'parameterModel': parameterModel - } + 'parameterModel': parameterModel, + }, }); catchGenericError(result); @@ -597,19 +1436,22 @@ export class ParametersService { parameterHeader, parameterQuery, parameterForm, - parameterBody + parameterBody, ) { const result = await $request({ method: 'get', path: \`/api/v\${OpenAPI.VERSION}/parameters\`, + headers: { + 'parameterHeader': parameterHeader, + }, query: { - 'parameterQuery': parameterQuery + 'parameterQuery': parameterQuery, }, formData: { - 'parameterForm': parameterForm + 'parameterForm': parameterForm, }, - body: parameterBody + body: parameterBody, }); catchGenericError(result); @@ -639,7 +1481,7 @@ export class ResponseService { const result = await $request({ method: 'post', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); if (!result.ok) { @@ -663,7 +1505,7 @@ export class ResponseService { const result = await $request({ method: 'get', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); catchGenericError(result); @@ -681,7 +1523,7 @@ export class ResponseService { const result = await $request({ method: 'put', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); if (!result.ok) { @@ -718,7 +1560,7 @@ export class SimpleService { const result = await $request({ method: 'delete', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -733,7 +1575,7 @@ export class SimpleService { const result = await $request({ method: 'get', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -748,7 +1590,7 @@ export class SimpleService { const result = await $request({ method: 'head', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -763,7 +1605,7 @@ export class SimpleService { const result = await $request({ method: 'options', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -778,7 +1620,7 @@ export class SimpleService { const result = await $request({ method: 'patch', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -793,7 +1635,7 @@ export class SimpleService { const result = await $request({ method: 'post', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -808,7 +1650,7 @@ export class SimpleService { const result = await $request({ method: 'put', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -853,7 +1695,7 @@ export class TypesService { parameterArray, parameterDictionary, parameterEnum, - id + id, ) { const result = await $request({ @@ -866,8 +1708,8 @@ export class TypesService { 'parameterObject': parameterObject, 'parameterArray': parameterArray, 'parameterDictionary': parameterDictionary, - 'parameterEnum': parameterEnum - } + 'parameterEnum': parameterEnum, + }, }); catchGenericError(result); @@ -1348,7 +2190,19 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a simple array containing an array */ -export type ArrayWithArray = Array>;" +export type ArrayWithArray = Array>; + +export namespace ArrayWithArray { + + export const schema = { + type: 'Array', + item: { + type: 'Array', + item: 'ModelWithString', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayWithBooleans.ts): ./test/result/v2/typescript/models/ArrayWithBooleans.ts 1`] = ` @@ -1360,7 +2214,18 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW /** * This is a simple array with booleans */ -export type ArrayWithBooleans = Array;" +export type ArrayWithBooleans = Array; + +export namespace ArrayWithBooleans { + + export const schema = { + type: 'Array', + item: { + type: 'boolean', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayWithNumbers.ts): ./test/result/v2/typescript/models/ArrayWithNumbers.ts 1`] = ` @@ -1372,7 +2237,18 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW /** * This is a simple array with numbers */ -export type ArrayWithNumbers = Array;" +export type ArrayWithNumbers = Array; + +export namespace ArrayWithNumbers { + + export const schema = { + type: 'Array', + item: { + type: 'number', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayWithProperties.ts): ./test/result/v2/typescript/models/ArrayWithProperties.ts 1`] = ` @@ -1386,8 +2262,24 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW */ export type ArrayWithProperties = Array<{ foo?: string, - bar?: string -}>;" + bar?: string, +}>; + +export namespace ArrayWithProperties { + + export const schema = { + type: 'Array', + item: { + foo: { + type: 'string', + }, + bar: { + type: 'string', + }, + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayWithReferences.ts): ./test/result/v2/typescript/models/ArrayWithReferences.ts 1`] = ` @@ -1401,7 +2293,16 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a simple array with references */ -export type ArrayWithReferences = Array;" +export type ArrayWithReferences = Array; + +export namespace ArrayWithReferences { + + export const schema = { + type: 'Array', + item: 'ModelWithString', + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayWithStrings.ts): ./test/result/v2/typescript/models/ArrayWithStrings.ts 1`] = ` @@ -1413,7 +2314,18 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW /** * This is a simple array with strings */ -export type ArrayWithStrings = Array;" +export type ArrayWithStrings = Array; + +export namespace ArrayWithStrings { + + export const schema = { + type: 'Array', + item: { + type: 'string', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/Dictionary.ts): ./test/result/v2/typescript/models/Dictionary.ts 1`] = ` @@ -1440,7 +2352,19 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a complex dictionary */ -export type DictionaryWithArray = Dictionary>;" +export type DictionaryWithArray = Dictionary>; + +export namespace DictionaryWithArray { + + export const schema = { + type: 'Dictionary', + item: { + type: 'Array', + item: 'ModelWithString', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/DictionaryWithDictionary.ts): ./test/result/v2/typescript/models/DictionaryWithDictionary.ts 1`] = ` @@ -1454,7 +2378,21 @@ import { Dictionary } from '../models/Dictionary'; /** * This is a string dictionary */ -export type DictionaryWithDictionary = Dictionary>;" +export type DictionaryWithDictionary = Dictionary>; + +export namespace DictionaryWithDictionary { + + export const schema = { + type: 'Dictionary', + item: { + type: 'Dictionary', + item: { + type: 'string', + }, + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/DictionaryWithProperties.ts): ./test/result/v2/typescript/models/DictionaryWithProperties.ts 1`] = ` @@ -1470,8 +2408,24 @@ import { Dictionary } from '../models/Dictionary'; */ export type DictionaryWithProperties = Dictionary<{ foo?: string, - bar?: string -}>;" + bar?: string, +}>; + +export namespace DictionaryWithProperties { + + export const schema = { + type: 'Dictionary', + item: { + foo: { + type: 'string', + }, + bar: { + type: 'string', + }, + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/DictionaryWithReference.ts): ./test/result/v2/typescript/models/DictionaryWithReference.ts 1`] = ` @@ -1486,7 +2440,16 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a string reference */ -export type DictionaryWithReference = Dictionary;" +export type DictionaryWithReference = Dictionary; + +export namespace DictionaryWithReference { + + export const schema = { + type: 'Dictionary', + item: 'ModelWithString', + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/DictionaryWithString.ts): ./test/result/v2/typescript/models/DictionaryWithString.ts 1`] = ` @@ -1500,7 +2463,18 @@ import { Dictionary } from '../models/Dictionary'; /** * This is a string dictionary */ -export type DictionaryWithString = Dictionary;" +export type DictionaryWithString = Dictionary; + +export namespace DictionaryWithString { + + export const schema = { + type: 'Dictionary', + item: { + type: 'string', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/EnumFromDescription.ts): ./test/result/v2/typescript/models/EnumFromDescription.ts 1`] = ` @@ -1515,7 +2489,15 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/EnumFr export enum EnumFromDescription { ERROR = 3, SUCCESS = 1, - WARNING = 2 + WARNING = 2, +} + +export namespace EnumFromDescription { + + export const schema = { + type: 'Enum', + }; + }" `; @@ -1531,7 +2513,15 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/EnumWi export enum EnumWithNumbers { NUM_1 = 1, NUM_2 = 2, - NUM_3 = 3 + NUM_3 = 3, +} + +export namespace EnumWithNumbers { + + export const schema = { + type: 'Enum', + }; + }" `; @@ -1547,7 +2537,15 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/EnumWi export enum EnumWithStrings { ERROR = 'Error', SUCCESS = 'Success', - WARNING = 'Warning' + WARNING = 'Warning', +} + +export namespace EnumWithStrings { + + export const schema = { + type: 'Enum', + }; + }" `; @@ -1563,7 +2561,16 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelL export interface ModelLink { id?: string; } -" + +export namespace ModelLink { + + export const schema = { + id: { + type: 'string', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelThatExtends.ts): ./test/result/v2/typescript/models/ModelThatExtends.ts 1`] = ` @@ -1581,7 +2588,19 @@ export interface ModelThatExtends extends ModelWithString { propExtendsA?: string; propExtendsB?: ModelWithString; } -" + +export namespace ModelThatExtends { + + export const schema = { + propExtendsA: { + type: 'string', + }, + propExtendsB: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelThatExtendsExtends.ts): ./test/result/v2/typescript/models/ModelThatExtendsExtends.ts 1`] = ` @@ -1600,7 +2619,19 @@ export interface ModelThatExtendsExtends extends ModelWithString, ModelThatExten propExtendsC?: string; propExtendsD?: ModelWithString; } -" + +export namespace ModelThatExtendsExtends { + + export const schema = { + propExtendsC: { + type: 'string', + }, + propExtendsD: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithArray.ts): ./test/result/v2/typescript/models/ModelWithArray.ts 1`] = ` @@ -1619,7 +2650,29 @@ export interface ModelWithArray { propWithFile?: Array; propWithNumber?: Array; } -" + +export namespace ModelWithArray { + + export const schema = { + prop: { + type: 'Array', + item: 'ModelWithString', + }, + propWithFile: { + type: 'Array', + item: { + type: 'File', + }, + }, + propWithNumber: { + type: 'Array', + item: { + type: 'number', + }, + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithBoolean.ts): ./test/result/v2/typescript/models/ModelWithBoolean.ts 1`] = ` @@ -1637,7 +2690,16 @@ export interface ModelWithBoolean { */ prop?: boolean; } -" + +export namespace ModelWithBoolean { + + export const schema = { + prop: { + type: 'boolean', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithCircularReference.ts): ./test/result/v2/typescript/models/ModelWithCircularReference.ts 1`] = ` @@ -1652,7 +2714,16 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW export interface ModelWithCircularReference { prop?: ModelWithCircularReference; } -" + +export namespace ModelWithCircularReference { + + export const schema = { + prop: { + type: 'ModelWithCircularReference', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithDictionary.ts): ./test/result/v2/typescript/models/ModelWithDictionary.ts 1`] = ` @@ -1669,7 +2740,19 @@ import { Dictionary } from '../models/Dictionary'; export interface ModelWithDictionary { prop?: Dictionary; } -" + +export namespace ModelWithDictionary { + + export const schema = { + prop: { + type: 'Dictionary', + item: { + type: 'string', + }, + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithDuplicateImports.ts): ./test/result/v2/typescript/models/ModelWithDuplicateImports.ts 1`] = ` @@ -1688,7 +2771,22 @@ export interface ModelWithDuplicateImports { propB?: ModelWithString; propC?: ModelWithString; } -" + +export namespace ModelWithDuplicateImports { + + export const schema = { + propA: { + type: 'ModelWithString', + }, + propB: { + type: 'ModelWithString', + }, + propC: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithDuplicateProperties.ts): ./test/result/v2/typescript/models/ModelWithDuplicateProperties.ts 1`] = ` @@ -1705,7 +2803,16 @@ import { ModelWithString } from '../models/ModelWithString'; export interface ModelWithDuplicateProperties { prop?: ModelWithString; } -" + +export namespace ModelWithDuplicateProperties { + + export const schema = { + prop: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithEnum.ts): ./test/result/v2/typescript/models/ModelWithEnum.ts 1`] = ` @@ -1732,11 +2839,16 @@ export namespace ModelWithEnum { export enum test { SUCCESS = 'Success', WARNING = 'Warning', - ERROR = 'Error' + ERROR = 'Error', } -} -" + export const schema = { + test: { + type: 'Enum', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithEnumFromDescription.ts): ./test/result/v2/typescript/models/ModelWithEnumFromDescription.ts 1`] = ` @@ -1763,11 +2875,16 @@ export namespace ModelWithEnumFromDescription { export enum test { SUCCESS = 1, WARNING = 2, - ERROR = 3 + ERROR = 3, } -} -" + export const schema = { + test: { + type: 'Enum', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithInteger.ts): ./test/result/v2/typescript/models/ModelWithInteger.ts 1`] = ` @@ -1785,7 +2902,16 @@ export interface ModelWithInteger { */ prop?: number; } -" + +export namespace ModelWithInteger { + + export const schema = { + prop: { + type: 'number', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithLink.ts): ./test/result/v2/typescript/models/ModelWithLink.ts 1`] = ` @@ -1803,7 +2929,16 @@ import { ModelWithString } from '../models/ModelWithString'; export interface ModelWithLink { prop?: ModelLink; } -" + +export namespace ModelWithLink { + + export const schema = { + prop: { + type: 'ModelLink', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithNestedEnums.ts): ./test/result/v2/typescript/models/ModelWithNestedEnums.ts 1`] = ` @@ -1823,7 +2958,37 @@ export interface ModelWithNestedEnums { dictionaryWithEnum?: Dictionary<('Success' | 'Warning' | 'Error')>; dictionaryWithEnumFromDescription?: Dictionary<(1 | 2 | 3)>; } -" + +export namespace ModelWithNestedEnums { + + export const schema = { + arrayWithDescription: { + type: 'Array', + item: { + type: 'Enum', + }, + }, + arrayWithEnum: { + type: 'Array', + item: { + type: 'Enum', + }, + }, + dictionaryWithEnum: { + type: 'Dictionary', + item: { + type: 'Enum', + }, + }, + dictionaryWithEnumFromDescription: { + type: 'Dictionary', + item: { + type: 'Enum', + }, + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithNestedProperties.ts): ./test/result/v2/typescript/models/ModelWithNestedProperties.ts 1`] = ` @@ -1838,11 +3003,30 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW export interface ModelWithNestedProperties { readonly first: { readonly second: { - readonly third: string - } + readonly third: string, + }, }; } -" + +export namespace ModelWithNestedProperties { + + export const schema = { + first: { + second: { + third: { + type: 'string', + isReadOnly: true, + isRequired: true, + }, + isReadOnly: true, + isRequired: true, + }, + isReadOnly: true, + isRequired: true, + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithProperties.ts): ./test/result/v2/typescript/models/ModelWithProperties.ts 1`] = ` @@ -1864,7 +3048,34 @@ export interface ModelWithProperties { readonly requiredAndReadOnly: string; string?: string; } -" + +export namespace ModelWithProperties { + + export const schema = { + boolean: { + type: 'boolean', + }, + number: { + type: 'number', + }, + reference: { + type: 'ModelWithString', + }, + required: { + type: 'string', + isRequired: true, + }, + requiredAndReadOnly: { + type: 'string', + isReadOnly: true, + isRequired: true, + }, + string: { + type: 'string', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithReference.ts): ./test/result/v2/typescript/models/ModelWithReference.ts 1`] = ` @@ -1881,7 +3092,16 @@ import { ModelWithString } from '../models/ModelWithString'; export interface ModelWithReference { prop?: ModelWithString; } -" + +export namespace ModelWithReference { + + export const schema = { + prop: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelWithString.ts): ./test/result/v2/typescript/models/ModelWithString.ts 1`] = ` @@ -1899,7 +3119,16 @@ export interface ModelWithString { */ prop?: string; } -" + +export namespace ModelWithString { + + export const schema = { + prop: { + type: 'string', + }, + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/SimpleBoolean.ts): ./test/result/v2/typescript/models/SimpleBoolean.ts 1`] = ` @@ -1911,7 +3140,15 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Simple /** * This is a simple boolean */ -export type SimpleBoolean = boolean;" +export type SimpleBoolean = boolean; + +export namespace SimpleBoolean { + + export const schema = { + type: 'boolean', + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/SimpleFile.ts): ./test/result/v2/typescript/models/SimpleFile.ts 1`] = ` @@ -1923,7 +3160,15 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Simple /** * This is a simple file */ -export type SimpleFile = File;" +export type SimpleFile = File; + +export namespace SimpleFile { + + export const schema = { + type: 'File', + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/SimpleInteger.ts): ./test/result/v2/typescript/models/SimpleInteger.ts 1`] = ` @@ -1935,7 +3180,15 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Simple /** * This is a simple number */ -export type SimpleInteger = number;" +export type SimpleInteger = number; + +export namespace SimpleInteger { + + export const schema = { + type: 'number', + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/SimpleReference.ts): ./test/result/v2/typescript/models/SimpleReference.ts 1`] = ` @@ -1949,7 +3202,15 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a simple reference */ -export type SimpleReference = ModelWithString;" +export type SimpleReference = ModelWithString; + +export namespace SimpleReference { + + export const schema = { + type: 'ModelWithString', + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/models/SimpleString.ts): ./test/result/v2/typescript/models/SimpleString.ts 1`] = ` @@ -1961,7 +3222,15 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Simple /** * This is a simple string */ -export type SimpleString = string;" +export type SimpleString = string; + +export namespace SimpleString { + + export const schema = { + type: 'string', + }; + +}" `; exports[`generation v2 typescript file(./test/result/v2/typescript/services/ComplexService.ts): ./test/result/v2/typescript/services/ComplexService.ts 1`] = ` @@ -1987,11 +3256,11 @@ export class ComplexService { parameterObject: { first?: { second?: { - third?: string - } - } + third?: string, + }, + }, }, - parameterReference: ModelWithString + parameterReference: ModelWithString, ): Promise> { const result = await $request({ @@ -1999,8 +3268,8 @@ export class ComplexService { path: \`/api/v\${OpenAPI.VERSION}/complex\`, query: { 'parameterObject': parameterObject, - 'parameterReference': parameterReference - } + 'parameterReference': parameterReference, + }, }); if (!result.ok) { @@ -2046,7 +3315,7 @@ export class DefaultsService { parameterEnum: ('Success' | 'Warning' | 'Error') = 'Success', parameterModel: ModelWithString = { \\"prop\\": \\"Hello World\\" - } + }, ): Promise { const result = await $request({ @@ -2057,8 +3326,8 @@ export class DefaultsService { 'parameterNumber': parameterNumber, 'parameterBoolean': parameterBoolean, 'parameterEnum': parameterEnum, - 'parameterModel': parameterModel - } + 'parameterModel': parameterModel, + }, }); catchGenericError(result); @@ -2092,19 +3361,22 @@ export class ParametersService { parameterHeader: string, parameterQuery: string, parameterForm: string, - parameterBody: string + parameterBody: string, ): Promise { const result = await $request({ method: 'get', path: \`/api/v\${OpenAPI.VERSION}/parameters\`, + headers: { + 'parameterHeader': parameterHeader, + }, query: { - 'parameterQuery': parameterQuery + 'parameterQuery': parameterQuery, }, formData: { - 'parameterForm': parameterForm + 'parameterForm': parameterForm, }, - body: parameterBody + body: parameterBody, }); catchGenericError(result); @@ -2138,7 +3410,7 @@ export class ResponseService { const result = await $request({ method: 'post', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); if (!result.ok) { @@ -2162,7 +3434,7 @@ export class ResponseService { const result = await $request({ method: 'get', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); catchGenericError(result); @@ -2180,7 +3452,7 @@ export class ResponseService { const result = await $request({ method: 'put', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); if (!result.ok) { @@ -2218,7 +3490,7 @@ export class SimpleService { const result = await $request({ method: 'delete', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -2233,7 +3505,7 @@ export class SimpleService { const result = await $request({ method: 'get', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -2248,7 +3520,7 @@ export class SimpleService { const result = await $request({ method: 'head', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -2263,7 +3535,7 @@ export class SimpleService { const result = await $request({ method: 'options', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -2278,7 +3550,7 @@ export class SimpleService { const result = await $request({ method: 'patch', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -2293,7 +3565,7 @@ export class SimpleService { const result = await $request({ method: 'post', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -2308,7 +3580,7 @@ export class SimpleService { const result = await $request({ method: 'put', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -2355,7 +3627,7 @@ export class TypesService { parameterArray: Array, parameterDictionary: Dictionary, parameterEnum: ('Success' | 'Warning' | 'Error'), - id?: number + id?: number, ): Promise { const result = await $request({ @@ -2368,8 +3640,8 @@ export class TypesService { 'parameterObject': parameterObject, 'parameterArray': parameterArray, 'parameterDictionary': parameterDictionary, - 'parameterEnum': parameterEnum - } + 'parameterEnum': parameterEnum, + }, }); catchGenericError(result); @@ -2740,11 +4012,43 @@ export { ApiError } from './core/ApiError'; export { isSuccess } from './core/isSuccess'; export { OpenAPI } from './core/OpenAPI'; +export { ArrayWithArray } from './models/ArrayWithArray'; +export { ArrayWithBooleans } from './models/ArrayWithBooleans'; +export { ArrayWithNumbers } from './models/ArrayWithNumbers'; +export { ArrayWithProperties } from './models/ArrayWithProperties'; +export { ArrayWithReferences } from './models/ArrayWithReferences'; +export { ArrayWithStrings } from './models/ArrayWithStrings'; +export { DictionaryWithArray } from './models/DictionaryWithArray'; +export { DictionaryWithDictionary } from './models/DictionaryWithDictionary'; +export { DictionaryWithProperties } from './models/DictionaryWithProperties'; +export { DictionaryWithReference } from './models/DictionaryWithReference'; +export { DictionaryWithString } from './models/DictionaryWithString'; export { EnumFromDescription } from './models/EnumFromDescription'; export { EnumWithNumbers } from './models/EnumWithNumbers'; export { EnumWithStrings } from './models/EnumWithStrings'; +export { ModelLink } from './models/ModelLink'; +export { ModelThatExtends } from './models/ModelThatExtends'; +export { ModelThatExtendsExtends } from './models/ModelThatExtendsExtends'; +export { ModelWithArray } from './models/ModelWithArray'; +export { ModelWithBoolean } from './models/ModelWithBoolean'; +export { ModelWithCircularReference } from './models/ModelWithCircularReference'; +export { ModelWithDictionary } from './models/ModelWithDictionary'; +export { ModelWithDuplicateImports } from './models/ModelWithDuplicateImports'; +export { ModelWithDuplicateProperties } from './models/ModelWithDuplicateProperties'; export { ModelWithEnum } from './models/ModelWithEnum'; export { ModelWithEnumFromDescription } from './models/ModelWithEnumFromDescription'; +export { ModelWithInteger } from './models/ModelWithInteger'; +export { ModelWithLink } from './models/ModelWithLink'; +export { ModelWithNestedEnums } from './models/ModelWithNestedEnums'; +export { ModelWithNestedProperties } from './models/ModelWithNestedProperties'; +export { ModelWithProperties } from './models/ModelWithProperties'; +export { ModelWithReference } from './models/ModelWithReference'; +export { ModelWithString } from './models/ModelWithString'; +export { SimpleBoolean } from './models/SimpleBoolean'; +export { SimpleFile } from './models/SimpleFile'; +export { SimpleInteger } from './models/SimpleInteger'; +export { SimpleReference } from './models/SimpleReference'; +export { SimpleString } from './models/SimpleString'; export { ComplexService } from './services/ComplexService'; export { DefaultsService } from './services/DefaultsService'; @@ -2755,6 +4059,268 @@ export { TypesService } from './services/TypesService'; " `; +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayWithArray.js): ./test/result/v3/javascript/models/ArrayWithArray.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a simple array containing an array + */ +export let ArrayWithArray; +(function (ArrayWithArray) { + + ArrayWithArray.schema = { + type: 'Array', + item: { + type: 'Array', + item: 'ModelWithString', + }, + }; + +})(ArrayWithArray || (ArrayWithArray = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayWithBooleans.js): ./test/result/v3/javascript/models/ArrayWithBooleans.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple array with booleans + */ +export let ArrayWithBooleans; +(function (ArrayWithBooleans) { + + ArrayWithBooleans.schema = { + type: 'Array', + item: { + type: 'boolean', + }, + }; + +})(ArrayWithBooleans || (ArrayWithBooleans = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayWithNumbers.js): ./test/result/v3/javascript/models/ArrayWithNumbers.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple array with numbers + */ +export let ArrayWithNumbers; +(function (ArrayWithNumbers) { + + ArrayWithNumbers.schema = { + type: 'Array', + item: { + type: 'number', + }, + }; + +})(ArrayWithNumbers || (ArrayWithNumbers = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayWithProperties.js): ./test/result/v3/javascript/models/ArrayWithProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple array with properties + */ +export let ArrayWithProperties; +(function (ArrayWithProperties) { + + ArrayWithProperties.schema = { + type: 'Array', + item: { + foo: { + type: 'string', + }, + bar: { + type: 'string', + }, + }, + }; + +})(ArrayWithProperties || (ArrayWithProperties = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayWithReferences.js): ./test/result/v3/javascript/models/ArrayWithReferences.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a simple array with references + */ +export let ArrayWithReferences; +(function (ArrayWithReferences) { + + ArrayWithReferences.schema = { + type: 'Array', + item: 'ModelWithString', + }; + +})(ArrayWithReferences || (ArrayWithReferences = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayWithStrings.js): ./test/result/v3/javascript/models/ArrayWithStrings.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple array with strings + */ +export let ArrayWithStrings; +(function (ArrayWithStrings) { + + ArrayWithStrings.schema = { + type: 'Array', + item: { + type: 'string', + }, + }; + +})(ArrayWithStrings || (ArrayWithStrings = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/DictionaryWithArray.js): ./test/result/v3/javascript/models/DictionaryWithArray.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a complex dictionary + */ +export let DictionaryWithArray; +(function (DictionaryWithArray) { + + DictionaryWithArray.schema = { + type: 'Dictionary', + item: { + type: 'Array', + item: 'ModelWithString', + }, + }; + +})(DictionaryWithArray || (DictionaryWithArray = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/DictionaryWithDictionary.js): ./test/result/v3/javascript/models/DictionaryWithDictionary.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a string dictionary + */ +export let DictionaryWithDictionary; +(function (DictionaryWithDictionary) { + + DictionaryWithDictionary.schema = { + type: 'Dictionary', + item: { + type: 'Dictionary', + item: { + type: 'string', + }, + }, + }; + +})(DictionaryWithDictionary || (DictionaryWithDictionary = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/DictionaryWithProperties.js): ./test/result/v3/javascript/models/DictionaryWithProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a complex dictionary + */ +export let DictionaryWithProperties; +(function (DictionaryWithProperties) { + + DictionaryWithProperties.schema = { + type: 'Dictionary', + item: { + foo: { + type: 'string', + }, + bar: { + type: 'string', + }, + }, + }; + +})(DictionaryWithProperties || (DictionaryWithProperties = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/DictionaryWithReference.js): ./test/result/v3/javascript/models/DictionaryWithReference.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a string reference + */ +export let DictionaryWithReference; +(function (DictionaryWithReference) { + + DictionaryWithReference.schema = { + type: 'Dictionary', + item: 'ModelWithString', + }; + +})(DictionaryWithReference || (DictionaryWithReference = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/DictionaryWithString.js): ./test/result/v3/javascript/models/DictionaryWithString.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a string dictionary + */ +export let DictionaryWithString; +(function (DictionaryWithString) { + + DictionaryWithString.schema = { + type: 'Dictionary', + item: { + type: 'string', + }, + }; + +})(DictionaryWithString || (DictionaryWithString = {}));" +`; + exports[`generation v3 javascript file(./test/result/v3/javascript/models/EnumFromDescription.js): ./test/result/v3/javascript/models/EnumFromDescription.js 1`] = ` "/* istanbul ignore file */ /* eslint-disable */ @@ -2771,6 +4337,10 @@ export let EnumFromDescription; EnumFromDescription.SUCCESS = 1; EnumFromDescription.WARNING = 2; + EnumFromDescription.schema = { + type: 'Enum', + }; + })(EnumFromDescription || (EnumFromDescription = {}));" `; @@ -2790,6 +4360,10 @@ export let EnumWithNumbers; EnumWithNumbers.NUM_2 = 2; EnumWithNumbers.NUM_3 = 3; + EnumWithNumbers.schema = { + type: 'Enum', + }; + })(EnumWithNumbers || (EnumWithNumbers = {}));" `; @@ -2809,9 +4383,237 @@ export let EnumWithStrings; EnumWithStrings.SUCCESS = 'Success'; EnumWithStrings.WARNING = 'Warning'; + EnumWithStrings.schema = { + type: 'Enum', + }; + })(EnumWithStrings || (EnumWithStrings = {}));" `; +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelLink.js): ./test/result/v3/javascript/models/ModelLink.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model that can have a template?? + */ +export let ModelLink; +(function (ModelLink) { + + ModelLink.schema = { + id: { + type: 'string', + }, + }; + +})(ModelLink || (ModelLink = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelThatExtends.js): ./test/result/v3/javascript/models/ModelThatExtends.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model that extends another model + */ +export let ModelThatExtends; +(function (ModelThatExtends) { + + ModelThatExtends.schema = { + propExtendsA: { + type: 'string', + }, + propExtendsB: { + type: 'ModelWithString', + }, + }; + +})(ModelThatExtends || (ModelThatExtends = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelThatExtendsExtends.js): ./test/result/v3/javascript/models/ModelThatExtendsExtends.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelThatExtends } from '../models/ModelThatExtends'; +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model that extends another model + */ +export let ModelThatExtendsExtends; +(function (ModelThatExtendsExtends) { + + ModelThatExtendsExtends.schema = { + propExtendsC: { + type: 'string', + }, + propExtendsD: { + type: 'ModelWithString', + }, + }; + +})(ModelThatExtendsExtends || (ModelThatExtendsExtends = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithArray.js): ./test/result/v3/javascript/models/ModelWithArray.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with one property containing an array + */ +export let ModelWithArray; +(function (ModelWithArray) { + + ModelWithArray.schema = { + prop: { + type: 'Array', + item: 'ModelWithString', + }, + propWithFile: { + type: 'Array', + item: { + type: 'File', + }, + }, + propWithNumber: { + type: 'Array', + item: { + type: 'number', + }, + }, + }; + +})(ModelWithArray || (ModelWithArray = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithBoolean.js): ./test/result/v3/javascript/models/ModelWithBoolean.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one boolean property + */ +export let ModelWithBoolean; +(function (ModelWithBoolean) { + + ModelWithBoolean.schema = { + prop: { + type: 'boolean', + }, + }; + +})(ModelWithBoolean || (ModelWithBoolean = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithCircularReference.js): ./test/result/v3/javascript/models/ModelWithCircularReference.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one property containing a circular reference + */ +export let ModelWithCircularReference; +(function (ModelWithCircularReference) { + + ModelWithCircularReference.schema = { + prop: { + type: 'ModelWithCircularReference', + }, + }; + +})(ModelWithCircularReference || (ModelWithCircularReference = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithDictionary.js): ./test/result/v3/javascript/models/ModelWithDictionary.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a model with one property containing a dictionary + */ +export let ModelWithDictionary; +(function (ModelWithDictionary) { + + ModelWithDictionary.schema = { + prop: { + type: 'Dictionary', + item: { + type: 'string', + }, + }, + }; + +})(ModelWithDictionary || (ModelWithDictionary = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithDuplicateImports.js): ./test/result/v3/javascript/models/ModelWithDuplicateImports.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with duplicated imports + */ +export let ModelWithDuplicateImports; +(function (ModelWithDuplicateImports) { + + ModelWithDuplicateImports.schema = { + propA: { + type: 'ModelWithString', + }, + propB: { + type: 'ModelWithString', + }, + propC: { + type: 'ModelWithString', + }, + }; + +})(ModelWithDuplicateImports || (ModelWithDuplicateImports = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithDuplicateProperties.js): ./test/result/v3/javascript/models/ModelWithDuplicateProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with duplicated properties + */ +export let ModelWithDuplicateProperties; +(function (ModelWithDuplicateProperties) { + + ModelWithDuplicateProperties.schema = { + prop: { + type: 'ModelWithString', + }, + }; + +})(ModelWithDuplicateProperties || (ModelWithDuplicateProperties = {}));" +`; + exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithEnum.js): ./test/result/v3/javascript/models/ModelWithEnum.js 1`] = ` "/* istanbul ignore file */ /* eslint-disable */ @@ -2830,7 +4632,13 @@ export let ModelWithEnum; ModelWithEnum.Test = { SUCCESS: 'Success', WARNING: 'Warning', - ERROR: 'Error' + ERROR: 'Error', + }; + + ModelWithEnum.schema = { + Test: { + type: 'Enum', + }, }; })(ModelWithEnum || (ModelWithEnum = {}));" @@ -2854,12 +4662,323 @@ export let ModelWithEnumFromDescription; ModelWithEnumFromDescription.Test = { SUCCESS: 1, WARNING: 2, - ERROR: 3 + ERROR: 3, + }; + + ModelWithEnumFromDescription.schema = { + Test: { + type: 'Enum', + }, }; })(ModelWithEnumFromDescription || (ModelWithEnumFromDescription = {}));" `; +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithInteger.js): ./test/result/v3/javascript/models/ModelWithInteger.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one number property + */ +export let ModelWithInteger; +(function (ModelWithInteger) { + + ModelWithInteger.schema = { + prop: { + type: 'number', + }, + }; + +})(ModelWithInteger || (ModelWithInteger = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithLink.js): ./test/result/v3/javascript/models/ModelWithLink.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelLink } from '../models/ModelLink'; +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model that can have a template?? + */ +export let ModelWithLink; +(function (ModelWithLink) { + + ModelWithLink.schema = { + prop: { + type: 'ModelLink', + }, + }; + +})(ModelWithLink || (ModelWithLink = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithNestedEnums.js): ./test/result/v3/javascript/models/ModelWithNestedEnums.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from '../models/Dictionary'; + +/** + * This is a model with nested enums + */ +export let ModelWithNestedEnums; +(function (ModelWithNestedEnums) { + + ModelWithNestedEnums.schema = { + arrayWithDescription: { + type: 'Array', + item: { + type: 'Enum', + }, + }, + arrayWithEnum: { + type: 'Array', + item: { + type: 'Enum', + }, + }, + dictionaryWithEnum: { + type: 'Dictionary', + item: { + type: 'Enum', + }, + }, + dictionaryWithEnumFromDescription: { + type: 'Dictionary', + item: { + type: 'Enum', + }, + }, + }; + +})(ModelWithNestedEnums || (ModelWithNestedEnums = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithNestedProperties.js): ./test/result/v3/javascript/models/ModelWithNestedProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one nested property + */ +export let ModelWithNestedProperties; +(function (ModelWithNestedProperties) { + + ModelWithNestedProperties.schema = { + first: { + second: { + third: { + type: 'string', + isReadOnly: true, + isRequired: true, + isNullable: true, + }, + isReadOnly: true, + isRequired: true, + isNullable: true, + }, + isReadOnly: true, + isRequired: true, + isNullable: true, + }, + }; + +})(ModelWithNestedProperties || (ModelWithNestedProperties = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithProperties.js): ./test/result/v3/javascript/models/ModelWithProperties.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with one nested property + */ +export let ModelWithProperties; +(function (ModelWithProperties) { + + ModelWithProperties.schema = { + boolean: { + type: 'boolean', + }, + number: { + type: 'number', + }, + reference: { + type: 'ModelWithString', + }, + required: { + type: 'string', + isRequired: true, + }, + requiredAndNullable: { + type: 'string', + isRequired: true, + isNullable: true, + }, + requiredAndReadOnly: { + type: 'string', + isReadOnly: true, + isRequired: true, + }, + string: { + type: 'string', + }, + }; + +})(ModelWithProperties || (ModelWithProperties = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithReference.js): ./test/result/v3/javascript/models/ModelWithReference.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a model with one property containing a reference + */ +export let ModelWithReference; +(function (ModelWithReference) { + + ModelWithReference.schema = { + prop: { + type: 'ModelWithString', + }, + }; + +})(ModelWithReference || (ModelWithReference = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelWithString.js): ./test/result/v3/javascript/models/ModelWithString.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a model with one string property + */ +export let ModelWithString; +(function (ModelWithString) { + + ModelWithString.schema = { + prop: { + type: 'string', + }, + }; + +})(ModelWithString || (ModelWithString = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/SimpleBoolean.js): ./test/result/v3/javascript/models/SimpleBoolean.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple boolean + */ +export let SimpleBoolean; +(function (SimpleBoolean) { + + SimpleBoolean.schema = { + type: 'boolean', + }; + +})(SimpleBoolean || (SimpleBoolean = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/SimpleFile.js): ./test/result/v3/javascript/models/SimpleFile.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple file + */ +export let SimpleFile; +(function (SimpleFile) { + + SimpleFile.schema = { + type: 'File', + }; + +})(SimpleFile || (SimpleFile = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/SimpleInteger.js): ./test/result/v3/javascript/models/SimpleInteger.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple number + */ +export let SimpleInteger; +(function (SimpleInteger) { + + SimpleInteger.schema = { + type: 'number', + }; + +})(SimpleInteger || (SimpleInteger = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/SimpleReference.js): ./test/result/v3/javascript/models/SimpleReference.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + +import { ModelWithString } from '../models/ModelWithString'; + +/** + * This is a simple reference + */ +export let SimpleReference; +(function (SimpleReference) { + + SimpleReference.schema = { + type: 'ModelWithString', + }; + +})(SimpleReference || (SimpleReference = {}));" +`; + +exports[`generation v3 javascript file(./test/result/v3/javascript/models/SimpleString.js): ./test/result/v3/javascript/models/SimpleString.js 1`] = ` +"/* istanbul ignore file */ +/* eslint-disable */ +/* prettier-ignore */ + + +/** + * This is a simple string + */ +export let SimpleString; +(function (SimpleString) { + + SimpleString.schema = { + type: 'string', + }; + +})(SimpleString || (SimpleString = {}));" +`; + exports[`generation v3 javascript file(./test/result/v3/javascript/services/ComplexService.js): ./test/result/v3/javascript/services/ComplexService.js 1`] = ` "/* istanbul ignore file */ /* eslint-disable */ @@ -2879,7 +4998,7 @@ export class ComplexService { */ static async complexTypes( parameterReference, - parameterObject + parameterObject, ) { const result = await $request({ @@ -2887,8 +5006,8 @@ export class ComplexService { path: \`/api/v\${OpenAPI.VERSION}/complex\`, query: { 'parameterReference': parameterReference, - 'parameterObject': parameterObject - } + 'parameterObject': parameterObject, + }, }); if (!result.ok) { @@ -2932,7 +5051,7 @@ export class DefaultsService { parameterEnum = 'Success', parameterModel = { \\"prop\\": \\"Hello World\\" - } + }, ) { const result = await $request({ @@ -2943,8 +5062,8 @@ export class DefaultsService { 'parameterNumber': parameterNumber, 'parameterBoolean': parameterBoolean, 'parameterEnum': parameterEnum, - 'parameterModel': parameterModel - } + 'parameterModel': parameterModel, + }, }); catchGenericError(result); @@ -2979,25 +5098,25 @@ export class ParametersService { parameterQuery, parameterForm, parameterCookie, - requestBody + requestBody, ) { const result = await $request({ method: 'get', path: \`/api/v\${OpenAPI.VERSION}/parameters\`, cookies: { - 'parameterCookie': parameterCookie + 'parameterCookie': parameterCookie, }, headers: { - 'parameterHeader': parameterHeader + 'parameterHeader': parameterHeader, }, query: { - 'parameterQuery': parameterQuery + 'parameterQuery': parameterQuery, }, formData: { - 'parameterForm': parameterForm + 'parameterForm': parameterForm, }, - body: requestBody + body: requestBody, }); catchGenericError(result); @@ -3027,7 +5146,7 @@ export class ResponseService { const result = await $request({ method: 'post', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); if (!result.ok) { @@ -3051,7 +5170,7 @@ export class ResponseService { const result = await $request({ method: 'get', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); catchGenericError(result); @@ -3069,7 +5188,7 @@ export class ResponseService { const result = await $request({ method: 'put', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); if (!result.ok) { @@ -3106,7 +5225,7 @@ export class SimpleService { const result = await $request({ method: 'delete', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -3121,7 +5240,7 @@ export class SimpleService { const result = await $request({ method: 'get', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -3136,7 +5255,7 @@ export class SimpleService { const result = await $request({ method: 'head', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -3151,7 +5270,7 @@ export class SimpleService { const result = await $request({ method: 'options', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -3166,7 +5285,7 @@ export class SimpleService { const result = await $request({ method: 'patch', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -3181,7 +5300,7 @@ export class SimpleService { const result = await $request({ method: 'post', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -3196,7 +5315,7 @@ export class SimpleService { const result = await $request({ method: 'put', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -3241,7 +5360,7 @@ export class TypesService { parameterArray, parameterDictionary, parameterEnum, - id + id, ) { const result = await $request({ @@ -3254,8 +5373,8 @@ export class TypesService { 'parameterObject': parameterObject, 'parameterArray': parameterArray, 'parameterDictionary': parameterDictionary, - 'parameterEnum': parameterEnum - } + 'parameterEnum': parameterEnum, + }, }); catchGenericError(result); @@ -3736,7 +5855,19 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a simple array containing an array */ -export type ArrayWithArray = Array>;" +export type ArrayWithArray = Array>; + +export namespace ArrayWithArray { + + export const schema = { + type: 'Array', + item: { + type: 'Array', + item: 'ModelWithString', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayWithBooleans.ts): ./test/result/v3/typescript/models/ArrayWithBooleans.ts 1`] = ` @@ -3748,7 +5879,18 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW /** * This is a simple array with booleans */ -export type ArrayWithBooleans = Array;" +export type ArrayWithBooleans = Array; + +export namespace ArrayWithBooleans { + + export const schema = { + type: 'Array', + item: { + type: 'boolean', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayWithNumbers.ts): ./test/result/v3/typescript/models/ArrayWithNumbers.ts 1`] = ` @@ -3760,7 +5902,18 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW /** * This is a simple array with numbers */ -export type ArrayWithNumbers = Array;" +export type ArrayWithNumbers = Array; + +export namespace ArrayWithNumbers { + + export const schema = { + type: 'Array', + item: { + type: 'number', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayWithProperties.ts): ./test/result/v3/typescript/models/ArrayWithProperties.ts 1`] = ` @@ -3774,8 +5927,24 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW */ export type ArrayWithProperties = Array<{ foo?: string, - bar?: string -}>;" + bar?: string, +}>; + +export namespace ArrayWithProperties { + + export const schema = { + type: 'Array', + item: { + foo: { + type: 'string', + }, + bar: { + type: 'string', + }, + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayWithReferences.ts): ./test/result/v3/typescript/models/ArrayWithReferences.ts 1`] = ` @@ -3789,7 +5958,16 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a simple array with references */ -export type ArrayWithReferences = Array;" +export type ArrayWithReferences = Array; + +export namespace ArrayWithReferences { + + export const schema = { + type: 'Array', + item: 'ModelWithString', + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayWithStrings.ts): ./test/result/v3/typescript/models/ArrayWithStrings.ts 1`] = ` @@ -3801,7 +5979,18 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW /** * This is a simple array with strings */ -export type ArrayWithStrings = Array;" +export type ArrayWithStrings = Array; + +export namespace ArrayWithStrings { + + export const schema = { + type: 'Array', + item: { + type: 'string', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/Dictionary.ts): ./test/result/v3/typescript/models/Dictionary.ts 1`] = ` @@ -3828,7 +6017,19 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a complex dictionary */ -export type DictionaryWithArray = Dictionary>;" +export type DictionaryWithArray = Dictionary>; + +export namespace DictionaryWithArray { + + export const schema = { + type: 'Dictionary', + item: { + type: 'Array', + item: 'ModelWithString', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/DictionaryWithDictionary.ts): ./test/result/v3/typescript/models/DictionaryWithDictionary.ts 1`] = ` @@ -3842,7 +6043,21 @@ import { Dictionary } from '../models/Dictionary'; /** * This is a string dictionary */ -export type DictionaryWithDictionary = Dictionary>;" +export type DictionaryWithDictionary = Dictionary>; + +export namespace DictionaryWithDictionary { + + export const schema = { + type: 'Dictionary', + item: { + type: 'Dictionary', + item: { + type: 'string', + }, + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/DictionaryWithProperties.ts): ./test/result/v3/typescript/models/DictionaryWithProperties.ts 1`] = ` @@ -3858,8 +6073,24 @@ import { Dictionary } from '../models/Dictionary'; */ export type DictionaryWithProperties = Dictionary<{ foo?: string, - bar?: string -}>;" + bar?: string, +}>; + +export namespace DictionaryWithProperties { + + export const schema = { + type: 'Dictionary', + item: { + foo: { + type: 'string', + }, + bar: { + type: 'string', + }, + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/DictionaryWithReference.ts): ./test/result/v3/typescript/models/DictionaryWithReference.ts 1`] = ` @@ -3874,7 +6105,16 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a string reference */ -export type DictionaryWithReference = Dictionary;" +export type DictionaryWithReference = Dictionary; + +export namespace DictionaryWithReference { + + export const schema = { + type: 'Dictionary', + item: 'ModelWithString', + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/DictionaryWithString.ts): ./test/result/v3/typescript/models/DictionaryWithString.ts 1`] = ` @@ -3888,7 +6128,18 @@ import { Dictionary } from '../models/Dictionary'; /** * This is a string dictionary */ -export type DictionaryWithString = Dictionary;" +export type DictionaryWithString = Dictionary; + +export namespace DictionaryWithString { + + export const schema = { + type: 'Dictionary', + item: { + type: 'string', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/EnumFromDescription.ts): ./test/result/v3/typescript/models/EnumFromDescription.ts 1`] = ` @@ -3903,7 +6154,15 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/EnumFr export enum EnumFromDescription { ERROR = 3, SUCCESS = 1, - WARNING = 2 + WARNING = 2, +} + +export namespace EnumFromDescription { + + export const schema = { + type: 'Enum', + }; + }" `; @@ -3919,7 +6178,15 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/EnumWi export enum EnumWithNumbers { NUM_1 = 1, NUM_2 = 2, - NUM_3 = 3 + NUM_3 = 3, +} + +export namespace EnumWithNumbers { + + export const schema = { + type: 'Enum', + }; + }" `; @@ -3935,7 +6202,15 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/EnumWi export enum EnumWithStrings { ERROR = 'Error', SUCCESS = 'Success', - WARNING = 'Warning' + WARNING = 'Warning', +} + +export namespace EnumWithStrings { + + export const schema = { + type: 'Enum', + }; + }" `; @@ -3951,7 +6226,16 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelL export interface ModelLink { id?: string; } -" + +export namespace ModelLink { + + export const schema = { + id: { + type: 'string', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelThatExtends.ts): ./test/result/v3/typescript/models/ModelThatExtends.ts 1`] = ` @@ -3969,7 +6253,19 @@ export interface ModelThatExtends extends ModelWithString { propExtendsA?: string; propExtendsB?: ModelWithString; } -" + +export namespace ModelThatExtends { + + export const schema = { + propExtendsA: { + type: 'string', + }, + propExtendsB: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelThatExtendsExtends.ts): ./test/result/v3/typescript/models/ModelThatExtendsExtends.ts 1`] = ` @@ -3988,7 +6284,19 @@ export interface ModelThatExtendsExtends extends ModelWithString, ModelThatExten propExtendsC?: string; propExtendsD?: ModelWithString; } -" + +export namespace ModelThatExtendsExtends { + + export const schema = { + propExtendsC: { + type: 'string', + }, + propExtendsD: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithArray.ts): ./test/result/v3/typescript/models/ModelWithArray.ts 1`] = ` @@ -4007,7 +6315,29 @@ export interface ModelWithArray { propWithFile?: Array; propWithNumber?: Array; } -" + +export namespace ModelWithArray { + + export const schema = { + prop: { + type: 'Array', + item: 'ModelWithString', + }, + propWithFile: { + type: 'Array', + item: { + type: 'File', + }, + }, + propWithNumber: { + type: 'Array', + item: { + type: 'number', + }, + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithBoolean.ts): ./test/result/v3/typescript/models/ModelWithBoolean.ts 1`] = ` @@ -4025,7 +6355,16 @@ export interface ModelWithBoolean { */ prop?: boolean; } -" + +export namespace ModelWithBoolean { + + export const schema = { + prop: { + type: 'boolean', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithCircularReference.ts): ./test/result/v3/typescript/models/ModelWithCircularReference.ts 1`] = ` @@ -4040,7 +6379,16 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW export interface ModelWithCircularReference { prop?: ModelWithCircularReference; } -" + +export namespace ModelWithCircularReference { + + export const schema = { + prop: { + type: 'ModelWithCircularReference', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithDictionary.ts): ./test/result/v3/typescript/models/ModelWithDictionary.ts 1`] = ` @@ -4057,7 +6405,19 @@ import { Dictionary } from '../models/Dictionary'; export interface ModelWithDictionary { prop?: Dictionary; } -" + +export namespace ModelWithDictionary { + + export const schema = { + prop: { + type: 'Dictionary', + item: { + type: 'string', + }, + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithDuplicateImports.ts): ./test/result/v3/typescript/models/ModelWithDuplicateImports.ts 1`] = ` @@ -4076,7 +6436,22 @@ export interface ModelWithDuplicateImports { propB?: ModelWithString; propC?: ModelWithString; } -" + +export namespace ModelWithDuplicateImports { + + export const schema = { + propA: { + type: 'ModelWithString', + }, + propB: { + type: 'ModelWithString', + }, + propC: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithDuplicateProperties.ts): ./test/result/v3/typescript/models/ModelWithDuplicateProperties.ts 1`] = ` @@ -4093,7 +6468,16 @@ import { ModelWithString } from '../models/ModelWithString'; export interface ModelWithDuplicateProperties { prop?: ModelWithString; } -" + +export namespace ModelWithDuplicateProperties { + + export const schema = { + prop: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithEnum.ts): ./test/result/v3/typescript/models/ModelWithEnum.ts 1`] = ` @@ -4120,11 +6504,16 @@ export namespace ModelWithEnum { export enum Test { SUCCESS = 'Success', WARNING = 'Warning', - ERROR = 'Error' + ERROR = 'Error', } -} -" + export const schema = { + Test: { + type: 'Enum', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithEnumFromDescription.ts): ./test/result/v3/typescript/models/ModelWithEnumFromDescription.ts 1`] = ` @@ -4151,11 +6540,16 @@ export namespace ModelWithEnumFromDescription { export enum Test { SUCCESS = 1, WARNING = 2, - ERROR = 3 + ERROR = 3, } -} -" + export const schema = { + Test: { + type: 'Enum', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithInteger.ts): ./test/result/v3/typescript/models/ModelWithInteger.ts 1`] = ` @@ -4173,7 +6567,16 @@ export interface ModelWithInteger { */ prop?: number; } -" + +export namespace ModelWithInteger { + + export const schema = { + prop: { + type: 'number', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithLink.ts): ./test/result/v3/typescript/models/ModelWithLink.ts 1`] = ` @@ -4191,7 +6594,16 @@ import { ModelWithString } from '../models/ModelWithString'; export interface ModelWithLink { prop?: ModelLink; } -" + +export namespace ModelWithLink { + + export const schema = { + prop: { + type: 'ModelLink', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithNestedEnums.ts): ./test/result/v3/typescript/models/ModelWithNestedEnums.ts 1`] = ` @@ -4211,7 +6623,37 @@ export interface ModelWithNestedEnums { dictionaryWithEnum?: Dictionary<('Success' | 'Warning' | 'Error')>; dictionaryWithEnumFromDescription?: Dictionary<(1 | 2 | 3)>; } -" + +export namespace ModelWithNestedEnums { + + export const schema = { + arrayWithDescription: { + type: 'Array', + item: { + type: 'Enum', + }, + }, + arrayWithEnum: { + type: 'Array', + item: { + type: 'Enum', + }, + }, + dictionaryWithEnum: { + type: 'Dictionary', + item: { + type: 'Enum', + }, + }, + dictionaryWithEnumFromDescription: { + type: 'Dictionary', + item: { + type: 'Enum', + }, + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithNestedProperties.ts): ./test/result/v3/typescript/models/ModelWithNestedProperties.ts 1`] = ` @@ -4226,11 +6668,33 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW export interface ModelWithNestedProperties { readonly first: { readonly second: { - readonly third: string | null - } | null + readonly third: string | null, + } | null, } | null; } -" + +export namespace ModelWithNestedProperties { + + export const schema = { + first: { + second: { + third: { + type: 'string', + isReadOnly: true, + isRequired: true, + isNullable: true, + }, + isReadOnly: true, + isRequired: true, + isNullable: true, + }, + isReadOnly: true, + isRequired: true, + isNullable: true, + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithProperties.ts): ./test/result/v3/typescript/models/ModelWithProperties.ts 1`] = ` @@ -4253,7 +6717,39 @@ export interface ModelWithProperties { readonly requiredAndReadOnly: string; string?: string; } -" + +export namespace ModelWithProperties { + + export const schema = { + boolean: { + type: 'boolean', + }, + number: { + type: 'number', + }, + reference: { + type: 'ModelWithString', + }, + required: { + type: 'string', + isRequired: true, + }, + requiredAndNullable: { + type: 'string', + isRequired: true, + isNullable: true, + }, + requiredAndReadOnly: { + type: 'string', + isReadOnly: true, + isRequired: true, + }, + string: { + type: 'string', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithReference.ts): ./test/result/v3/typescript/models/ModelWithReference.ts 1`] = ` @@ -4270,7 +6766,16 @@ import { ModelWithString } from '../models/ModelWithString'; export interface ModelWithReference { prop?: ModelWithString; } -" + +export namespace ModelWithReference { + + export const schema = { + prop: { + type: 'ModelWithString', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelWithString.ts): ./test/result/v3/typescript/models/ModelWithString.ts 1`] = ` @@ -4288,7 +6793,16 @@ export interface ModelWithString { */ prop?: string; } -" + +export namespace ModelWithString { + + export const schema = { + prop: { + type: 'string', + }, + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/SimpleBoolean.ts): ./test/result/v3/typescript/models/SimpleBoolean.ts 1`] = ` @@ -4300,7 +6814,15 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Simple /** * This is a simple boolean */ -export type SimpleBoolean = boolean;" +export type SimpleBoolean = boolean; + +export namespace SimpleBoolean { + + export const schema = { + type: 'boolean', + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/SimpleFile.ts): ./test/result/v3/typescript/models/SimpleFile.ts 1`] = ` @@ -4312,7 +6834,15 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Simple /** * This is a simple file */ -export type SimpleFile = File;" +export type SimpleFile = File; + +export namespace SimpleFile { + + export const schema = { + type: 'File', + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/SimpleInteger.ts): ./test/result/v3/typescript/models/SimpleInteger.ts 1`] = ` @@ -4324,7 +6854,15 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Simple /** * This is a simple number */ -export type SimpleInteger = number;" +export type SimpleInteger = number; + +export namespace SimpleInteger { + + export const schema = { + type: 'number', + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/SimpleReference.ts): ./test/result/v3/typescript/models/SimpleReference.ts 1`] = ` @@ -4338,7 +6876,15 @@ import { ModelWithString } from '../models/ModelWithString'; /** * This is a simple reference */ -export type SimpleReference = ModelWithString;" +export type SimpleReference = ModelWithString; + +export namespace SimpleReference { + + export const schema = { + type: 'ModelWithString', + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/models/SimpleString.ts): ./test/result/v3/typescript/models/SimpleString.ts 1`] = ` @@ -4350,7 +6896,15 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Simple /** * This is a simple string */ -export type SimpleString = string;" +export type SimpleString = string; + +export namespace SimpleString { + + export const schema = { + type: 'string', + }; + +}" `; exports[`generation v3 typescript file(./test/result/v3/typescript/services/ComplexService.ts): ./test/result/v3/typescript/services/ComplexService.ts 1`] = ` @@ -4377,10 +6931,10 @@ export class ComplexService { parameterObject?: { first?: { second?: { - third?: string - } - } - } + third?: string, + }, + }, + }, ): Promise> { const result = await $request({ @@ -4388,8 +6942,8 @@ export class ComplexService { path: \`/api/v\${OpenAPI.VERSION}/complex\`, query: { 'parameterReference': parameterReference, - 'parameterObject': parameterObject - } + 'parameterObject': parameterObject, + }, }); if (!result.ok) { @@ -4429,13 +6983,13 @@ export class DefaultsService { * @throws ApiError */ public static async callWithDefaultParameters( - parameterString?: string = 'Hello World!', - parameterNumber?: number = 123, - parameterBoolean?: boolean = true, - parameterEnum?: ('Success' | 'Warning' | 'Error') = 'Success', - parameterModel?: ModelWithString | null = { + parameterString: string = 'Hello World!', + parameterNumber: number = 123, + parameterBoolean: boolean = true, + parameterEnum: ('Success' | 'Warning' | 'Error') = 'Success', + parameterModel: ModelWithString | null = { \\"prop\\": \\"Hello World\\" - } + }, ): Promise { const result = await $request({ @@ -4446,8 +7000,8 @@ export class DefaultsService { 'parameterNumber': parameterNumber, 'parameterBoolean': parameterBoolean, 'parameterEnum': parameterEnum, - 'parameterModel': parameterModel - } + 'parameterModel': parameterModel, + }, }); catchGenericError(result); @@ -4484,25 +7038,25 @@ export class ParametersService { parameterQuery?: string, parameterForm?: string, parameterCookie?: string, - requestBody?: ModelWithString + requestBody?: ModelWithString, ): Promise { const result = await $request({ method: 'get', path: \`/api/v\${OpenAPI.VERSION}/parameters\`, cookies: { - 'parameterCookie': parameterCookie + 'parameterCookie': parameterCookie, }, headers: { - 'parameterHeader': parameterHeader + 'parameterHeader': parameterHeader, }, query: { - 'parameterQuery': parameterQuery + 'parameterQuery': parameterQuery, }, formData: { - 'parameterForm': parameterForm + 'parameterForm': parameterForm, }, - body: requestBody + body: requestBody, }); catchGenericError(result); @@ -4536,7 +7090,7 @@ export class ResponseService { const result = await $request({ method: 'post', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); if (!result.ok) { @@ -4560,7 +7114,7 @@ export class ResponseService { const result = await $request({ method: 'get', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); catchGenericError(result); @@ -4578,7 +7132,7 @@ export class ResponseService { const result = await $request({ method: 'put', - path: \`/api/v\${OpenAPI.VERSION}/response\` + path: \`/api/v\${OpenAPI.VERSION}/response\`, }); if (!result.ok) { @@ -4616,7 +7170,7 @@ export class SimpleService { const result = await $request({ method: 'delete', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -4631,7 +7185,7 @@ export class SimpleService { const result = await $request({ method: 'get', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -4646,7 +7200,7 @@ export class SimpleService { const result = await $request({ method: 'head', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -4661,7 +7215,7 @@ export class SimpleService { const result = await $request({ method: 'options', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -4676,7 +7230,7 @@ export class SimpleService { const result = await $request({ method: 'patch', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -4691,7 +7245,7 @@ export class SimpleService { const result = await $request({ method: 'post', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -4706,7 +7260,7 @@ export class SimpleService { const result = await $request({ method: 'put', - path: \`/api/v\${OpenAPI.VERSION}/simple\` + path: \`/api/v\${OpenAPI.VERSION}/simple\`, }); catchGenericError(result); @@ -4745,14 +7299,14 @@ export class TypesService { * @throws ApiError */ public static async types( - parameterNumber?: number = 123, - parameterString?: string = 'default', - parameterBoolean?: boolean = true, - parameterObject?: any = null, + parameterNumber: number = 123, + parameterString: string = 'default', + parameterBoolean: boolean = true, + parameterObject: any = null, parameterArray?: Array, parameterDictionary?: any, parameterEnum?: ('Success' | 'Warning' | 'Error'), - id?: number + id?: number, ): Promise { const result = await $request({ @@ -4765,8 +7319,8 @@ export class TypesService { 'parameterObject': parameterObject, 'parameterArray': parameterArray, 'parameterDictionary': parameterDictionary, - 'parameterEnum': parameterEnum - } + 'parameterEnum': parameterEnum, + }, }); catchGenericError(result);