Skip to content

Commit 46f6c4f

Browse files
committed
chore: update dependencies
1 parent df9b2cd commit 46f6c4f

File tree

3 files changed

+136
-69
lines changed

3 files changed

+136
-69
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"object-path": "^0.11.4"
3333
},
3434
"optionalDependencies": {
35-
"graphql-compose-connection": ">=3.2.0",
35+
"graphql-compose-connection": ">=3.2.1",
3636
"graphql-compose-pagination": ">=3.3.0"
3737
},
3838
"peerDependencies": {
@@ -41,7 +41,7 @@
4141
},
4242
"devDependencies": {
4343
"@types/graphql": "^0.13.4",
44-
"@types/mongoose": "^5.2.5",
44+
"@types/mongoose": "^5.2.6",
4545
"babel-cli": "^6.26.0",
4646
"babel-core": "^6.26.3",
4747
"babel-eslint": "^8.2.6",
@@ -52,24 +52,24 @@
5252
"babel-plugin-transform-runtime": "^6.23.0",
5353
"babel-preset-env": "^1.7.0",
5454
"cz-conventional-changelog": "^2.1.0",
55-
"eslint": "^5.3.0",
55+
"eslint": "^5.4.0",
5656
"eslint-config-airbnb-base": "^13.1.0",
5757
"eslint-config-prettier": "^3.0.1",
5858
"eslint-plugin-flowtype": "^2.50.0",
5959
"eslint-plugin-import": "^2.14.0",
6060
"eslint-plugin-prettier": "^2.6.2",
61-
"flow-bin": "^0.79.0",
61+
"flow-bin": "^0.79.1",
6262
"graphql": "0.13.2",
6363
"graphql-compose": "^4.8.2",
64-
"graphql-compose-connection": ">=3.2.0",
64+
"graphql-compose-connection": ">=3.2.1",
6565
"graphql-compose-pagination": ">=3.3.0",
6666
"jest": "^23.5.0",
67-
"mongodb-memory-server": "^2.0.0",
68-
"mongoose": "^5.2.8",
67+
"mongodb-memory-server": "^2.0.1",
68+
"mongoose": "^5.2.9",
6969
"prettier": "^1.14.2",
7070
"request": "^2.88.0",
7171
"rimraf": "^2.6.2",
72-
"semantic-release": "^15.9.8",
72+
"semantic-release": "^15.9.9",
7373
"tslint": "^5.11.0",
7474
"typescript": "^3.0.1"
7575
},
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
/* @flow */
2+
/* eslint-disable no-await-in-loop */
3+
4+
import mongoose from 'mongoose';
5+
import MongodbMemoryServer from 'mongodb-memory-server';
6+
import { composeWithMongoose } from '../../index';
7+
8+
let mongoServer;
9+
beforeAll(async () => {
10+
mongoServer = new MongodbMemoryServer();
11+
const mongoUri = await mongoServer.getConnectionString();
12+
await mongoose.connect(
13+
mongoUri,
14+
{ useNewUrlParser: true }
15+
);
16+
// mongoose.set('debug', true);
17+
});
18+
19+
afterAll(() => {
20+
mongoose.disconnect();
21+
mongoServer.stop();
22+
});
23+
24+
// May require additional time for downloading MongoDB binaries
25+
jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000;
26+
27+
describe('issue #120 - check `connection` resolver with last/before', () => {
28+
const RecordSchema = new mongoose.Schema({ id: String, title: String });
29+
const Record = mongoose.model('Record', RecordSchema);
30+
const RecordTC = composeWithMongoose(Record);
31+
const resolver = RecordTC.getResolver('connection');
32+
33+
beforeAll(async () => {
34+
for (let i = 1; i <= 9; i++) {
35+
await Record.create({ _id: `10000000000000000000000${i}`, title: `${i}` });
36+
}
37+
});
38+
39+
it('check last/before with sorting', async () => {
40+
const res1 = await resolver.resolve({ args: { last: 2, before: '', sort: { _id: 1 } } });
41+
expect(res1.edges.map(({ cursor, node }) => ({ cursor, node: node.toString() }))).toEqual([
42+
{
43+
cursor: 'eyJfaWQiOiIxMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDgifQ==',
44+
node: '{ _id: 100000000000000000000008 }',
45+
},
46+
{
47+
cursor: 'eyJfaWQiOiIxMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDkifQ==',
48+
node: '{ _id: 100000000000000000000009 }',
49+
},
50+
]);
51+
52+
const res2 = await resolver.resolve({
53+
args: {
54+
last: 2,
55+
before: 'eyJfaWQiOiIxMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDgifQ==',
56+
sort: { _id: 1 },
57+
},
58+
});
59+
expect(res2.edges.map(({ cursor, node }) => ({ cursor, node: node.toString() }))).toEqual([
60+
{
61+
cursor: 'eyJfaWQiOiIxMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDYifQ==',
62+
node: '{ _id: 100000000000000000000006 }',
63+
},
64+
{
65+
cursor: 'eyJfaWQiOiIxMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDcifQ==',
66+
node: '{ _id: 100000000000000000000007 }',
67+
},
68+
]);
69+
});
70+
71+
it('check last/before without sorting', async () => {
72+
const res1 = await resolver.resolve({ args: { last: 2, before: '' } });
73+
expect(res1.edges.map(({ cursor, node }) => ({ cursor, node: node.toString() }))).toEqual([
74+
{ cursor: 'Nw==', node: "{ _id: 100000000000000000000008, title: '8', __v: 0 }" },
75+
{ cursor: 'OA==', node: "{ _id: 100000000000000000000009, title: '9', __v: 0 }" },
76+
]);
77+
78+
const res2 = await resolver.resolve({ args: { last: 2, before: 'Nw==' } });
79+
expect(res2.edges.map(({ cursor, node }) => ({ cursor, node: node.toString() }))).toEqual([
80+
{ cursor: 'NQ==', node: "{ _id: 100000000000000000000006, title: '6', __v: 0 }" },
81+
{ cursor: 'Ng==', node: "{ _id: 100000000000000000000007, title: '7', __v: 0 }" },
82+
]);
83+
});
84+
});

