Skip to content
This repository has been archived by the owner on Dec 6, 2018. It is now read-only.

Commit

Permalink
Switch to level-codec and level-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
eight04 committed Jul 1, 2018
1 parent 0979520 commit 2891690
Show file tree
Hide file tree
Showing 9 changed files with 124 additions and 84 deletions.
6 changes: 3 additions & 3 deletions bytewise.js
@@ -1,9 +1,9 @@
var nut = require('./nut')
var shell = require('./shell') //the shell surrounds the nut
var codec = require('levelup/lib/codec')
var Codec = require('level-codec')
var merge = require('xtend')
var compare = require('typewiselite')
var ReadStream = require('levelup/lib/read-stream')
var ReadStream = require('./read-stream')

var precodec = require('./codec/bytewise')

Expand All @@ -22,7 +22,7 @@ module.exports = function (db, opts) {
}, opts)

return shell (
nut ( db, precodec, codec, compare ),
nut ( db, precodec, new Codec, compare ),
[], ReadStream, opts
)
}
Expand Down
6 changes: 3 additions & 3 deletions index.js
Expand Up @@ -4,14 +4,14 @@
var nut = require('./nut')
var shell = require('./shell') //the shell surrounds the nut
var precodec = require('./codec')
var codec = require('levelup/lib/codec')
var Codec = require('level-codec')
var merge = require('xtend')

var ReadStream = require('levelup/lib/read-stream')
var ReadStream = require('./read-stream')

var sublevel = function (db, opts) {
opts = merge(db.options, opts)
return shell ( nut ( db, precodec, codec ), [], ReadStream, opts)
return shell ( nut ( db, precodec, new Codec ), [], ReadStream, opts)
}

module.exports = function (db, opts) {
Expand Down
6 changes: 3 additions & 3 deletions legacy.js
@@ -1,17 +1,17 @@
var nut = require('./nut')
var shell = require('./shell') //the shell surrounds the nut
var codec = require('levelup/lib/codec')
var Codec = require('level-codec')
var merge = require('xtend')

var ReadStream = require('levelup/lib/read-stream')
var ReadStream = require('./read-stream')

var precodec = require('./codec/legacy')

module.exports = function (db, opts) {

opts = merge(db.options, opts)

return shell ( nut ( db, precodec, codec ), [], ReadStream, db.options)
return shell ( nut ( db, precodec, new Codec ), [], ReadStream, db.options)

}

4 changes: 2 additions & 2 deletions nut.js
Expand Up @@ -113,7 +113,7 @@ module.exports = function (db, precodec, codec, compare) {
cb()
},
get: function (key, prefix, opts, cb) {
opts.asBuffer = codec.isValueAsBuffer(opts)
opts.asBuffer = codec.valueAsBuffer(opts)
return (db.db || db).get(
encodePrefix(prefix, key, opts),
opts,
Expand Down Expand Up @@ -185,7 +185,7 @@ module.exports = function (db, precodec, codec, compare) {
opts.limit = -1

opts.keyAsBuffer = precodec.buffer
opts.valueAsBuffer = codec.isValueAsBuffer(opts)
opts.valueAsBuffer = codec.valueAsBuffer(opts)

function wrapIterator (iterator) {
return {
Expand Down
174 changes: 105 additions & 69 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
Expand Up @@ -9,7 +9,10 @@
},
"dependencies": {
"bytewise": "~1.1.0",
"levelup": "~0.19.0",
"level-codec": "^9.0.0",
"level-errors": "^2.0.0",
"level-iterator-stream": "^2.0.3",
"levelup": "^0.19.1",
"ltgt": "~2.1.1",
"pull-defer": "^0.2.2",
"pull-level": "^2.0.3",
Expand Down
1 change: 1 addition & 0 deletions read-stream.js
@@ -0,0 +1 @@
module.exports = require("levelup/lib/read-stream");
2 changes: 1 addition & 1 deletion shell.js
@@ -1,7 +1,7 @@
var EventEmitter = require('events').EventEmitter
var addpre = require('./range').addPrefix

var errors = require('levelup/lib/errors')
var errors = require('level-errors')

function isFunction (f) {
return 'function' === typeof f
Expand Down
4 changes: 2 additions & 2 deletions test/level.js
Expand Up @@ -6,7 +6,7 @@ var path = require('path')
var mock = require('./mock')
var nut = require('../nut')
var shell = require('../shell') //the shell surrounds the nut
var codec = require('levelup/lib/codec')
var Codec = require('level-codec')
var concat = require('../codec')
var legacy = require('../codec/legacy')
var bytewise = require('../codec/bytewise')
Expand All @@ -23,7 +23,7 @@ var pullReadStream = require('../pull')
function create (precodec, db) {

//convert pull stream to iterators
return shell ( nut ( db || mock(), precodec, codec ), [], pullReadStream)
return shell ( nut ( db || mock(), precodec, new Codec ), [], pullReadStream)
}

function prehookPut (db) {
Expand Down

0 comments on commit 2891690

Please sign in to comment.