Merge pull request #185 from hey-api/feat/unify-node-and-fetch-templates

feat(client): unify fetch and node clients
hey-api · Mar 30, 2024 · 7b66dfa · 7b66dfa
2 parents cefbda4 + 80a5886
commit 7b66dfa
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 231 deletions.
diff --git a/.changeset/mean-coats-fetch.md b/.changeset/mean-coats-fetch.md
@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+Attempt to use body type as content type when sending Blob in node client
diff --git a/src/templates/core/fetch/request.hbs b/src/templates/core/fetch/request.hbs
@@ -1,3 +1,8 @@
+{{#equals @root.$config.client 'node'}}
+import fetch, { FormData, Headers } from 'node-fetch';
+import type { RequestInit, Response } from 'node-fetch';
+
+{{/equals}}
 import { ApiError } from './ApiError';
 import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';

diff --git a/src/templates/core/fetch/sendRequest.hbs b/src/templates/core/fetch/sendRequest.hbs
@@ -16,9 +16,11 @@ export const sendRequest = async (
 		signal: controller.signal,
 	};
 
+	{{#equals @root.$config.client 'fetch'}}
 	if (config.WITH_CREDENTIALS) {
 		request.credentials = config.CREDENTIALS;
 	}
+	{{/equals}}
 
 	for (const fn of config.interceptors.request._fns) {
 		request = await fn(request)

diff --git a/src/templates/core/node/getHeaders.hbs b/src/templates/core/node/getHeaders.hbs
diff --git a/src/templates/core/node/getRequestBody.hbs b/src/templates/core/node/getRequestBody.hbs
diff --git a/src/templates/core/node/getResponseBody.hbs b/src/templates/core/node/getResponseBody.hbs
diff --git a/src/templates/core/node/getResponseHeader.hbs b/src/templates/core/node/getResponseHeader.hbs
diff --git a/src/templates/core/node/request.hbs b/src/templates/core/node/request.hbs
diff --git a/src/templates/core/node/sendRequest.hbs b/src/templates/core/node/sendRequest.hbs
diff --git a/src/templates/core/request.hbs b/src/templates/core/request.hbs
@@ -1,5 +1,5 @@
 {{~#equals @root.$config.client 'angular'}}{{>angular/request}}{{/equals~}}
 {{~#equals @root.$config.client 'axios'}}{{>axios/request}}{{/equals~}}
 {{~#equals @root.$config.client 'fetch'}}{{>fetch/request}}{{/equals~}}
-{{~#equals @root.$config.client 'node'}}{{>node/request}}{{/equals~}}
+{{~#equals @root.$config.client 'node'}}{{>fetch/request}}{{/equals~}}
 {{~#equals @root.$config.client 'xhr'}}{{>xhr/request}}{{/equals~}}
diff --git a/src/utils/handlebars.ts b/src/utils/handlebars.ts
@@ -39,12 +39,6 @@ import functionIsStringWithValue from '../templates/core/functions/isStringWithV
 import functionIsSuccess from '../templates/core/functions/isSuccess.hbs';
 import functionResolve from '../templates/core/functions/resolve.hbs';
 import templateCoreHttpRequest from '../templates/core/HttpRequest.hbs';
-import nodeGetHeaders from '../templates/core/node/getHeaders.hbs';
-import nodeGetRequestBody from '../templates/core/node/getRequestBody.hbs';
-import nodeGetResponseBody from '../templates/core/node/getResponseBody.hbs';
-import nodeGetResponseHeader from '../templates/core/node/getResponseHeader.hbs';
-import nodeRequest from '../templates/core/node/request.hbs';
-import nodeSendRequest from '../templates/core/node/sendRequest.hbs';
 import templateCoreSettings from '../templates/core/OpenAPI.hbs';
 import templateCoreRequest from '../templates/core/request.hbs';
 import templateCoreTypes from '../templates/core/types.hbs';
@@ -361,14 +355,6 @@ export const registerHandlebarTemplates = (config: Config, client: Client): Temp
     Handlebars.registerPartial('xhr/request', Handlebars.template(xhrRequest));
     Handlebars.registerPartial('xhr/sendRequest', Handlebars.template(xhrSendRequest));
 
-    // Specific files for the node client implementation
-    Handlebars.registerPartial('node/getHeaders', Handlebars.template(nodeGetHeaders));
-    Handlebars.registerPartial('node/getRequestBody', Handlebars.template(nodeGetRequestBody));
-    Handlebars.registerPartial('node/getResponseBody', Handlebars.template(nodeGetResponseBody));
-    Handlebars.registerPartial('node/getResponseHeader', Handlebars.template(nodeGetResponseHeader));
-    Handlebars.registerPartial('node/request', Handlebars.template(nodeRequest));
-    Handlebars.registerPartial('node/sendRequest', Handlebars.template(nodeSendRequest));
-
     // Specific files for the axios client implementation
     Handlebars.registerPartial('axios/getHeaders', Handlebars.template(axiosGetHeaders));
     Handlebars.registerPartial('axios/getRequestBody', Handlebars.template(axiosGetRequestBody));

diff --git a/test/__snapshots__/v3_node/core/request.ts.snap b/test/__snapshots__/v3_node/core/request.ts.snap
@@ -156,7 +156,7 @@ export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptio
         if (options.mediaType) {
             headers['Content-Type'] = options.mediaType;
         } else if (isBlob(options.body)) {
-            headers['Content-Type'] = 'application/octet-stream';
+            headers['Content-Type'] = options.body.type || 'application/octet-stream';
         } else if (isString(options.body)) {
             headers['Content-Type'] = 'text/plain';
         } else if (!isFormData(options.body)) {
@@ -172,7 +172,7 @@ export const getRequestBody = (options: ApiRequestOptions): unknown => {
         if (options.mediaType?.includes('/json')) {
             return JSON.stringify(options.body);
         } else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
-            return options.body as unknown;
+            return options.body;
         } else {
             return JSON.stringify(options.body);
         }
@@ -193,8 +193,8 @@ export const sendRequest = async (
 
     let request: RequestInit = {
         headers,
-        method: options.method,
         body: body ?? formData,
+        method: options.method,
         signal: controller.signal,
     };