@team-supercharge/oasg 14.1.0-feature-csharp-functions-2e109dee.0 → 14.1.0-feature-csharp-functions-win-ffd21d9f.0

package/bin/exec.js

@@ -11,4 +11,15 @@ function exec(command, stdio) {
   }
 }
 
+function bash(command, stdio) {
+  try {
+    execSync(`bash -e -c "${command}"`, { stdio: stdio || 'inherit' });
+  }
+  catch (e) {
+    console.error(e.message);
+    exit(1);
+  }
+}
+
 exports.exec = exec;
+exports.bash = bash;

package/bin/oasg

@@ -15,6 +15,7 @@ const expressHttpProxy = require('express-http-proxy');
 const { exit } = require('process');
 
 const { exec } = require(`${__dirname}/exec.js`);
+const { bash } = require(`${__dirname}/exec.js`);
 const { merge } = require(`${__dirname}/merger.js`);
 const { applyOverrides } = require(`${__dirname}/overrider.js`);
 const { openApiTarget } = require(`${__dirname}/openapi-target.js`);
@@ -550,9 +551,9 @@ 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}`);
+  bash(`mkdir -p ${BIN_FOLDER}`);
+  bash(`wget ${binary.url} -q -O ${binaryPath}`);
+  bash(`chmod +x ${binaryPath}`);
   return binaryPath;
 }
 
@@ -583,9 +584,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}`);
+  bash(`mkdir -p ${BIN_FOLDER}`);
+  bash(`wget ${binary.url} -q -O ${binaryPath}`);
+  bash(`chmod +x ${binaryPath}`);
   return binaryPath;
 }
 
@@ -596,12 +597,12 @@ function customizeTemplates(target) {
   const targetTemplateDir = `${__dirname}/../targets/${target.type}/templates`;
 
   if (fs.existsSync(templateDir)) {
-    exec(`rm -rf ${templateDir}`);
+  bash(`rm -rf ${templateDir}`);
   }
-  exec(`mkdir -p ${templateDir}`);
+  bash(`mkdir -p ${templateDir}`);
 
   if (fs.existsSync(targetTemplateDir)) {
-    exec(`cp -R ${targetTemplateDir}/* ${templateDir}`);
+    bash(`cp -R ${targetTemplateDir}/* ${templateDir}`);
   }
 
   if (target.templateDir) {
@@ -610,7 +611,7 @@ function customizeTemplates(target) {
       exit(1);
     }
 
-    exec(`cp -R ${target.templateDir}/* ${templateDir}`);
+    bash(`cp -R ${target.templateDir}/* ${templateDir}`);
   }
 
   return templateDir;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "14.1.0-feature-csharp-functions-2e109dee.0",
+  "version": "14.1.0-feature-csharp-functions-win-ffd21d9f.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/common.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # command line arguments:
 #   1. version - semantic version string
 #   2. binary - openapi-generator JAR file
@@ -21,10 +23,11 @@ templateDir=$9
 
 echo -e "\n=====\n  version:\t$version\n  binary:\t$binary\n  configFile:\t$configFile\n  targetId:\t$targetId\n generatorId:\t$generatorId\n openApiFile:\t$openApiFile\n  formatter:\t$formatterBinary\n  preRelease:\t$preRelease\n templateDir:\t$templateDir\n ---"
 
-for paramName in $(cat $configFile | jq -r ".targets[] | select(.id==\"$targetId\") | del(.id) | del(.type) | del(.source) | del(.generator) | del(.generatorId) | del(.templateDir) | keys | .[]"); do
-  result=$(cat $configFile | jq -r ".targets[] | select(.id==\"$targetId\") | .$paramName")
-  echo -e "  $paramName:\t$result"
-  eval $paramName="'$result'"
-done
+blacklist='.id, .type, .source, .generator, .generatorId, .templateDir'
+
+params=$(jq -r ".targets[] | select(.id == \"$targetId\") | del($blacklist) | to_entries | map(\"\(.key)=\(.value | @sh);\") | .[]" $configFile)
+
+echo "$params"
+eval $params
 
 echo -e "=====\n"