mappersmith

Author: mkefd

package.json

@@ -108,6 +108,7 @@
         "glob": "10.2.1",
         "jest": "29.5.0",
         "jest-cli": "29.5.0",
+        "mappersmith": "^2.38.1",
         "node-fetch": "2.6.9",
         "prettier": "2.8.7",
         "puppeteer": "19.10.1",
@@ -121,7 +122,7 @@
         "typescript": "4.9.5",
         "zone.js": "0.13.0"
     },
-    "overrides" : {
+    "overrides": {
         "node-fetch": "2.6.9",
         "rollup": "3.20.2",
         "typescript": "4.9.5"

src/HttpClient.ts

@@ -4,4 +4,5 @@ export enum HttpClient {
     NODE = 'node',
     AXIOS = 'axios',
     ANGULAR = 'angular',
+    MAPPERSMITH = 'mappersmith',
 }

src/templates/core/mappersmith/request.hbs

@@ -0,0 +1,29 @@
+import forge, { Client } from 'mappersmith';
+
+export type {{{clientName}}}Resource = {
+{{#each services}}
+	{{name}}: {
+	{{#each operations}}
+		{{name}}: {
+			method: string;
+			path: string;
+		};
+	{{/each}}
+	};
+{{/each}}
+};
+
+export const {{{camelCase clientName}}}MappersmithClientFactory = (host: string): Client<{{{clientName}}}Resource> =>
+	forge({
+		clientId: '{{clientName}}',
+		host,
+		resources: {
+		{{#each services}}
+			{{name}}: {
+			{{#each operations}}
+				{{name}}: { method: '{{method}}', path: '{{path}}' },
+			{{/each}}
+			},
+		{{/each}}
+		},
+	});

src/templates/core/request.hbs

@@ -3,3 +3,4 @@
 {{~#equals @root.httpClient 'axios'}}{{>axios/request}}{{/equals~}}
 {{~#equals @root.httpClient 'angular'}}{{>angular/request}}{{/equals~}}
 {{~#equals @root.httpClient 'node'}}{{>node/request}}{{/equals~}}
+{{~#equals @root.httpClient 'mappersmith'}}{{>mappersmith/request}}{{/equals~}}

src/templates/exportService.hbs

@@ -17,6 +17,10 @@ import type { {{{this}}} } from '../models/{{{this}}}';
 {{/each}}
 
 {{/if}}
+{{#equals @root.httpClient 'mappersmith'}}
+import { Client } from 'mappersmith'
+import type { {{{clientName}}}Resource } from '../core/request';
+{{else}}
 {{#notEquals @root.httpClient 'angular'}}
 import type { CancelablePromise } from '../core/CancelablePromise';
 {{/notEquals}}
@@ -30,13 +34,21 @@ import type { BaseHttpRequest } from '../core/BaseHttpRequest';
 import { OpenAPI } from '../core/OpenAPI';
 import { request as __request } from '../core/request';
 {{/if}}
+{{/equals}}
 
 {{#equals @root.httpClient 'angular'}}
 @Injectable({
   providedIn: 'root',
 })
 {{/equals}}
 export class {{{name}}}{{{@root.postfix}}} {
+	{{#equals @root.httpClient 'mappersmith'}}
+	private mappersmithClient: Client<{{{clientName}}}Resource>
+
+	constructor(mappersmithClient: Client<{{{clientName}}}Resource>) {
+		this.mappersmithClient = mappersmithClient
+	}
+	{{else}}
 	{{#if @root.exportClient}}
 
 	constructor(public readonly httpRequest: BaseHttpRequest) {}
@@ -46,6 +58,7 @@ export class {{{name}}}{{{@root.postfix}}} {
 	constructor(public readonly http: HttpClient) {}
 	{{/equals}}
 	{{/if}}
+	{{/equals}}
 
 	{{#each operations}}
 	/**
@@ -70,6 +83,16 @@ export class {{{name}}}{{{@root.postfix}}} {
 	{{/each}}
 	 * @throws ApiError
 	 */
+	{{#equals @root.httpClient 'mappersmith'}}
+		public async {{{name}}}({{>parameters}}): Promise<{{>result}}> {
+			return (await this.mappersmithClient.{{{../name}}}.{{{name}}}(
+		{{#if parametersPath}}
+			{ {{#each parametersPath}}"{{prop}}": {{name}},{{/each}} }
+		{{/if}}
+		{{#if parametersBody}}{{#if parametersPath}},{{/if}}{{parametersBody.name}}{{/if}}
+		)).data()
+		}
+	{{else}}
 	{{#if @root.exportClient}}
 	{{#equals @root.httpClient 'angular'}}
 	public {{{name}}}({{>parameters}}): Observable<{{>result}}> {
@@ -148,5 +171,6 @@ export class {{{name}}}{{{@root.postfix}}} {
 		});
 	}
 
+	{{/equals}}
 	{{/each}}
 }

src/utils/registerHandlebarTemplates.ts

@@ -38,6 +38,7 @@ 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 mappersmithRequest from '../templates/core/mappersmith/request.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';
@@ -220,5 +221,8 @@ export const registerHandlebarTemplates = (root: {
     Handlebars.registerPartial('angular/sendRequest', Handlebars.template(angularSendRequest));
     Handlebars.registerPartial('angular/request', Handlebars.template(angularRequest));
 
+    // Specific files for the mappersmith client implementation
+    Handlebars.registerPartial('mappersmith/request', Handlebars.template(mappersmithRequest));
+
     return templates;
 };

src/utils/writeClient.ts

@@ -1,7 +1,7 @@
 import { resolve } from 'path';
 
 import type { Client } from '../client/interfaces/Client';
-import type { HttpClient } from '../HttpClient';
+import { HttpClient } from '../HttpClient';
 import type { Indent } from '../Indent';
 import { mkdir, rmdir } from './fileSystem';
 import { isDefined } from './isDefined';
@@ -94,7 +94,7 @@ export const writeClient = async (
         await writeClientModels(client.models, templates, outputPathModels, httpClient, useUnionTypes, indent);
     }
 
-    if (isDefined(clientName)) {
+    if (isDefined(clientName) && httpClient !== HttpClient.MAPPERSMITH) {
         await mkdir(outputPath);
         await writeClientClass(client, templates, outputPath, httpClient, clientName, indent, postfixServices);
     }
@@ -112,7 +112,8 @@ export const writeClient = async (
             exportSchemas,
             postfixServices,
             postfixModels,
-            clientName
+            clientName,
+            httpClient
         );
     }
 };

src/utils/writeClientCore.ts

@@ -1,7 +1,7 @@
 import { resolve } from 'path';
 
 import type { Client } from '../client/interfaces/Client';
-import type { HttpClient } from '../HttpClient';
+import { HttpClient } from '../HttpClient';
 import type { Indent } from '../Indent';
 import { copyFile, exists, writeFile } from './fileSystem';
 import { formatIndentation as i } from './formatIndentation';
@@ -35,6 +35,7 @@ export const writeClientCore = async (
         httpRequest,
         server: client.server,
         version: client.version,
+        services: client.services,
     };
 
     await writeFile(resolve(outputPath, 'OpenAPI.ts'), i(templates.core.settings(context), indent));
@@ -44,7 +45,7 @@ export const writeClientCore = async (
     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)) {
+    if (isDefined(clientName) && httpClient !== HttpClient.MAPPERSMITH) {
         await writeFile(resolve(outputPath, 'BaseHttpRequest.ts'), i(templates.core.baseHttpRequest(context), indent));
         await writeFile(resolve(outputPath, `${httpRequest}.ts`), i(templates.core.httpRequest(context), indent));
     }

src/utils/writeClientIndex.ts

@@ -6,6 +6,7 @@ import { isDefined } from './isDefined';
 import { Templates } from './registerHandlebarTemplates';
 import { sortModelsByName } from './sortModelsByName';
 import { sortServicesByName } from './sortServicesByName';
+import {HttpClient} from '../HttpClient'
 
 /**
  * Generate the OpenAPI client index file using the Handlebar template and write it to disk.
@@ -22,6 +23,7 @@ import { sortServicesByName } from './sortServicesByName';
  * @param postfixServices Service name postfix
  * @param postfixModels Model name postfix
  * @param clientName Custom client class name
+ * @param httpClient The selected httpClient (fetch, xhr, node, axios or mappersmith)
  */
 export const writeClientIndex = async (
     client: Client,
@@ -34,7 +36,8 @@ export const writeClientIndex = async (
     exportSchemas: boolean,
     postfixServices: string,
     postfixModels: string,
-    clientName?: string
+    clientName?: string,
+    httpClient?: string
 ): Promise<void> => {
     const templateResult = templates.index({
         exportCore,
@@ -49,7 +52,7 @@ export const writeClientIndex = async (
         version: client.version,
         models: sortModelsByName(client.models),
         services: sortServicesByName(client.services),
-        exportClient: isDefined(clientName),
+        exportClient: isDefined(clientName) && httpClient !== HttpClient.MAPPERSMITH,
     });
 
     await writeFile(resolve(outputPath, 'index.ts'), templateResult);

src/utils/writeClientServices.ts

@@ -1,7 +1,7 @@
 import { resolve } from 'path';
 
 import type { Service } from '../client/interfaces/Service';
-import type { HttpClient } from '../HttpClient';
+import { HttpClient } from '../HttpClient';
 import type { Indent } from '../Indent';
 import { writeFile } from './fileSystem';
 import { formatCode as f } from './formatCode';
@@ -40,7 +40,8 @@ export const writeClientServices = async (
             useUnionTypes,
             useOptions,
             postfix,
-            exportClient: isDefined(clientName),
+            exportClient: isDefined(clientName) && httpClient !== HttpClient.MAPPERSMITH,
+            clientName,
         });
         await writeFile(file, i(f(templateResult), indent));
     }