Merge branch 'master' into pr/419

# Conflicts:
#	src/openApi/v3/parser/getModel.ts

Author: ferdikoomen

.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"]
     }
 }

README.md

@@ -441,6 +441,16 @@ npm install node-fetch --save-dev
 npm install form-data --save-dev
 ```
 
+In order to compile the project and resolve the imports, you will need to enable the `allowSyntheticDefaultImports`
+in your `tsconfig.json` file.
+
+```json
+{
+    "allowSyntheticDefaultImports": true
+}
+```
+
+
 [npm-url]: https://npmjs.org/package/openapi-typescript-codegen
 [npm-image]: https://img.shields.io/npm/v/openapi-typescript-codegen.svg
 [license-url]: LICENSE

package.json

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.5.4",
+    "version": "0.6.0",
     "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",
@@ -77,18 +77,18 @@
         "@babel/preset-typescript": "7.12.1",
         "@rollup/plugin-commonjs": "16.0.0",
         "@rollup/plugin-node-resolve": "10.0.0",
-        "@types/express": "4.17.8",
+        "@types/express": "4.17.9",
         "@types/jest": "26.0.15",
         "@types/js-yaml": "3.12.5",
-        "@types/node": "14.14.6",
+        "@types/node": "14.14.7",
         "@types/node-fetch": "2.5.7",
-        "@typescript-eslint/eslint-plugin": "4.6.1",
-        "@typescript-eslint/parser": "4.6.1",
+        "@typescript-eslint/eslint-plugin": "4.7.0",
+        "@typescript-eslint/parser": "4.7.0",
         "codecov": "3.8.1",
         "eslint": "7.13.0",
         "eslint-config-prettier": "6.15.0",
         "eslint-plugin-prettier": "3.1.4",
-        "eslint-plugin-simple-import-sort": "5.0.3",
+        "eslint-plugin-simple-import-sort": "6.0.0",
         "express": "4.17.1",
         "form-data": "3.0.0",
         "glob": "7.1.6",
@@ -97,7 +97,7 @@
         "node-fetch": "2.6.1",
         "prettier": "2.1.2",
         "puppeteer": "5.4.1",
-        "rollup": "2.33.1",
+        "rollup": "2.33.2",
         "rollup-plugin-terser": "7.0.2",
         "rollup-plugin-typescript2": "0.29.0",
         "typescript": "4.0.5"

src/client/interfaces/Model.d.ts

@@ -15,6 +15,4 @@ export interface Model extends Schema {
     enum: Enum[];
     enums: Model[];
     properties: Model[];
-    extendedFrom?: string[];
-    extendedBy?: string[];
 }

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,
                     });
                 }

src/openApi/v2/parser/getEnumFromDescription.ts

@@ -3,7 +3,8 @@ import { getMappedType } from './getMappedType';
 describe('getMappedType', () => {
     it('should map types to the basics', () => {
         expect(getMappedType('File')).toEqual('File');
-        expect(getMappedType('String')).toEqual('string');
+        expect(getMappedType('file')).toEqual('File');
+        expect(getMappedType('string')).toEqual('string');
         expect(getMappedType('date')).toEqual('string');
         expect(getMappedType('date-time')).toEqual('string');
         expect(getMappedType('float')).toEqual('number');