- Testing new templates

Author: ferdikoomen

jest.config.js

@@ -15,11 +15,11 @@ module.exports = {
             displayName: 'E2E',
             testEnvironment: 'node',
             testMatch: [
-                '<rootDir>/test/e2e/v2.fetch.spec.js',
-                '<rootDir>/test/e2e/v2.xhr.spec.js',
-                // '<rootDir>/test/e2e/v2.node.spec.js',
-                '<rootDir>/test/e2e/v3.fetch.spec.js',
-                '<rootDir>/test/e2e/v3.xhr.spec.js',
+                // '<rootDir>/test/e2e/v2.fetch.spec.js',
+                // '<rootDir>/test/e2e/v2.xhr.spec.js',
+                '<rootDir>/test/e2e/v2.node.spec.js',
+                // '<rootDir>/test/e2e/v3.fetch.spec.js',
+                // '<rootDir>/test/e2e/v3.xhr.spec.js',
                 // '<rootDir>/test/e2e/v3.node.spec.js',
             ],
         },

package.json

@@ -63,11 +63,14 @@
         "aap": "node test/e2e/index.js"
     },
     "dependencies": {
+        "@types/node-fetch": "2.5.7",
         "camelcase": "6.0.0",
         "commander": "6.1.0",
+        "form-data": "3.0.0",
         "handlebars": "4.7.6",
         "js-yaml": "3.14.0",
         "mkdirp": "1.0.4",
+        "node-fetch": "2.6.1",
         "path": "0.12.7",
         "rimraf": "3.0.2"
     },

src/openApi/v2/parser/getOperation.ts

@@ -26,7 +26,7 @@ export function getOperation(openApi: OpenApi, url: string, method: string, op:
         summary: getComment(op.summary),
         description: getComment(op.description),
         deprecated: op.deprecated === true,
-        method: method,
+        method: method.toUpperCase(),
         path: operationPath,
         parameters: [...pathParams.parameters],
         parametersPath: [...pathParams.parametersPath],

src/openApi/v3/parser/getOperation.ts

@@ -30,7 +30,7 @@ export function getOperation(openApi: OpenApi, url: string, method: string, op:
         summary: getComment(op.summary),
         description: getComment(op.description),
         deprecated: op.deprecated === true,
-        method: method,
+        method: method.toUpperCase(),
         path: operationPath,
         parameters: [...pathParams.parameters],
         parametersPath: [...pathParams.parametersPath],

src/templates/core/ApiError.hbs

@@ -1,43 +1,19 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
+{{>header}}
 
-import { isSuccess } from './isSuccess';
-import { Result } from './Result';
+import { ApiResponse } from './ApiResponse';
 
 export class ApiError extends Error {
-
     public readonly url: string;
     public readonly status: number;
     public readonly statusText: string;
     public readonly body: any;
 
-    constructor(result: Readonly<Result>, message: string) {
+    constructor(response: ApiResponse, message: string) {
         super(message);
 
-        this.url = result.url;
-        this.status = result.status;
-        this.statusText = result.statusText;
-        this.body = result.body;
-    }
-}
-
-/**
- * Catch common errors (based on status code).
- * @param result
- */
-export function catchGenericError(result: Result): void {
-    switch (result.status) {
-        case 400: throw new ApiError(result, 'Bad Request');
-        case 401: throw new ApiError(result, 'Unauthorized');
-        case 403: throw new ApiError(result, 'Forbidden');
-        case 404: throw new ApiError(result, 'Not Found');
-        case 500: throw new ApiError(result, 'Internal Server Error');
-        case 502: throw new ApiError(result, 'Bad Gateway');
-        case 503: throw new ApiError(result, 'Service Unavailable');
-    }
-
-    if (!isSuccess(result.status)) {
-        throw new ApiError(result, 'Generic Error');
+        this.url = response.url;
+        this.status = response.status;
+        this.statusText = response.statusText;
+        this.body = response.body;
     }
 }

src/templates/core/ApiRequestOptions.hbs

@@ -0,0 +1,13 @@
+{{>header}}
+
+export interface RequestOptions {
+    readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
+    readonly path: string;
+    readonly cookies?: Record<string, any>;
+    readonly headers?: Record<string, any>;
+    readonly query?: Record<string, any>;
+    readonly formData?: Record<string, any>;
+    readonly body?: any;
+    readonly responseHeader?: string;
+    readonly errors?: Record<number, string>;
+}

src/templates/core/ApiResponse.hbs

@@ -0,0 +1,9 @@
+{{>header}}
+
+export interface Response {
+    readonly url: string;
+    readonly ok: boolean;
+    readonly status: number;
+    readonly statusText: string;
+    readonly body: any;
+}

src/templates/core/OpenAPI.hbs

@@ -1,6 +1,4 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
+{{>header}}
 
 interface Config {
     BASE: string;