swaggie 0.7.0-alpha.3 → 0.7.1

package/dist/cli.js

@@ -5,6 +5,7 @@ var _nanocolors = require('nanocolors');
 
 var _index = require('./index');
 
+
 const program = new (0, _commander.Command)();
 program
   .version(require('../package.json').version)

package/dist/gen/js/createBarrel.js

@@ -1,4 +1,5 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _lodash = require('lodash');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _lodashcamelcase = require('lodash.camelcase'); var _lodashcamelcase2 = _interopRequireDefault(_lodashcamelcase);
+
 var _templateManager = require('../templateManager');
 
  async function generateBarrelFile(clients, clientOptions) {
@@ -15,7 +16,7 @@ var _templateManager = require('../templateManager');
       .map((c) => ({
         fileName: (clientOptions.servicePrefix || '') + c,
         className: (clientOptions.servicePrefix || '') + c + 'Client',
-        camelCaseName: _lodash.camelCase.call(void 0, (clientOptions.servicePrefix || '') + c + 'Client'),
+        camelCaseName: _lodashcamelcase2.default.call(void 0, (clientOptions.servicePrefix || '') + c + 'Client'),
       })),
   };
 

package/dist/gen/js/genOperations.js

@@ -1,6 +1,12 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _lodash = require('lodash');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _lodashcamelcase = require('lodash.camelcase'); var _lodashcamelcase2 = _interopRequireDefault(_lodashcamelcase);
 
 var _support = require('./support');
+
+
+
+
+
+
 var _util = require('../util');
 
 
@@ -12,6 +18,7 @@ var _util = require('../util');
 var _createBarrel = require('./createBarrel');
 var _templateManager = require('../templateManager');
 
