swagger-typescript-api 12.0.0 → 13.0.0-experimental-1

package/templates/base/interface-data-contract.ejs

@@ -3,8 +3,8 @@ const { contract, utils } = it;
 const { formatDescription, require, _ } = utils;
 %>
 export interface <%~ contract.name %> {
-  <% _.forEach(contract.$content, (field) => { %>
-    <%~ includeFile('@base/object-field-jsdoc.ejs', { ...it, field }) %>
+  <% for await (const field of contract.$content) { %>
+    <%~ await includeFile('@base/object-field-jsdoc.ejs', { ...it, field }) %>
     <%~ field.name %><%~ field.isRequired ? '' : '?' %>: <%~ field.value %><%~ field.isNullable ? ' | null' : ''%>;
-  <% }) %>
+  <% } %>
 }

package/templates/base/route-type.ejs

@@ -3,7 +3,7 @@ const { route, utils, config } = it;
 const { _, pascalCase, require } = utils;
 const { query, payload, pathParams, headers } = route.request;
 
-const routeDocs = includeFile("@base/route-docs", { config, route, utils });
+const routeDocs = await includeFile("@base/route-docs", { config, route, utils });
 const routeNamespace = pascalCase(route.routeName.usage);
 
 %>

package/templates/base/type-data-contract.ejs

@@ -5,10 +5,10 @@ const { formatDescription, require, _ } = utils;
 %>
 <% if (contract.$content.length) { %>
 export type <%~ contract.name %> = {
-  <% _.forEach(contract.$content, (field) => { %>
-    <%~ includeFile('@base/object-field-jsdoc.ejs', { ...it, field }) %>
+  <% for await (const field of contract.$content) { %>
+    <%~ await includeFile('@base/object-field-jsdoc.ejs', { ...it, field }) %>
     <%~ field.field %>;
-  <% }) %>
+  <% } %>
 }<%~ utils.isNeedToAddNull(contract) ? ' | null' : ''%>
 <% } else { %>
 export type <%~ contract.name %> = Record<string, any>;

package/templates/default/api.ejs

@@ -23,7 +23,6 @@ const descriptionLines = _.compact([
   info.description && " ",
   info.description && _.replace(formatDescription(info.description), /\n/g, "\n * "),
 ]);
-
 %>
 
 <% if (config.httpClientType === config.constants.HTTP_CLIENT.AXIOS) { %> import { AxiosRequestConfig, AxiosResponse } from "axios"; <% } %>
@@ -47,19 +46,23 @@ export class <%~ config.apiClassName %><SecurityDataType extends unknown><% if (
 <% } %>
 
 
-<% routes.outOfModule && routes.outOfModule.forEach((route) => { %>
+<% if (routes.outOfModule) { %>
+ <% for await (const route of routes.outOfModule) { %>
 
-        <%~ includeFile('./procedure-call.ejs', { ...it, route }) %>
 
-<% }) %>
+  <%~ await includeFile('./procedure-call.ejs', { ...it, route }) %>
+ <% } %>
+<% } %>
 
-<% routes.combined && routes.combined.forEach(({ routes = [], moduleName }) => { %>
+<% if (routes.combined) { %>
+  <% for await (const { routes: combinedRoutes = [], moduleName } of routes.combined) { %>
     <%~ moduleName %> = {
-    <% routes.forEach((route) => { %>
+    <% for await (const route of combinedRoutes) { %>
 
-        <%~ includeFile('./procedure-call.ejs', { ...it, route }) %>
 
-    <% }) %>
+    <%~ await includeFile('./procedure-call.ejs', { ...it, route }) %>
+    <% } %>
     }
-<% }) %>
+  <% } %>
+<% } %>
 }

package/templates/default/procedure-call.ejs

