@penkov/swagger-code-gen 1.6.2 → 1.6.3

package/README.md

@@ -26,6 +26,7 @@ Cli parameters:
   (which is default in .net world: asp generates wrong spec)
 * `--enableScats` - generate additional wrappers in [scats](https://www.npmjs.com/package/scats) 
   style for all objects and create a service with methods for each endpoint.
+* `--targetNode` - adds imports for `node-fetch` package in generated code.
 
 
 

package/dist/cli.mjs

@@ -12,15 +12,17 @@ program
     .option('--includeTags <tags...>', 'Space-separated list of tags of paths to be included. Path is included if it contains any of specified tag')
     .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)
     .argument('outputFile', 'File with generated code')
     .parse();
 const url = program.opts().url;
 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, outputFile, {
+main(url, enableScats, targetNode, outputFile, {
     referencedObjectsNullableByDefault: referencedObjectsNullableByDefault,
     includeTags: includeTags,
     excludeTags: excludeTags

package/dist/index.js

@@ -6,7 +6,7 @@ import { fileURLToPath } from 'url';
 import { dirname } from 'path';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-export async function main(url, enableScats, outputFile, options) {
+export async function main(url, enableScats, targetNode, outputFile, options) {
     const { configure, getLogger } = log4js;
     configure(`${__dirname}/../config/log4js.json`);
     const logger = getLogger('Generator');
@@ -19,7 +19,7 @@ export async function main(url, enableScats, outputFile, options) {
         const schemas = resolveSchemas(json, schemasTypes, options);
         const paths = resolvePaths(json, schemasTypes, options);
         logger.debug(`Downloaded swagger: ${schemas.size} schemas, ${paths.size} paths`);
-        await renderer.renderToFile(schemas.values, paths, enableScats, outputFile);
+        await renderer.renderToFile(schemas.values, paths, enableScats, targetNode, outputFile);
         logger.debug(`Wrote client to ${outputFile}`);
     });
 }

package/dist/property.js

@@ -31,7 +31,7 @@ export class Property {
             .map(ref => ref.substring(SCHEMA_PREFIX.length))
             .orElseValue(option(oneOfItem.type))).mkString(' & ')))
             .getOrElseValue(definition.type);
-        const nullable = option(definition.nullable).contains(true) || !option(definition.required).contains(true) ||
+        const nullable = option(definition.nullable).contains(true) ||
             (referencesObject && options.referencedObjectsNullableByDefault && !option(definition.nullable).contains(false));
         const description = option(definition.description);
         const required = option(definition.required).contains(false);

package/dist/renderer.js

@@ -1,16 +1,16 @@
 import * as ejs from 'ejs';
 import * as fs from 'fs';
-import path from 'path';
+import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
-import { dirname } from 'path';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 export class Renderer {
-    async renderToFile(schemas, methods, enableScats, file) {
+    async renderToFile(schemas, methods, enableScats, targetNode, file) {
         const view = await ejs.renderFile(path.resolve(__dirname, 'templates/index.ejs'), {
             schemas: schemas,
             methods: methods,
-            scats: enableScats
+            scats: enableScats,
+            targetNode: targetNode
         });
         fs.writeFileSync(file, view);
     }

package/dist/templates/index.ejs

@@ -10,7 +10,9 @@
  *********************************************************
  *********************************************************
  *********************************************************/
+<% if (targetNode) {%>
 import fetch, {Request, Response} from 'node-fetch';
+<% } %>
 <% if (scats) {%>
 import {option, Option, Collection, Try, TryLike, none} from 'scats';
 <% } %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "type": "module",
   "bin": {
     "generate-client": "./dist/cli.mjs"
@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/papirosko/swagger-code-gen#readme",
   "scripts": {
-    "test:petstore": "mkdir -p tmp && ts-node-esm ./src/cli.mjs --enableScats --url https://petstore3.swagger.io/api/v3/openapi.json tmp/petstore.ts",
+    "test:petstore": "npm run build && mkdir -p tmp && ts-node-esm ./dist/cli.mjs --enableScats --targetNode --url https://petstore3.swagger.io/api/v3/openapi.json tmp/petstore.ts",
     "clean": "rimraf dist",
     "lint": "eslint \"{src,test}/**/*.ts\" --fix",
     "prebuild": "npm run lint && npm run clean",