swaggie 0.6.7 → 0.6.9

package/README.md

@@ -4,15 +4,16 @@
 
 # Swaggie
 
+![npm latest version](https://img.shields.io/npm/v/swaggie)
 ![NodeCI](https://github.com/yhnavein/swaggie/workflows/NodeCI/badge.svg)
 [![CircleCI](https://circleci.com/gh/yhnavein/swaggie.svg?style=svg)](https://circleci.com/gh/yhnavein/swaggie)
-![Dependencies](https://img.shields.io/david/yhnavein/swaggie.svg)
 ![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/yhnavein/swaggie.svg)
 ![npm downloads](https://img.shields.io/npm/dw/swaggie.svg)
-![npm latest version](https://img.shields.io/npm/v/swaggie)
 ![npm bundle size](https://img.shields.io/bundlephobia/minzip/swaggie.svg)
 ![npm install size](https://packagephobia.now.sh/badge?p=swaggie)
 
+<!-- ![Dependencies](https://img.shields.io/david/yhnavein/swaggie.svg) -->
+
 Generate ES6 or Typescript code from an OpenAPI 2.0 spec, so that accessing REST API resources from the client code is less error-prone, static-typed and just easier to use long-term.
 
 You can take a look at the [Examples section](#example) down below.
@@ -88,6 +89,7 @@ The following templates are bundled with Swaggie:
 
 ```
 axios     Default template. Recommended for React / Vue / similar frameworks. Uses axios
+swr-axios Template that embraces SRW for GET requests and as a fallback uses axios.
 fetch     Template similar to axios, but with fetch API instead. Recommended for React / Vue / similar frameworks
 ng1       Template for Angular 1 (this is for the old one)
 ng2       Template for Angular 2+ (uses HttpClient, InjectionTokens, etc)
@@ -183,7 +185,9 @@ You might wonder how to set up server to fully utilize Swaggie's features. For t
 
 [ASP.NET Core + Nswag](./samples/dotnetcore/nswag/README.md)
 
-Server is not necessary to use Swaggie. Swaggie cares only about the JSON file with the Open API spec, but for your development purpose you might want to have a server that can serve this file automatically from the actual endpoints.
+[ASP.NET Core + Swashbuckle](./samples/dotnetcore/swashbuckle/README.md)
+
+Server is not necessary to use Swaggie. Swaggie cares only about the JSON/yaml file with the Open API spec, but for your development purpose you might want to have a server that can serve this file automatically from the actual endpoints.
 
 ## Notes
 

package/dist/gen/js/genTypes.js

@@ -1,6 +1,6 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _util = require('../util');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _lodash = require('lodash');
+var _util = require('../util');
 var _support = require('./support');
-var _lodash = require('lodash');
 
 
  function genTypes(
@@ -56,10 +56,9 @@ function renderTsType(name, def, options, typeToBeGeneric) {
 
   const lines = [];
   if (def.description) {
-    lines.push(`/**`);
-    lines.push(_support.DOC + def.description.trim().replace(/\n/g, `\n${_support.DOC}${_support.SP}`));
-    lines.push(` */`);
+    lines.push(renderComment(def.description));
   }
+
   if (!!def['x-enumNames']) {
     lines.push(renderXEnumType(name, def));
     return lines;
@@ -90,8 +89,7 @@ function renderTsType(name, def, options, typeToBeGeneric) {
     _util.join.call(void 0, lines, requiredPropLines);
     _util.join.call(void 0, lines, optionalPropLines);
   }
-  lines.push('}');
-  lines.push('');
+  lines.push('}\n');
   return lines;
 }
 
@@ -178,10 +176,11 @@ function renderTsInheritance(name, allOf, options) {
   const ref = allOf[0];
   const parentName = ref.$ref.split('/').pop();
   const lines = renderTsType(name, allOf[1], options);
-  if (lines[0].startsWith('export interface')) {
-    lines.shift();
+  const interfaceLineIndex = lines.findIndex((l) => l.indexOf('export interface') === 0);
+  if (interfaceLineIndex > -1) {
+    // Let's replace generic interface definition with more specific one with inheritance info
+    lines[interfaceLineIndex] = `export interface ${name} extends ${parentName} {`;
   }
-  lines.unshift(`export interface ${name} extends ${parentName} {`);
   return lines;
 }
 
@@ -198,48 +197,11 @@ function renderTsTypeProp(
     type = type.replace(typeToBeGeneric, 'T');
   }
   if (info.description) {
-    lines.push(`${_support.SP}/**`);
-    lines.push(
-      `${_support.SP}${_support.DOC}` + (info.description || '').trim().replace(/\n/g, `\n${_support.SP}${_support.DOC}${_support.SP}`)
-    );
-    lines.push(`${_support.SP} */`);
+    lines.push(renderComment(info.desciption));
   }
   const req = required ? '' : '?';
-  lines.push(`${_support.SP}${prop}${req}: ${type};`);
-  return lines;
-}
-
-function renderTypeDoc(name, def) {
-  if (def.allOf) {
-    return renderDocInheritance(name, def.allOf);
-  }
-  if (def.type !== 'object') {
-    console.warn(`Unable to render ${name} ${def.type}, skipping.`);
-    return [];
-  }
-
-  const lines = ['/**', `${_support.DOC}@typedef ${name}`];
-  const req = def.required || [];
-  const propLines = Object.keys(def.properties).map((prop) => {
-    const info = def.properties[prop];
-    const description = (info.description || '').trim().replace(/\n/g, `\n${_support.DOC}${_support.SP}`);
-    return `${_support.DOC}@property {${_support.getDocType.call(void 0, info)}} ${prop} ${description}`;
-  });
-  if (propLines.length) {
-    lines.push(`${_support.DOC}`);
-  }
-  _util.join.call(void 0, lines, propLines);
-  lines.push(' */');
-  lines.push('');
-  return lines;
-}
+  lines.push(`  ${prop}${req}: ${type};`);
 
-function renderDocInheritance(name, allOf) {
-  verifyAllOf(name, allOf);
-  const ref = allOf[0];
-  const parentName = ref.$ref.split('/').pop();
-  const lines = renderTypeDoc(name, allOf[1]);
-  lines.splice(3, 0, `${_support.DOC}@extends ${parentName}`);
   return lines;
 }
 
@@ -277,3 +239,17 @@ function unwrapDefinitions(definitions) {
 
   return result;
 }
+
+ function renderComment(comment) {
+  if (!comment) {
+    return null;
+  }
+
+  const commentLines = comment.split('\n');
+
+  if (commentLines.length === 1) {
+    return '// ' + comment.trim();
+  }
+
+  return ' /**\n' + commentLines.map((line) => '  * ' + line.trim()).join('\n') + '\n  */';
+} exports.renderComment = renderComment;

package/dist/gen/js/support.js

@@ -1,44 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); const DOC = ' * '; exports.DOC = DOC;
- const DEFAULT_SP = '  '; exports.DEFAULT_SP = DEFAULT_SP;
- let SP = exports.DEFAULT_SP; exports.SP = SP;
-
- function formatDocDescription(description) {
-  return (description || '').trim().replace(/\n/g, `\n${exports.DOC}${exports.SP}`);
-} exports.formatDocDescription = formatDocDescription;
-
- function getDocType(param, options) {
-  if (!param) {
-    return 'object';
-  } else if (param.$ref) {
-    const type = param.$ref.split('/').pop();
-    return `module:${type}`;
-  } else if (param.schema) {
-    return getDocType(param.schema, options);
-  } else if (param['x-schema']) {
-    return getDocType(param['x-schema'], options);
-  } else if (param.type === 'array') {
-    if (param.items.type) {
-      return `${getDocType(param.items, options)}[]`;
-    } else if (param.items.$ref) {
-      const type = param.items.$ref.split('/').pop();
-      return `module:${type}[]`;
-    } else {
-      return 'object[]';
-    }
-  } else if (param.type === 'integer' || param.type === 'number') {
-    return 'number';
-  } else if (param.type === 'string' && (param.format === 'date-time' || param.format === 'date')) {
-    return options && options.dateFormat === 'string' ? 'string' : 'Date';
-  } else if (param.type === 'string') {
-    return 'string';
-  } else if (param.type === 'boolean') {
-    return 'boolean';
-  } else {
-    return 'object';
-  }
-} exports.getDocType = getDocType;
-
- function getTSParamType(param, options) {
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function getTSParamType(param, options) {
   const unknownType = options.preferAny ? 'any' : 'unknown';
 
   if (!param) {
@@ -63,7 +23,7 @@
       if (param.items.enum) {
         return `(${getTSParamType(param.items, options)})[]`;
       } else {
-        return `${getTSParamType(param.items, options)}[]`;
+        return getTSParamType(param.items, options) + '[]';
       }
     } else if (param.items.$ref) {
       const type = param.items.$ref.split('/').pop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swaggie",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "Generate ES6 or TypeScript service integration code from an OpenAPI spec",
   "author": {
     "name": "Piotr Dabrowski",
@@ -25,8 +25,7 @@
   "scripts": {
     "build": "sucrase ./src -d ./dist --transforms typescript,imports && npm run rm-tests",
     "rm-tests": "find dist/ -name '*.spec.js' -type f -delete",
-    "test": "jest --ci",
-    "test:watch": "jest --watch"
+    "test": "mocha 'src/**/*.spec.ts'"
   },
   "files": [
     "dist",
@@ -42,7 +41,7 @@
     "codegen"
   ],
   "dependencies": {
-    "commander": "^8.2.0",
+    "commander": "^8.3.0",
     "ejs": "^3.1.6",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
@@ -51,31 +50,16 @@
     "node-fetch": "^2.6.3"
   },
   "devDependencies": {
-    "@sucrase/jest-plugin": "2.1.1",
+    "@types/chai": "4.2.22",
     "@types/ejs": "3.1.0",
-    "@types/jest": "27.0.2",
-    "@types/js-yaml": "4.0.3",
-    "@types/lodash": "4.14.175",
+    "@types/js-yaml": "4.0.5",
+    "@types/lodash": "4.14.177",
     "@types/mkdirp": "^1.0.2",
-    "@types/node": "16.10.2",
+    "@types/mocha": "9.0.0",
     "@types/node-fetch": "2.5.3",
-    "jest": "27.2.4",
-    "sucrase": "3.20.1",
-    "typescript": "4.4.3"
-  },
-  "jest": {
-    "testRegex": "\\.(test|spec)\\.tsx?$",
-    "transform": {
-      "^.+\\.tsx?$": "@sucrase/jest-plugin"
-    },
-    "testPathIgnorePatterns": [
-      "<rootDir>/node_modules/",
-      "<rootDir>/dist/"
-    ],
-    "testEnvironment": "node",
-    "watchPathIgnorePatterns": [
-      "<rootDir>/node_modules/",
-      "<rootDir>/dist/"
-    ]
+    "chai": "4.3.4",
+    "mocha": "9.1.3",
+    "sucrase": "3.20.3",
+    "typescript": "4.5.2"
   }
 }

package/templates/swr-axios/barrel.ejs

@@ -0,0 +1,9 @@
+
+function serializeQueryParam(obj: any) {
+  if (obj === null || obj === undefined) return '';
+  if (obj instanceof Date) return obj.toJSON();
+  if (typeof obj !== 'object' || Array.isArray(obj)) return obj;
+  return Object.keys(obj)
+    .reduce((a: any, b) => a.push(b + '=' + obj[b]) && a, [])
+    .join('&');
+}

package/templates/swr-axios/baseClient.ejs

@@ -0,0 +1,24 @@
+/* tslint:disable */
+/* eslint-disable */
+//----------------------
+// <auto-generated>
+//   Generated using Swaggie (https://github.com/yhnavein/swaggie)
+//   Please avoid doing any manual changes in this file
+// </auto-generated>
+//----------------------
+// ReSharper disable InconsistentNaming
+
+import Axios, { AxiosPromise, AxiosRequestConfig } from "axios";
+import useSWR, { SWRConfiguration, Key } from 'swr';
+
+export const axios = Axios.create({
+  baseURL: '<%- baseUrl || '' -%>',
+});
+
+interface SwrConfig extends SWRConfiguration {
+  /* Custom key for SWR. You don't have to worry about this as by default it's the URL. You can use standard SWR Key here if you need more flexibility. */
+  key?: Key;
+
+  /* Configuration for axios fetcher */
+  axios?: AxiosRequestConfig;
+}

package/templates/swr-axios/client.ejs

@@ -0,0 +1,19 @@
+export const <%- varName -%>Client = {
+  <% operations.forEach(function(operation) { %>
+<%- include('operation', operation); %>
+  <% }); %>
+};
+
+<% var getOperations = operations.filter(function(o) { return o.method == 'GET'; });
+if(getOperations.length > 0) { %>
+  <% getOperations.forEach(function(operation) {
+  var opName = operation.name;
+  if(opName.toLowerCase().startsWith("get")) {
+    opName = opName.substring(3);
+  }
+  opName[0] = opName[0].toUpperCase();
+  var customName = "use" + clientName + opName;
+  var swrOperation = Object.assign({ swrOpName: customName }, operation); %>
+<%- include('swrOperation', swrOperation); %>
+  <% }); %>
+<% } %>

package/templates/swr-axios/operation.ejs

@@ -0,0 +1,58 @@
+  /**<% parameters.forEach(function(parameter) { %>
+   * @param <%- parameter.name -%> <%- parameter.optional ? '(optional)' : '' -%> <%- parameter.name != parameter.originalName ? `(API name: ${parameter.originalName})` : '' -%>
+<% }); %>
+   */
+  <%- name -%>(<% parameters.forEach(function(parameter) { -%>
+  <%- parameter.name -%>: <%- parameter.type -%> <%- parameter.optional ? ' | null | undefined' : '' -%>,
+    <% }); -%>
+  $config?: AxiosRequestConfig
+  ): AxiosPromise<<%- returnType -%>> {
+    let url = '<%- url -%>';
+
+<%_ if(pathParams && pathParams.length > 0) {
+  pathParams.forEach(function(parameter) { -%>
+    url = url.replace('{<%- parameter.name -%>}', encodeURIComponent("" + <%- parameter.name -%>));
+<% });
+} _%>
+<%_ if(formData && formData.length > 0) { _%>
+    const formDataBody = new FormData();
+  <%_ formData.forEach(function(parameter) { -%>
+    if (!!<%- parameter.name -%>) {
+    <%_ if(parameter.original && parameter.original.type === 'array') { -%>
+      <%- parameter.name -%>.forEach((f: any) => formDataBody.append("<%- parameter.originalName -%>", f));
+    <%_ } else { %>
+      formDataBody.append("<%- parameter.originalName -%>", <%- parameter.name -%><%- parameter.type !== 'string' && parameter.type !== 'File' && parameter.type !== 'Blob' ? '.toString()' : '' -%>);
+    <%_ } %>
+    }
+<% });
+} _%>
+
+    return axios.request<<%- returnType -%>>({
+      url: url,
+      method: '<%- method -%>',
+<%_ if(formData && formData.length > 0) { _%>
+      data: formDataBody,
+<%_ } else if(body) { _%>
+      data: <%- body.name -%>,
+<%_ } _%>
+<%_ if(query && query.length > 0) { _%>
+      params: {
+        <% query.forEach(function(parameter) { -%>
+    '<%- parameter.originalName -%>': serializeQueryParam(<%- parameter.name -%>),
+    <% }); -%>
+      },
+<%_ } _%>
+<%_ if(headers && headers.length > 0) { _%>
+      headers: {
+        <% headers.forEach(function(parameter) { -%>
+    <%_ if (parameter.value) { _%>
+    '<%- parameter.originalName -%>': '<%- parameter.value -%>',
+    <%_ } else { _%>
+    '<%- parameter.originalName -%>': <%- parameter.name -%>,
+    <%_ } _%>
+    <% }); -%>
+      },
+<%_ } _%>
+      ...$config,
+    });
+  },

package/templates/swr-axios/swrOperation.ejs

@@ -0,0 +1,60 @@
+  /**<% parameters.forEach(function(parameter) { %>
+   * @param <%- parameter.name -%> <%- parameter.optional ? '(optional)' : '' -%> <%- parameter.name != parameter.originalName ? `(API name: ${parameter.originalName})` : '' -%>
+<% }); %>
+   */
+export function <%- swrOpName -%>(<% parameters.forEach(function(parameter) { -%>
+  <%- parameter.name -%>: <%- parameter.type -%> <%- parameter.optional ? ' | null | undefined' : '' -%>,
+    <% }); -%>
+  $config?: SwrConfig
+  ) {
+  let url = '<%- url -%>';
+  const { axios: $axiosConf, key, ...config } = $config || {};
+
+<%_ if(pathParams && pathParams.length > 0) {
+  pathParams.forEach(function(parameter) { -%>
+    url = url.replace('{<%- parameter.name -%>}', encodeURIComponent("" + <%- parameter.name -%>));
+<% });
+} _%>
+
+  let cacheUrl = url + '?';
+<%_ if(query && query.length > 0) { _%>
+  <% query.forEach(function(parameter) { -%>
+  if (!!<%- parameter.name -%>) {
+      cacheUrl += `<%- parameter.originalName -%>=${<%- parameter.name -%>}&`;
+    }
+  <% }); -%>
+<%_ } _%>
+  const { data, error, mutate } = useSWR<<%- returnType -%>>(
+    key ?? cacheUrl,
+    () => axios.request({
+      url: url,
+      method: '<%- method -%>',
+<%_ if(query && query.length > 0) { _%>
+      params: {
+        <% query.forEach(function(parameter) { -%>
+    '<%- parameter.originalName -%>': serializeQueryParam(<%- parameter.name -%>),
+    <% }); -%>
+      },
+<%_ } _%>
+<%_ if(headers && headers.length > 0) { _%>
+      headers: {
+        <% headers.forEach(function(parameter) { -%>
+    <%_ if (parameter.value) { _%>
+    '<%- parameter.originalName -%>': '<%- parameter.value -%>',
+    <%_ } else { _%>
+    '<%- parameter.originalName -%>': <%- parameter.name -%>,
+    <%_ } _%>
+    <% }); -%>
+      },
+<%_ } _%>
+    ...$axiosConf})
+    .then((resp) => resp.data),
+  config);
+
+  return {
+    data,
+    isLoading: !error && !data,
+    error: error,
+    mutate,
+  };
+}

package/dist/codegen/common.js

@@ -1,53 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _typescript = require('typescript'); var _typescript2 = _interopRequireDefault(_typescript);
-var _lodash = require('lodash');
-
-
-const _questionToken = _typescript2.default.createToken(_typescript2.default.SyntaxKind.QuestionToken);
-
- function questionToken(condition) {
-  return condition ? _questionToken : undefined;
-} exports.questionToken = questionToken;
-
- const modifiers = {
-  export: _typescript2.default.createModifier(_typescript2.default.SyntaxKind.ExportKeyword),
-}; exports.modifiers = modifiers;
- const keywordType = {
-  any: _typescript2.default.createKeywordTypeNode(_typescript2.default.SyntaxKind.AnyKeyword),
-  number: _typescript2.default.createKeywordTypeNode(_typescript2.default.SyntaxKind.NumberKeyword),
-  object: _typescript2.default.createKeywordTypeNode(_typescript2.default.SyntaxKind.ObjectKeyword),
-  string: _typescript2.default.createKeywordTypeNode(_typescript2.default.SyntaxKind.StringKeyword),
-  boolean: _typescript2.default.createKeywordTypeNode(_typescript2.default.SyntaxKind.BooleanKeyword),
-  undefined: _typescript2.default.createKeywordTypeNode(_typescript2.default.SyntaxKind.UndefinedKeyword),
-  null: _typescript2.default.createKeywordTypeNode(_typescript2.default.SyntaxKind.NullKeyword ),
-  void: _typescript2.default.createKeywordTypeNode(_typescript2.default.SyntaxKind.VoidKeyword),
-}; exports.keywordType = keywordType;
-
- function isNullable(schema) {
-  return !!(schema && schema.nullable);
-} exports.isNullable = isNullable;
-
- function isReference(obj) {
-  return obj && '$ref' in obj;
-} exports.isReference = isReference;
-
- function getReference(spec, ref) {
-  const path = ref
-    .slice(2)
-    .split('/')
-    .map((s) => unescape(s.replace(/~1/g, '/').replace(/~0/g, '~')));
-
-  const ret = _lodash.get.call(void 0, spec, path);
-  if (typeof ret === 'undefined') {
-    throw new Error(`Can't find ${path}`);
-  }
-  return ret;
-} exports.getReference = getReference;
-
-/**
- * If the given object is a ReferenceObject, return the last part of its path.
- */
- function getReferenceName(obj) {
-  if (isReference(obj)) {
-    return _lodash.camelCase.call(void 0, obj.$ref.split('/').slice(-1)[0]);
-  }
-} exports.getReferenceName = getReferenceName;

package/dist/codegen/index.js

@@ -1,31 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-
-
-
-
-
-
-
-
-
-var _common = require('./common');
-
- function generateApi(spec) {
-  const aliases = [];
-
-  function resolve(obj) {
-    if (!_common.isReference.call(void 0, obj)) return obj;
-    const ref = obj.$ref;
-    if (!ref.startsWith('#/')) {
-      throw new Error(
-        `External refs are not supported (${ref}). Make sure to call SwaggerParser.bundle() first.`
-      );
-    }
-    return _common.getReference.call(void 0, spec, ref) ;
-  }
-
-  function resolveArray(array) {
-    return array ? array.map(resolve) : [];
-  }
-} exports.default = generateApi;

package/dist/codegen/models.js

@@ -1,281 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _typescript = require('typescript'); var _typescript2 = _interopRequireDefault(_typescript);
-
-var _lodash = require('lodash'); var _lodash2 = _interopRequireDefault(_lodash);
-
-var _common = require('./common');
-
- function genType(name, component) {
-  const keys = Object.keys(component.properties || {});
-
-  const fields = keys.map((p) => {
-    const property = component.properties[p];
-    const type = getTypeFromSchema(property);
-    return _typescript2.default.createPropertySignature(
-      undefined,
-      _typescript2.default.createIdentifier(p),
-      _common.questionToken.call(void 0, false),
-      type,
-      undefined
-    );
-  });
-  return _typescript2.default.createInterfaceDeclaration(
-    undefined,
-    [_common.modifiers.export],
-    _typescript2.default.createIdentifier(name),
-    undefined,
-    undefined,
-    fields
-    /*
-    [
-      ts.createPropertySignature(
-        undefined,
-        ts.createIdentifier('id'),
-        undefined,
-        ts.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
-        undefined
-      ),
-      ts.createPropertySignature(
-        undefined,
-        ts.createIdentifier('marketCode'),
-        questionToken(true),
-        ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-        undefined
-      ),
-      ts.createPropertySignature(
-        undefined,
-        ts.createIdentifier('entries'),
-        undefined,
-        ts.createArrayTypeNode(
-          ts.createTypeReferenceNode(ts.createIdentifier('BookEntry'), undefined)
-        ),
-        undefined
-      ),
-    ]
-    */
-  );
-} exports.genType = genType;
-
- function generateTypes() {
-  return [];
-} exports.generateTypes = generateTypes;
-
-const aliases = [];
-const refs = {};
-
-function getRefAlias(obj) {
-  const { $ref } = obj;
-  let ref = refs[$ref];
-  if (!ref) {
-    const schema = resolve(obj);
-    const name = getUniqueAlias(_lodash2.default.upperFirst(schema.title || getRefBasename($ref)));
-
-    ref = refs[$ref] = _typescript2.default.createTypeReferenceNode(name, undefined);
-
-    const type = getTypeFromSchema(schema);
-    aliases.push(
-      _typescript2.default.createTypeAliasDeclaration(undefined, [_common.modifiers.export], name, undefined, type)
-    );
-  }
-  return ref;
-}
-
-function getTypeFromSchema(schema) {
-  const type = getBaseTypeFromSchema(schema);
-  return _common.isNullable.call(void 0, schema) ? _typescript2.default.createUnionTypeNode([type, _common.keywordType.null]) : type;
-}
-
-function getRefBasename(ref) {
-  return ref.replace(/.+\//, '');
-}
-
- function getBaseTypeFromSchema(
-  schema
-) {
-  if (!schema) return _common.keywordType.any;
-  if (_common.isReference.call(void 0, schema)) {
-    return _common.keywordType.any;
-    // return getRefAlias(schema);
-  }
-
-  if (schema.oneOf) {
-    // oneOf -> union
-    return getUnionType(schema.oneOf, schema.discriminator);
-  }
-  if (schema.anyOf) {
-    // anyOf -> union
-    return _typescript2.default.createUnionTypeNode(schema.anyOf.map(getTypeFromSchema));
-  }
-  if (schema.allOf) {
-    // allOf -> intersection
-    return _typescript2.default.createIntersectionTypeNode(schema.allOf.map(getTypeFromSchema));
-  }
-  if ('items' in schema) {
-    // items -> array
-    return _typescript2.default.createArrayTypeNode(getTypeFromSchema(schema.items));
-  }
-  if (schema.properties || schema.additionalProperties) {
-    // properties -> literal type
-    return getTypeFromProperties(
-      schema.properties || {},
-      schema.required,
-      schema.additionalProperties
-    );
-  }
-  if (schema.enum) {
-    // enum -> union of literal types
-    const types = schema.enum.map((s) =>
-      s === null ? _common.keywordType.null : _typescript2.default.createLiteralTypeNode(_typescript2.default.createStringLiteral(s))
-    );
-    return types.length > 1 ? _typescript2.default.createUnionTypeNode(types) : types[0];
-  }
-  if (schema.format === 'binary') {
-    return _typescript2.default.createTypeReferenceNode('Blob', []);
-  }
-  if (schema.type) {
-    // string, boolean, null, number
-    if (schema.type in _common.keywordType) return _common.keywordType[schema.type];
-    if (schema.type === 'integer') return _common.keywordType.number;
-  }
-
-  return _common.keywordType.any;
-} exports.getBaseTypeFromSchema = getBaseTypeFromSchema;
-
-function supportDeepObjects(params) {
-  const res = [];
-  const merged = {};
-  params.forEach((p) => {
-    const m = /^(.+?)\[(.*?)\]/.exec(p.name);
-    if (!m) {
-      res.push(p);
-      return;
-    }
-    const [, name, prop] = m;
-    let obj = merged[name];
-    if (!obj) {
-      obj = merged[name] = {
-        name,
-        in: p.in,
-        style: 'deepObject',
-        schema: {
-          type: 'object',
-          properties: {},
-        },
-      };
-      res.push(obj);
-    }
-    obj.schema.properties[prop] = p.schema;
-  });
-  return res;
-}
-
-const typeAliases = {};
-function getUniqueAlias(name) {
-  let used = typeAliases[name] || 0;
-  if (used) {
-    typeAliases[name] = ++used;
-    name += used;
-  }
-  typeAliases[name] = 1;
-  return name;
-}
-function getTypeFromProperties(
-  props
-
-,
-  required,
-  additionalProperties
-) {
-  const members = Object.keys(props).map((name) => {
-    const schema = props[name];
-    const isRequired = required && required.includes(name);
-    return _typescript2.default.createPropertySignature(
-      undefined,
-      name,
-      _common.questionToken.call(void 0, !isRequired),
-      getTypeFromSchema(schema)
-    );
-  });
-  if (additionalProperties) {
-    const type =
-      additionalProperties === true ? _common.keywordType.any : getTypeFromSchema(additionalProperties);
-
-    members.push(_typescript2.default.createIndexSignature(undefined, undefined, undefined, type));
-  }
-  return _typescript2.default.createTypeLiteralNode(members);
-}
-
- function getUnionType(
-  variants,
-  discriminator
-) {
-  if (discriminator) {
-    // oneOf + discriminator -> tagged union (polymorphism)
-    if (discriminator.propertyName === undefined) {
-      throw new Error('Discriminators require a propertyName');
-    }
-
-    // By default, the last component of the ref name (i.e., after the last trailing slash) is
-    // used as the discriminator value for each variant. This can be overridden using the
-    // discriminator.mapping property.
-    const mappedValues = new Set(
-      Object.values(discriminator.mapping || {}).map((ref) => getRefBasename(ref))
-    );
-
-    return _typescript2.default.createUnionTypeNode(
-      ([
-        ...Object.entries(discriminator.mapping || {}).map(([discriminatorValue, variantRef]) => [
-          discriminatorValue,
-          { $ref: variantRef },
-        ]),
-        ...variants
-          .filter((variant) => {
-            if (!_common.isReference.call(void 0, variant)) {
-              // From the Swagger spec: "When using the discriminator, inline schemas will not be
-              // considered."
-              throw new Error('Discriminators require references, not inline schemas');
-            }
-            return !mappedValues.has(getRefBasename(variant.$ref));
-          })
-          .map((schema) => [getRefBasename((schema ).$ref), schema]),
-      ] ).map(([discriminatorValue, variant]) =>
-        // Yields: { [discriminator.propertyName]: discriminatorValue } & variant
-        _typescript2.default.createIntersectionTypeNode([
-          _typescript2.default.createTypeLiteralNode([
-            _typescript2.default.createPropertySignature(
-              undefined,
-              discriminator.propertyName,
-              undefined,
-              _typescript2.default.createLiteralTypeNode(_typescript2.default.createStringLiteral(discriminatorValue))
-            ),
-          ]),
-          getTypeFromSchema(variant),
-        ])
-      )
-    );
-  } else {
-    // oneOf -> untagged union
-    return _typescript2.default.createUnionTypeNode(variants.map(getTypeFromSchema));
-  }
-} exports.getUnionType = getUnionType;
-
-function resolve(obj) {
-  if (!_common.isReference.call(void 0, obj)) return obj;
-  const ref = obj.$ref;
-  if (!ref.startsWith('#/')) {
-    throw new Error(
-      `External refs are not supported (${ref}). Make sure to call SwaggerParser.bundle() first.`
-    );
-  }
-  // return getReference(spec, ref) as T;
-}
-
-function resolveArray(array) {
-  return array ? array.map(resolve) : [];
-}
-
-
-
-
-
-
-

package/dist/codegen/renderer.js

@@ -1,42 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
-var _typescript = require('typescript'); var _typescript2 = _interopRequireDefault(_typescript);
-
- function parseFile(file) {
-  return _typescript2.default.createSourceFile(
-    file,
-    _fs2.default.readFileSync(file, 'utf8'),
-    _typescript2.default.ScriptTarget.Latest,
-    false,
-    _typescript2.default.ScriptKind.TS
-  );
-} exports.parseFile = parseFile;
-
-const printer = _typescript2.default.createPrinter({
-  newLine: _typescript2.default.NewLineKind.LineFeed,
-});
-
- function printNode(node) {
-  const file = _typescript2.default.createSourceFile(
-    'someFileName.ts',
-    '',
-    _typescript2.default.ScriptTarget.Latest,
-    false,
-    _typescript2.default.ScriptKind.TS
-  );
-  return printer.printNode(_typescript2.default.EmitHint.Unspecified, node, file);
-} exports.printNode = printNode;
-
- function printNodes(nodes) {
-  const file = _typescript2.default.createSourceFile(
-    'someFileName.ts',
-    '',
-    _typescript2.default.ScriptTarget.Latest,
-    false,
-    _typescript2.default.ScriptKind.TS
-  );
-  return nodes.map((node) => printer.printNode(_typescript2.default.EmitHint.Unspecified, node, file)).join('\n');
-} exports.printNodes = printNodes;
-
- function printFile(sourceFile) {
-  return printer.printFile(sourceFile);
-} exports.printFile = printFile;

package/dist/schema.js

@@ -1,41 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-var _lodash = require('lodash');
-var _utils = require('./utils');
-
-const models = [];
-
-exports. default = function (spec) {
-  function getAllModels() {
-    return spec.components.schemas;
-  }
-
-  function handleGenericTypes() {
-    return [];
-  }
-}
-
- function getParamName(name) {
-  return _utils.escapeReservedWords.call(void 0, 
-    name
-      .split('.')
-      .map((x) => _lodash.camelCase.call(void 0, x))
-      .join('_')
-  );
-} exports.getParamName = getParamName;
-
- function getOperationName(opId, group) {
-  if (!opId) {
-    return '';
-  }
-  if (!group) {
-    return opId;
-  }
-
-  return _lodash.camelCase.call(void 0, opId.replace(group + '_', ''));
-} exports.getOperationName = getOperationName;
-
-
-
-
-
-

package/dist/swagger2openapi.d.js

@@ -1,11 +0,0 @@
-"use strict";
-
-
-
-
-
-
-
-
-
-

package/dist/utils/index.js

@@ -1,3 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _createStarExport(obj) { Object.keys(obj) .filter((key) => key !== "default" && key !== "__esModule") .forEach((key) => { if (exports.hasOwnProperty(key)) { return; } Object.defineProperty(exports, key, {enumerable: true, get: () => obj[key]}); }); }var _utils = require('./utils'); _createStarExport(_utils);
-var _specLoader = require('./specLoader'); _createStarExport(_specLoader);
-var _types = require('./types'); _createStarExport(_types);

package/dist/utils/queryModels.js

@@ -1,57 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-var _lodash = require('lodash');
-var _ = require('./');
-
-const verbs = ['GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'HEAD', 'PATCH', 'TRACE'];
-
-// TODO: Merge with path-level parameters
- function getQueryModels(spec) {
-  const res = Object.keys(spec.paths).map((key) => {
-    const el = spec.paths[key];
-    return Object.keys(el)
-      .filter((verb) => verbs.indexOf(verb.toUpperCase()) > -1)
-      .map((verb) => {
-        const operation = el[verb] ;
-        const queryParams = operation.parameters.filter(
-          (p) => p.in === 'query'
-        );
-
-        if (!queryParams || queryParams.length <= 1) {
-          return null;
-        }
-
-        const params = queryParams.map((q) => ({ name: q.name, ...q.schema }));
-        return {
-          name: `I${_lodash.upperFirst.call(void 0, getOperationName(operation.operationId))}ServiceQuery`,
-          type: 'object',
-          additionalProperties: false,
-          properties: params.reduce((obj, item) => Object.assign(obj, { [item.name]: item }), {}),
-        } ;
-      });
-  });
-  return _lodash.flatten.call(void 0, res).filter((e) => e);
-} exports.getQueryModels = getQueryModels;
-
- function getParamName(name) {
-  return _.escapeReservedWords.call(void 0, 
-    name
-      .split('.')
-      .map((x) => _lodash.camelCase.call(void 0, x))
-      .join('_')
-  );
-} exports.getParamName = getParamName;
-
- function getOperationName(opId, group) {
-  if (!opId) {
-    return '';
-  }
-  if (!group) {
-    return opId;
-  }
-
-  return _lodash.camelCase.call(void 0, opId.replace(group + '_', ''));
-} exports.getOperationName = getOperationName;
-
-
-
-

package/dist/utils/specLoader.js

@@ -1,87 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _jsyaml = require('js-yaml'); var _jsyaml2 = _interopRequireDefault(_jsyaml);
-var _nodefetch = require('node-fetch'); var _nodefetch2 = _interopRequireDefault(_nodefetch);
-
-/** Either tries to load spec from given location or returns it further if it was already given */
- function loadSpecification(src) {
-  if (typeof src === 'string') {
-    return loadFile(src);
-  } else {
-    return Promise.resolve(src);
-  }
-} exports.loadSpecification = loadSpecification;
-
-function loadFile(src) {
-  if (/^https?:\/\//im.test(src)) {
-    return loadFromUrl(src);
-  } else if (String(process) === '[object process]') {
-    return readLocalFile(src).then((contents) => parseFileContents(contents, src));
-  } else {
-    throw new Error(`Unable to load api at '${src}'`);
-  }
-}
-
-function loadFromUrl(url) {
-  return _nodefetch2.default.call(void 0, url)
-    .then((resp) => resp.text())
-    .then((contents) => parseFileContents(contents, url));
-}
-
-function readLocalFile(filePath) {
-  return new Promise((res, rej) =>
-    require('fs').readFile(filePath, 'utf8', (err, contents) => (err ? rej(err) : res(contents)))
-  );
-}
-
-function parseFileContents(contents, path) {
-  return /.ya?ml$/i.test(path) ? _jsyaml2.default.load(contents) : JSON.parse(contents);
-}
-
-/**
- * Recursively expand internal references in the form `#/path/to/object`.
- *
- * @param {object} data the object to search for and update refs
- * @param {object} lookup the object to clone refs from
- * @param {regexp=} refMatch an optional regex to match specific refs to resolve
- * @returns {object} the resolved data object
- */
-function expandRefs(data, lookup) {
-  if (!data) {
-    return data;
-  }
-
-  if (Array.isArray(data)) {
-    return data.map((item) => expandRefs(item, lookup));
-  } else if (typeof data === 'object') {
-    if (dataCache.has(data)) {
-      return data;
-    }
-    if (data.$ref) {
-      const resolved = expandRef(data.$ref, lookup);
-      delete data.$ref;
-      data = Object.assign({}, resolved, data);
-    }
-    dataCache.add(data);
-
-    for (let name in data) {
-      data[name] = expandRefs(data[name], lookup);
-    }
-  }
-  return data;
-}
-
-function expandRef(ref, lookup) {
-  const parts = ref.split('/');
-  if (parts.shift() !== '#' || !parts[0]) {
-    throw new Error(`Only support JSON Schema $refs in format '#/path/to/ref'`);
-  }
-  let value = lookup;
-  while (parts.length) {
-    value = value[parts.shift()];
-    if (!value) {
-      throw new Error(`Invalid schema reference: ${ref}`);
-    }
-  }
-  return value;
-}
-
-const dataCache = new Set();

package/dist/utils/types.js

@@ -1,29 +0,0 @@
-"use strict";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- // 'luxon', 'momentjs', etc
-
-// interface ApiOperationParam extends ApiOperationParamBase {
-//   name: string;
-//   in: 'header' | 'path' | 'query' | 'body' | 'formData';
-//   description: string;
-//   required: boolean;
-//   readonly?: boolean;
-//   allowEmptyValue: boolean;
-//   schema: object;
-//   'x-nullable'?: boolean;
-//   'x-schema'?: object;
-// }

package/dist/utils/utils.js

@@ -1,59 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});/** This method tries to fix potentially wrong out parameter given from commandline */
- function prepareOutputFilename(out) {
-  if (!out) {
-    return null;
-  }
-
-  if (/\.[jt]sx?$/i.test(out)) {
-    return out.replace(/[\\]/i, '/');
-  }
-  if (/[\/\\]$/i.test(out)) {
-    return out.replace(/[\/\\]$/i, '') + '/index.ts';
-  }
-  return out.replace(/[\\]/i, '/') + '.ts';
-} exports.prepareOutputFilename = prepareOutputFilename;
-
-const reservedWords = [
-  'break',
-  'case',
-  'catch',
-  'class',
-  'const',
-  'continue',
-  'debugger',
-  'default',
-  'delete',
-  'do',
-  'else',
-  'export',
-  'extends',
-  'finally',
-  'for',
-  'function',
-  'if',
-  'import',
-  'in',
-  'instanceof',
-  'new',
-  'return',
-  'super',
-  'switch',
-  'this',
-  'throw',
-  'try',
-  'typeof',
-  'var',
-  'void',
-  'while',
-  'with',
-  'yield',
-];
-
- function escapeReservedWords(name) {
-  let escapedName = name;
-
-  if (reservedWords.indexOf(name) >= 0) {
-    escapedName = '_' + name;
-  }
-  return escapedName;
-} exports.escapeReservedWords = escapeReservedWords;