Extending 2

Author: Havasjethi

rollup.config.js

@@ -30,8 +30,9 @@ const handlebarsPlugin = () => ({
                 strict: true,
                 noEscape: true,
                 preventIndent: true,
-                knownHelpersOnly: true,
+                knownHelpersOnly: false,
                 knownHelpers: {
+                    // This is a manual solution which is not good enough
                     equals: true,
                     notEquals: true,
                     containsSpaces: true,

src/openApi/v3/parser/getServices.ts

@@ -8,46 +8,47 @@ import { getOperationParameters } from './getOperationParameters';
  */
 export function getServices(openApi: OpenApi): Service[] {
     const services = new Map<string, Service>();
+
     for (const url in openApi.paths) {
-        if (openApi.paths.hasOwnProperty(url)) {
-            // Grab path and parse any global path parameters
-            const path = openApi.paths[url];
-            const pathParams = getOperationParameters(openApi, path.parameters || []);
-
-            // Parse all the methods for this path
-            for (const method in path) {
-                if (path.hasOwnProperty(method)) {
-                    switch (method) {
-                        case 'get':
-                        case 'put':
-                        case 'post':
-                        case 'delete':
-                        case 'options':
-                        case 'head':
-                        case 'patch':
-                            // Each method contains an OpenAPI operation, we parse the operation
-                            const op = path[method]!;
-                            const operation = getOperation(openApi, url, method, op, pathParams);
-
-                            // If we have already declared a service, then we should fetch that and
-                            // append the new method to it. Otherwise we should create a new service object.
-                            const service =
-                                services.get(operation.service) ||
-                                ({
-                                    name: operation.service,
-                                    operations: [],
-                                    imports: [],
-                                } as Service);
-
-                            // Push the operation in the service
-                            service.operations.push(operation);
-                            service.imports.push(...operation.imports);
-                            services.set(operation.service, service);
-                            break;
-                    }
-                }
+        if (!openApi.paths.hasOwnProperty(url)) { continue; }
+
+        // Grab path and parse any global path parameters
+        const path = openApi.paths[url];
+        const pathParams = getOperationParameters(openApi, path.parameters || []);
+
+        // Parse all the methods for this path
+        for (const method in path) {
+            // This for the Typescript check
+            if (!path.hasOwnProperty(method)) { continue; }
+
+            switch (method) {
+                case 'get':
+                case 'put':
+                case 'post':
+                case 'delete':
+                case 'options':
+                case 'head':
+                case 'patch':
+                    // Each method contains an OpenAPI operation, we parse the operation
+                    const op = path[method]!;
+                    const operation = getOperation(openApi, url, method, op, pathParams);
+
+                    // If we have already declared a service, then we should fetch that and
+                    // append the new method to it. Otherwise we should create a new service object.
+                    const service = services.get(operation.service) || {
+                        name: operation.service,
+                        operations: [],
+                        imports: [],
+                    };
+
+                    // Push the operation in the service
+                    service.operations.push(operation);
+                    service.imports.push(...operation.imports);
+                    services.set(operation.service, service);
+                    break;
             }
         }
     }
+
     return Array.from(services.values());
 }

src/templates/controller_partials/method.hbs

@@ -0,0 +1,56 @@
+
+
+@{{{Capital method}}}('{{{path}}}')
+public {{{name}}}(
+{{#each parameters}}
+    {{MethodInput this }},
+{{/each}}
+): {{>result}} {
+const result = __request({
+{{#if parametersCookie}}
+    cookies: {
+    {{#each parametersCookie}}
+        '{{{prop}}}': {{{name}}},
+    {{/each}}
+    },
+{{/if}}
+{{#if parametersHeader}}
+    headers: {
+    {{#each parametersHeader}}
+        '{{{prop}}}': {{{name}}},
+    {{/each}}
+    },
+{{/if}}
+{{#if parametersQuery}}
+    query: {
+    {{#each parametersQuery}}
+        '{{{prop}}}': {{{name}}},
+    {{/each}}
+    },
+{{/if}}
+{{#if parametersForm}}
+    formData: {
+    {{#each parametersForm}}
+        '{{{prop}}}': {{{name}}},
+    {{/each}}
+    },
+{{/if}}
+{{#if parametersBody}}
+    body: {{{parametersBody.name}}},
+    {{#if parametersBody.mediaType}}
+        mediaType: '{{{parametersBody.mediaType}}}',
+    {{/if}}
+{{/if}}
+{{#if responseHeader}}
+    responseHeader: '{{{responseHeader}}}',
+{{/if}}
+{{#if errors}}
+    errors: {
+    {{#each errors}}
+        {{{code}}}: `{{{description}}}`,
+    {{/each}}
+    },
+{{/if}}
+});
+return result.body;
+}

src/templates/controller_partials/method_comment.hbs

@@ -0,0 +1,22 @@
+/**
+{{#if deprecated}}
+    * @deprecated
+{{/if}}
+{{#if summary}}
+    * {{{summary}}}
+{{/if}}
+{{#if description}}
+    * {{{description}}}
+{{/if}}
+{{#unless @root.useOptions}}
+    {{#if parameters}}
+        {{#each parameters}}
+            * @param {{{name}}} {{{description}}}
+        {{/each}}
+    {{/if}}
+{{/unless}}
+{{#each results}}
+    * @returns {{{type}}} {{{description}}}
+{{/each}}
+* @throws ApiError
+*/

src/templates/exportController.hbs

@@ -1 +1,30 @@
-console.log('Hello world');
+{{>header}}
+
+
+{{#if imports}}
+    {{#each imports}}
+        import type { {{{this}}} } from '../models/{{{this}}}';
+    {{/each}}
+{{/if}}
+import { request as __request } from '../core/request';
+import { Get, Post, Delete, Put, Option, Head, Patch, Method,
+RequestObj, ResponseObj, Next, Body, PathVariable, Param, Query, Cookie,
+Router, Path} from 'havas-express';
+
+
+{{#if @root.useVersion}}
+    import { OpenAPI } from '../core/OpenAPI';
+{{/if}}
+
+@Path('/')
+export class {{{name}}} extends Router {
+
+    {{#each operations}}
+        {{>controller_method_comment}}
+
+        {{>controller_method }}
+
+
+    {{/each}}
+
+}