+
 const MAX_QUERY_PARAMS = 1;
 
  async function genOperations(
@@ -20,10 +27,11 @@ const MAX_QUERY_PARAMS = 1;
   options
 ) {
   const groups = _util.groupOperationsByGroupName.call(void 0, operations);
-  let result = await _templateManager.renderFile.call(void 0, 'baseClient.ejs', {
-    servicePrefix: options.servicePrefix || '',
-    baseUrl: options.baseUrl,
-  }) || '';
+  let result =
+    (await _templateManager.renderFile.call(void 0, 'baseClient.ejs', {
+      servicePrefix: options.servicePrefix || '',
+      baseUrl: options.baseUrl,
+    })) || '';
   let queryDefinitions = {} ;
 
   for (let name in groups) {
@@ -61,7 +69,7 @@ function prepareClient(
   return [
     {
       clientName: name,
-      camelCaseName: _lodash.camelCase.call(void 0, name),
+      camelCaseName: _lodashcamelcase2.default.call(void 0, name),
       operations: preparedOperations,
       baseUrl: options.baseUrl,
     },
@@ -118,7 +126,7 @@ function prepareClient(
   }
 
   const ops = operations.map((a) => Object.assign({}, a));
-  const results = _lodash.orderBy.call(void 0, ops, (o) => o.id);
+  const results = _util.orderBy.call(void 0, ops, 'id');
 
   let inc = 0;
   let prevOpId = results[0].id;
@@ -142,7 +150,7 @@ function prepareClient(
     return opId;
   }
 
-  return _lodash.camelCase.call(void 0, opId.replace(group + '_', ''));
+  return _lodashcamelcase2.default.call(void 0, opId.replace(group + '_', ''));
 } exports.getOperationName = getOperationName;
 
 function getHeaders(op, options) {
@@ -208,7 +216,7 @@ function getParams(
   return _util.escapeReservedWords.call(void 0, 
     name
       .split('.')
-      .map((x) => _lodash.camelCase.call(void 0, x))
+      .map((x) => _lodashcamelcase2.default.call(void 0, x))
       .join('_')
   );
 } exports.getParamName = getParamName;
@@ -248,7 +256,7 @@ function getQueryDefinition(
   const queryParam = {
     originalName: `${op.id.replace('_', '')}Query`,
     name: getParamName(`${op.id.replace('_', '')}Query`),
-    type: `I${_lodash.upperFirst.call(void 0, getOperationName(op.id, op.group))}From${options.servicePrefix || ''}${
+    type: `I${_util.upperFirst.call(void 0, getOperationName(op.id, op.group))}From${options.servicePrefix || ''}${
       op.group
     }ServiceQuery`,
     optional: false,

package/dist/gen/js/genTypes.js

@@ -1,8 +1,9 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _lodash = require('lodash');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _lodashset = require('lodash.set'); var _lodashset2 = _interopRequireDefault(_lodashset);
 var _util = require('../util');
 var _support = require('./support');
 
 
+
  function genTypes(
   spec,
   queryDefinitions,
@@ -112,7 +113,7 @@ function renderTsType(name, def, options, typeToBeGeneric) {
     parts: def.properties[e].name.split('.'),
   }));
   const objNotation = {};
-  props.forEach((p) => _lodash.set.call(void 0, objNotation, p.name, def.properties[p.key]));
+  props.forEach((p) => _lodashset2.default.call(void 0, objNotation, p.name, def.properties[p.key]));
 
   return processQueryStringParameter(objNotation, null, options);
 } exports.renderQueryStringParameters = renderQueryStringParameters;
@@ -223,7 +224,7 @@ function verifyAllOf(name, allOf) {
 
 function getDistinctGenericTypes(keys) {
   const sanitizedKeys = keys.map((k) => k.substring(0, k.indexOf('[')));
-  return _lodash.uniq.call(void 0, sanitizedKeys);
+  return _util.uniq.call(void 0, sanitizedKeys);
 }
 
 function unwrapDefinitions(definitions) {

package/dist/gen/js/index.js

@@ -2,6 +2,7 @@
 var _genTypes = require('./genTypes'); var _genTypes2 = _interopRequireDefault(_genTypes);
 var _util = require('../util');
 
+
  async function genCode(
   spec,
   operations,

package/dist/gen/js/models.js

@@ -36,6 +36,8 @@
 
 
 
+
+
 
 
 

package/dist/gen/js/support.js

@@ -1,4 +1,6 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function getTSParamType(param, options) {
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+ function getTSParamType(param, options) {
   const unknownType = options.preferAny ? 'any' : 'unknown';
 
   if (!param) {

package/dist/gen/templateManager.js

@@ -2,20 +2,18 @@
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _eta = require('eta'); var Eta = _interopRequireWildcard(_eta);
 
-let templatesDir = null;
-
  function loadAllTemplateFiles(templateName) {
   if (!templateName) {
     throw new Error(`No template name was provided`);
   }
 
-  templatesDir = _fs2.default.existsSync(templateName)
+  const templatesDir = _fs2.default.existsSync(templateName)
     ? templateName
     : _path2.default.join(__dirname, '..', '..', 'templates', templateName);
 
   if (!_fs2.default.existsSync(templatesDir)) {
     throw new Error(
-      `Could not found directory with the template (we tried ${templatesDir}). Template name is correct?`,
+      `Could not found directory with the template (we tried ${templatesDir}). Template name is correct?`
     );
   }
   const templates = _fs2.default.readdirSync(templatesDir);
@@ -28,6 +26,6 @@ let templatesDir = null;
 } exports.loadAllTemplateFiles = loadAllTemplateFiles;
 
  function renderFile(templateFile, data = {}) {
-  const filePath = _path2.default.join(templatesDir, templateFile);
-  return Eta.renderFile(filePath, data);
+  const template = Eta.templates.get(templateFile);
+  return Eta.render(template, data);
 } exports.renderFile = renderFile;

package/dist/gen/util.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});var _fs = require('fs');
 var _path = require('path');
-var _mkdirp = require('mkdirp');
+
+
 
  function exists(filePath) {
   try {
@@ -11,9 +12,12 @@ var _mkdirp = require('mkdirp');
 } exports.exists = exists;
 
  function saveFile(filePath, contents) {
-  _mkdirp.sync.call(void 0, _path.dirname.call(void 0, filePath));
-
-  _fs.writeFileSync.call(void 0, filePath, contents);
+  _fs.mkdir.call(void 0, _path.dirname.call(void 0, filePath), { recursive: true }, (err) => {
+    if (err) {
+      throw err;
+    }
+    _fs.writeFileSync.call(void 0, filePath, contents);
+  });
 } exports.saveFile = saveFile;
 
  function groupOperationsByGroupName(operations) {
@@ -109,3 +113,25 @@ const reservedWords = [
   }
   return out.replace(/[\\]/i, '/') + '.ts';
 } exports.prepareOutputFilename = prepareOutputFilename;
+
+ function uniq(arr) {
+  if (!arr) {
+    return [];
+  }
+
+  return [...new Set(arr)];
+} exports.uniq = uniq;
+
+ function orderBy(arr, key) {
+  if (!arr) {
+    return [];
+  }
+
+  return arr.concat().sort(sortByKey(key));
+} exports.orderBy = orderBy;
+
+const sortByKey = (key) => (a, b) => a[key] > b[key] ? 1 : b[key] > a[key] ? -1 : 0;
+
+ function upperFirst(str) {
+  return str ? str.charAt(0).toUpperCase() + str.slice(1) : '';
+} exports.upperFirst = upperFirst;

package/dist/index.js

@@ -6,6 +6,7 @@ var _js = require('./gen/js'); var _js2 = _interopRequireDefault(_js);
 var _templateManager = require('./gen/templateManager');
 var _swagger = require('./swagger');
 
+
  function runCodeGenerator(options) {
   return verifyOptions(options)
     .then(applyConfigFile)

package/dist/swagger/operations.js

@@ -1,4 +1,12 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});const SUPPORTED_METHODS = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch'];
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+
+
+
+
+
+
+const SUPPORTED_METHODS = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch'];
 
 /**
  * This method converts dictionary-alike operation definition to operation array.

package/dist/swagger/swagger.js

@@ -8,6 +8,7 @@ var _nodefetch = require('node-fetch'); var _nodefetch2 = _interopRequireDefault
 
 
 
+
  function resolveSpec(src, options) {
   if (!options) {
     options = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swaggie",
-  "version": "0.7.0-alpha.3",
+  "version": "0.7.1",
   "description": "Generate ES6 or TypeScript service integration code from an OpenAPI spec",
   "author": {
     "name": "Piotr Dabrowski",
@@ -44,16 +44,16 @@
     "commander": "^8.3.0",
     "eta": "^1.12.3",
     "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
-    "mkdirp": "^1.0.3",
+    "lodash.camelcase": "^4.3.0",
+    "lodash.set": "^4.3.2",
     "nanocolors": "^0.2.0",
     "node-fetch": "^2.6.3"
   },
   "devDependencies": {
     "@types/chai": "4.3.0",
     "@types/js-yaml": "4.0.5",
-    "@types/lodash": "4.14.178",
-    "@types/mkdirp": "^1.0.2",
+    "@types/lodash.camelcase": "4.3.6",
+    "@types/lodash.set": "4.3.6",
     "@types/mocha": "9.0.0",
     "@types/node-fetch": "2.5.3",
     "chai": "4.3.4",