mappersmith import

Author: mkefd

bin/index.js

@@ -33,7 +33,7 @@ if (params.client === 'mappersmith' && params.name === undefined) {
 }
 
 if (params.client === 'mappersmith') {
-    console.log('INFO: --exportServices is forced to be false mappersmith client');
+    console.log('INFO: --exportServices option is forced to be false for mappersmith client');
     params.exportServices = false;
 }
 

src/templates/core/mappersmith/request.hbs

@@ -1,27 +1,16 @@
+{{>header}}
+
+
 import forge, { Middleware, Response } from 'mappersmith';
-{{!--import forge, { Client, Response } from 'mappersmith';--}}
 {{#each services}}
 {{#if imports}}
 	{{#each imports}}
 		import type { {{{this}}} } from '../models/{{{this}}}';
 	{{/each}}
 {{/if}}
 {{/each}}
-{{!----}}
-{{!--export type {{{clientName}}}Resource = {--}}
-{{!--{{#each services}}--}}
-{{!--	{{name}}: {--}}
-{{!--	{{#each operations}}--}}
-{{!--		{{name}}: {--}}
-{{!--			method: '{{method}}';--}}
-{{!--			path: '{{path}}';--}}
-{{!--		};--}}
-{{!--	{{/each}}--}}
-{{!--	};--}}
-{{!--{{/each}}--}}
-{{!--};--}}
 
-export type {{{clientName}}}Client = {
+export type {{{clientName}}}MappersmithClient = {
 {{#each services}}
 	{{name}}: {
 	{{#each operations}}
@@ -79,4 +68,4 @@ export const {{{camelCase clientName}}}MappersmithClientFactory = ({
 			},
 		{{/each}}
 		},
-	}) as {{{clientName}}}Client;
+	}) as {{{clientName}}}MappersmithClient;

src/templates/index.hbs

@@ -4,6 +4,8 @@
 export { {{{clientName}}} } from './{{{clientName}}}';
 
 {{/if}}
+{{#equals @root.httpClient 'mappersmith'}}
+{{else}}
 {{#if @root.exportCore}}
 export { ApiError } from './core/ApiError';
 {{#if @root.exportClient}}
@@ -13,6 +15,7 @@ export { CancelablePromise, CancelError } from './core/CancelablePromise';
 export { OpenAPI } from './core/OpenAPI';
 export type { OpenAPIConfig } from './core/OpenAPI';
 {{/if}}
+{{/equals}}
 {{#if @root.exportModels}}
 {{#if models}}
 
@@ -45,3 +48,8 @@ export { {{{name}}}{{{@root.postfixServices}}} } from './services/{{{name}}}{{{@
 {{/each}}
 {{/if}}
 {{/if}}
+
+{{#equals @root.httpClient 'mappersmith'}}
+export type { {{clientName}}MappersmithClient } from './core/request';
+export { {{{camelCase clientName}}}MappersmithClientFactory } from './core/request';
+{{/equals}}

src/utils/writeClientCore.ts

@@ -1,13 +1,13 @@
-import { resolve } from 'path';
+import {resolve} from 'path';
 
-import type { Client } from '../client/interfaces/Client';
-import { HttpClient } from '../HttpClient';
-import type { Indent } from '../Indent';
-import { copyFile, exists, writeFile } from './fileSystem';
-import { formatIndentation as i } from './formatIndentation';
-import { getHttpRequestName } from './getHttpRequestName';
-import { isDefined } from './isDefined';
-import type { Templates } from './registerHandlebarTemplates';
+import type {Client} from '../client/interfaces/Client';
+import {HttpClient} from '../HttpClient';
+import type {Indent} from '../Indent';
+import {copyFile, exists, writeFile} from './fileSystem';
+import {formatIndentation as i} from './formatIndentation';
+import {getHttpRequestName} from './getHttpRequestName';
+import {isDefined} from './isDefined';
+import type {Templates} from './registerHandlebarTemplates';
 
 /**
  * Generate OpenAPI core files, this includes the basic boilerplate code to handle requests.
@@ -38,11 +38,13 @@ export const writeClientCore = async (
         services: client.services,
     };
 
-    await writeFile(resolve(outputPath, 'OpenAPI.ts'), i(templates.core.settings(context), indent));
-    await writeFile(resolve(outputPath, 'ApiError.ts'), i(templates.core.apiError(context), indent));
-    await writeFile(resolve(outputPath, 'ApiRequestOptions.ts'), i(templates.core.apiRequestOptions(context), indent));
-    await writeFile(resolve(outputPath, 'ApiResult.ts'), i(templates.core.apiResult(context), indent));
-    await writeFile(resolve(outputPath, 'CancelablePromise.ts'), i(templates.core.cancelablePromise(context), indent));
+    if (httpClient !== HttpClient.MAPPERSMITH) {
+        await writeFile(resolve(outputPath, 'OpenAPI.ts'), i(templates.core.settings(context), indent));
+        await writeFile(resolve(outputPath, 'ApiError.ts'), i(templates.core.apiError(context), indent));
+        await writeFile(resolve(outputPath, 'ApiRequestOptions.ts'), i(templates.core.apiRequestOptions(context), indent));
+        await writeFile(resolve(outputPath, 'ApiResult.ts'), i(templates.core.apiResult(context), indent));
+        await writeFile(resolve(outputPath, 'CancelablePromise.ts'), i(templates.core.cancelablePromise(context), indent));
+    }
     await writeFile(resolve(outputPath, 'request.ts'), i(templates.core.request(context), indent));
 
     if (isDefined(clientName) && httpClient !== HttpClient.MAPPERSMITH) {

src/utils/writeClientIndex.ts

@@ -53,6 +53,7 @@ export const writeClientIndex = async (
         models: sortModelsByName(client.models),
         services: sortServicesByName(client.services),
         exportClient: isDefined(clientName) && httpClient !== HttpClient.MAPPERSMITH,
+        httpClient,
     });
 
     await writeFile(resolve(outputPath, 'index.ts'), templateResult);