diff --git a/src/openApi/v2/interfaces/OpenApi.ts b/src/openApi/v2/interfaces/OpenApi.ts index eea7f8660..3fa3b5901 100644 --- a/src/openApi/v2/interfaces/OpenApi.ts +++ b/src/openApi/v2/interfaces/OpenApi.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiExternalDocs } from './OpenApiExternalDocs'; import type { OpenApiInfo } from './OpenApiInfo'; import type { OpenApiParameter } from './OpenApiParameter'; diff --git a/src/openApi/v2/interfaces/OpenApiHeader.ts b/src/openApi/v2/interfaces/OpenApiHeader.ts index 42809f17b..4f490c439 100644 --- a/src/openApi/v2/interfaces/OpenApiHeader.ts +++ b/src/openApi/v2/interfaces/OpenApiHeader.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiItems } from './OpenApiItems'; /** diff --git a/src/openApi/v2/interfaces/OpenApiResponse.ts b/src/openApi/v2/interfaces/OpenApiResponse.ts index 64a0bc85a..df250ad50 100644 --- a/src/openApi/v2/interfaces/OpenApiResponse.ts +++ b/src/openApi/v2/interfaces/OpenApiResponse.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiExample } from './OpenApiExample'; import type { OpenApiHeader } from './OpenApiHeader'; import type { OpenApiReference } from './OpenApiReference'; diff --git a/src/openApi/v2/interfaces/OpenApiSchema.ts b/src/openApi/v2/interfaces/OpenApiSchema.ts index e2c696dce..e0998dfa9 100644 --- a/src/openApi/v2/interfaces/OpenApiSchema.ts +++ b/src/openApi/v2/interfaces/OpenApiSchema.ts @@ -1,5 +1,5 @@ import type { WithEnumExtension } from '../../../types/client'; -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { WithNullableExtension } from './Extensions/WithNullableExtension'; import type { OpenApiExternalDocs } from './OpenApiExternalDocs'; import type { OpenApiReference } from './OpenApiReference'; diff --git a/src/openApi/v2/interfaces/OpenApiSecurityScheme.ts b/src/openApi/v2/interfaces/OpenApiSecurityScheme.ts index 121c737a9..51162103a 100644 --- a/src/openApi/v2/interfaces/OpenApiSecurityScheme.ts +++ b/src/openApi/v2/interfaces/OpenApiSecurityScheme.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#securitySchemeObject diff --git a/src/openApi/v3/interfaces/OpenApiComponents.ts b/src/openApi/v3/interfaces/OpenApiComponents.ts index 54cfaa680..eeaa8a8b5 100644 --- a/src/openApi/v3/interfaces/OpenApiComponents.ts +++ b/src/openApi/v3/interfaces/OpenApiComponents.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiCallback } from './OpenApiCallback'; import type { OpenApiExample } from './OpenApiExample'; import type { OpenApiHeader } from './OpenApiHeader'; diff --git a/src/openApi/v3/interfaces/OpenApiDiscriminator.ts b/src/openApi/v3/interfaces/OpenApiDiscriminator.ts index aa683057f..c878f2281 100644 --- a/src/openApi/v3/interfaces/OpenApiDiscriminator.ts +++ b/src/openApi/v3/interfaces/OpenApiDiscriminator.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#discriminatorObject diff --git a/src/openApi/v3/interfaces/OpenApiEncoding.ts b/src/openApi/v3/interfaces/OpenApiEncoding.ts index 670a5f15c..ffdacf15a 100644 --- a/src/openApi/v3/interfaces/OpenApiEncoding.ts +++ b/src/openApi/v3/interfaces/OpenApiEncoding.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiHeader } from './OpenApiHeader'; /** diff --git a/src/openApi/v3/interfaces/OpenApiHeader.ts b/src/openApi/v3/interfaces/OpenApiHeader.ts index 4bafccca5..0b07f9830 100644 --- a/src/openApi/v3/interfaces/OpenApiHeader.ts +++ b/src/openApi/v3/interfaces/OpenApiHeader.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiExample } from './OpenApiExample'; import type { OpenApiReference } from './OpenApiReference'; import type { OpenApiSchema } from './OpenApiSchema'; diff --git a/src/openApi/v3/interfaces/OpenApiLink.ts b/src/openApi/v3/interfaces/OpenApiLink.ts index 4b7708d3b..be17339e5 100644 --- a/src/openApi/v3/interfaces/OpenApiLink.ts +++ b/src/openApi/v3/interfaces/OpenApiLink.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiReference } from './OpenApiReference'; import type { OpenApiServer } from './OpenApiServer'; diff --git a/src/openApi/v3/interfaces/OpenApiMediaType.ts b/src/openApi/v3/interfaces/OpenApiMediaType.ts index 6bc1038c8..1b7dd0f56 100644 --- a/src/openApi/v3/interfaces/OpenApiMediaType.ts +++ b/src/openApi/v3/interfaces/OpenApiMediaType.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiEncoding } from './OpenApiEncoding'; import type { OpenApiExample } from './OpenApiExample'; import type { OpenApiReference } from './OpenApiReference'; diff --git a/src/openApi/v3/interfaces/OpenApiOAuthFlow.ts b/src/openApi/v3/interfaces/OpenApiOAuthFlow.ts index 85654a9a3..1f8124da1 100644 --- a/src/openApi/v3/interfaces/OpenApiOAuthFlow.ts +++ b/src/openApi/v3/interfaces/OpenApiOAuthFlow.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; /** * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#oauthFlowObject diff --git a/src/openApi/v3/interfaces/OpenApiOperation.ts b/src/openApi/v3/interfaces/OpenApiOperation.ts index 954d9653b..0721c98c8 100644 --- a/src/openApi/v3/interfaces/OpenApiOperation.ts +++ b/src/openApi/v3/interfaces/OpenApiOperation.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiCallback } from './OpenApiCallback'; import type { OpenApiExternalDocs } from './OpenApiExternalDocs'; import type { OpenApiParameter } from './OpenApiParameter'; diff --git a/src/openApi/v3/interfaces/OpenApiParameter.ts b/src/openApi/v3/interfaces/OpenApiParameter.ts index c1b61cdee..63a78176d 100644 --- a/src/openApi/v3/interfaces/OpenApiParameter.ts +++ b/src/openApi/v3/interfaces/OpenApiParameter.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiExample } from './OpenApiExample'; import type { OpenApiReference } from './OpenApiReference'; import type { OpenApiSchema } from './OpenApiSchema'; diff --git a/src/openApi/v3/interfaces/OpenApiRequestBody.ts b/src/openApi/v3/interfaces/OpenApiRequestBody.ts index fc323dba1..647134ed0 100644 --- a/src/openApi/v3/interfaces/OpenApiRequestBody.ts +++ b/src/openApi/v3/interfaces/OpenApiRequestBody.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiMediaType } from './OpenApiMediaType'; import type { OpenApiReference } from './OpenApiReference'; diff --git a/src/openApi/v3/interfaces/OpenApiResponse.ts b/src/openApi/v3/interfaces/OpenApiResponse.ts index d6509bd7b..c28cbf182 100644 --- a/src/openApi/v3/interfaces/OpenApiResponse.ts +++ b/src/openApi/v3/interfaces/OpenApiResponse.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiHeader } from './OpenApiHeader'; import type { OpenApiLink } from './OpenApiLink'; import type { OpenApiMediaType } from './OpenApiMediaType'; diff --git a/src/openApi/v3/interfaces/OpenApiSchema.ts b/src/openApi/v3/interfaces/OpenApiSchema.ts index ccd90a439..02a3517ff 100644 --- a/src/openApi/v3/interfaces/OpenApiSchema.ts +++ b/src/openApi/v3/interfaces/OpenApiSchema.ts @@ -1,5 +1,5 @@ import type { WithEnumExtension } from '../../../types/client'; -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiDiscriminator } from './OpenApiDiscriminator'; import type { OpenApiExternalDocs } from './OpenApiExternalDocs'; import type { OpenApiReference } from './OpenApiReference'; diff --git a/src/openApi/v3/interfaces/OpenApiServer.ts b/src/openApi/v3/interfaces/OpenApiServer.ts index 811786614..1b1e329f9 100644 --- a/src/openApi/v3/interfaces/OpenApiServer.ts +++ b/src/openApi/v3/interfaces/OpenApiServer.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApiServerVariable } from './OpenApiServerVariable'; /** diff --git a/src/openApi/v3/parser/getContent.ts b/src/openApi/v3/parser/getContent.ts index 18e4d283c..34bed2e2d 100644 --- a/src/openApi/v3/parser/getContent.ts +++ b/src/openApi/v3/parser/getContent.ts @@ -1,4 +1,4 @@ -import type { Dictionary } from '../../../utils/types'; +import type { Dictionary } from '../../../types/generic'; import type { OpenApi } from '../interfaces/OpenApi'; import type { OpenApiMediaType } from '../interfaces/OpenApiMediaType'; import type { OpenApiSchema } from '../interfaces/OpenApiSchema'; diff --git a/src/utils/types.ts b/src/types/generic.ts similarity index 100% rename from src/utils/types.ts rename to src/types/generic.ts diff --git a/src/utils/discriminator.ts b/src/utils/discriminator.ts index ca7fb4b75..b398621e4 100644 --- a/src/utils/discriminator.ts +++ b/src/utils/discriminator.ts @@ -1,8 +1,8 @@ import type { OpenApi } from '../openApi/v3/interfaces/OpenApi'; import type { OpenApiDiscriminator } from '../openApi/v3/interfaces/OpenApiDiscriminator'; import type { Model } from '../types/client'; +import type { Dictionary } from '../types/generic'; import { stripNamespace } from './stripNamespace'; -import type { Dictionary } from './types'; const inverseDictionary = (map: Dictionary): Dictionary => { const m2: Dictionary = {};