feat: more changes

Author: viskystream

package-lock.json

@@ -6,6 +6,7 @@ type DefaultIntervals = {
 }
 
 export type CustomConfig = {
+readonly BASE: string;
 readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
  readonly retryStatuses?: number[];
  readonly retryIntervals?: DefaultIntervals;
@@ -17,4 +18,5 @@ export type CustomConfig = {
 readonly retryOn4xx?: boolean;
 readonly headers?: Record<string, any>;
 readonly url?: string;
+readonly token?: string;
 };

src/templates/core/CustomConfig.hbs

@@ -35,7 +35,7 @@ import type { OpenAPIConfig } from './OpenAPI';
 {{>functions/getQueryString}}
 
 
-{{>functions/getUrl}}
+{{>functions/customGetUrl}}
 
 
 {{>functions/getFormData}}

src/templates/core/custom/request.hbs

@@ -0,0 +1,15 @@
+const getUrl = (serviceRequestConfig: CustomConfig, options: ApiRequestOptions): string => {
+const path = options.url
+.replace(/{(.*?)}/g, (substring: string, group: string) => {
+if (options.path?.hasOwnProperty(group)) {
+return encoder(String(options.path[group]));
+}
+return substring;
+});
+
+const url = `${serviceRequestConfig.BASE}${path}`;
+if (options.query) {
+return `${url}${getQueryString(options.query)}`;
+}
+return url;
+};

src/templates/core/functions/customGetUrl.hbs

@@ -16,5 +16,7 @@ export const getHttpRequestName = (httpClient: HttpClient): string => {
  return 'AxiosHttpRequest';
  case HttpClient.ANGULAR:
  return 'AngularHttpRequest';
+ case HttpClient.CUSTOM:
+ return 'CustomHttpRequest';
  }
 };

src/utils/getHttpRequestName.ts

@@ -10,7 +10,6 @@ import angularRequest from '../templates/core/angular/request.hbs';
 import angularSendRequest from '../templates/core/angular/sendRequest.hbs';
 import templateCoreApiError from '../templates/core/ApiError.hbs';
 import templateCoreApiRequestOptions from '../templates/core/ApiRequestOptions.hbs';
-import templateCoreCustomConfig from '../templates/core/CustomConfig.hbs';
 import templateCoreCustomApiError from '../templates/core/custom/ApiError.hbs';
 import templateCoreApiResult from '../templates/core/ApiResult.hbs';
 import axiosGetHeaders from '../templates/core/axios/getHeaders.hbs';
@@ -32,6 +31,7 @@ import functionCatchErrorCodes from '../templates/core/functions/catchErrorCodes
 import functionGetFormData from '../templates/core/functions/getFormData.hbs';
 import functionGetQueryString from '../templates/core/functions/getQueryString.hbs';
 import functionGetUrl from '../templates/core/functions/getUrl.hbs';
+import functionCustomGetUrl from '../templates/core/functions/customGetUrl.hbs';
 import functionIsBlob from '../templates/core/functions/isBlob.hbs';
 import functionIsDefined from '../templates/core/functions/isDefined.hbs';
 import functionIsFormData from '../templates/core/functions/isFormData.hbs';
@@ -54,6 +54,7 @@ import xhrGetResponseBody from '../templates/core/xhr/getResponseBody.hbs';
 import xhrGetResponseHeader from '../templates/core/xhr/getResponseHeader.hbs';
 import xhrRequest from '../templates/core/xhr/request.hbs';
 import xhrSendRequest from '../templates/core/xhr/sendRequest.hbs';
+import templateCoreCustomConfig from '../templates/core/CustomConfig.hbs';
 import customGetHeaders from '../templates/core/custom/getHeaders.hbs';
 import customGetRequestBody from '../templates/core/custom/getRequestBody.hbs';
 import customGetResponseBody from '../templates/core/custom/getResponseBody.hbs';
@@ -184,6 +185,7 @@ export const registerHandlebarTemplates = (root: {
  Handlebars.registerPartial('functions/getFormData', Handlebars.template(functionGetFormData));
  Handlebars.registerPartial('functions/getQueryString', Handlebars.template(functionGetQueryString));
  Handlebars.registerPartial('functions/getUrl', Handlebars.template(functionGetUrl));
+ Handlebars.registerPartial('functions/customGetUrl', Handlebars.template(functionCustomGetUrl));
  Handlebars.registerPartial('functions/isBlob', Handlebars.template(functionIsBlob));
  Handlebars.registerPartial('functions/isDefined', Handlebars.template(functionIsDefined));
  Handlebars.registerPartial('functions/isFormData', Handlebars.template(functionIsFormData));
@@ -240,5 +242,6 @@ export const registerHandlebarTemplates = (root: {
  Handlebars.registerPartial('custom/getResponseHeader', Handlebars.template(customGetResponseHeader));
  Handlebars.registerPartial('custom/sendRequest', Handlebars.template(customSendRequest));
  Handlebars.registerPartial('custom/request', Handlebars.template(customRequest));
+ Handlebars.registerPartial('custom/getUrl', Handlebars.template(templateCoreCustomApiError));
  return templates;
 };

src/utils/registerHandlebarTemplates.ts

@@ -33,6 +33,8 @@ describe('writeClient', () => {
  request: () => 'request',
  baseHttpRequest: () => 'baseHttpRequest',
  httpRequest: () => 'httpRequest',
+ customConfig: () => 'customConfig',
+ customApiError: () => 'customApiError',
  },
  };
 

src/utils/writeClient.spec.ts

@@ -46,7 +46,7 @@ export const writeClientCore = async (
  await writeFile(resolve(outputPath, 'request.ts'), i(templates.core.request(context), indent));
  if (httpClient === HttpClientValues.CUSTOM) {
  await writeFile(resolve(outputPath, 'CustomConfig.ts'), i(templates.core.customConfig(context), indent));
- await writeFile(resolve(outputPath, 'CustomApiError.ts'), i(templates.core.customApiError(context), indent));
+ await writeFile(resolve(outputPath, 'ApiError.ts'), i(templates.core.customApiError(context), indent));
  }
  if (isDefined(clientName)) {
  await writeFile(resolve(outputPath, 'BaseHttpRequest.ts'), i(templates.core.baseHttpRequest(context), indent));