Skip to content

Commit ce274c8

Browse files
committed
Breaking: modernize syntax and bump standard (Level/community#98)
1 parent ae4c767 commit ce274c8

File tree

5 files changed

+94
-99
lines changed

5 files changed

+94
-99
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ updates:
77
ignore:
88
- dependency-name: dependency-check
99
- dependency-name: nyc
10-
- dependency-name: standard
11-
- dependency-name: tempy

example.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
var iteratorStream = require('./')
2-
var leveldown = require('leveldown')
3-
var path = require('path')
1+
const iteratorStream = require('.')
2+
const leveldown = require('leveldown')
3+
const path = require('path')
4+
5+
const db = leveldown(path.join(__dirname, 'db'))
46

5-
var db = leveldown(path.join(__dirname, 'db'))
67
db.open(function (err) {
78
if (err) throw err
89

9-
var ops = []
10-
for (var i = 0; i < 1000; i++) {
10+
const ops = []
11+
for (let i = 0; i < 1000; i++) {
1112
ops.push({
1213
type: 'put',
1314
key: String(Math.random()),
@@ -18,7 +19,7 @@ db.open(function (err) {
1819
db.batch(ops, function (err) {
1920
if (err) throw err
2021

21-
var stream = iteratorStream(db.iterator())
22+
const stream = iteratorStream(db.iterator())
2223
stream.on('data', function (kv) {
2324
console.log('%s -> %s', kv.key, kv.value)
2425
})

index.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
var inherits = require('inherits')
2-
var Readable = require('readable-stream').Readable
3-
var extend = require('xtend')
1+
'use strict'
2+
3+
const inherits = require('inherits')
4+
const { Readable } = require('readable-stream')
45

56
module.exports = ReadStream
67
inherits(ReadStream, Readable)
78

89
function ReadStream (iterator, options) {
910
if (!(this instanceof ReadStream)) return new ReadStream(iterator, options)
1011
options = options || {}
11-
Readable.call(this, extend(options, {
12+
Readable.call(this, Object.assign({}, options, {
1213
objectMode: true
1314
}))
1415
this._iterator = iterator
@@ -17,22 +18,20 @@ function ReadStream (iterator, options) {
1718
}
1819

1920
ReadStream.prototype._read = function () {
20-
var self = this
21-
var options = this._options
2221
if (this.destroyed) return
2322

24-
this._iterator.next(function (err, key, value) {
25-
if (self.destroyed) return
26-
if (err) return self.destroy(err)
23+
this._iterator.next((err, key, value) => {
24+
if (this.destroyed) return
25+
if (err) return this.destroy(err)
2726

2827
if (key === undefined && value === undefined) {
29-
self.push(null)
30-
} else if (options.keys !== false && options.values === false) {
31-
self.push(key)
32-
} else if (options.keys === false && options.values !== false) {
33-
self.push(value)
28+
this.push(null)
29+
} else if (this._options.keys !== false && this._options.values === false) {
30+
this.push(key)
31+
} else if (this._options.keys === false && this._options.values !== false) {
32+
this.push(value)
3433
} else {
35-
self.push({ key: key, value: value })
34+
this.push({ key, value })
3635
}
3736
})
3837
}

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
},
1313
"dependencies": {
1414
"inherits": "^2.0.4",
15-
"readable-stream": "^3.4.0",
16-
"xtend": "^4.0.2"
15+
"readable-stream": "^3.4.0"
1716
},
1817
"devDependencies": {
1918
"coveralls": "^3.0.2",
@@ -24,9 +23,9 @@
2423
"leveldown": "^5.0.0",
2524
"nyc": "^14.0.0",
2625
"secret-event-listener": "^1.0.0",
27-
"standard": "^14.0.0",
26+
"standard": "^16.0.3",
2827
"tape": "^5.0.1",
29-
"tempy": "0.2.1",
28+
"tempy": "^1.0.1",
3029
"through2": "^4.0.2"
3130
},
3231
"hallmark": {

0 commit comments

Comments
 (0)