custom generator to generate opendev code

Author: noneall

bin/index.js

@@ -23,7 +23,7 @@ const params = program
     .option('--exportIndex <value>', 'Write Index to disk', true)
     .option('--exportSchemas <value>', 'Write schemas to disk', false)
     .option('--indent <value>', 'Indentation options [4, 2, tabs]', '4')
-    .option('--postfixServices <value>', 'Service name postfix', 'Service')
+    .option('--postfixServices <value>', 'Service name postfix', '')
     .option('--postfixModels <value>', 'Model name postfix')
     .option('--request <value>', 'Path to custom request file')
     .option('--serviceTemplate <value>', 'Path to custom service handlebars template to generate the service files')

src/index.ts

@@ -73,7 +73,7 @@ export const generate = async ({
     exportIndex = true,
     exportSchemas = false,
     indent = Indent.SPACE_4,
-    postfixServices = 'Service',
+    postfixServices = '',
     postfixModels = '',
     request,
     serviceTemplate,

src/openApi/v3/index.ts

@@ -13,8 +13,14 @@ import { getServiceVersion } from './parser/getServiceVersion';
 export const parse = (openApi: OpenApi): Client => {
     const version = getServiceVersion(openApi.info.version);
     const server = getServer(openApi);
-    const models = getModels(openApi);
-    const services = getServices(openApi);
+    const models = cleanDTO(getModels(openApi));
+    const services = cleanDTO(getServices(openApi));
 
     return { version, server, models, services };
 };
+
+function cleanDTO<T>(model: T) {
+    const str = JSON.stringify(model).replace(/DTO/g, 'Model');
+
+    return JSON.parse(str) as T;
+}

src/openApi/v3/parser/getOperation.ts

@@ -1,4 +1,5 @@
 import type { Operation } from '../../../client/interfaces/Operation';
+import { OperationParameter } from '../../../client/interfaces/OperationParameter';
 import type { OperationParameters } from '../../../client/interfaces/OperationParameters';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiOperation } from '../interfaces/OpenApiOperation';
@@ -60,6 +61,10 @@ export const getOperation = (
         operation.parametersBody = parameters.parametersBody;
     }
 
+    if (operation.parametersPath?.length) {
+        operation.path = feedParamsToUrl(operation.path);
+    }
+
     if (op.requestBody) {
         const requestBodyDef = getRef<OpenApiRequestBody>(openApi, op.requestBody);
         const requestBody = getOperationRequestBody(openApi, requestBodyDef);
@@ -85,3 +90,7 @@ export const getOperation = (
 
     return operation;
 };
+
+function feedParamsToUrl(url: string) {
+    return url.replace(/{([^{}]*)}/g, (_match, p1) => `\${encodeURIComponent(options.pathParams!.${p1})}`);
+}

src/utils/writeClient.ts

@@ -56,7 +56,7 @@ export const writeClient = async (
     const outputPathCore = resolve(outputPath, 'core');
     const outputPathModels = resolve(outputPath, 'models');
     const outputPathSchemas = resolve(outputPath, 'schemas');
-    const outputPathServices = resolve(outputPath, 'services');
+    const outputPathServices = resolve(outputPath, 'store');
 
     if (!isSubDirectory(process.cwd(), output)) {
         throw new Error(`Output folder is not a subdirectory of the current working directory`);

src/utils/writeCustomTemplate/clientServices.ts

@@ -38,12 +38,12 @@ export const writeClientServicesCustomTemplate = async (
 
     const serviceTemplate = Handlebars.compile(await readFile(templatePath, 'utf8'));
 
-    const servicesDir = resolve(outputPath, 'services');
+    const servicesDir = resolve(outputPath, 'store');
     await remove(servicesDir);
     await mkdir(servicesDir);
 
     for (const service of client.services) {
-        const file = resolve(outputPath, `services/${service.name}${postfixServices}.ts`);
+        const file = resolve(outputPath, `store/${service.name}${postfixServices}.ts`);
         const templateResult = serviceTemplate({
             ...service,
             serviceBaseUrl: client.server,