Merge pull request #102 from nicolas-chaulet/refactor/types-generic

refactor(types): move generic types to types folder
hey-api · Mar 20, 2024 · 8382138 · 8382138
2 parents df99278 + 4445b79
commit 8382138
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → src/types/generic.ts b/src/utils/types.ts → src/types/generic.ts
diff --git 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<string>): Dictionary<string> => {
     const m2: Dictionary<string> = {};