Skip to content

Commit 6334105

Browse files
committed
Replace Object.values with Object.keys
1 parent a600c31 commit 6334105

File tree

4 files changed

+36
-13
lines changed

4 files changed

+36
-13
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
### Fixed
11+
12+
* Replaced `Object.values` use to improve Node version compatibility
13+
14+
This allows using arangojs in Node.js 6 LTS without a polyfill.
15+
1016
## [6.2.1] - 2018-03-21
1117

1218
### Changed

package.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,19 @@
4747
"lib/cjs/util/*.*"
4848
],
4949
"scripts": {
50-
"test": "mocha --growl --reporter spec --require source-map-support/register --require core-js/shim --timeout 10000 lib/cjs/test",
50+
"test":
51+
"mocha --growl --reporter spec --require source-map-support/register --timeout 10000 lib/cjs/test",
5152
"pretest": "yarn dist",
52-
"ci": "mocha --reporter spec --require source-map-support/register --require core-js/shim --timeout 10000 lib/cjs/test",
53+
"ci":
54+
"mocha --reporter spec --require source-map-support/register --timeout 10000 lib/cjs/test",
5355
"preci": "yarn install",
5456
"jenkins": "yarn ci -- --timeout 0 --reporter xunit-file",
5557
"dist:cjs": "tsc -p . --outDir ./lib/cjs/ && cpy src/index.js lib/cjs/",
56-
"dist:async": "tsc -p . --outDir ./lib/async/ --target es2017 && cpy src/index.js lib/async/",
58+
"dist:async":
59+
"tsc -p . --outDir ./lib/async/ --target es2017 && cpy src/index.js lib/async/",
5760
"dist:web": "webpack",
58-
"dist": "rimraf lib && npm-run-all --parallel dist:* && cpy src/index.all.js --rename index.js lib/",
61+
"dist":
62+
"rimraf lib && npm-run-all --parallel dist:* && cpy src/index.all.js --rename index.js lib/",
5963
"prepublish": "yarn dist && node -e 'require(\".\");'"
6064
},
6165
"dependencies": {
@@ -76,7 +80,6 @@
7680
"babel-plugin-transform-object-rest-spread": "^6.26.0",
7781
"babel-preset-env": "^1.6.1",
7882
"chai": "^4.0.2",
79-
"core-js": "^2.4.1",
8083
"cpy-cli": "^1.0.1",
8184
"eslint": "^4.13.0",
8285
"eslint-config-prettier": "^2.9.0",
@@ -92,4 +95,4 @@
9295
"webpack": "^3.0.0",
9396
"xunit-file": "1.0.0"
9497
}
95-
}
98+
}

src/database.ts

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,10 @@ export class Database {
422422
},
423423
res => res.body
424424
);
425-
if (!minimal || !Object.values(result).every((value: any) => value.title))
425+
if (
426+
!minimal ||
427+
!Object.keys(result).every((key: string) => result[key].title)
428+
)
426429
return result;
427430
const values: any = {};
428431
for (const key of Object.keys(result)) {
@@ -448,7 +451,9 @@ export class Database {
448451
if (
449452
minimal ||
450453
!result.values ||
451-
!Object.values(result.values).every((value: any) => value.title)
454+
!Object.keys(result.values).every(
455+
(key: string) => result.values[key].title
456+
)
452457
) {
453458
return result;
454459
}
@@ -478,7 +483,9 @@ export class Database {
478483
if (
479484
minimal ||
480485
!result.values ||
481-
!Object.values(result.values).every((value: any) => value.title)
486+
!Object.keys(result.values).every(
487+
(key: string) => result.values[key].title
488+
)
482489
) {
483490
return result;
484491
}
@@ -499,7 +506,10 @@ export class Database {
499506
},
500507
res => res.body
501508
);
502-
if (!minimal || !Object.values(result).every((value: any) => value.title))
509+
if (
510+
!minimal ||
511+
!Object.keys(result).every((key: string) => result[key].title)
512+
)
503513
return result;
504514
const values: any = {};
505515
for (const key of Object.keys(result)) {
@@ -525,7 +535,9 @@ export class Database {
525535
if (
526536
minimal ||
527537
!result.values ||
528-
!Object.values(result.values).every((value: any) => value.title)
538+
!Object.keys(result.values).every(
539+
(key: string) => result.values[key].title
540+
)
529541
) {
530542
return result;
531543
}
@@ -555,7 +567,9 @@ export class Database {
555567
if (
556568
minimal ||
557569
!result.values ||
558-
!Object.values(result.values).every((value: any) => value.title)
570+
!Object.keys(result.values).every(
571+
(key: string) => result.values[key].title
572+
)
559573
) {
560574
return result;
561575
}

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ convert-source-map@^1.5.0:
11051105
version "1.5.1"
11061106
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
11071107

1108-
core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
1108+
core-js@^2.4.0, core-js@^2.5.0:
11091109
version "2.5.3"
11101110
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
11111111

0 commit comments

Comments
 (0)