yarn.lock

Lines changed: 44 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@
199199
"@types/events" "*"
200200
"@types/node" "*"
201201

202-
"@types/mongoose@^5.2.5":
203-
version "5.2.5"
204-
resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.2.5.tgz#3a8467549744c105515299acc6f590e5403fb277"
202+
"@types/mongoose@^5.2.6":
203+
version "5.2.6"
204+
resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.2.6.tgz#96b89f8a35b37b3beb5bf50572ac6cf7f7d52453"
205205
dependencies:
206206
"@types/events" "*"
207207
"@types/mongodb" "*"
@@ -1365,9 +1365,9 @@ bser@^2.0.0:
13651365
dependencies:
13661366
node-int64 "^0.4.0"
13671367

1368-
bson@~1.0.4:
1369-
version "1.0.4"
1370-
resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.4.tgz#93c10d39eaa5b58415cbc4052f3e53e562b0b72c"
1368+
bson@^1.1.0:
1369+
version "1.1.0"
1370+
resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.0.tgz#bee57d1fb6a87713471af4e32bcae36de814b5b0"
13711371

13721372
bson@~1.0.5:
13731373
version "1.0.9"
@@ -2283,19 +2283,19 @@ error-ex@^1.3.1:
22832283
dependencies:
22842284
is-arrayish "^0.2.1"
22852285

2286-
es-abstract@^1.10.0, es-abstract@^1.6.1:
2287-
version "1.12.0"
2288-
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
2286+
es-abstract@^1.5.1:
2287+
version "1.10.0"
2288+
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
22892289
dependencies:
22902290
es-to-primitive "^1.1.1"
22912291
function-bind "^1.1.1"
22922292
has "^1.0.1"
22932293
is-callable "^1.1.3"
22942294
is-regex "^1.0.4"
22952295

2296-
es-abstract@^1.5.1:
2297-
version "1.10.0"
2298-
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
2296+
es-abstract@^1.6.1:
2297+
version "1.12.0"
2298+
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
22992299
dependencies:
23002300
es-to-primitive "^1.1.1"
23012301
function-bind "^1.1.1"
@@ -2418,9 +2418,9 @@ eslint-visitor-keys@^1.0.0:
24182418
version "1.0.0"
24192419
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
24202420

