@live-change/dao 0.5.22 → 0.8.4

package/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2019-2022 Michał Łaszczewski
+Copyright 2019-2024 Michał Łaszczewski
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

package/index.js

@@ -1,70 +1,90 @@
-const Dao = require("./lib/Dao.js")
+import Dao from "./lib/Dao.js"
+let rd = Dao
+rd.Dao = Dao
 
-Dao.Dao = Dao
+import Observable from "./lib/Observable.js"
+rd.Observable = Observable
+export { Observable }
 
-const Observable = require("./lib/Observable.js")
-Dao.Observable = Observable
+import ObservableValue from "./lib/ObservableValue.js"
+rd.ObservableValue = ObservableValue
+export { ObservableValue }
 
-const ObservableValue = require("./lib/ObservableValue.js")
-Dao.ObservableValue = ObservableValue
+import ObservableList from "./lib/ObservableList.js"
+rd.ObservableList = ObservableList
+export { ObservableList }
 
-const ObservableList = require("./lib/ObservableList.js")
-Dao.ObservableList = ObservableList
+import ExtendedObservableList from "./lib/ExtendedObservableList.js"
+rd.ExtendedObservableList = ExtendedObservableList
+export { ExtendedObservableList }
 
-const ExtendedObservableList = require("./lib/ExtendedObservableList.js")
-Dao.ExtendedObservableList = ExtendedObservableList
+import DaoPrerenderCache from "./lib/DaoPrerenderCache.js"
+const ReactiveCache = DaoPrerenderCache // backward compatibility
+rd.ReactiveCache = DaoPrerenderCache // backward compatibility
+rd.DaoPrerenderCache = DaoPrerenderCache
+export { ReactiveCache, DaoPrerenderCache }
 
-const ReactiveServer = require("./lib/ReactiveServer.js")
-Dao.ReactiveServer = ReactiveServer
+import DaoProxy from "./lib/DaoProxy.js"
+const ReactiveDaoProxy = DaoProxy // backward compatibility
+rd.ReactiveDaoProxy = DaoProxy // backward compatibility
+rd.DaoProxy = DaoProxy
+export { ReactiveDaoProxy, DaoProxy }
 
-const DaoPrerenderCache = require("./lib/DaoPrerenderCache.js")
-Dao.DaoPrerenderCache = DaoPrerenderCache
-Dao.ReactiveCache = DaoPrerenderCache // BACKWARD COMPATIBILITY
+import DaoCache from "./lib/DaoCache.js"
+rd.DaoCache = DaoCache
+export { DaoCache }
 
-const ReactiveConnection = require("./lib/ReactiveConnection.js")
-Dao.ReactiveConnection = ReactiveConnection
+import InboxReader from "./lib/InboxReader.js"
+rd.InboxReader = InboxReader
+export { InboxReader }
 
-const LoopbackConnection = require('./lib/LoopbackConnection.js')
-Dao.LoopbackConnection = LoopbackConnection
+import ReactiveConnection from "./lib/ReactiveConnection.js"
+rd.ReactiveConnection = ReactiveConnection
+export { ReactiveConnection }
 
-const SimpleDao = require("./lib/SimpleDao.js")
-Dao.SimpleDao = SimpleDao
+import LoopbackConnection from "./lib/LoopbackConnection.js"
+rd.LoopbackConnection = LoopbackConnection
+export { LoopbackConnection }
 
-const ObservableProxy = require("./lib/ObservableProxy.js")
-Dao.ObservableProxy = ObservableProxy
+import SimpleDao from "./lib/SimpleDao.js"
+rd.SimpleDao = SimpleDao
+export { SimpleDao }
 
-const ObservablePromiseProxy = require("./lib/ObservablePromiseProxy.js")
-Dao.ObservablePromiseProxy = ObservablePromiseProxy
+import ObservableError from "./lib/ObservableError.js"
+rd.ObservableError = ObservableError
+export { ObservableError }
 
