Merge branch 'master' of https://github.com/ferdikoomen/openapi-typescript-codegen into features

Alex0007 · Alex0007 · commit 6ad0852682e7 · 2020-09-07T16:38:50.000+05:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.4.10",
+    "version": "0.4.11",
     "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",
@@ -57,8 +57,8 @@
         "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b"
     },
     "dependencies": {
-        "camelcase": "5.3.1",
-        "commander": "6.0.0",
+        "camelcase": "6.0.0",
+        "commander": "6.1.0",
         "handlebars": "4.7.6",
         "js-yaml": "3.14.0",
         "mkdirp": "1.0.4",
@@ -67,31 +67,31 @@
         "stringify-object": "^3.3.0"
     },
     "devDependencies": {
-        "@babel/core": "7.11.1",
-        "@babel/preset-env": "7.11.0",
+        "@babel/core": "7.11.6",
+        "@babel/preset-env": "7.11.5",
         "@babel/preset-typescript": "7.10.4",
-        "@rollup/plugin-commonjs": "14.0.0",
-        "@rollup/plugin-node-resolve": "8.4.0",
-        "@types/jest": "26.0.9",
+        "@rollup/plugin-commonjs": "15.0.0",
+        "@rollup/plugin-node-resolve": "9.0.0",
+        "@types/jest": "26.0.13",
         "@types/js-yaml": "3.12.5",
         "@types/mkdirp": "1.0.1",
-        "@types/node": "14.0.27",
+        "@types/node": "14.6.4",
         "@types/rimraf": "3.0.0",
-        "@typescript-eslint/eslint-plugin": "3.8.0",
-        "@typescript-eslint/parser": "3.8.0",
+        "@typescript-eslint/eslint-plugin": "4.0.0",
+        "@typescript-eslint/parser": "3.10.1",
         "codecov": "3.7.2",
-        "eslint": "7.6.0",
+        "eslint": "7.8.1",
         "eslint-config-prettier": "6.11.0",
         "eslint-plugin-prettier": "3.1.4",
         "eslint-plugin-simple-import-sort": "5.0.3",
         "glob": "7.1.6",
-        "jest": "26.2.2",
-        "jest-cli": "26.2.2",
-        "prettier": "2.0.5",
-        "rollup": "2.23.1",
-        "rollup-plugin-terser": "7.0.0",
+        "jest": "26.4.2",
+        "jest-cli": "26.4.2",
+        "prettier": "2.1.1",
+        "rollup": "2.26.10",
+        "rollup-plugin-terser": "7.0.2",
         "rollup-plugin-typescript2": "0.27.2",
-        "typescript": "3.9.7"
+        "typescript": "4.0.2"
     },
     "peerDependencies": {
         "node-fetch": "*"
diff --git a/src/index.spec.ts b/src/index.spec.ts
@@ -24,15 +24,15 @@ describe('index', () => {
     it('downloads and parses v2 without issues', async () => {
         await OpenAPI.generate({
             input: 'https://raw.githubusercontent.com/ferdikoomen/openapi-typescript-codegen/master/test/mock/v2/spec.json',
-            output: './test/result/v22/',
+            output: './test/result/v2-downloaded/',
             write: false,
         });
     });
 
     it('downloads and parses v3 without issues', async () => {
         await OpenAPI.generate({
             input: 'https://raw.githubusercontent.com/ferdikoomen/openapi-typescript-codegen/master/test/mock/v3/spec.json',
-            output: './test/result/v33/',
+            output: './test/result/v3-downloaded/',
             write: false,
         });
     });
diff --git a/src/templates/core/ApiError.ts b/src/templates/core/ApiError.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 import { isSuccess } from './isSuccess';
 import { Result } from './Result';
diff --git a/src/templates/core/OpenAPI.hbs b/src/templates/core/OpenAPI.hbs
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 interface Config {
     BASE: string;
diff --git a/src/templates/core/RequestOptions.ts b/src/templates/core/RequestOptions.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 export interface RequestOptions {
     method: 'get' | 'put' | 'post' | 'delete' | 'options' | 'head' | 'patch';
diff --git a/src/templates/core/Result.ts b/src/templates/core/Result.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 export interface Result {
     url: string;
diff --git a/src/templates/core/getFormData.ts b/src/templates/core/getFormData.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 /**
  * Get FormData from object. This method is needed to upload
diff --git a/src/templates/core/getQueryString.ts b/src/templates/core/getQueryString.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 /**
  * Get query string from query parameters object. This method also
diff --git a/src/templates/core/isSuccess.ts b/src/templates/core/isSuccess.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 /**
  * Check success response code.
diff --git a/src/templates/core/request.ts b/src/templates/core/request.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 import { getFormData } from './getFormData';
 import { getQueryString } from './getQueryString';
diff --git a/src/templates/core/requestUsingFetch.ts b/src/templates/core/requestUsingFetch.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 import { Result } from './Result';
 
diff --git a/src/templates/core/requestUsingXHR.ts b/src/templates/core/requestUsingXHR.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 import { isSuccess } from './isSuccess';
 import { Result } from './Result';
diff --git a/src/templates/exportModel.hbs b/src/templates/exportModel.hbs
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 {{#if imports}}
 {{#each imports}}
diff --git a/src/templates/exportSchema.hbs b/src/templates/exportSchema.hbs
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 {{#if extends}}
 
 {{#each extends}}
diff --git a/src/templates/exportService.hbs b/src/templates/exportService.hbs
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 {{#if imports}}
 {{#each imports}}
diff --git a/src/templates/index.hbs b/src/templates/index.hbs
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 {{#if exportCore}}
 
 export { ApiError } from './core/ApiError';
@@ -12,23 +11,29 @@ export { OpenAPI } from './core/OpenAPI';
 {{#if models}}
 
 {{#each models}}
-export { {{{this}}} } from './models/{{{this}}}';
+{{#if enum}}
+export { {{{name}}} } from './models/{{{name}}}';
+{{else if enums}}
+export { {{{name}}} } from './models/{{{name}}}';
+{{else}}
+export type { {{{name}}} } from './models/{{{name}}}';
+{{/if}}
 {{/each}}
 {{/if}}
 {{/if}}
 {{#if exportSchemas}}
 {{#if models}}
 
 {{#each models}}
-export { ${{{this}}} } from './schemas/${{{this}}}';
+export { ${{{name}}} } from './schemas/${{{name}}}';
 {{/each}}
 {{/if}}
 {{/if}}
 {{#if exportServices}}
 {{#if services}}
 
 {{#each services}}
-export { {{{this}}} } from './services/{{{this}}}';
+export { {{{name}}} } from './services/{{{name}}}';
 {{/each}}
 {{/if}}
 {{/if}}
diff --git a/src/templates/models/Dictionary.ts b/src/templates/models/Dictionary.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-/* prettier-ignore */
 
 export type Dictionary<T> = {
     [key: string]: T;
diff --git a/src/utils/fileSystem.ts b/src/utils/fileSystem.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as mkdirp from 'mkdirp';
+import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
 import * as util from 'util';
 
diff --git a/src/utils/getModelNames.spec.ts b/src/utils/getModelNames.spec.ts
@@ -3,8 +3,7 @@ import { getModelNames } from './getModelNames';
 
 describe('getModelNames', () => {
     it('should return sorted list', () => {
-        const models: Model[] = [];
-        models.push({
+        const john: Model = {
             export: 'interface',
             name: 'John',
             type: 'John',
@@ -21,8 +20,8 @@ describe('getModelNames', () => {
             enum: [],
             enums: [],
             properties: [],
-        });
-        models.push({
+        };
+        const jane: Model = {
             export: 'interface',
             name: 'Jane',
             type: 'Jane',
@@ -39,8 +38,8 @@ describe('getModelNames', () => {
             enum: [],
             enums: [],
             properties: [],
-        });
-        models.push({
+        };
+        const doe: Model = {
             export: 'interface',
             name: 'Doe',
             type: 'Doe',
@@ -57,7 +56,8 @@ describe('getModelNames', () => {
             enum: [],
             enums: [],
             properties: [],
-        });
+        };
+        const models: Model[] = [john, jane, doe];
 
         expect(getModelNames([])).toEqual([]);
         expect(getModelNames(models)).toEqual(['Doe', 'Jane', 'John']);
diff --git a/src/utils/getServiceNames.spec.ts b/src/utils/getServiceNames.spec.ts
@@ -3,22 +3,23 @@ import { getServiceNames } from './getServiceNames';
 
 describe('getServiceNames', () => {
     it('should return sorted list', () => {
-        const services: Service[] = [];
-        services.push({
+        const john: Service = {
             name: 'John',
             operations: [],
             imports: [],
-        });
-        services.push({
+        };
+        const jane: Service = {
             name: 'Jane',
             operations: [],
             imports: [],
-        });
-        services.push({
+        };
+        const doe: Service = {
             name: 'Doe',
             operations: [],
             imports: [],
-        });
+        };
+
+        const services: Service[] = [john, jane, doe];
 
         expect(getServiceNames([])).toEqual([]);
         expect(getServiceNames(services)).toEqual(['Doe', 'Jane', 'John']);
diff --git a/src/utils/sortModelsByName.spec.ts b/src/utils/sortModelsByName.spec.ts
@@ -0,0 +1,65 @@
+import { Model } from '../client/interfaces/Model';
+import { sortModelsByName } from './sortModelsByName';
+
+describe('sortModelsByName', () => {
+    it('should return sorted list', () => {
+        const john: Model = {
+            export: 'interface',
+            name: 'John',
+            type: 'John',
+            base: 'John',
+            template: null,
+            link: null,
+            description: null,
+            isDefinition: true,
+            isReadOnly: false,
+            isRequired: false,
+            isNullable: false,
+            imports: [],
+            extends: [],
+            enum: [],
+            enums: [],
+            properties: [],
+        };
+        const jane: Model = {
+            export: 'interface',
+            name: 'Jane',
+            type: 'Jane',
+            base: 'Jane',
+            template: null,
+            link: null,
+            description: null,
+            isDefinition: true,
+            isReadOnly: false,
+            isRequired: false,
+            isNullable: false,
+            imports: [],
+            extends: [],
+            enum: [],
+            enums: [],
+            properties: [],
+        };
+        const doe: Model = {
+            export: 'interface',
+            name: 'Doe',
+            type: 'Doe',
+            base: 'Doe',
+            template: null,
+            link: null,
+            description: null,
+            isDefinition: true,
+            isReadOnly: false,
+            isRequired: false,
+            isNullable: false,
+            imports: [],
+            extends: [],
+            enum: [],
+            enums: [],
+            properties: [],
+        };
+        const models: Model[] = [john, jane, doe];
+
+        expect(sortModelsByName([])).toEqual([]);
+        expect(sortModelsByName(models)).toEqual([doe, jane, john]);
+    });
+});
diff --git a/src/utils/sortModelsByName.ts b/src/utils/sortModelsByName.ts
@@ -0,0 +1,9 @@
+import { Model } from '../client/interfaces/Model';
+
+export function sortModelsByName(models: Model[]): Model[] {
+    return models.sort((a, b) => {
+        const nameA = a.name.toLowerCase();
+        const nameB = b.name.toLowerCase();
+        return nameA.localeCompare(nameB, 'en');
+    });
+}
diff --git a/src/utils/sortServicesByName.spec.ts b/src/utils/sortServicesByName.spec.ts
diff --git a/src/utils/sortServicesByName.ts b/src/utils/sortServicesByName.ts
diff --git a/src/utils/writeClientIndex.ts b/src/utils/writeClientIndex.ts
diff --git a/test/__snapshots__/index.spec.js.snap b/test/__snapshots__/index.spec.js.snap
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/yarn.lock b/yarn.lock