2421-
eslint@^5.3.0:
2422-
version "5.3.0"
2423-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.3.0.tgz#53695aca5213968aacdf970ccb231e42a2b285f8"
2421+
eslint@^5.4.0:
2422+
version "5.4.0"
2423+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.4.0.tgz#d068ec03006bb9e06b429dc85f7e46c1b69fac62"
24242424
dependencies:
24252425
ajv "^6.5.0"
24262426
babel-code-frame "^6.26.0"
@@ -2456,7 +2456,6 @@ eslint@^5.3.0:
24562456
regexpp "^2.0.0"
24572457
require-uncached "^1.0.3"
24582458
semver "^5.5.0"
2459-
string.prototype.matchall "^2.0.0"
24602459
strip-ansi "^4.0.0"
24612460
strip-json-comments "^2.0.1"
24622461
table "^4.0.3"
@@ -2763,9 +2762,9 @@ flat-cache@^1.2.1:
27632762
graceful-fs "^4.1.2"
27642763
write "^0.2.1"
27652764

2766-
flow-bin@^0.79.0:
2767-
version "0.79.0"
2768-
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.79.0.tgz#a7029f2832d45e5b78f7e77a74fee898722fb6ef"
2765+
flow-bin@^0.79.1:
2766+
version "0.79.1"
2767+
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.79.1.tgz#01c9f427baa6556753fa878c192d42e1ecb764b6"
27692768

27702769
flush-write-stream@^1.0.0:
27712770
version "1.0.3"
@@ -3106,9 +3105,9 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4
31063105
version "1.0.1"
31073106
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
31083107

3109-
graphql-compose-connection@>=3.2.0:
3110-
version "3.2.0"
3111-
resolved "https://registry.yarnpkg.com/graphql-compose-connection/-/graphql-compose-connection-3.2.0.tgz#87bb068564b76bfdf613c48134b1e47ed4a2f232"
3108+
graphql-compose-connection@>=3.2.1:
3109+
version "3.2.1"
3110+
resolved "https://registry.yarnpkg.com/graphql-compose-connection/-/graphql-compose-connection-3.2.1.tgz#7ab3d59c775e9b165d2cd70c72e940e0fde1b681"
31123111
dependencies:
31133112
babel-runtime "^6.26.0"
31143113

@@ -4621,9 +4620,9 @@ marked-terminal@^3.0.0:
46214620
lodash.assign "^4.2.0"
46224621
node-emoji "^1.4.1"
46234622

4624-
marked@^0.4.0:
4625-
version "0.4.0"
4626-
resolved "https://registry.yarnpkg.com/marked/-/marked-0.4.0.tgz#9ad2c2a7a1791f10a852e0112f77b571dce10c66"
4623+
marked@^0.5.0:
4624+
version "0.5.0"
4625+
resolved "https://registry.yarnpkg.com/marked/-/marked-0.5.0.tgz#9e590bad31584a48ff405b33ab1c0dd25172288e"
46274626

46284627
md5-file@^4.0.0:
46294628
version "4.0.0"
@@ -4816,18 +4815,18 @@ modify-values@^1.0.0:
48164815
version "1.0.0"
48174816
resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
48184817

4819-
4820-
version "3.1.0"
4821-
resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.1.0.tgz#af91f36fd560ed785f4e61e694432df4d3698aad"
4818+
4819+
version "3.1.2"
4820+
resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.1.2.tgz#c85055a2691ac3661951e557a0d6482796ad5c42"
48224821
dependencies:
4823-
bson "~1.0.4"
4822+
bson "^1.1.0"
48244823
require_optional "^1.0.1"
48254824
optionalDependencies:
48264825
saslprep "^1.0.0"
48274826