@@ -5,7 +5,7 @@ const { _, getInlineParseContent, getParseContent, parseSchema, getComponentByRe
 const { parameters, path, method, payload, query, formData, security, requestParams } = route.request;
 const { type, errorType, contentTypes } = route.response;
 const { HTTP_CLIENT, RESERVED_REQ_PARAMS_ARG_NAMES } = config.constants;
-const routeDocs = includeFile("@base/route-docs", { config, route, utils });
+const routeDocs = await includeFile("@base/route-docs", { config, route, utils });
 const queryName = (query && query.name) || "query";
 const pathParams = _.values(parameters);
 const pathParamsNames = _.map(pathParams, "name");
@@ -26,7 +26,7 @@ const rawWrapperArgs = config.extractRequestParams ?
         requestParams && {
           name: pathParams.length ? `{ ${_.join(pathParamsNames, ", ")}, ...${queryName} }` : queryName,
           optional: false,
-          type: getInlineParseContent(requestParams),
+          type: await getInlineParseContent(requestParams),
         },
         ...(!requestParams ? pathParams : []),
         payload,

package/templates/default/route-types.ejs

@@ -12,17 +12,21 @@ import { <%~ dataContracts.join(", ") %> } from "./<%~ config.fileNames.dataCont
 /* TODO: outOfModule, combined should be attributes of route, which will allow to avoid duplication of code */
 %>
 
-<% routes.outOfModule && routes.outOfModule.forEach(({ routes = [] }) => { %>
-    <% routes.forEach((route) => { %>
-        <%~ includeFile('@base/route-type.ejs', { ...it, route }) %>
-    <% }) %>
-<% }) %>
 
-<% routes.combined && routes.combined.forEach(({ routes = [], moduleName }) => { %>
+<% if (routes.outOfModule) { %>
+ <% for await (const route of routes.outOfModule) { %>
+
+  <%~ await includeFile('@base/route-type.ejs', { ...it, route }) %>
+ <% } %>
+<% } %>
+
+<% if (routes.combined) { %>
+  <% for await (const { routes: combinedRoutes = [], moduleName } of routes.combined) { %>
+
     export namespace <%~ pascalCase(moduleName) %> {
-    <% routes.forEach((route) => { %>
-        <%~ includeFile('@base/route-type.ejs', { ...it, route }) %>
-    <% }) %>
+    <% for await (const route of combinedRoutes) { %>
+        <%~ await includeFile('@base/route-type.ejs', { ...it, route }) %>
+    <% } %>
     }
-
-<% }) %>
+  <% } %>
+<% } %>

package/templates/modular/api.ejs

@@ -22,7 +22,7 @@ export class <%= apiClassName %><SecurityDataType = unknown><% if (!config.singl
   }
 <% } %>
 
-    <% routes.forEach((route) => { %>
-        <%~ includeFile('./procedure-call.ejs', { ...it, route }) %>
-    <% }) %>
+    <% for await (const route of routes) { %>
+    <%~ await includeFile('./procedure-call.ejs', { ...it, route }) %>
+    <% } %>
 }

package/templates/modular/procedure-call.ejs

@@ -5,7 +5,7 @@ const { _, getInlineParseContent, getParseContent, parseSchema, getComponentByRe
 const { parameters, path, method, payload, query, formData, security, requestParams } = route.request;
 const { type, errorType, contentTypes } = route.response;
 const { HTTP_CLIENT, RESERVED_REQ_PARAMS_ARG_NAMES } = config.constants;
-const routeDocs = includeFile("@base/route-docs", { config, route, utils });
+const routeDocs = await includeFile("@base/route-docs", { config, route, utils });
 const queryName = (query && query.name) || "query";
 const pathParams = _.values(parameters);
 const pathParamsNames = _.map(pathParams, "name");
@@ -26,7 +26,7 @@ const rawWrapperArgs = config.extractRequestParams ?
         requestParams && {
           name: pathParams.length ? `{ ${_.join(pathParamsNames, ", ")}, ...${queryName} }` : queryName,
           optional: false,
-          type: getInlineParseContent(requestParams),
+          type: await getInlineParseContent(requestParams),
         },
         ...(!requestParams ? pathParams : []),
         payload,

package/templates/modular/route-types.ejs

@@ -10,9 +10,9 @@ import { <%~ dataContracts.join(", ") %> } from "./<%~ config.fileNames.dataCont
 <% } %>
 
 export namespace <%~ pascalCase(moduleName) %> {
-    <% _.forEach(routes, (route) => { %>
+    <% for await (const route of routes) { %>
 
-        <%~ includeFile('@base/route-type.ejs', { ...it, route }) %>
 
-    <% }) %>
+    <%~ await includeFile('@base/route-type.ejs', { ...it, route }) %>
+    <% } %>
 }