- Added support for node fetch 3.x, but recommend 2.x for Jest and NodeJS compatibility

Author: ferdikoomen

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Ferdi Koomen
+Copyright (c) 2021 Ferdi Koomen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -459,10 +459,9 @@ you can specify `--client node` in the openapi call:
 `openapi --input ./spec.json --output ./dist --client node`
 
 This will generate a client that uses [`node-fetch`](https://www.npmjs.com/package/node-fetch) internally. However,
-in order to compile and run this client, you will need to install the `node-fetch` dependencies:
+in order to compile and run this client, you will need to install the `node-fetch@2.x` dependencies:
 
 ```
-npm install @types/node-fetch --save-dev
 npm install node-fetch --save-dev
 npm install form-data --save-dev
 ```

package.json

@@ -61,12 +61,15 @@
         "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b"
     },
     "dependencies": {
+        "@types/node-fetch": "^2.5.12",
         "camelcase": "^6.2.0",
         "commander": "^8.0.0",
+        "form-data": "^4.0.0",
         "handlebars": "^4.7.6",
         "js-yaml": "^4.0.0",
         "json-schema-ref-parser": "^9.0.7",
         "mkdirp": "^1.0.4",
+        "node-fetch": "^2.6.5",
         "rimraf": "^3.0.2"
     },
     "devDependencies": {
@@ -89,11 +92,9 @@
         "eslint-plugin-prettier": "4.0.0",
         "eslint-plugin-simple-import-sort": "7.0.0",
         "express": "4.17.1",
-        "form-data": "4.0.0",
         "glob": "7.2.0",
         "jest": "27.2.2",
         "jest-cli": "27.2.2",
-        "node-fetch": "3.0.0",
         "prettier": "2.4.1",
         "puppeteer": "10.4.0",
         "qs": "6.10.1",

src/templates/core/node/getHeaders.hbs

@@ -29,7 +29,7 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
     if (options.body) {
         if (options.mediaType) {
             headers.append('Content-Type', options.mediaType);
-        } else if (isBlob(options.body)) {
+        } else if (isBlob(options.body) || isBinary(options.body)) {
             headers.append('Content-Type', 'application/octet-stream');
         } else if (isString(options.body)) {
             headers.append('Content-Type', 'text/plain');

src/templates/core/node/getRequestBody.hbs

@@ -5,8 +5,8 @@ function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
     if (options.body) {
         if (options.mediaType?.includes('/json')) {
             return JSON.stringify(options.body)
-        } else if (isString(options.body) || isBlob(options.body)) {
-            return options.body;
+        } else if (isString(options.body) || isBlob(options.body) || isBinary(options.body)) {
+            return options.body as any;
         } else {
             return JSON.stringify(options.body);
         }

src/templates/core/node/request.hbs

@@ -21,6 +21,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/isBlob}}
 
 
+{{>functions/isBinary}}
+
+
 {{>functions/getQueryString}}
 
 

src/templates/partials/base.hbs

@@ -1,7 +1,7 @@
 {{~#equals base 'File'~}}
 {{~#equals @root.httpClient 'fetch'}}Blob{{/equals~}}
 {{~#equals @root.httpClient 'xhr'}}Blob{{/equals~}}
-{{~#equals @root.httpClient 'node'}}Blob{{/equals~}}
+{{~#equals @root.httpClient 'node'}}Blob | Buffer | ArrayBuffer | ArrayBufferView{{/equals~}}
 {{~else~}}
 {{{base}}}
 {{~/equals~}}

test/e2e/v2.babel.spec.js

@@ -17,8 +17,8 @@ describe('v2.fetch', () => {
     }, 30000);
 
     afterAll(async () => {
-        await server.stop();
         await browser.stop();
+        await server.stop();
     });
 
     it('requests token', async () => {

test/e2e/v2.fetch.spec.js

@@ -17,8 +17,8 @@ describe('v2.fetch', () => {
     }, 30000);
 
     afterAll(async () => {
-        await server.stop();
         await browser.stop();
+        await server.stop();
     });
 
     it('requests token', async () => {

test/e2e/v2.node.spec.js

@@ -18,7 +18,7 @@ describe('v2.node', () => {
 
     it('requests token', async () => {
         const { OpenAPI, SimpleService } = require('./generated/v2/node/index.js');
-        const tokenRequest = jest.fn().mockResolvedValue('MY_TOKEN')
+        const tokenRequest = jest.fn().mockResolvedValue('MY_TOKEN');
         OpenAPI.TOKEN = tokenRequest;
         const result = await SimpleService.getCallWithoutParametersAndResponse();
         expect(tokenRequest.mock.calls.length).toBe(1);