@live-change/db 0.6.23 → 0.7.0

package/index.js

@@ -1,11 +1,11 @@
-const Log = require("./lib/Log.js")
-const Table = require("./lib/Table.js")
-const OpLogger = require("./lib/OpLogger.js")
-const Index = require("./lib/Index.js")
-const AtomicWriter = require("./lib/AtomicWriter.js")
-const Database = require("./lib/Database.js")
-const profileLog = require('./lib/profileLog.js')
+import Log from "./lib/Log.js"
+import Table from "./lib/Table.js"
+import OpLogger from "./lib/OpLogger.js"
+import Index from "./lib/Index.js"
+import AtomicWriter from "./lib/AtomicWriter.js"
+import Database from "./lib/Database.js"
+import profileLog from './lib/profileLog.js'
 
-module.exports = {
+export {
   Log, Table, OpLogger, Index, AtomicWriter, Database, profileLog
 }

package/lib/AtomicWriter.js

@@ -324,4 +324,4 @@ class AtomicWriter {
   }
 }
 
-module.exports = AtomicWriter
+export default AtomicWriter

package/lib/ChangeStream.js

@@ -65,4 +65,4 @@ class ChangeStreamPipe extends ChangeStream {
   }
 }
 
-module.exports = { ChangeStream, ChangeStreamPipe }
+export { ChangeStream, ChangeStreamPipe }

package/lib/Database.js

@@ -1,14 +1,15 @@
-const Table = require('./Table.js')
-const Index = require('./Index.js')
-const Log = require('./Log.js')
-const queryGet = require('./queryGet.js')
-const queryObservable = require('./queryObservable.js')
-const getRandomValues = require('get-random-values')
-const nextTick = require('next-tick')
+import Table from './Table.js'
+import Index from './Index.js'
+import Log from './Log.js'
+import queryGet from './queryGet.js'
+import queryObservable from './queryObservable.js'
+import getRandomValues from 'get-random-values'
+import nextTick from 'next-tick'
 
-const ReactiveDao = require("@live-change/dao")
+import ReactiveDao from "@live-change/dao"
 
-const debug = require('debug')('db')
+import Debug from 'debug'
+const debug = Debug('db')
 
 class Database {
   constructor(config, storeFactory, saveConfig, deleteStore, name, createScriptContext) {
@@ -300,4 +301,4 @@ class Database {
   }
 }
 
-module.exports = Database
+export default Database

package/lib/Index.js

@@ -1,13 +1,15 @@
-const IntervalTree = require('node-interval-tree').default
-const ReactiveDao = require("@live-change/dao")
-const Table = require('./Table.js')
-const queryGet = require('./queryGet.js')
-const profileLog = require('./profileLog.js')
-const nextTick = require('next-tick')
-const queryObservable = require('./queryObservable.js')
-const { ChangeStream } = require('./ChangeStream.js')
+import IntervalTreeLib from 'node-interval-tree'
+const IntervalTree = IntervalTreeLib.default || IntervalTreeLib
+import ReactiveDao from "@live-change/dao"
+import Table from './Table.js'
+import queryGet from './queryGet.js'
+import profileLog from './profileLog.js'
+import nextTick from 'next-tick'
+import { ChangeStream } from './ChangeStream.js'
 
-const debug = require('debug')('db')
+
+import Debug from 'debug'
+const debug = Debug('db')
 
 const opLogBatchSize = 128 /// TODO: incrase after testing
 
@@ -526,4 +528,4 @@ class Index extends Table {
   }
 }
 
-module.exports = Index
+export default Index

package/lib/Log.js