-const ObservableError = require("./lib/ObservableError.js")
-Dao.ObservableError = ObservableError
+import ObservableProxy from "./lib/ObservableProxy.js"
+rd.ObservableProxy = ObservableProxy
+export { ObservableProxy }
 
-const ConnectionMonitorPinger = require("./lib/ConnectionMonitorPinger.js")
-Dao.ConnectionMonitorPinger = ConnectionMonitorPinger
+import ObservablePromiseProxy from "./lib/ObservablePromiseProxy.js"
+rd.ObservablePromiseProxy = ObservablePromiseProxy
+export { ObservablePromiseProxy }
 
-const ConnectionMonitorPingReceiver = require("./lib/ConnectionMonitorPingReceiver.js")
-Dao.ConnectionMonitorPingReceiver = ConnectionMonitorPingReceiver
+import ConnectionMonitorPinger from "./lib/ConnectionMonitorPinger.js"
+rd.ConnectionMonitorPinger = ConnectionMonitorPinger
+export { ConnectionMonitorPinger }
 
-const TimeSynchronization = require("./lib/TimeSynchronization.js")
-Dao.TimeSynchronization = TimeSynchronization
+import ConnectionMonitorPingReceiver from "./lib/ConnectionMonitorPingReceiver.js"
+rd.ConnectionMonitorPingReceiver = ConnectionMonitorPingReceiver
+export { ConnectionMonitorPingReceiver }
 
-const DaoProxy = require("./lib/DaoProxy.js")
-Dao.ReactiveDaoProxy = DaoProxy // BACKWARD COMPATIBILITY
-Dao.DaoProxy = DaoProxy
+import TimeSynchronization from "./lib/TimeSynchronization.js"
+rd.TimeSynchronization = TimeSynchronization
+export { TimeSynchronization }
 
-const DaoCache = require("./lib/DaoCache.js")
-Dao.DaoCache = DaoCache
+import collectPointers from "./lib/collectPointers.js"
+rd.collectPointers = collectPointers
+export { collectPointers }
 
-const InboxReader = require("./lib/InboxReader.js")
-Dao.InboxReader = InboxReader
+import ReactiveServer from "./lib/ReactiveServer.js"
+rd.ReactiveServer = ReactiveServer
+export { ReactiveServer }
 
-const Path = require("./lib/Path.js")
-Dao.Path = Path
+import Path from "./lib/Path.js"
+rd.Path = Path
+export { Path }
 
-const collectPointers = require("./lib/collectPointers.js")
-Dao.collectPointers = collectPointers
-
-Dao.global = Dao
-
-module.exports = Dao
 
+export default rd

package/lib/ConnectionMonitorPingReceiver.js

@@ -28,4 +28,4 @@ class ConnectionMonitorPingReceiver {
   }
 }
 
-module.exports = ConnectionMonitorPingReceiver
+export default ConnectionMonitorPingReceiver

package/lib/ConnectionMonitorPinger.js

@@ -47,4 +47,4 @@ class ConnectionMonitorPinger {
 
 }
 
-module.exports = ConnectionMonitorPinger
+export default ConnectionMonitorPinger

package/lib/Dao.js