4828-
mongodb-memory-server@^2.0.0:
4829-
version "2.0.0"
4830-
resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-2.0.0.tgz#2443872591bbba38991ff5a69d4c1bf50149860e"
4827+
mongodb-memory-server@^2.0.1:
4828+
version "2.0.1"
4829+
resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-2.0.1.tgz#f67f63bef6937c0a497416d98b93a08cd93e5a45"
48314830
dependencies:
48324831
babel-runtime "^6.26.0"
48334832
debug "^3.1.0"
@@ -4841,26 +4840,26 @@ mongodb-memory-server@^2.0.0:
48414840
tmp "^0.0.33"
48424841
uuid "^3.2.1"
48434842

4844-
4845-
version "3.1.1"
4846-
resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.1.1.tgz#c018c4b277614e8b1e08426d5bcbe1a7e5cdbd74"
4843+
4844+
version "3.1.3"
4845+
resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.1.3.tgz#7523d438d190e80a757c5947dbc226768cb7b1d5"
48474846
dependencies:
4848-
mongodb-core "3.1.0"
4847+
mongodb-core "3.1.2"
48494848

48504849
48514850
version "1.0.2"
48524851
resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
48534852

4854-
mongoose@^5.2.8:
4855-
version "5.2.8"
4856-
resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.2.8.tgz#dd74ce0c4df803cb816c37ee1228d6663e2c2254"
4853+
mongoose@^5.2.9:
4854+
version "5.2.9"
4855+
resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.2.9.tgz#1b4a01de776504193ecdeda87c0c7d1962c2d632"
48574856
dependencies:
48584857
async "2.6.1"
48594858
bson "~1.0.5"
48604859
kareem "2.2.1"
48614860
lodash.get "4.4.2"
4862-
mongodb "3.1.1"
4863-
mongodb-core "3.1.0"
4861+
mongodb "3.1.3"
4862+
mongodb-core "3.1.2"
48644863
mongoose-legacy-pluralize "1.0.2"
48654864
mpath "0.4.1"
48664865
mquery "3.1.2"
@@ -6091,12 +6090,6 @@ [email protected]:
60916090
version "0.0.1"
60926091
resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-0.0.1.tgz#a7c2e09891fdbf38fbb10d376fb73003e68ac589"
60936092

6094-
regexp.prototype.flags@^1.2.0:
6095-
version "1.2.0"
6096-
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
6097-
dependencies:
6098-
define-properties "^1.1.2"
6099-
61006093
regexpp@^2.0.0:
61016094
version "2.0.0"
61026095
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365"
@@ -6443,9 +6436,9 @@ seek-bzip@^1.0.5:
64436436
dependencies:
64446437
commander "~2.8.1"
64456438

6446-
semantic-release@^15.9.8:
6447-
version "15.9.8"
6448-
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-15.9.8.tgz#cacd6a160f8155f1ef98eef5923af19979bc34e5"
6439+
semantic-release@^15.9.9:
6440+
version "15.9.9"
6441+
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-15.9.9.tgz#967f0a5eea4c297d8052a6f4cb91b2e20aa00496"
64496442
dependencies:
64506443
"@semantic-release/commit-analyzer" "^6.0.0"
64516444
"@semantic-release/error" "^2.2.0"
@@ -6465,7 +6458,7 @@ semantic-release@^15.9.8:
64656458
hook-std "^1.1.0"
64666459
hosted-git-info "^2.7.1"
64676460
lodash "^4.17.4"
6468-
marked "^0.4.0"
6461+
marked "^0.5.0"
64696462
marked-terminal "^3.0.0"
64706463
p-locate "^3.0.0"
64716464
p-reduce "^1.0.0"
@@ -6859,16 +6852,6 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
68596852
is-fullwidth-code-point "^2.0.0"
68606853
strip-ansi "^4.0.0"
68616854

6862-
string.prototype.matchall@^2.0.0:
6863-
version "2.0.0"
6864-
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz#2af8fe3d2d6dc53ca2a59bd376b089c3c152b3c8"
6865-
dependencies:
6866-
define-properties "^1.1.2"
6867-
es-abstract "^1.10.0"
6868-
function-bind "^1.1.1"
6869-
has-symbols "^1.0.0"
6870-
regexp.prototype.flags "^1.2.0"
6871-
68726855
string_decoder@~0.10.x:
68736856
version "0.10.31"
68746857
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"

0 commit comments

Comments
 (0)