@@ -1,5 +1,5 @@
-const AtomicWriter = require('./AtomicWriter.js')
-const ReactiveDao = require("@live-change/dao")
+import AtomicWriter from './AtomicWriter.js'
+import ReactiveDao from "@live-change/dao"
 
 class Log {
   constructor(database, name, config) {
@@ -61,4 +61,4 @@ class Log {
 
 }
 
-module.exports = Log
+export default Log

package/lib/OpLogger.js

@@ -46,4 +46,4 @@ class OpLogger {
 
 }
 
-module.exports = OpLogger
+export default OpLogger

package/lib/ScriptContext.js

@@ -1,6 +1,7 @@
-const vm = require('vm')
-const crypto = require('crypto')
-const { ChangeStreamPipe } = require('./ChangeStream.js')
+import vm from 'vm'
+import crypto from 'crypto'
+import { ChangeStreamPipe } from './ChangeStream.js'
+import pref_hooks from 'perf_hooks'
 
 const defaultNativeGlobals = [
   'Array', 'ArrayBuffer',
@@ -34,7 +35,7 @@ const defaultContext = {
   pipe() {
     return new ChangeStreamPipe()
   },
-  'performance': require('perf_hooks').performance,
+  'performance': pref_hooks.performance,
   constructor: null
 }
 
@@ -103,4 +104,4 @@ class ScriptContext {
   }
 }
 
-module.exports = ScriptContext
+export default ScriptContext

package/lib/Table.js

@@ -1,6 +1,6 @@
-const OpLogger = require('./OpLogger.js')
-const AtomicWriter = require('./AtomicWriter.js')
-const ReactiveDao = require('@live-change/dao')
+import OpLogger from './OpLogger.js'
+import AtomicWriter from './AtomicWriter.js'
+import ReactiveDao from '@live-change/dao'
 
 function opLogWritter(store) {
   let lastTime = Date.now()
@@ -143,4 +143,4 @@ class Table {
   }
 }
 
-module.exports = Table
+export default Table

package/lib/WebScriptContext.js

@@ -59,4 +59,4 @@ class WebScriptContext {
   }
 }
 
-module.exports = WebScriptContext
+export default WebScriptContext

package/lib/profileLog.js

@@ -91,4 +91,4 @@ function getParamNames(func) {
 const profileLog = new ProfileLog()
 profileLog.ProfileLog = ProfileLog
 
-module.exports = profileLog
+export default profileLog

package/lib/queryGet.js

@@ -1,5 +1,5 @@
-const { TableWriter, LogWriter } = require('./queryUpdate.js')
-const { ChangeStream } = require('./ChangeStream.js')
+import { TableWriter, LogWriter } from './queryUpdate.js'
+import { ChangeStream } from './ChangeStream.js'
 
 const maxGetLimit = 256
 
@@ -194,4 +194,4 @@ queryGet.single = querySingleGet
 queryGet.QueryWriter = QueryWriter
 queryGet.QueryReader = QueryReader
 
-module.exports = queryGet
+export default queryGet

package/lib/queryObservable.js

@@ -1,5 +1,5 @@
-const ReactiveDao = require("@live-change/dao")
-const { ChangeStream } = require('./ChangeStream.js')
+import ReactiveDao from "@live-change/dao"
+import { ChangeStream } from './ChangeStream.js'
 
 class ObjectObserver {
   #callback = null
@@ -486,4 +486,4 @@ queryObservable.single = querySingleObservable
 queryObservable.QueryWriter = QueryWriter
 queryObservable.QueryReader = QueryReader
 
-module.exports = queryObservable
+export default queryObservable

package/lib/queryUpdate.js

@@ -34,4 +34,4 @@ class LogWriter {
   }
 }
 
-module.exports = { TableWriter, LogWriter }
+export { TableWriter, LogWriter }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db",
-  "version": "0.6.23",
+  "version": "0.7.0",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -19,15 +19,16 @@
   "bugs": {
     "url": "https://github.com/live-change/live-change-db/issues"
   },
+  "type": "module",
   "homepage": "https://github.com/live-change/live-change-db",
   "devDependencies": {
-    "@live-change/db-store-level": "^0.6.23",
-    "@live-change/db-store-lmdb": "^0.6.23",
+    "@live-change/db-store-level": "^0.7.0",
+    "@live-change/db-store-lmdb": "^0.7.0",
     "minimist": ">=1.2.3",
     "next-tick": "^1.1.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.5",
     "sockjs": "^0.3.24",
-    "tape": "^5.3.2",
+    "tape": "^5.7.4",
     "websocket-extensions": ">=0.1.4"
   },
   "dependencies": {
@@ -35,5 +36,5 @@
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
   },
-  "gitHead": "0998da21c5082239a24d631110b33a5b00310a07"
+  "gitHead": "b372725d436e29f7cc66b811533009c9ea5330a1"
 }

package/tests/index.js

@@ -1,5 +1,6 @@
-const test = require('tape')
-const rimraf = require("rimraf")
+import test from 'tape'
+import { rimraf } from "rimraf"
+import createDb from './utils/createDb.js'
 
 const dbPath = `./test.i.db`
 rimraf.sync(dbPath)
@@ -37,7 +38,7 @@ test("index", t => {
 
   t.test('open database', async t => {
     t.plan(1)
-    db = require('./utils/createDb.js')(dbPath)
+    db = createDb(dbPath)
     t.pass('opened')
   })
 
@@ -191,9 +192,7 @@ test("index", t => {
     t.plan(2)
     await db.close()
     t.pass('closed')
-    rimraf(dbPath, (err) => {
-      if(err) return t.fail(err)
-      t.pass('removed')
-    })
+    await rimraf(dbPath)
+    t.pass('removed')
   })
 })

package/tests/log.js

@@ -1,5 +1,6 @@
-const test = require('tape')
-const rimraf = require("rimraf")
+import test from 'tape'
+import { rimraf } from "rimraf"
+import createDb from './utils/createDb.js'
 
 const dbPath = `./test.l.db`
 rimraf.sync(dbPath)
@@ -19,7 +20,7 @@ test("store range observable", t => {
 
   t.test('open database', async t => {
     t.plan(1)
-    db = require('./utils/createDb.js')(dbPath)
+    db = createDb(dbPath)
     t.pass('opened')
   })
 
@@ -39,9 +40,8 @@ test("store range observable", t => {
     t.plan(2)
     await db.close()
     t.pass('closed')
-    rimraf(dbPath, (err) => {
-      if(err) return t.fail(err)
-      t.pass('removed')
-    })
+    await rimraf(dbPath)
+    t.pass('removed')
   })
+
 })

package/tests/query-get.js

@@ -1,8 +1,9 @@
-const test = require('tape')
-const rimraf = require("rimraf")
+import test from 'tape'
+import { rimraf } from "rimraf"
+import createDb from './utils/createDb.js'
 
 const dbPath = `./test.qg.db`
-const db = require('./utils/createDb.js')(dbPath)
+const db = createDb(dbPath)
 
 const users = [
   { id: '1', name: 'david' },
@@ -109,9 +110,7 @@ test("store range observable", t => {
 
   t.test("close and remove database", async t => {
     t.plan(1)
-    rimraf(dbPath, (err) => {
-      if(err) return t.fail(err)
-      t.pass('removed')
-    })
+    await rimraf(dbPath)
+    t.pass('removed')
   })
 })

package/tests/query-observable.js

@@ -1,5 +1,6 @@
-const test = require('tape')
-const rimraf = require("rimraf")
+import test from 'tape'
+import { rimraf } from "rimraf"
+import createDb from './utils/createDb.js'
 
 const dbPath = `./test.qo.db`
 rimraf.sync(dbPath)
@@ -37,7 +38,7 @@ test("query observable", t => {
 
   t.test('open database', async t => {
     t.plan(1)
-    db = require('./utils/createDb.js')(dbPath)
+    db = createDb(dbPath)
     t.pass('opened')
   })
 
@@ -236,9 +237,7 @@ test("query observable", t => {
     t.plan(2)
     await db.close()
     t.pass('closed')
-    rimraf(dbPath, (err) => {
-      if(err) return t.fail(err)
-      t.pass('removed')
-    })
+    await rimraf(dbPath)
+    t.pass('removed')
   })
 })

package/tests/table.js

@@ -1,5 +1,6 @@
-const test = require('tape')
-const rimraf = require("rimraf")
+import test from 'tape'
+import { rimraf } from "rimraf"
+import createDb from './utils/createDb.js'
 
 const dbPath = `./test.t.db`
 rimraf.sync(dbPath)
@@ -26,7 +27,7 @@ test("store range observable", t => {
 
   t.test('open database', async t => {
     t.plan(1)
-    db = require('./utils/createDb.js')(dbPath)
+    db = createDb(dbPath)
     t.pass('opened')
   })
 
@@ -48,9 +49,7 @@ test("store range observable", t => {
     t.plan(2)
     await db.close()
     t.pass('closed')
-    rimraf(dbPath, (err) => {
-      if(err) return t.fail(err)
-      t.pass('removed')
-    })
+    await rimraf(dbPath)
+    t.pass('removed')
   })
 })

package/tests/utils/createDb.js

@@ -1,15 +1,17 @@
-const rimraf = require("rimraf")
+import { rimrafSync } from "rimraf"
 
-const Database = require("../../lib/Database.js")
+import Database from "../../lib/Database.js"
+import createStoreLevel from "./createStore.level.js"
+import createStoreLmdb from "./createStore.lmdb.js"
 
 function createDb(dbPath) {
-  rimraf.sync(dbPath)
+  rimrafSync(dbPath)
   const db = new Database({}, (name, config) => {
     let store
     if(process.env.DB=='level') {
-      store = require('./createStore.level.js')(dbPath, name)
+      store = createStoreLmdb(dbPath, name)
     } else if(process.env.DB=='lmdb' || !process.env.DB) {
-      store = require('./createStore.lmdb.js')(dbPath, name)
+      store = createStoreLevel(dbPath, name)
     } else {
       console.error("Unknown database " + process.env.DB)
       throw new Error("Unknown database " + process.env.DB)
@@ -24,4 +26,4 @@ function createDb(dbPath) {
   return db
 }
 
-module.exports = createDb
+export default createDb

package/tests/utils/createStore.level.js

@@ -1,13 +1,12 @@
-const levelup = require('levelup')
-const leveldown = require('leveldown')
-const subleveldown = require('subleveldown')
-const encoding = require('encoding-down')
+import levelup from 'levelup'
+import leveldown from 'leveldown'
+import subleveldown from 'subleveldown'
 
-const Store = require('@live-change/db-store-level')
+import Store from '@live-change/db-store-level'
 
 const levels = new Map()
 
-module.exports = function(dbPath, name) {
+export default function(dbPath, name) {
   let level = levels.get(dbPath)
   if(!level) {
     level = levelup(leveldown(dbPath))

package/tests/utils/createStore.lmdb.js

@@ -1,11 +1,11 @@
-const lmdb = require('node-lmdb')
-const fs = require('fs')
+import lmdb from 'node-lmdb'
+import fs from 'fs'
 
-const Store = require('@live-change/db-store-lmdb')
+import Store from '@live-change/db-store-lmdb'
 
 const envs = new Map()
 
-module.exports = function(dbPath, name) {
+export default  function(dbPath, name) {
   let env = envs.get(dbPath)
   if(!env) {
     fs.mkdirSync(dbPath)