@@ -1,8 +1,9 @@
-const EventEmitter = require("./EventEmitter.js")
-const RemoteDataSource = require("./RemoteDataSource.js")
-const ReactiveConnection = require("./ReactiveConnection.js")
-const ObservableList = require("./ObservableList.js")
-const debug = require('debug')('dao')
+import EventEmitter from "./EventEmitter.js"
+import RemoteDataSource from "./RemoteDataSource.js"
+import ReactiveConnection from "./ReactiveConnection.js"
+import ObservableList from "./ObservableList.js"
+import Debug from "debug"
+const debug = Debug('dao')
 
 function isConstructor(f) {
   try {
@@ -113,5 +114,4 @@ class Dao extends EventEmitter {
   }
 }
 
-module.exports = Dao
-module.exports.default = Dao
+export default Dao

package/lib/DaoCache.js

@@ -1,4 +1,4 @@
-const EventEmitter = require("./EventEmitter.js")
+import EventEmitter from "./EventEmitter.js"
 
 class CacheState {
   constructor(cache, what, settings) {
@@ -272,4 +272,4 @@ class DaoCache extends EventEmitter {
   }
 }
 
-module.exports = DaoCache
+export default DaoCache

package/lib/DaoPrerenderCache.js

@@ -1,5 +1,6 @@
-const debug = require('debug')('reactive-dao:cache')
-const ObservableValue = require("./ObservableValue.js")
+import Debug from 'debug'
+const debug = Debug('reactive-dao:cache')
+import ObservableValue from "./ObservableValue.js"
 
 class DaoPrerenderCache {
 
@@ -151,4 +152,4 @@ class DaoPrerenderCache {
 
 }
 
-module.exports = DaoPrerenderCache
+export default DaoPrerenderCache

package/lib/DaoProxy.js

@@ -1,5 +1,5 @@
-const EventEmitter = require("./EventEmitter.js")
-const ObservableProxy = require("./ObservableProxy.js")
+import EventEmitter from "./EventEmitter.js"
+import ObservableProxy from "./ObservableProxy.js"
 
 class DaoProxy extends EventEmitter {
   constructor(dao) {
@@ -94,4 +94,4 @@ class DaoProxy extends EventEmitter {
   }
 }
 
-module.exports = DaoProxy
+export default DaoProxy

package/lib/EventEmitter.js

@@ -36,4 +36,4 @@ class EventEmitter {
   }
 }
 
-module.exports = EventEmitter
+export default EventEmitter

package/lib/ExtendedObservableList.js

@@ -1,4 +1,4 @@
-const ObservableList = require("./ObservableList.js")
+import ObservableList from "./ObservableList.js"
 
 class ExtendedObservableList extends ObservableList {
   constructor(observableList, elementActivator, elementDispose, valueActivator = observableList.valueActivator) {
@@ -222,4 +222,4 @@ class ExtendedObservableList extends ObservableList {
 
 }
 
-module.exports = ExtendedObservableList
+export default ExtendedObservableList

package/lib/InboxReader.js

@@ -97,4 +97,4 @@ class InboxReader {
 
 }
 
-module.exports = InboxReader
+export default InboxReader

package/lib/LoopbackConnection.js

@@ -1,5 +1,6 @@
-const Connection = require("./ReactiveConnection.js")
-const debug = require("debug")("reactive-dao:loopback-connection")
+import Connection from "./ReactiveConnection.js"
+import Debug from "debug"
+const debug = Debug("reactive-dao:loopback-connection")
 
 class LoopbackConnection extends Connection {
   constructor(credentials, server, settings) {
@@ -86,4 +87,4 @@ class LoopbackConnection extends Connection {
 
 }
 
-module.exports = LoopbackConnection
+export default LoopbackConnection

package/lib/Observable.js

@@ -1,4 +1,5 @@
-const debug = require('debug')('dao')
+import Debug from "debug"
+const debug = Debug('dao')
 
 class Observable {
   constructor() {
@@ -137,4 +138,4 @@ class Observable {
   }
 }
 
-module.exports = Observable
+export default Observable

package/lib/ObservableError.js

@@ -1,4 +1,4 @@
-const Observable = require("./Observable.js")
+import Observable from "./Observable.js"
 
 class ObservableError extends Observable {
   constructor(error) {
@@ -17,4 +17,4 @@ class ObservableError extends Observable {
   }
 }
 
-module.exports = ObservableError
+export default ObservableError

package/lib/ObservableList.js

@@ -1,4 +1,4 @@
-const Observable = require("./Observable.js")
+import Observable from "./Observable.js"
 
 class ObservableList extends Observable {
   constructor(list, _what, _dispose, valueActivator) {
@@ -300,4 +300,4 @@ class ObservableList extends Observable {
   }
 }
 
-module.exports = ObservableList
+export default ObservableList

package/lib/ObservablePromiseProxy.js

@@ -1,7 +1,8 @@
-const Observable = require("./Observable.js")
-const ObservableValue = require("./ObservableValue.js")
-const ObservableError = require("./ObservableError.js")
-const debug = require('debug')('dao')
+import Observable from "./Observable.js"
+import ObservableValue from "./ObservableValue.js"
+import ObservableError from "./ObservableError.js"
+import Debug from "debug"
+const debug = Debug('dao')
 
 class ObservablePromiseProxy extends Observable {
   constructor(promise, errorMapper = v => v) {
@@ -58,4 +59,4 @@ class ObservablePromiseProxy extends Observable {
   }
 }
 
-module.exports = ObservablePromiseProxy
+export default ObservablePromiseProxy

package/lib/ObservableProxy.js

@@ -1,5 +1,6 @@
-const debug = require('debug')('dao')
-const Observable = require("./Observable.js")
+import Debug from "debug"
+const debug = Debug('dao')
+import Observable from "./Observable.js"
 
 class ObservableProxy extends Observable {
   constructor(observable) {
@@ -136,4 +137,4 @@ class ObservableProxy extends Observable {
 
 }
 
-module.exports = ObservableProxy
+export default ObservableProxy

package/lib/ObservableValue.js

@@ -1,4 +1,4 @@
-const Observable = require("./Observable.js")
+import Observable from "./Observable.js"
 
 class ObservableValue extends Observable {
   constructor(value) {
@@ -167,4 +167,4 @@ class ObservableValue extends Observable {
   }
 }
 
-module.exports = ObservableValue
+export default ObservableValue

package/lib/Path.js

@@ -147,4 +147,4 @@ class Path {
   }
 }
 
-module.exports = Path
+export default Path

package/lib/ReactiveConnection.js

@@ -1,6 +1,7 @@
-const EventEmitter = require("./EventEmitter.js")
-const debug = require('debug')('dao')
-const utils = require('./utils')
+import EventEmitter from "./EventEmitter.js"
+import Debug from 'debug'
+const debug = Debug('dao')
+import * as utils from './utils.js'
 
 let lastUid = 0
 
@@ -455,4 +456,4 @@ class Connection extends EventEmitter {
 
 }
 
-module.exports = Connection
+export default Connection

package/lib/ReactiveServer.js

@@ -1,6 +1,6 @@
-const ReactiveServerConnection = require('./ReactiveServerConnection.js')
-
-const debug = require('debug')('dao')
+import ReactiveServerConnection from './ReactiveServerConnection.js'
+import Debug from 'debug'
+const debug = Debug('dao')
 
 class ReactiveServer {
   constructor(daoFactory, settings) {
@@ -21,4 +21,4 @@ class ReactiveServer {
   }
 }
 
-module.exports = ReactiveServer
+export default ReactiveServer

package/lib/ReactiveServerConnection.js

@@ -1,9 +1,10 @@
-const EventEmitter = require('./EventEmitter.js')
-const ObservableList = require("./ObservableList.js")
-const utils = require('./utils.js')
-const collectPointers = require('./collectPointers.js')
-const debug = require("debug")("reactive-dao")
-const debugPot = require("debug")("reactive-dao:pot")
+import EventEmitter from './EventEmitter.js'
+import ObservableList from "./ObservableList.js"
+import * as utils from './utils.js'
+import collectPointers from './collectPointers.js'
+import Debug from 'debug'
+const debug = Debug("reactive-dao")
+const debugPot = Debug("reactive-dao:pot")
 
 class PushObservableTrigger {
   constructor(po, what, more) {
@@ -597,11 +598,10 @@ class ReactiveServerConnection extends EventEmitter {
       const pointers = collectPointers(source, schema, (dep) => {
         const key = JSON.stringify(dep)
         const value = resultsMap.get(key)
-        if(typeof value != 'undefined') return value
+        if(typeof value != 'undefined') return value.data
         moreDeps.push(dep)
         return undefined
       })
-      //console.log("S PTRS", JSON.stringify(pointers, null, '  '))
       if(moreDeps.length == 0) return Promise.resolve(pointers)
       return Promise.all(moreDeps.map(dep => {
         const result = fetch({ what: dep }).catch(error => {
@@ -611,7 +611,6 @@ class ReactiveServerConnection extends EventEmitter {
         })
         return result
       })).then(gotSomeDeps => fetchDeps(source, schema))
-
     }
     function fetchMore(result, more) {
       return Promise.all(
@@ -749,12 +748,12 @@ class ReactiveServerConnection extends EventEmitter {
       this.dao = this.daoPromise
       this.daoPromise = null
     } else {
-      this.daoPromise.catch(error => this.handleDaoFactoryError(error)).then(dd => {
+      this.daoPromise.then(dd => {
         if(!dd) return this.handleDaoFactoryError("dao not defined")
         this.dao = dd
         this.daoPromise = null
         for(const message of this.daoGenerationQueue) this.handleAuthorizedMessage(message)
-      })
+      }).catch(error => this.handleDaoFactoryError(error))
     }
   }
 
@@ -791,4 +790,4 @@ class ReactiveServerConnection extends EventEmitter {
 
 }
 
-module.exports = ReactiveServerConnection
+export default ReactiveServerConnection

package/lib/RemoteDataSource.js

@@ -22,4 +22,4 @@ class RemoteDataSource {
   }
 }
 
-module.exports = RemoteDataSource
+export default RemoteDataSource

package/lib/SimpleDao.js

@@ -1,7 +1,8 @@
-const ObservableValue = require("./ObservableValue.js")
-const ObservablePromiseProxy = require("./ObservablePromiseProxy.js")
-const ObservableError = require("./ObservableError.js")
-const debug = require("debug")("reactive-dao")
+import ObservableValue from "./ObservableValue.js"
+import ObservablePromiseProxy from "./ObservablePromiseProxy.js"
+import ObservableError from "./ObservableError.js"
+import Debug from "debug"
+const debug = Debug("reactive-dao")
 
 const errorMapper = e => ''+(e.stack || e.message || (typeof e == 'object' ? JSON.stringify(e) : e))
 
@@ -48,4 +49,4 @@ class SimpleDao {
 
 }
 
-module.exports = SimpleDao
+export default SimpleDao

package/lib/TimeSynchronization.js

@@ -119,4 +119,4 @@ class TimeSynchronization {
 
 }
 
-module.exports = TimeSynchronization
+export default TimeSynchronization

package/lib/collectPointers.js

@@ -150,4 +150,4 @@ function collectPointers(source, schemas, getSource) {
   return results
 }
 
-module.exports = collectPointers
+export default collectPointers

package/lib/utils.js

@@ -1,4 +1,4 @@
-function errorToJSON(error) {
+export function errorToJSON(error) {
   if(typeof error == 'object') {
     let obj = {}
     Object.getOwnPropertyNames(error).forEach(function (key) {
@@ -9,8 +9,6 @@ function errorToJSON(error) {
   return error
 }
 
-module.exports.errorToJSON = errorToJSON
-
 function nextTickMicrotask(handler, ...args) {
   queueMicrotask(() => handler(...args))
 }
@@ -23,4 +21,4 @@ function nextTickPromise(handler, ...args) {
 const supportMicrotask = typeof queueMicrotask !== 'undefined'
 const supportNextTick = typeof process !== 'undefined' && process.nextTick
 
-module.exports.nextTick = supportNextTick ? process.nextTick : (supportMicrotask ? nextTickMicrotask : nextTickPromise)
+export const nextTick = supportNextTick ? process.nextTick : (supportMicrotask ? nextTickMicrotask : nextTickPromise)

package/package.json

@@ -17,10 +17,10 @@
   },
   "description": "live data access object",
   "devDependencies": {
-    "blue-tape": "^1.0.0",
-    "supports-color": "^7.2.0"
+    "supports-color": "^9.4.0",
+    "tape": "^5.7.4"
   },
-  "directories": {},
+  "type": "module",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "browsernpm ": "browser.js",
@@ -33,8 +33,8 @@
   "name": "@live-change/dao",
   "readme": "README.md",
   "scripts": {
-    "test": "NODE_ENV=test blue-tape tests/*"
+    "test": "NODE_ENV=test tape tests/*"
   },
-  "version": "0.5.22",
-  "gitHead": "c44369e98e27df9f5d09142e6c34d02510b018b1"
+  "version": "0.8.4",
+  "gitHead": "cdc66924576866cd3b476e5a0e8956de54c6d8d9"
 }

package/tests/clicks-list.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape')
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("click list", (t) => {
   t.plan(4)

package/tests/connection-monitors.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("connection monitors", (t) => {
   t.plan(5)

package/tests/failed-dao-factory.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("time value", (t) => {
   t.plan(2)
@@ -15,8 +15,8 @@ test("time value", (t) => {
     client = new LoopbackConnection({ sessionId }, server, {
       delay: 50
     })
-    client.initialize()
     client.once('authenticationError', (err) => t.pass("authentication failed!"))
+    client.initialize()
   })
 
   t.test('create connection with dao factory throwing exception', (t) => {
@@ -26,6 +26,7 @@ test("time value", (t) => {
       delay: 50
     })
     client.once('authenticationError', (err) => t.pass("authentication failed!"))
+    client.initialize()
   })
 
 })

package/tests/get-more.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape')
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("get more", (t) => {
   t.plan(5)

package/tests/insta-error.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("time value", (t) => {
   t.plan(3)

package/tests/loopback-connection.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("loopback connection", (t) => {
   t.plan(4)

package/tests/malformed-packets.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 let sessionId = ""+Math.random()
 

package/tests/observe-more.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape')
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("observe more", (t) => {
   t.plan(6)

package/tests/path.js

@@ -1,6 +1,6 @@
-const test = require('blue-tape')
-const testServerDao = require('./testServerDao.js')
-const { Path } = require("../index.js")
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import { Path } from "../index.js"
 
 const users = (params) => new Path(['users', params])
 const user = (params) => new Path(['user', params])

package/tests/pointers-collector.js

@@ -1,5 +1,5 @@
-const test = require('blue-tape')
-const ReactiveDao = require("../index.js")
+import test from 'tape'
+import ReactiveDao from "../index.js"
 
 test("pointers collector", (t) => {
   t.plan(14)

package/tests/promised-error.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("time value", (t) => {
   t.plan(3)

package/tests/promised-time-value.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("time value", (t) => {
   t.plan(4)

package/tests/request-resend.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("request resend", (t) => {
   t.plan(7)

package/tests/testServerDao.js

@@ -1,9 +1,9 @@
-const ReactiveDao = require("../index.js")
+import ReactiveDao from "../index.js"
 
 let timeObservable = new ReactiveDao.ObservableValue(Date.now())
 let clicksObservable = new ReactiveDao.ObservableList([])
 
-class ObservableCounter extends ReactiveDao.ObservableValue {
+export class ObservableCounter extends ReactiveDao.ObservableValue {
   constructor(v) {
     super(v)
   }
@@ -278,16 +278,15 @@ function generator(credentials) {
   })
 }
 
-module.exports.instant = generator
+export const instant = generator
 
-module.exports.promised = (credentials) => new Promise((resolve, reject) => {
+export const promised = (credentials) => new Promise((resolve, reject) => {
   setTimeout(() => resolve(generator(credentials)), 50)
 })
 
-module.exports.failedPromise = (credentials) => new Promise((resolve, reject) => {
+export const failedPromise = (credentials) => new Promise((resolve, reject) => {
   setTimeout(() => reject("error"))
 })
 
-module.exports.failed = (credentials) => { throw new Error("error") }
+export const failed = (credentials) => { throw new Error("error") }
 
-module.exports.ObservableCounter = ObservableCounter

package/tests/time-sync.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("time synchronization", (t) => {
   t.plan(6)

package/tests/time-value.js

@@ -1,7 +1,7 @@
-const test = require('blue-tape');
-const testServerDao = require('./testServerDao.js')
-const ReactiveDao = require("../index.js")
-const LoopbackConnection = require('../lib/LoopbackConnection.js')
+import test from 'tape'
+import * as testServerDao from './testServerDao.js'
+import ReactiveDao from "../index.js"
+import LoopbackConnection from '../lib/LoopbackConnection.js'
 
 test("time value", (t) => {
   t.plan(4)

package/browser.js

@@ -1,81 +0,0 @@
-import Dao from "./lib/Dao.js"
-let rd = Dao
-rd.Dao = Dao
-
-import Observable from "./lib/Observable.js"
-rd.Observable = Observable
-export { Observable }
-
-import ObservableValue from "./lib/ObservableValue.js"
-rd.ObservableValue = ObservableValue
-export { ObservableValue }
-
-import ObservableList from "./lib/ObservableList.js"
-rd.ObservableList = ObservableList
-export { ObservableList }
-
-import ExtendedObservableList from "./lib/ExtendedObservableList.js"
-rd.ExtendedObservableList = ExtendedObservableList
-export { ExtendedObservableList }
-
-import DaoPrerenderCache from "./lib/DaoPrerenderCache.js"
-const ReactiveCache = DaoPrerenderCache // backward compatibility
-rd.ReactiveCache = DaoPrerenderCache // backward compatibility
-rd.DaoPrerenderCache = DaoPrerenderCache
-export { ReactiveCache, DaoPrerenderCache }
-
-import DaoProxy from "./lib/DaoProxy.js"
-const ReactiveDaoProxy = DaoProxy // backward compatibility
-rd.ReactiveDaoProxy = DaoProxy // backward compatibility
-rd.DaoProxy = DaoProxy
-export { ReactiveDaoProxy, DaoProxy }
-
-import DaoCache from "./lib/DaoCache.js"
-rd.DaoCache = DaoCache
-export { DaoCache }
-
-import InboxReader from "./lib/InboxReader.js"
-rd.InboxReader = InboxReader
-export { InboxReader }
-
-import ReactiveConnection from "./lib/ReactiveConnection.js"
-rd.ReactiveConnection = ReactiveConnection
-export { ReactiveConnection }
-
-import LoopbackConnection from "./lib/LoopbackConnection.js"
-rd.LoopbackConnection = LoopbackConnection
-export { LoopbackConnection }
-
-import SimpleDao from "./lib/SimpleDao.js"
-rd.SimpleDao = SimpleDao
-export { SimpleDao }
-
-import ObservableError from "./lib/ObservableError.js"
-rd.ObservableError = ObservableError
-export { ObservableError }
-
-import ObservableProxy from "./lib/ObservableProxy.js"
-rd.ObservableProxy = ObservableProxy
-export { ObservableProxy }
-
-import ObservablePromiseProxy from "./lib/ObservablePromiseProxy.js"
-rd.ObservablePromiseProxy = ObservablePromiseProxy
-export { ObservablePromiseProxy }
-
-import ConnectionMonitorPinger from "./lib/ConnectionMonitorPinger.js"
-rd.ConnectionMonitorPinger = ConnectionMonitorPinger
-export { ConnectionMonitorPinger }
-
-import ConnectionMonitorPingReceiver from "./lib/ConnectionMonitorPingReceiver.js"
-rd.ConnectionMonitorPingReceiver = ConnectionMonitorPingReceiver
-export { ConnectionMonitorPingReceiver }
-
-import TimeSynchronization from "./lib/TimeSynchronization.js"
-rd.TimeSynchronization = TimeSynchronization
-export { TimeSynchronization }
-
-import collectPointers from "./lib/collectPointers.js"
-rd.collectPointers = collectPointers
-export { collectPointers }
-
-export default rd