Skip to content

Commit cfc2f39

Browse files
committed
fix(deps): made graphql a peer dependency
BREAKING CHANGE: Bring your own graphql is now required
1 parent 35f5101 commit cfc2f39

File tree

4 files changed

+44
-46
lines changed

4 files changed

+44
-46
lines changed

lib/index.js

+10-19
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,14 @@ var schemaFromEndpoints = function schemaFromEndpoints(endpoints) {
3838
var rootType = new _graphql.GraphQLObjectType({
3939
name: 'Query',
4040
fields: function fields() {
41-
return {
42-
viewer: {
43-
type: new _graphql.GraphQLObjectType({
44-
name: 'viewer',
45-
fields: function fields() {
46-
var queryFields = getQueriesFields(endpoints, false, proxyUrl);
47-
if (!(0, _keys2.default)(queryFields).length) {
48-
throw new Error('Did not find any GET endpoints');
49-
}
50-
return queryFields;
51-
}
52-
}),
53-
resolve: function resolve() {
54-
return 'Without this resolver graphql does not resolve further';
55-
}
56-
}
57-
};
41+
var queryFields = getQueriesFields(endpoints, false, proxyUrl);
42+
if (!(0, _keys2.default)(queryFields).length) {
43+
throw new Error('Did not find any GET endpoints');
44+
}
45+
return queryFields;
46+
},
47+
resolve: function resolve() {
48+
return 'Without this resolver graphql does not resolve further';
5849
}
5950
});
6051

@@ -76,7 +67,7 @@ var schemaFromEndpoints = function schemaFromEndpoints(endpoints) {
7667

7768
var resolver = function resolver(endpoint, proxyUrl) {
7869
return function () {
79-
var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(_, args, opts) {
70+
var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(_, args, opts) {
8071
var proxy, req, res;
8172
return _regenerator2.default.wrap(function _callee$(_context) {
8273
while (1) {
@@ -127,7 +118,7 @@ var getQueriesFields = function getQueriesFields(endpoints, isMutation, proxyUrl
127118
};
128119

129120
var build = function () {
130-
var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(swaggerPath) {
121+
var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(swaggerPath) {
131122
var proxyUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
132123
var swaggerSchema, endpoints, schema;
133124
return _regenerator2.default.wrap(function _callee2$(_context2) {

package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "@kbrandwijk/swagger-to-graphql",
3-
"version": "1.3.2",
3+
"version": "2.4.2",
44
"author": "Roman Krivtsov",
55
"contributors": [
66
"Kim Brandwijk <[email protected]>"
77
],
88
"bin": "./bin/swagger2graphql",
9+
"peerDependencies": {
10+
"graphql": "^0.12.3"
11+
},
912
"dependencies": {
1013
"babel-runtime": "^6.25.0",
11-
"graphql": "^0.12.3",
1214
"isomorphic-fetch": "^2.2.1",
1315
"js-yaml": "^3.8.4",
1416
"json-schema-ref-parser": "^3.1.2",
@@ -34,6 +36,7 @@
3436
"express": "^4.15.3",
3537
"express-graphql": "^0.6.6",
3638
"flow-bin": "^0.47.0",
39+
"graphql": "^0.12.3",
3740
"mocha": "^3.1.2"
3841
},
3942
"keywords": [

src/index.js

+8-15
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,14 @@ type Endpoints ={[string]: Endpoint};
1010
const schemaFromEndpoints = (endpoints: Endpoints, proxyUrl: ?(Function | string) = null) => {
1111
const rootType = new GraphQLObjectType({
1212
name: 'Query',
13-
fields: () => ({
14-
viewer: {
15-
type: new GraphQLObjectType({
16-
name: 'viewer',
17-
fields: () => {
18-
const queryFields = getQueriesFields(endpoints, false, proxyUrl);
19-
if (!Object.keys(queryFields).length) {
20-
throw new Error('Did not find any GET endpoints');
21-
}
22-
return queryFields;
23-
}
24-
}),
25-
resolve: () => 'Without this resolver graphql does not resolve further'
26-
}
27-
})
13+
fields: () => {
14+
const queryFields = getQueriesFields(endpoints, false, proxyUrl);
15+
if (!Object.keys(queryFields).length) {
16+
throw new Error('Did not find any GET endpoints');
17+
}
18+
return queryFields;
19+
},
20+
resolve: () => 'Without this resolver graphql does not resolve further'
2821
});
2922

3023
const graphQLSchema: RootGraphQLSchema = {

yarn.lock

+21-10
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,13 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0:
776776
core-js "^2.4.0"
777777
regenerator-runtime "^0.10.0"
778778

779+
babel-runtime@^6.25.0:
780+
version "6.26.0"
781+
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
782+
dependencies:
783+
core-js "^2.4.0"
784+
regenerator-runtime "^0.11.0"
785+
779786
babel-template@^6.24.1:
780787
version "6.24.1"
781788
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
@@ -1678,11 +1685,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.4:
16781685
version "1.0.1"
16791686
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
16801687

1681-
graphql@^0.10.1:
1682-
version "0.10.1"
1683-
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.10.1.tgz#75c93c2ce73aeb5bae2eefb555a8e9e39c36027d"
1688+
graphql@^0.12.3:
1689+
version "0.12.3"
1690+
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.12.3.tgz#11668458bbe28261c0dcb6e265f515ba79f6ce07"
16841691
dependencies:
1685-
iterall "^1.1.0"
1692+
iterall "1.1.3"
16861693

16871694
16881695
version "1.9.2"
@@ -1983,9 +1990,9 @@ isstream@~0.1.2:
19831990
version "0.1.2"
19841991
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
19851992

1986-
iterall@^1.1.0:
1987-
version "1.1.1"
1988-
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.1.tgz#f7f0af11e9a04ec6426260f5019d9fcca4d50214"
1993+
1994+
version "1.1.3"
1995+
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9"
19891996

19901997
jest-matcher-utils@^19.0.0:
19911998
version "19.0.0"
@@ -2332,9 +2339,9 @@ node-pre-gyp@^0.6.29:
23322339
tar "^2.2.1"
23332340
tar-pack "^3.4.0"
23342341

2335-
"node-request-by-swagger@github:marla-singer/node-request-by-swagger":
2336-
version "1.0.5"
2337-
resolved "https://codeload.github.com/marla-singer/node-request-by-swagger/tar.gz/703e9f2ffff74cb932e12a9fa84deeef704a8b26"
2342+
node-request-by-swagger@^1.0.6:
2343+
version "1.0.6"
2344+
resolved "https://registry.yarnpkg.com/node-request-by-swagger/-/node-request-by-swagger-1.0.6.tgz#3129510e33232e4d37be4cce94c704670bc5b135"
23382345

23392346
nopt@^4.0.1:
23402347
version "4.0.1"
@@ -2697,6 +2704,10 @@ regenerator-runtime@^0.10.0:
26972704
version "0.10.5"
26982705
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
26992706

2707+
regenerator-runtime@^0.11.0:
2708+
version "0.11.1"
2709+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
2710+
27002711
27012712
version "0.9.11"
27022713
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"

0 commit comments

Comments
 (0)