fix: add functions to fetch swagger.json from saddleback server

Author: romantech48

bin/saddleback.cli.js

@@ -15,14 +15,8 @@ const params = program
     .option('-c, --config <value>', 'Path to the config file')
     .option('-l, --login <value>', 'Login')
     .option('-p, --password <value>', 'Password')
-    .option('-e, --environment <value>', 'Environment')
-    .option('-uc, --useAutoCore <value>', 'Use fetching Core service swagger.json via login and password')
-    .option('-ue, --useAutoEvent <value>', 'Use fetching Event service swagger.json via login and password')
-    .option(
-        '-un, --useAutoNotification <value>',
-        'Use fetching Notification service swagger.json via login and password'
-    )
-    .option('-uw, --useAutoWorkflows <value>', 'Use fetching Workflows service swagger.json via login and password')
+    .option('-e, --environment <value>', 'Environment dev | stage | stage2')
+    .option('-s, --service <value>', 'Service ')
     .parse(process.argv)
     .opts();
 
@@ -52,10 +46,7 @@ if (OpenAPI) {
         username: params.login,
         password: params.password,
         useEnvironment: params.environment,
-        useAutoCoreService: params.useAutoCore,
-        useAutoEventService: params.useAutoEvent,
-        useAutoNotificationService: params.useAutoNotification,
-        useAutoWorkflowsService: params.useAutoWorkflows,
+        useService: params.service,
     })
         .then(() => {
             process.exit(0);

src/generateSaddlebackSpec.ts

@@ -17,82 +17,38 @@ type Config = Options & {
     removeLodashPrefixes?: boolean;
     username: string;
     password: string;
-    useAutoCoreService?: boolean;
-    useAutoEventService?: boolean;
-    useAutoNotificationService?: boolean;
-    useAutoWorkflowsService?: boolean;
     useEnvironment?: Environment;
+    useService?: Service;
 };
 
 export const generateSaddlebackSpec = async (config: Config) => {
-    const saddlebackGenerator = async (input: string | Record<string, any>, output: string) => {
-        const openApi: OpenApi = isString(input) ? await getOpenApiSpec(input) : input;
-
-        if (config.removeLodashPrefixes && openApi.components && openApi.components.schemas) {
-            const newSchemas: Dictionary<OpenApiSchema> = {};
-
-            for (const schemaKey in openApi.components.schemas) {
-                if (openApi.components.schemas.hasOwnProperty(schemaKey)) {
-                    newSchemas[removeLodashPrefix(schemaKey)] = openApi.components.schemas[schemaKey];
-                }
+    const openApi: OpenApi =
+        config.useEnvironment && config.useService
+            ? await getSwaggerJsonByEnv({
+                  env: config.useEnvironment,
+                  service: config.useService,
+                  username: config.username,
+                  password: config.password,
+              })
+            : isString(config.input)
+            ? await getOpenApiSpec(config.input)
+            : config.input;
+
+    if (config.removeLodashPrefixes && openApi.components && openApi.components.schemas) {
+        const newSchemas: Dictionary<OpenApiSchema> = {};
+
+        for (const schemaKey in openApi.components.schemas) {
+            if (openApi.components.schemas.hasOwnProperty(schemaKey)) {
+                newSchemas[removeLodashPrefix(schemaKey)] = openApi.components.schemas[schemaKey];
             }
-
-            openApi.components.schemas = newSchemas;
         }
 
-        mapSwaggerRef(openApi, removeLodashPrefixFromRef);
+        openApi.components.schemas = newSchemas;
+    }
 
-        await generate({ ...config, input: openApi });
-    };
+    mapSwaggerRef(openApi, removeLodashPrefixFromRef);
 
-    if (!config.useEnvironment) {
-        await saddlebackGenerator(config.input, config.output);
-        return;
-    }
-    if (config.useAutoCoreService) {
-        await saddlebackGenerator(
-            await getSwaggerJsonByEnv({
-                env: config.useEnvironment,
-                service: Service.Core,
-                username: config.username,
-                password: config.password,
-            }),
-            config.output + '/core'
-        );
-    }
-    if (config.useAutoEventService) {
-        await saddlebackGenerator(
-            await getSwaggerJsonByEnv({
-                env: config.useEnvironment,
-                service: Service.Event,
-                username: config.username,
-                password: config.password,
-            }),
-            config.output + '/event'
-        );
-    }
-    if (config.useAutoNotificationService) {
-        await saddlebackGenerator(
-            await getSwaggerJsonByEnv({
-                env: config.useEnvironment,
-                service: Service.Notifications,
-                username: config.username,
-                password: config.password,
-            }),
-            config.output + '/notifications'
-        );
-    }
-    if (config.useAutoWorkflowsService) {
-        await saddlebackGenerator(
-            await getSwaggerJsonByEnv({
-                env: config.useEnvironment,
-                service: Service.Workflows,
-                username: config.username,
-                password: config.password,
-            }),
-            config.output + '/workflows'
-        );
-    }
+    await generate({ ...config, input: openApi });
 };
 
 export default generateSaddlebackSpec;

src/templates/exportSaddlebackService.hbs

@@ -1,3 +1,5 @@
+{{>header}}
+
 {{#if imports}}
 {{#each imports}}
 import type { {{{this}}} } from '../models/{{{this}}}{{#if ../additionalModelFileExtension}}.models{{/if}}';

test/index.js

@@ -75,36 +75,32 @@ const main = async () => {
         removeLodashPrefixes: true,
         username: '[email protected]',
         password: `&cY8at<'S5PfJa#k`,
-        useEnvironment: 'dev',
-        useAutoCoreService: true,
-        useAutoEventService: false,
-        useAutoNotificationService: false,
-        useAutoWorkflowsService: false,
+        useEnvironment: 'stage2',
     };
-    await OpenAPI.generateSaddlebackSpec({
-        output: './test/auto',
-        ...config,
-    });
-    // await OpenAPI.generateSaddlebackSpec({
-    //     input: './test/spec/saddlebackCoreApi.json',
-    //     output: './test/new/saddleback/core',
-    //     ...config,
-    // });
-    // await OpenAPI.generateSaddlebackSpec({
-    //     input: './test/spec/saddlebackEventApi.json',
-    //     output: './test/new/saddleback/event',
-    //     ...config,
-    // });
-    // await OpenAPI.generateSaddlebackSpec({
-    //     input: './test/spec/saddlebackWebAppApi.json',
-    //     output: './test/new/saddleback/web',
-    //     ...config,
-    // });
     // await OpenAPI.generateSaddlebackSpec({
-    //     input: './test/spec/saddlebackWorkflowApi.json',
-    //     output: './test/new/saddleback/workflow',
+    //     output: './test/auto',
     //     ...config,
     // });
+    await OpenAPI.generateSaddlebackSpec({
+        useService: 'core',
+        output: './auto/core',
+        ...config,
+    });
+    await OpenAPI.generateSaddlebackSpec({
+        useService: 'event',
+        output: './auto/event',
+        ...config,
+    });
+    await OpenAPI.generateSaddlebackSpec({
+        useService: 'workflows',
+        output: './auto/workflows',
+        ...config,
+    });
+    await OpenAPI.generateSaddlebackSpec({
+        useService: 'notifications',
+        output: './auto/notifications',
+        ...config,
+    });
 
     // await generateRealWorldSpecs();
 };

types/index.d.ts

@@ -1,4 +1,5 @@
-import {Environment} from "../src/utils/saddleback/getUrlByServiceEnv";
+import { Service } from '../src/client/interfaces/Service';
+import { Environment } from '../src/utils/saddleback/getUrlByServiceEnv';
 
 export declare enum HttpClient {
     FETCH = 'fetch',
@@ -42,7 +43,8 @@ export type CustomConfig = Options & {
     useAutoEventService?: boolean;
     useAutoNotificationService?: boolean;
     useAutoWorkflowsService?: boolean;
-    useEnvironment?: Environment;
+    useEnvironment?: Environment | 'dev' | 'stage' | 'stage2';
+    useService?: Service | 'workflows' | 'event' | 'notifications' | 'core';
 };
 
 export declare function generate(options: Options): Promise<void>;