resolve conflicts

Author: richgoldmd

.eslintrc.json

@@ -24,7 +24,8 @@
         "@typescript-eslint/explicit-module-boundary-types": 0,
         "sort-imports": "off",
         "import/order": "off",
-        "simple-import-sort/sort": "error",
+        "simple-import-sort/imports": "error",
+        "simple-import-sort/exports": "error",
         "prettier/prettier": ["error"]
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.6.0",
+    "version": "0.7.0-beta",
     "description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",

src/client/interfaces/Model.d.ts

@@ -3,18 +3,15 @@ import type { Schema } from './Schema';
 
 export interface Model extends Schema {
     name: string;
-    export: 'reference' | 'generic' | 'enum' | 'array' | 'dictionary' | 'interface';
+    export: 'reference' | 'generic' | 'enum' | 'array' | 'dictionary' | 'interface' | 'one-of' | 'any-of' | 'all-of';
     type: string;
     base: string;
     template: string | null;
     link: Model | null;
     description: string | null;
     default?: string;
     imports: string[];
-    extends: string[];
     enum: Enum[];
     enums: Model[];
     properties: Model[];
-    extendedFrom?: string[];
-    extendedBy?: string[];
 }

src/client/interfaces/ModelComposition.d.ts

@@ -0,0 +1,8 @@
+import type { Model } from './Model';
+
+export interface ModelComposition {
+    type: 'one-of' | 'any-of' | 'all-of';
+    imports: string[];
+    enums: Model[];
+    properties: Model[];
+}

src/index.ts

@@ -13,7 +13,7 @@ export enum HttpClient {
     NODE = 'node',
 }
 
-export interface Options {
+export type Options = {
     input: string | Record<string, any>;
     output: string;
     httpClient?: HttpClient;
@@ -24,7 +24,7 @@ export interface Options {
     exportModels?: boolean;
     exportSchemas?: boolean;
     write?: boolean;
-}
+};
 
 /**
  * Generate the OpenAPI client. This method will read the OpenAPI specification and based on the

src/openApi/v2/interfaces/OpenApiParameter.d.ts

@@ -1,5 +1,5 @@
 import type { WithEnumExtension } from './Extensions/WithEnumExtension';
-import { WithNullableExtension } from './Extensions/WithNullableExtension';
+import type { WithNullableExtension } from './Extensions/WithNullableExtension';
 import type { OpenApiItems } from './OpenApiItems';
 import type { OpenApiReference } from './OpenApiReference';
 import type { OpenApiSchema } from './OpenApiSchema';

src/openApi/v2/parser/constants.ts

@@ -12,8 +12,8 @@ export function extendEnum(enumerators: Enum[], definition: WithEnumExtension):
     const descriptions = definition['x-enum-descriptions'];
 
     return enumerators.map((enumerator, index) => ({
-        name: (names && names[index]) || enumerator.name,
-        description: (descriptions && descriptions[index]) || enumerator.description,
+        name: names?.[index] || enumerator.name,
+        description: descriptions?.[index] || enumerator.description,
         value: enumerator.value,
         type: enumerator.type,
     }));

src/openApi/v2/parser/extendEnum.ts

@@ -1,5 +1,4 @@
 import type { Enum } from '../../../client/interfaces/Enum';
-import { PrimaryType } from './constants';
 import { isDefined } from './isDefined';
 
 export function getEnum(values?: (string | number)[]): Enum[] {
@@ -14,7 +13,7 @@ export function getEnum(values?: (string | number)[]): Enum[] {
                     return {
                         name: `_${value}`,
                         value: String(value),
-                        type: PrimaryType.NUMBER,
+                        type: 'number',
                         description: null,
                     };
                 }
@@ -25,7 +24,7 @@ export function getEnum(values?: (string | number)[]): Enum[] {
                         .replace(/([a-z])([A-Z]+)/g, '$1_$2')
                         .toUpperCase(),
                     value: `'${value}'`,
-                    type: PrimaryType.STRING,
+                    type: 'string',
                     description: null,
                 };
             });

src/openApi/v2/parser/getEnum.ts

@@ -1,5 +1,4 @@
 import type { Enum } from '../../../client/interfaces/Enum';
-import { PrimaryType } from './constants';
 
 export function getEnumFromDescription(description: string): Enum[] {
     // Check if we can find this special format string:
@@ -20,7 +19,7 @@ export function getEnumFromDescription(description: string): Enum[] {
                             .replace(/([a-z])([A-Z]+)/g, '$1_$2')
                             .toUpperCase(),
                         value: String(value),
-                        type: PrimaryType.NUMBER,
+                        type: 'number',
                         description: null,
                     });
                 }