fix: index file and config priority

Author: romantech48

bin/saddleback.cli.js

@@ -18,12 +18,13 @@ const params = program
 
 const OpenAPI = require(path.resolve(__dirname, '../dist/index.js'));
 const config = require(path.resolve(params.config || `./openapi.config.json`));
+const generateSaddlebackSpec = require('../src/generateSaddlebackSpec');
 
 if (OpenAPI) {
-    OpenAPI.generateCustomSpec({
+    OpenAPI.generateSaddlebackSpec({
+        ...config,
         input: params.input,
         output: params.output,
-        ...config,
     })
         .then(() => {
             process.exit(0);

src/generateSaddlebackSpec.ts

@@ -7,6 +7,7 @@ import { OpenApiSchema } from './openApi/v3/interfaces/OpenApiSchema';
 import { removeLodashPrefix } from './utils/removeLodashPrefix';
 import { mapSwaggerRef } from './utils/mapSwaggerRef';
 import { removeLodashPrefixFromRef } from './utils/removeLodashPrefixFromRef';
+import RefParser from 'json-schema-ref-parser';
 
 type Config = Options & {
     useSaddlebackServices?: boolean;
@@ -16,6 +17,19 @@ type Config = Options & {
 };
 
 export const generateSaddlebackSpec = async (config: Config) => {
+    const url = 'https://hc-eventservice-dev.azurewebsites.net/api-doc/all/swagger.json';
+    const test = await RefParser.bundle(url, url, {
+        resolve: {
+            http: {
+                withCredentials: true,
+                headers: {
+                    'Cookie': 'ARRAffinity=7d18d5957d129d3dc3a25d7a2c85147ef57f1a6b93910c50eb850417ab59dc56; ARRAffinitySameSite=7d18d5957d129d3dc3a25d7a2c85147ef57f1a6b93910c50eb850417ab59dc56; apiKey=eyJhbGciOiJSUzI1NiIsImtpZCI6IjRCNDc1Q0I5RUQ5QTAzNThFMzExRjNBMjEwOERCNERDOUJGMDQ0MTIiLCJ0eXAiOiJKV1QiLCJ4NXQiOiJTMGRjdWUyYUExampFZk9pRUkyMDNKdndSQkkifQ.eyJuYmYiOjE2NTU3MDc5MjcsImV4cCI6MTY1NTcxMTUyNywiaXNzIjoiaHR0cHM6Ly9pZGVudGl0eS1kZXYuc2FkZGxlYmFjay5jb20iLCJhdWQiOlsiaHR0cHM6Ly9pZGVudGl0eS1kZXYuc2FkZGxlYmFjay5jb20vcmVzb3VyY2VzIiwiY20tYXBpIl0sImNsaWVudF9pZCI6ImNtIiwic3ViIjoiNzc5ODMxMCIsImF1dGhfdGltZSI6MTY1NTcwNzkyNSwiaWRwIjoibG9jYWwiLCJ1cm46c2FkZGxlYmFjazp1c2VyX2lkIjpbIjg4YjI4ODk1LTQyMDgtNDY5NC1hZGQ4LWYzYWJhZjUzYjFlYiIsIjg4YjI4ODk1LTQyMDgtNDY5NC1hZGQ4LWYzYWJhZjUzYjFlYiJdLCJpZCI6Ijc3OTgzMTAiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwidXJuOnNhZGRsZWJhY2s6cGVyc29uX2xpbmsiOiJFeGlzdGluZ1JlY29yZCIsInNjb3BlIjpbImNtLWFwaS5kZWZhdWx0Il0sImFtciI6WyJwd2QiXX0.qstJ8gSzRFXgo5hcBlj7BusYSxno-Cx_l96CQjqlRXfiTBOrouCpcCdrQLuaafZrJv7Hvn_jogOI7-r6d_qB575NIPBKNed7Z6LSQcXHWbvZVBB3J9Ch1g5M8U3eG71_uuBF7aFb_ecVVktOHcGDeC24g7UrmI5_jRFf9rYXbT0lhH4KwSIZzMFOS19Wd8txa7XE_rIDkhzetcH1z2sf9QL5Vd9RkdJUgFKPJEneyRmeZyBxHKn5cgrtF3cANZJlvIBZ2Mxu1OFxcQx6mGy-nHUTEPz1dHFPi2FZ8xkBgUxLeaQMflLgIv6nICpe_uESRvP91MxIQ--vEsrjN7Cy9A; SL_G_WPT_TO=ru; SL_GWPT_Show_Hide_tmp=1; SL_wptGlobTipTmp=1',
+                    'Authorizations': 'Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjRCNDc1Q0I5RUQ5QTAzNThFMzExRjNBMjEwOERCNERDOUJGMDQ0MTIiLCJ0eXAiOiJKV1QiLCJ4NXQiOiJTMGRjdWUyYUExampFZk9pRUkyMDNKdndSQkkifQ.eyJuYmYiOjE2NTU3MDc5MjcsImV4cCI6MTY1NTcxMTUyNywiaXNzIjoiaHR0cHM6Ly9pZGVudGl0eS1kZXYuc2FkZGxlYmFjay5jb20iLCJhdWQiOlsiaHR0cHM6Ly9pZGVudGl0eS1kZXYuc2FkZGxlYmFjay5jb20vcmVzb3VyY2VzIiwiY20tYXBpIl0sImNsaWVudF9pZCI6ImNtIiwic3ViIjoiNzc5ODMxMCIsImF1dGhfdGltZSI6MTY1NTcwNzkyNSwiaWRwIjoibG9jYWwiLCJ1cm46c2FkZGxlYmFjazp1c2VyX2lkIjpbIjg4YjI4ODk1LTQyMDgtNDY5NC1hZGQ4LWYzYWJhZjUzYjFlYiIsIjg4YjI4ODk1LTQyMDgtNDY5NC1hZGQ4LWYzYWJhZjUzYjFlYiJdLCJpZCI6Ijc3OTgzMTAiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwidXJuOnNhZGRsZWJhY2s6cGVyc29uX2xpbmsiOiJFeGlzdGluZ1JlY29yZCIsInNjb3BlIjpbImNtLWFwaS5kZWZhdWx0Il0sImFtciI6WyJwd2QiXX0.qstJ8gSzRFXgo5hcBlj7BusYSxno-Cx_l96CQjqlRXfiTBOrouCpcCdrQLuaafZrJv7Hvn_jogOI7-r6d_qB575NIPBKNed7Z6LSQcXHWbvZVBB3J9Ch1g5M8U3eG71_uuBF7aFb_ecVVktOHcGDeC24g7UrmI5_jRFf9rYXbT0lhH4KwSIZzMFOS19Wd8txa7XE_rIDkhzetcH1z2sf9QL5Vd9RkdJUgFKPJEneyRmeZyBxHKn5cgrtF3cANZJlvIBZ2Mxu1OFxcQx6mGy-nHUTEPz1dHFPi2FZ8xkBgUxLeaQMflLgIv6nICpe_uESRvP91MxIQ--vEsrjN7Cy9A',
+                }
+            }
+        }
+    });
+
     const openApi: OpenApi = isString(config.input) ? await getOpenApiSpec(config.input) : config.input;
 
     if (config.removeLodashPrefixes && openApi.components && openApi.components.schemas) {

src/utils/writeClient.ts

@@ -142,6 +142,8 @@ export const writeClient = async (
             exportSchemas,
             postfix,
             httpClient,
+            additionalModelFileExtension,
+            additionalServiceFileExtension,
             clientName
         );
     }

src/utils/writeClientIndex.spec.ts

@@ -36,7 +36,7 @@ describe('writeClientIndex', () => {
             },
         };
 
-        await writeClientIndex(client, templates, '/', true, true, true, true, true, 'Service', HttpClient.AXIOS);
+        await writeClientIndex(client, templates, '/', true, true, true, true, true, 'Service', HttpClient.AXIOS, false, false);
 
         expect(writeFile).toBeCalledWith('/index.ts', 'index');
     });

src/utils/writeClientIndex.ts

@@ -22,6 +22,8 @@ import { HttpClient } from '../HttpClient';
  * @param exportSchemas Generate schemas
  * @param postfix Service name postfix
  * @param httpClient The selected httpClient (fetch, xhr, node or axios)
+ * @param additionalModelFileExtension Add file extension for models *.models.*
+ * @param additionalServiceFileExtension Add file extension for service *.service.*
  * @param clientName Custom client class name
  */
 export const writeClientIndex = async (
@@ -35,6 +37,8 @@ export const writeClientIndex = async (
     exportSchemas: boolean,
     postfix: string,
     httpClient: HttpClient,
+    additionalModelFileExtension: boolean,
+    additionalServiceFileExtension: boolean,
     clientName?: string
 ): Promise<void> => {
     const templateResult = templates.index({
@@ -51,6 +55,8 @@ export const writeClientIndex = async (
         services: sortServicesByName(client.services),
         exportClient: isDefined(clientName),
         httpClient,
+        additionalModelFileExtension,
+        additionalServiceFileExtension,
     });
 
     await writeFile(resolve(outputPath, 'index.ts'), templateResult);

test/index.js

@@ -70,8 +70,8 @@ const main = async () => {
         exportSchemas: false,
         indent: '4',
         postfix: '',
-        additionalModelFileExtension: false,
-        additionalServiceFileExtension: false,
+        additionalModelFileExtension: true,
+        additionalServiceFileExtension: true,
         removeLodashPrefixes: true,
     };
     await OpenAPI.generateSaddlebackSpec({