Merge pull request yarax#29 from marla-singer/master

Improve support es6 features for node v4

Author: raxpost

.babelrc

@@ -1,4 +1,4 @@
 {
   "presets": ["es2015", "stage-0"],
-  "plugins": ["add-module-exports", "syntax-flow", "transform-flow-strip-types"]
+  "plugins": ["add-module-exports", "syntax-flow", "transform-flow-strip-types", "transform-runtime"]
 }

lib/index.js

@@ -4,6 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _requestPromise = require('request-promise');
 
 var _requestPromise2 = _interopRequireDefault(_requestPromise);
@@ -16,11 +28,6 @@ var _typeMap = require('./typeMap');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
-
-require('babel-polyfill');
-
-
 var schemaFromEndpoints = function schemaFromEndpoints(endpoints) {
   var rootType = new _graphql.GraphQLObjectType({
     name: 'Query',
@@ -31,7 +38,7 @@ var schemaFromEndpoints = function schemaFromEndpoints(endpoints) {
             name: 'viewer',
             fields: function fields() {
               var queryFields = getQueriesFields(endpoints, false);
-              if (!Object.keys(queryFields).length) {
+              if (!(0, _keys2.default)(queryFields).length) {
                 throw new Error('Did not find any GET endpoints');
               }
               return queryFields;
@@ -50,7 +57,7 @@ var schemaFromEndpoints = function schemaFromEndpoints(endpoints) {
   };
 
   var mutationFields = getQueriesFields(endpoints, true);
-  if (Object.keys(mutationFields).length) {
+  if ((0, _keys2.default)(mutationFields).length) {
     graphQLSchema.mutation = new _graphql.GraphQLObjectType({
       name: 'Mutation',
       fields: mutationFields
@@ -60,11 +67,12 @@ var schemaFromEndpoints = function schemaFromEndpoints(endpoints) {
   return new _graphql.GraphQLSchema(graphQLSchema);
 };
 
+
 var resolver = function resolver(endpoint) {
   return function () {
-    var _ref = _asyncToGenerator(regeneratorRuntime.mark(function _callee(_, args, opts) {
+    var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(_, args, opts) {
       var req, res;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regenerator2.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -95,7 +103,7 @@ var resolver = function resolver(endpoint) {
 };
 
 var getQueriesFields = function getQueriesFields(endpoints, isMutation) {
-  return Object.keys(endpoints).filter(function (typeName) {
+  return (0, _keys2.default)(endpoints).filter(function (typeName) {
     return !!endpoints[typeName].mutation === !!isMutation;
   }).reduce(function (result, typeName) {
     var endpoint = endpoints[typeName];
@@ -112,9 +120,9 @@ var getQueriesFields = function getQueriesFields(endpoints, isMutation) {
 };
 
 var build = function () {
-  var _ref2 = _asyncToGenerator(regeneratorRuntime.mark(function _callee2(swaggerPath) {
+  var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(swaggerPath) {
     var swaggerSchema, endpoints, schema;
-    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    return _regenerator2.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:

lib/swagger.js

@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getAllEndPoints = exports.loadSchema = exports.getSchema = undefined;
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _jsonSchemaRefParser = require('json-schema-ref-parser');
 
 var _jsonSchemaRefParser2 = _interopRequireDefault(_jsonSchemaRefParser);
@@ -17,7 +21,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var __schema = void 0;
 var getSchema = exports.getSchema = function getSchema() {
-  if (!__schema || !Object.keys(__schema).length) {
+  if (!__schema || !(0, _keys2.default)(__schema).length) {
     throw new Error('Schema was not loaded');
   }
   return __schema;
@@ -33,7 +37,7 @@ var getSuccessResponse = function getSuccessResponse(responses) {
 
   if (!responses) return null;
 
-  Object.keys(responses).some(function (code) {
+  (0, _keys2.default)(responses).some(function (code) {
     resp = responses[code];
     return code[0] === '2';
   });
@@ -56,9 +60,9 @@ var replaceOddChars = function replaceOddChars(str) {
  */
 var getAllEndPoints = exports.getAllEndPoints = function getAllEndPoints(schema) {
   var allTypes = {};
-  Object.keys(schema.paths).forEach(function (path) {
+  (0, _keys2.default)(schema.paths).forEach(function (path) {
     var route = schema.paths[path];
-    Object.keys(route).forEach(function (method) {
+    (0, _keys2.default)(route).forEach(function (method) {
       var obj = route[method];
       var isMutation = ['post', 'put', 'patch', 'delete'].indexOf(method) !== -1;
       var typeName = obj.operationId || getGQLTypeNameFromURL(method, path);

lib/typeMap.js

@@ -5,6 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mapParametersToFields = exports.getTypeFields = exports.createGQLObject = undefined;
 
+var _stringify = require('babel-runtime/core-js/json/stringify');
+
+var _stringify2 = _interopRequireDefault(_stringify);
+
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _lodash = require('lodash');
 
 var _lodash2 = _interopRequireDefault(_lodash);
@@ -103,7 +111,7 @@ var getTypeFields = exports.getTypeFields = function getTypeFields(jsonSchema, t
     };
   });
 
-  if (!Object.keys(fields).length) {
+  if (!(0, _keys2.default)(fields).length) {
     fields.empty = {
       description: 'default field',
       type: graphql.GraphQLString
@@ -118,7 +126,7 @@ var jsonSchemaTypeToGraphQL = function jsonSchemaTypeToGraphQL(title, jsonSchema
   } else if (jsonSchema.type) {
     return getPrimitiveTypes(jsonSchema);
   }
-  throw new Error("Don't know how to handle schema " + JSON.stringify(jsonSchema) + ' without type and schema');
+  throw new Error("Don't know how to handle schema " + (0, _stringify2.default)(jsonSchema) + ' without type and schema');
 };
 
 var getPrimitiveTypes = function getPrimitiveTypes(jsonSchema) {

package.json

@@ -4,13 +4,12 @@
   "author": "Roman Krivtsov",
   "bin": "./bin/swagger2graphql",
   "dependencies": {
-    "babel-polyfill": "^6.23.0",
     "graphql": "^0.10.1",
     "isomorphic-fetch": "^2.2.1",
     "js-yaml": "^3.8.4",
     "json-schema-ref-parser": "^3.1.2",
     "lodash": "^4.16.4",
-    "node-request-by-swagger": "^1.0.5",
+    "node-request-by-swagger": "github:marla-singer/node-request-by-swagger",
     "request": "^2.75.0",
     "request-promise": "^4.1.1",
     "yargs": "^8.0.2"
@@ -22,6 +21,7 @@
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-syntax-flow": "^6.18.0",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "eslint": "^3.19.0",

src/index.js

@@ -1,5 +1,4 @@
 // @flow
-require('babel-polyfill');
 import type {GraphQLParameters, Endpoint, GraphQLType, RootGraphQLSchema, SwaggerToGraphQLOptions} from './types';
 import rp from 'request-promise';
 import { GraphQLSchema, GraphQLObjectType } from 'graphql';