@team-supercharge/oasg 13.2.0-feature-csharp-functions-22a33fb4.0 → 13.2.0-feature-csharp-functions-953cbbf4.0

package/bin/exec.js

@@ -1,23 +1,14 @@
 const { exit } = require('process');
 const { execSync } = require('child_process');
 
-function execCommand(command, stdio) {
+function exec(command, stdio) {
   try {
-    execSync(`bash -e -c "${command}"`, { stdio: stdio || 'inherit' });
-  } catch (e) {
-    console.error(e.message);
-    exit(1);
+    execSync(command, { stdio: stdio || 'inherit' });
   }
-}
-
-function execScript(script, stdio) {
-  try {
-    execSync(`bash -e ${script}`, { stdio: stdio || 'inherit' });
-  } catch (e) {
+  catch (e) {
     console.error(e.message);
     exit(1);
   }
 }
 
-exports.exec = execCommand;
-exports.execScript = execScript;
+exports.exec = exec;

package/bin/oasg

@@ -3,7 +3,7 @@
 const fs = require('fs');
 const crypto = require('crypto');
 const ajv = new (require('ajv'))({
-  strict: 'log',
+  strict: 'log'
 });
 const YAML = require('yamljs');
 const refParser = require('@apidevtools/json-schema-ref-parser');
@@ -15,7 +15,6 @@ const expressHttpProxy = require('express-http-proxy');
 const { exit } = require('process');
 
 const { exec } = require(`${__dirname}/exec.js`);
-const { execScript } = require(`${__dirname}/exec.js`);
 const { merge } = require(`${__dirname}/merger.js`);
 const { applyOverrides } = require(`${__dirname}/overrider.js`);
 const { openApiTarget } = require(`${__dirname}/openapi-target.js`);
@@ -34,23 +33,23 @@ const PROXY_PORT = '9999';
 
 const DEFAULT_GENERATOR_MAPPING = {
   // client targets
-  android: { version: '7.0.1', generator: 'kotlin' },
-  angular: { version: '7.0.1', generator: 'typescript-angular' },
-  feign: { version: '7.0.1', generator: 'spring' },
-  'feign-kotlin': { version: '7.0.1', generator: 'kotlin-spring' },
-  flutter: { version: '7.0.1', generator: 'dart-dio' },
-  ios: { version: '7.0.1', generator: 'swift5' },
-  python: { version: '7.0.1', generator: 'python' },
-  react: { version: '7.0.1', generator: 'typescript-fetch' },
+  "android":          { version: '7.0.1',   generator: 'kotlin' },
+  "angular":          { version: '7.0.1',   generator: 'typescript-angular' },
+  "feign":            { version: '7.0.1',   generator: 'spring' },
+  "feign-kotlin":     { version: '7.0.1',   generator: 'kotlin-spring' },
+  "flutter":          { version: '7.0.1',   generator: 'dart-dio' },
+  "ios":              { version: '7.0.1',   generator: 'swift5' },
+  "python":           { version: '7.0.1',   generator: 'python' },
+  "react":            { version: '7.0.1',   generator: 'typescript-fetch' },
   // server targets
-  nestjs: { version: '7.0.1', generator: 'typescript-angular' },
-  spring: { version: '7.0.1', generator: 'spring' },
-  'spring-kotlin': { version: '7.0.1', generator: 'kotlin-spring' },
-  'csharp-functions': { version: '7.0.1', generator: 'csharp-functions' },
+  "nestjs":           { version: '7.0.1',   generator: 'typescript-angular' },
+  "spring":           { version: '7.0.1',   generator: 'spring' },
+  "spring-kotlin":    { version: '7.0.1',   generator: 'kotlin-spring' },
+  "csharp-functions": { version: '7.0.1',   generator: 'csharp-functions' },
   // misc targets
-  'contract-testing': { version: '4.3.1', generator: 'typescript-node' },
-  openapi: { version: undefined, generator: undefined },
-  stubby: { version: '4.3.1', generator: 'stubby' },
+  "contract-testing": { version: '4.3.1',   generator: 'typescript-node' },
+  "openapi":          { version: undefined, generator: undefined },
+  "stubby":           { version: '4.3.1',   generator: 'stubby' },
 };
 const DEFAULT_KTLINT_VERSION = '1.0.0';
 const BIN_FOLDER = 'out/.bin';
@@ -60,8 +59,8 @@ const CONFIG_FILE_NAME = 'config.json';
 const DEFAULT_SOURCE = {
   id: 'default',
   type: 'simple',
-  input: 'api/openapi.yaml',
-};
+  input: 'api/openapi.yaml'
+}
 
 let config;
 
@@ -77,93 +76,71 @@ async function run() {
   // handle command line
   require('yargs')
     // lint
-    .command(
-      ['lint [source]', 'l'],
-      'lint definitions',
-      (yargs) => {
-        yargs.positional('source', {
+    .command(['lint [source]', 'l'], 'lint definitions', (yargs) => {
+      yargs
+        .positional('source', {
           describe: 'specify a source (optional)',
-          default: undefined,
-        });
-      },
-      (argv) => lint(argv)
-    )
+          default: undefined
+        })
+    }, (argv) => lint(argv))
 
     // serve
-    .command(
-      ['serve [source]', 's'],
-      'serve definition',
-      (yargs) => {
-        yargs.positional('source', {
+    .command(['serve [source]', 's'], 'serve definition', (yargs) => {
+      yargs
+        .positional('source', {
           describe: 'specify a source',
-          default: 'default',
-        });
-      },
-      (argv) => serve(argv)
-    )
+          default: 'default'
+        })
+    }, (argv) => serve(argv))
 
     // proxy
-    .command(
-      ['proxy [source]', 'p'],
-      'serve definition',
-      (yargs) => {
-        yargs
-          .positional('source', {
-            describe: 'specify a source',
-            default: 'default',
-          })
-          .option('server', {
-            describe: 'specify a server (from "servers" array)',
-            alias: 's',
-            demandOption: true,
-          });
-      },
-      (argv) => proxy(argv)
-    )
+    .command(['proxy [source]', 'p'], 'serve definition', (yargs) => {
+      yargs
+        .positional('source', {
+          describe: 'specify a source',
+          default: 'default'
+        })
+        .option('server', {
+          describe: 'specify a server (from "servers" array)',
+          alias: 's',
+          demandOption: true
+        })
+    }, (argv) => proxy(argv))
 
     // generate
-    .command(
-      ['generate [target]', 'g'],
-      'generate packages',
-      (yargs) => {
-        yargs
-          .positional('target', {
-            describe: 'specify a target (optional)',
-            default: undefined,
-          })
-          .option('artifactVersion', {
-            describe: "Specify an artifactVersion (optional). \nIf you do not specify it, the tool uses the root package.json's version field.",
-            default: undefined,
-          })
-          .option('preRelease', {
-            describe: 'Generate as pre-release (optional). \nHow a pre-release is handled varies between different target types.',
-            type: 'boolean',
-          });
-      },
-      (argv) => generate(argv)
-    )
+    .command(['generate [target]', 'g'], 'generate packages', (yargs) => {
+      yargs
+        .positional('target', {
+          describe: 'specify a target (optional)',
+          default: undefined
+        })
+        .option('artifactVersion', {
+          describe: 'Specify an artifactVersion (optional). \nIf you do not specify it, the tool uses the root package.json\'s version field.',
+          default: undefined
+        })
+        .option('preRelease', {
+          describe: 'Generate as pre-release (optional). \nHow a pre-release is handled varies between different target types.',
+          type: 'boolean'
+        })
+    }, (argv) => generate(argv))
 
     // publish
-    .command(
-      ['publish [target]', 'p'],
-      'publish packages',
-      (yargs) => {
-        yargs
-          .positional('target', {
-            describe: 'specifiy a target (optional)',
-            default: undefined,
-          })
-          .option('preRelease', {
-            describe: 'Publish as pre-release (optional). \nHow a pre-release is handled varies between different target types.',
-            type: 'boolean',
-          });
-      },
-      (argv) => publish(argv)
-    )
+    .command(['publish [target]', 'p'], 'publish packages', (yargs) => {
+      yargs
+      .positional('target', {
+        describe: 'specifiy a target (optional)',
+        default: undefined
+      })
+      .option('preRelease', {
+        describe: 'Publish as pre-release (optional). \nHow a pre-release is handled varies between different target types.',
+        type: 'boolean'
+      })
+    }, (argv) => publish(argv))
 
     // options
     .demandCommand(1, 'You need to specify a command!')
-    .strict().argv;
+    .strict()
+    .argv
 }
 
 function checkVersionMismatch() {
@@ -183,7 +160,7 @@ function checkVersionMismatch() {
 function checkRequiredCommands() {
   const missing = [];
 
-  REQUIRED_COMMANDS.forEach((command) => {
+  REQUIRED_COMMANDS.forEach(command => {
     if (!commandExistsSync(command)) {
       missing.push(command);
     }
@@ -214,10 +191,10 @@ async function parseConfig() {
   }
 
   // validate config schema
-  let schema = YAML.load(`${__dirname}/../config.schema.yml`);
+  let schema = YAML.load(`${__dirname}/../config.schema.yml`)
   schema = await refParser.dereference(schema);
   schema = mergeAllOf(schema, { ignoreAdditionalProperties: true });
-  ajv.addVocabulary(['sources', 'targets']);
+  ajv.addVocabulary(["sources", "targets"]);
   const valid = ajv.validate(schema, config);
 
   if (!valid) {
@@ -231,7 +208,7 @@ async function parseConfig() {
   }
 
   // set default source values
-  config.sources.forEach((s) => {
+  config.sources.forEach(s => {
     if (s.bundle === undefined) {
       s.bundle = true;
     }
@@ -250,14 +227,14 @@ async function parseConfig() {
   });
 
   // set default source to targets with undefined
-  config.targets.forEach((t) => {
+  config.targets.forEach(t => {
     if (!t.source) {
       t.source = 'default';
     }
   });
 
   // set default generator values to targets with undefined
-  config.targets.forEach((t) => {
+  config.targets.forEach(t => {
     if (!t.generator) {
       t.generator = DEFAULT_GENERATOR_MAPPING[t.type].version;
     }
@@ -269,20 +246,20 @@ async function parseConfig() {
         exit(1);
       }
     }
-  });
+  })
 
   // set default ktlint to android targets with undefined
-  config.targets.forEach((t) => {
+  config.targets.forEach(t => {
     //TODO: handle different types of platform
     if (t.type === 'android') {
       if (!t.formatter) {
         t.formatter = DEFAULT_KTLINT_VERSION;
       }
     }
-  });
+  })
 
   // validate uniqueness of source IDs
-  const sourceIds = config.sources.map((s) => s.id);
+  const sourceIds = config.sources.map(s => s.id);
   const duplicateSourceIds = findDuplicates(sourceIds);
 
   if (duplicateSourceIds.length > 0) {
@@ -291,7 +268,7 @@ async function parseConfig() {
   }
 
   // validate uniqueness of target IDs
-  const targetIds = config.targets.map((t) => t.id);
+  const targetIds = config.targets.map(t => t.id);
   const duplicateTargetIds = findDuplicates(targetIds);
 
   if (duplicateTargetIds.length > 0) {
@@ -300,7 +277,7 @@ async function parseConfig() {
   }
 
   // validate targets have valid sources
-  config.targets.forEach((t) => {
+  config.targets.forEach(t => {
     if (!sourceIds.includes(t.source)) {
       console.error(`source: ${t.source} not found for target: ${t.id}`);
       exit(1);
@@ -308,8 +285,8 @@ async function parseConfig() {
   });
 
   // validate unused sources
-  const usedSources = config.targets.map((t) => t.source);
-  config.sources.forEach((s) => {
+  const usedSources = config.targets.map(t => t.source);
+  config.sources.forEach(s => {
     if (!usedSources.includes(s.id)) {
       console.error(`source: ${s.id} is not used in any of the targets`);
       exit(1);
@@ -317,7 +294,7 @@ async function parseConfig() {
   });
 
   // validate source inputs exists
-  config.sources.forEach((s) => {
+  config.sources.forEach(s => {
     switch (s.type) {
       case 'simple':
         if (!fs.existsSync(s.input)) {
@@ -328,12 +305,12 @@ async function parseConfig() {
         break;
 
       case 'merged':
-        s.inputs.forEach((i) => {
+        s.inputs.forEach(i => {
           if (fs.existsSync(i)) {
             return;
           }
           const matches = globSync(i);
-          if (matches.every((m) => fs.existsSync(m))) {
+          if (matches.every(m => fs.existsSync(m))) {
             return;
           }
           console.error(`input file: ${i} not found for source: ${s.id}`);
@@ -358,11 +335,7 @@ async function buildSources(sourceIds) {
       continue;
     }
 
-    console.log(
-      `\n=====\n  id:\t\t${source.id}\n  type:\t\t${source.type}\n  bundle:\t${source.bundle}\n  sortSchemas:\t${
-        source.sortSchemas
-      }\n  decorators: \t${JSON.stringify(source.decorators)}\n  cleanup:\t${source.cleanup}\n---\n`
-    );
+    console.log(`\n=====\n  id:\t\t${source.id}\n  type:\t\t${source.type}\n  bundle:\t${source.bundle}\n  sortSchemas:\t${source.sortSchemas}\n  decorators: \t${JSON.stringify(source.decorators)}\n  cleanup:\t${source.cleanup}\n---\n`);
 
     let file;
 
@@ -393,8 +366,8 @@ async function lint(argv) {
 
   // gather and deduplicate input files
   let inputs = [];
-  sourceIds.forEach((sourceId) => {
-    const source = config.sources.find((s) => s.id === sourceId);
+  sourceIds.forEach(sourceId => {
+    const source = config.sources.find(s => s.id === sourceId);
 
     switch (source.type) {
       case 'simple':
@@ -402,9 +375,9 @@ async function lint(argv) {
         break;
 
       case 'merged':
-        source.inputs.forEach((i) => inputs.push(i));
+        source.inputs.forEach(i => inputs.push(i));
     }
-  });
+  })
   inputs = Array.from(new Set(inputs));
 
   exec(`npx spectral lint --fail-severity warn ${inputs.join(' ')}`);
@@ -422,16 +395,16 @@ async function serve(argv) {
   const app = express();
 
   // configure proxying
-  const proxyHost = function (request) {
+  const proxyHost = function(request) {
     const url = new URL(request.query.u);
     return url.origin;
   };
 
   const proxyOptions = {
-    proxyReqPathResolver: function (request) {
+    proxyReqPathResolver: function(request) {
       const url = new URL(request.query.u);
       return `${url.pathname}${url.search}${url.hash}`;
-    },
+    }
   };
   app.use('/proxy', expressHttpProxy(proxyHost, proxyOptions));
 
@@ -439,15 +412,15 @@ async function serve(argv) {
   var swaggerOptions = {
     swaggerOptions: {
       showMutatedRequest: false,
-      requestInterceptor: function (request) {
+      requestInterceptor: function(request) {
         if (request.url.startsWith('http://localhost')) {
           return request;
         }
 
         request.url = '/proxy?u=' + encodeURIComponent(request.url);
         return request;
-      },
-    },
+      }
+    }
   };
   app.use('/', swaggerUi.serve, swaggerUi.setup(document, swaggerOptions));
 
@@ -467,7 +440,7 @@ async function proxy(argv) {
   const document = YAML.load(input);
 
   // validate server name
-  const validServerNames = document.servers.map((s) => s.description);
+  const validServerNames = document.servers.map(s => s.description);
   const serverName = argv.server;
 
   if (!validServerNames.includes(serverName)) {
@@ -476,7 +449,7 @@ async function proxy(argv) {
   }
 
   // validate server url
-  const server = document.servers.find((s) => s.description === serverName);
+  const server = document.servers.find(s => s.description === serverName);
   if (!server.url) {
     console.error(`url must be defined for server ${server.description}`);
     exit(1);
@@ -497,8 +470,8 @@ async function generate(argv) {
 
   console.log(`generate targets: ${targetIds}`);
 
-  targetIds.forEach((targetId) => {
-    const target = config.targets.find((t) => t.id === targetId);
+  targetIds.forEach(targetId => {
+    const target = config.targets.find(t => t.id === targetId);
 
     // handle docs target
     if (target.type === 'openapi') {
@@ -518,11 +491,7 @@ async function generate(argv) {
     const templateDir = customizeTemplates(target);
 
     // run generation
-    execScript(
-      `${__dirname}/../targets/${target.type}/generate.sh ${VERSION} ${binary} ${CONFIG_FILE_NAME} ${target.id} ${
-        sources[target.source]
-      } ${formatter} ${target.generatorId} ${preRelease.toString()} ${templateDir}`
-    );
+    exec(`bash -e ${__dirname}/../targets/${target.type}/generate.sh ${VERSION} ${binary} ${CONFIG_FILE_NAME} ${target.id} ${sources[target.source]} ${formatter} ${target.generatorId} ${preRelease.toString()} ${templateDir}`);
   });
 }
 
@@ -534,8 +503,8 @@ async function publish(argv) {
 
   console.log(`publish targets: ${targetIds}`);
 
-  targetIds.forEach((targetId) => {
-    const target = config.targets.find((t) => t.id === targetId);
+  targetIds.forEach(targetId => {
+    const target = config.targets.find(t => t.id === targetId);
 
     // handle docs target
     if (target.type === 'openapi') {
@@ -551,17 +520,13 @@ async function publish(argv) {
       formatter = fetchFormatter(target);
     }
 
-    execScript(
-      `${__dirname}/../targets/${target.type}/publish.sh ${VERSION} ${binary} ${CONFIG_FILE_NAME} ${target.id} ${
-        sources[target.source]
-      } ${formatter} ${target.generatorId} ${preRelease.toString()}`
-    );
+    exec(`bash -e ${__dirname}/../targets/${target.type}/publish.sh ${VERSION} ${binary} ${CONFIG_FILE_NAME} ${target.id} ${sources[target.source]} ${formatter} ${target.generatorId} ${preRelease.toString()}`);
   });
 }
 
 function fetchBinary(target) {
   // determine binary
-  const generator = target.generator;
+  const generator = target.generator
   const binary = {};
 
   if (generator.startsWith('http')) {
@@ -569,7 +534,8 @@ function fetchBinary(target) {
 
     const hash = crypto.createHash('sha256').update(binary.url).digest('hex').substring(0, 8);
     binary.name = `openapi-generator-cli-${hash}.jar`;
-  } else {
+  }
+  else {
     binary.url = `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${generator}/openapi-generator-cli-${generator}.jar`;
     binary.name = `openapi-generator-cli-${generator}.jar`;
   }
@@ -583,24 +549,26 @@ function fetchBinary(target) {
 
   // download binary
   console.log(`... downloading ${binary.url} ==> ${binaryPath}`);
-  exec(`mkdir -p ${BIN_FOLDER}`);
-  exec(`wget ${binary.url} -q -O ${binaryPath}`);
-  exec(`chmod +x ${binaryPath}`);
+  exec(`bash -e -c "mkdir -p ${BIN_FOLDER}"`);
+  exec(`bash -e -c "wget ${binary.url} -q -O ${binaryPath}"`);
+  exec(`bash -e -c "chmod +x ${binaryPath}"`);
   return binaryPath;
 }
 
 function fetchFormatter(target) {
   // determine binary
-  const formatter = target.formatter;
+  const formatter = target.formatter
   const binary = {};
 
+
   //TODO: handle different types of platforms
   if (formatter.startsWith('http')) {
     binary.url = formatter;
 
     const hash = crypto.createHash('sha256').update(binary.url).digest('hex').substring(0, 8);
     binary.name = `ktlint-${hash}`;
-  } else {
+  }
+  else {
     binary.url = `https://github.com/pinterest/ktlint/releases/download/${formatter}/ktlint`;
     binary.name = `ktlint-${formatter}`;
   }
@@ -614,9 +582,9 @@ function fetchFormatter(target) {
 
   // download binary
   console.log(`... downloading ${binary.url} ==> ${binaryPath}`);
-  exec(`mkdir -p ${BIN_FOLDER}`);
-  exec(`wget ${binary.url} -q -O ${binaryPath}`);
-  exec(`chmod +x ${binaryPath}`);
+  exec(`bash -e -c "mkdir -p ${BIN_FOLDER}"`);
+  exec(`bash -e -c "wget ${binary.url} -q -O ${binaryPath}"`);
+  exec(`bash -e -c "chmod +x ${binaryPath}"`);
   return binaryPath;
 }
 
@@ -627,12 +595,12 @@ function customizeTemplates(target) {
   const targetTemplateDir = `${__dirname}/../targets/${target.type}/templates`;
 
   if (fs.existsSync(templateDir)) {
-    exec(`rm -rf ${templateDir}`);
+  exec(`bash -e -c "rm -rf ${templateDir}"`);
   }
-  exec(`mkdir -p ${templateDir}`);
+  exec(`bash -e -c "mkdir -p ${templateDir}"`);
 
   if (fs.existsSync(targetTemplateDir)) {
-    exec(`cp -R ${targetTemplateDir}/* ${templateDir}`);
+    exec(`bash -e -c "cp -R ${targetTemplateDir}/* ${templateDir}"`);
   }
 
   if (target.templateDir) {
@@ -641,7 +609,7 @@ function customizeTemplates(target) {
       exit(1);
     }
 
-    exec(`cp -R ${target.templateDir}/* ${templateDir}`);
+    exec(`bash -e -c "cp -R ${target.templateDir}/* ${templateDir}`);
   }
 
   return templateDir;
@@ -660,7 +628,7 @@ function determineSourceIds(argv) {
 }
 
 function validSourceIds() {
-  return config.sources.map((s) => s.id);
+  return config.sources.map(s => s.id);
 }
 
 function checkSourceId(sourceId) {
@@ -684,8 +652,8 @@ function determineTargetIds(argv) {
 
 function sourceIdsFromTargetIds(targetIds) {
   const sourceIds = [];
-  targetIds.forEach((targetId) => {
-    const target = config.targets.find((t) => t.id === targetId);
+  targetIds.forEach(targetId => {
+    const target = config.targets.find(t => t.id === targetId);
     if (target.source) {
       sourceIds.push(target.source);
     }
@@ -694,7 +662,7 @@ function sourceIdsFromTargetIds(targetIds) {
 }
 
 function validTargetIds() {
-  return config.targets.map((t) => t.id);
+  return config.targets.map(t => t.id);
 }
 
 function checkTargetId(targetId) {
@@ -706,9 +674,8 @@ function checkTargetId(targetId) {
 
 // find duplicates
 function findDuplicates(arr) {
-  return arr.reduce(function (acc, el, i, arr) {
-    if (arr.indexOf(el) !== i && acc.indexOf(el) < 0) acc.push(el);
-    return acc;
+  return arr.reduce(function(acc, el, i, arr) {
+    if (arr.indexOf(el) !== i && acc.indexOf(el) < 0) acc.push(el); return acc;
   }, []);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "13.2.0-feature-csharp-functions-22a33fb4.0",
+  "version": "13.2.0-feature-csharp-functions-953cbbf4.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",