accept output paths for core/models/services/schemas

Author: annacb40

README.md

@@ -41,6 +41,10 @@ $ openapi --help
     -i, --input <value>       OpenAPI specification, can be a path, url or string content (required)
     -o, --output <value>      Output directory (required)
     -c, --client <value>      HTTP client to generate [fetch, xhr, node] (default: "fetch")
+    --outputCore <value>      The relative ___location of the core output directory
+    --outputModels <value>    The relative ___location of the models output directory
+    --outputSchemas <value>   The relative ___location of the schemas output directory
+    --outputServices <value>  The relative ___location of the services output directory
     --useOptions              Use options instead of arguments
     --useUnionTypes           Use union types instead of enums
     --exportCore <value>      Write core files to disk (default: true)

bin/index.js

@@ -13,6 +13,10 @@ const params = program
     .requiredOption('-i, --input <value>', 'OpenAPI specification, can be a path, url or string content (required)')
     .requiredOption('-o, --output <value>', 'Output directory (required)')
     .option('-c, --client <value>', 'HTTP client to generate [fetch, xhr, node, axios]', 'fetch')
+    .option('--outputCore <value>', 'The relative ___location of the core output directory')
+    .option('--outputServices <value>', 'The relative ___location of the services output directory')
+    .option('--outputModels <value>', 'The relative ___location of the models output directory')
+    .option('--outputSchemas <value>', 'The relative ___location of the core output directory')
     .option('--useOptions', 'Use options instead of arguments')
     .option('--useUnionTypes', 'Use union types instead of enums')
     .option('--exportCore <value>', 'Write core files to disk', true)
@@ -29,6 +33,10 @@ if (OpenAPI) {
     OpenAPI.generate({
         input: params.input,
         output: params.output,
+        outputCore: params.outputCore,
+        outputServices: params.outputServices,
+        outputModels: params.outputModels,
+        outputSchemas: params.outputSchemas,
         httpClient: params.client,
         useOptions: params.useOptions,
         useUnionTypes: params.useUnionTypes,

src/index.ts

@@ -1,3 +1,4 @@
+import { resolve } from 'path';
 import { HttpClient } from './HttpClient';
 import { parse as parseV2 } from './openApi/v2';
 import { parse as parseV3 } from './openApi/v3';
@@ -13,6 +14,10 @@ export { HttpClient } from './HttpClient';
 export type Options = {
     input: string | Record<string, any>;
     output: string;
+    outputCore?: string;
+    outputServices?: string;
+    outputModels?: string;
+    outputSchemas?: string;
     httpClient?: HttpClient;
     useOptions?: boolean;
     useUnionTypes?: boolean;
@@ -30,6 +35,10 @@ export type Options = {
  * service layer, etc.
  * @param input The relative ___location of the OpenAPI spec
  * @param output The relative ___location of the output directory
+ * @param outputCore The relative ___location of the core output directory
+ * @param outputModels The relative ___location of the models output directory
+ * @param outputSchemas The relative ___location of the schemas output directory
+ * @param outputServices The relative ___location of the services output directory
  * @param httpClient The selected httpClient (fetch or XHR)
  * @param useOptions Use options or arguments functions
  * @param useUnionTypes Use union types instead of enums
@@ -43,6 +52,10 @@ export type Options = {
 export async function generate({
     input,
     output,
+    outputCore = resolve(output, 'core'),
+    outputModels = resolve(output, 'models'),
+    outputServices = resolve(output, 'services'),
+    outputSchemas = resolve(output, 'schemas'),
     httpClient = HttpClient.FETCH,
     useOptions = false,
     useUnionTypes = false,
@@ -66,15 +79,47 @@ export async function generate({
             const client = parseV2(openApi);
             const clientFinal = postProcessClient(client);
             if (!write) break;
-            await writeClient(clientFinal, templates, output, httpClient, useOptions, useUnionTypes, exportCore, exportServices, exportModels, exportSchemas, request);
+            await writeClient(
+                clientFinal,
+                templates,
+                output,
+                outputCore,
+                outputModels,
+                outputSchemas,
+                outputServices,
+                httpClient,
+                useOptions,
+                useUnionTypes,
+                exportCore,
+                exportServices,
+                exportModels,
+                exportSchemas,
+                request
+            );
             break;
         }
 
         case OpenApiVersion.V3: {
             const client = parseV3(openApi);
             const clientFinal = postProcessClient(client);
             if (!write) break;
-            await writeClient(clientFinal, templates, output, httpClient, useOptions, useUnionTypes, exportCore, exportServices, exportModels, exportSchemas, request);
+            await writeClient(
+                clientFinal,
+                templates,
+                output,
+                outputCore,
+                outputModels,
+                outputSchemas,
+                outputServices,
+                httpClient,
+                useOptions,
+                useUnionTypes,
+                exportCore,
+                exportServices,
+                exportModels,
+                exportSchemas,
+                request
+            );
             break;
         }
     }

types/index.d.ts

@@ -2,11 +2,16 @@ export declare enum HttpClient {
     FETCH = 'fetch',
     XHR = 'xhr',
     NODE = 'node',
+    AXIOS = 'axios',
 }
 
 export type Options = {
     input: string | Record<string, any>;
     output: string;
+    outputCore?: string;
+    outputServices?: string;
+    outputModels?: string;
+    outputSchemas?: string;
     httpClient?: HttpClient;
     useOptions?: boolean;
     useUnionTypes?: boolean;