@penkov/swagger-code-gen 1.8.7 → 1.8.9

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { main } from './index.js';
 import { Command } from "commander";
-import { HashSet } from "scats";
+import { HashSet, option } from "scats";
 const program = new Command();
 program
     .name('Swagger client code generator')
@@ -13,16 +13,25 @@ program
     .option('--excludeTags <tags...>', 'Space-separated list of tags of paths to be excluded. Path is excluded if it contains any of specified tag')
     .option('--enableScats', 'Generate scats', false)
     .option('--targetNode', 'Add imports for node-fetch into generated code', false)
+    .option('--user <username>', 'If swagger requires authorisation')
+    .option('--password <password>', 'If swagger requires authorisation')
+    .option('--ignoreSSLErrors', 'If swagger requires authorisation, but ssl cert is wrong')
     .argument('outputFile', 'File with generated code')
     .parse();
 const url = program.opts().url;
+const user = program.opts().user;
+const password = program.opts().password;
+const ignoreSSLErrors = program.opts().ignoreSSLErrors;
 const referencedObjectsNullableByDefault = program.opts().referencedObjectsNullableByDefault;
 const enableScats = program.opts().enableScats;
 const targetNode = program.opts().targetNode;
 const outputFile = program.args[0];
 const includeTags = HashSet.from(program.opts().includeTags || []);
 const excludeTags = HashSet.from(program.opts().excludeTags || []);
-main(url, enableScats, targetNode, outputFile, {
+main(url, enableScats, targetNode, outputFile, ignoreSSLErrors, option(user).flatMap(u => option(password).map(p => ({
+    user: u,
+    password: p
+}))), {
     referencedObjectsNullableByDefault: referencedObjectsNullableByDefault,
     includeTags: includeTags,
     excludeTags: excludeTags

package/dist/index.js

@@ -4,15 +4,25 @@ import { Renderer } from './renderer.js';
 import { resolvePaths, resolveSchemas, resolveSchemasTypes } from './components-parse.js';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
+import https from 'https';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-export async function main(url, enableScats, targetNode, outputFile, options) {
+export async function main(url, enableScats, targetNode, outputFile, ignoreSSLErrors, auth, options) {
     const { configure, getLogger } = log4js;
     configure(`${__dirname}/../config/log4js.json`);
     const logger = getLogger('Generator');
     logger.info(`Generating code from ${url}`);
+    const httpsAgent = ignoreSSLErrors ? new https.Agent({
+        rejectUnauthorized: false,
+    }) : undefined;
     const renderer = new Renderer();
-    fetch(url)
+    const headers = auth.map(a => new Headers({
+        'Authorization': `Basic ${btoa(a.user + ':' + a.password)}`
+    }));
+    fetch(url, {
+        headers: headers.orUndefined,
+        agent: httpsAgent
+    })
         .then(res => res.json())
         .then(async (json) => {
         const schemasTypes = resolveSchemasTypes(json);

package/dist/property.js

@@ -21,7 +21,12 @@ export class Property {
     }
     static fromDefinition(name, definition, schemaTypes, options) {
         const referencesObject = option(definition.$ref)
-            .exists(ref => schemaTypes.get(ref.substring(SCHEMA_PREFIX.length)).contains('object'));
+            .exists(ref => schemaTypes.get(ref.substring(SCHEMA_PREFIX.length)).contains('object')) ||
+            option(definition.allOf)
+                .filter(allOf => allOf.length === 1)
+                .flatMap(allOf => option(allOf[0]))
+                .flatMap(schema => option(schema.$ref))
+                .exists(ref => schemaTypes.get(ref.substring(SCHEMA_PREFIX.length)).contains('object'));
         const itemReferencesObject = option(definition.items)
             .flatMap(i => option(i.$ref))
             .exists(ref => schemaTypes.get(ref.substring(SCHEMA_PREFIX.length)).contains('object'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.8.7",
+  "version": "1.8.9",
   "type": "module",
   "bin": {
     "generate-client": "./dist/cli.mjs"