Update to esmodules and ava version

Author: Josema

package.json

@@ -1,5 +1,6 @@
 {
     "name": "dop",
+    "type": "module",
     "version": "1.5.4",
     "main": "dist/dop.js",
     "browser": "dist/dop.umd.js",
@@ -31,11 +32,10 @@
         "server",
         "client"
     ],
-    "dependencies": {},
     "devDependencies": {
         "@rollup/plugin-buble": "^0.20.0",
         "@rollup/plugin-json": "^4.0.1",
-        "ava": "^2.4.0",
+        "ava": "^6.4.1",
         "ejson": "^2.2.0",
         "esm": "^3.2.25",
         "lodash": "^4.17.15",
@@ -56,9 +56,6 @@
     "ava": {
         "files": [
             "!test/utils.js"
-        ],
-        "require": [
-            "esm"
         ]
     }
 }

test/.addType.js

@@ -1,5 +1,5 @@
 import test from 'ava'
-import { applyPatch, encode, decode, addType } from '../src'
+import { applyPatch, encode, decode, addType } from '../src/index.js'
 import Splice from '../src/types/Splice'
 import { getNewPlain } from '../src/util/getset'
 import { isPlainObject } from '../src/util/is'

test/api.js

@@ -1,6 +1,5 @@
 import test from 'ava'
-import dop from '../src'
-import { createNode } from '../src'
+import dop from '../src/index.js'
 
 const exported = {
     version: true,

test/apply_patch.js

@@ -1,6 +1,6 @@
 import test from 'ava'
-import { applyPatch, TYPE } from '../src'
-import { testPatchUnpatch } from './utils'
+import { applyPatch, TYPE } from '../src/index.js'
+import { testPatchUnpatch } from './utils.js'
 
 test('1 / https://tools.ietf.org/html/rfc7386 ', function (t) {
     const target = { a: 'b' }
@@ -220,8 +220,8 @@ test('basic mutation', function (t) {
 })
 
 test('basic mutations', function (t) {
-    const func1 = () => {}
-    const func2 = () => {}
+    const func1 = () => { }
+    const func2 = () => { }
     const target = { number: 1, bool: false, string: 'hello', func: func1 }
     const patch = { number: 2, bool: true, string: 'world', func: func2 }
     const expected = { number: 2, bool: true, string: 'world', func: func2 }
@@ -365,7 +365,7 @@ test('mutating multiple levels not defineds / inverted', function (t) {
 })
 
 test('function to target', function (t) {
-    const target = { prop: () => {} }
+    const target = { prop: () => { } }
     const patch = { prop: {} }
     const expected = { prop: {} }
     const fnpatch = (d) => {
@@ -383,7 +383,7 @@ test('function to target', function (t) {
 })
 
 test('target to function', function (t) {
-    const f = () => {}
+    const f = () => { }
     const target = { prop: {} }
     const patch = { prop: f }
     const expected = { prop: f }
@@ -402,7 +402,7 @@ test('target to function', function (t) {
 })
 
 test('plain to noplain', function (t) {
-    function Foo() {}
+    function Foo() { }
     const instance = new Foo()
     instance.prop = 2
 
@@ -425,7 +425,7 @@ test('plain to noplain', function (t) {
 })
 
 test('noplain to plain', function (t) {
-    function Foo() {}
+    function Foo() { }
     const instance = new Foo()
     instance.prop = 2
 
@@ -605,7 +605,7 @@ test('should assign `undefined` values', function (t) {
 })
 
 test('should assign non array/buffer/typed-array/plain-target source values directly', function (t) {
-    function Foo() {}
+    function Foo() { }
     const values = [
         new Foo(),
         new Boolean(),

test/create_node.js

@@ -1,6 +1,6 @@
 import test from 'ava'
-import { createNode } from '../src'
-import { RPC_CREATOR } from '../src/const'
+import { createNode } from '../src/index.js'
+import { RPC_CREATOR } from '../src/const.js'
 
 test('Api', async (t) => {
     const server = createNode()
@@ -59,7 +59,7 @@ test('Callback pattern example', async (t) => {
 test('Calling a defined function .message must return true', async (t) => {
     const server = createNode()
     const client = createNode()
-    const callClient = server.open(client.message, () => {})
+    const callClient = server.open(client.message, () => { })
     const callServer = client.open((msg) => {
         t.is(server.message(msg), true)
     })
@@ -79,7 +79,7 @@ test('Calling a not defined function .message must return false', async (t) => {
 test('Response (reject or resolve must delete request)', async (t) => {
     const server = createNode()
     const client = createNode()
-    server.open(client.message, (v) => {})
+    server.open(client.message, (v) => { })
     const callServer = client.open(server.message)
     t.is(Object.keys(client.requests).length, 0)
     callServer().then((v) => {
@@ -114,8 +114,8 @@ test('Passing same functions should not create a new one', async (t) => {
     )
 
     // Server side
-    const receiveFromClient = () => {}
-    const repeated = () => {}
+    const receiveFromClient = () => { }
+    const repeated = () => { }
     const callClient = server.open(client.message, receiveFromClient)
     callClient(repeated, repeated, receiveFromClient)
 })
@@ -250,7 +250,7 @@ test('rpc is created if rpcFilter returns the rpc itself', async (t) => {
     })
     t.is(callClient, n)
     const callServer = client.open(server.message)
-    callServer(() => {})
+    callServer(() => { })
 })
 
 test('rpcFilter API', async (t) => {
@@ -304,9 +304,9 @@ test('rpcFilter API', async (t) => {
     server.open(client.message, entryFunction)
     const callServer = client.open(server.message)
     const objServer = await callServer(() => {
-        return () => {}
+        return () => { }
     })
-    objServer.login({ value: 2, fn: () => {} })
+    objServer.login({ value: 2, fn: () => { } })
 })
 
 test('registerRpc & createRpc', async (t) => {

test/create_store.js

@@ -1,5 +1,5 @@
 import test from 'ava'
-import { createStore, TYPE } from '../src'
+import { createStore, TYPE } from '../src/index.js'
 
 test('createStore', function (t) {
     const state = { number: 1 }
@@ -19,8 +19,8 @@ test('createStore', function (t) {
 test('subscribe', function (t) {
     const state = { prop: true }
     const store = createStore(state)
-    const listener = () => {}
-    const filter = () => {}
+    const listener = () => { }
+    const filter = () => { }
     store.subscribe(listener, filter)
     t.true(store.listeners.has(listener))
     t.is(store.listeners.get(listener), filter)
@@ -33,7 +33,7 @@ test('subscribe', function (t) {
 test('unsubscribe from subscribe', function (t) {
     const state = { prop: true }
     const store = createStore(state)
-    const listener = () => {}
+    const listener = () => { }
     const unsubscribe = store.subscribe(listener)
     t.true(store.listeners.has(listener))
     t.is(store.listeners.size, 1)
@@ -45,7 +45,7 @@ test('unsubscribe from subscribe', function (t) {
 test('unsubscribe', function (t) {
     const state = { prop: true }
     const store = createStore(state)
-    const listener = () => {}
+    const listener = () => { }
     store.subscribe(listener)
     t.true(store.listeners.has(listener))
     t.is(store.listeners.size, 1)
@@ -58,7 +58,7 @@ test('applyPatch', function (t) {
     const state = { prop: false }
     const store = createStore(state)
     const patch = { prop: true }
-    const listener = (p) => {}
+    const listener = (p) => { }
     store.subscribe(listener)
     const outputs = store.applyPatch(patch)
     t.true(Array.isArray(outputs))
@@ -78,7 +78,7 @@ test('applyPatch', function (t) {
 test('applyPatch with function', function (t) {
     const state = { prop: false }
     const store = createStore(state)
-    const listener = (p) => {}
+    const listener = (p) => { }
     store.subscribe(listener)
     const outputs = store.applyPatch((draft) => {
         draft.prop = true
@@ -100,7 +100,7 @@ test('subscribe filter', function (t) {
     const store = createStore(initialstate)
     const patch = { prop: true, newprop: true }
     const filter = (mutation) => mutation.prop !== 'newprop'
-    store.subscribe(() => {}, filter)
+    store.subscribe(() => { }, filter)
     const result = store.applyPatch(patch)
     const [output] = result
     t.not(output.patch, patch)
@@ -114,11 +114,11 @@ test('subscribe output of applyPatch must return same length that listeners', fu
     const store = createStore({ prop: false })
     const patch = { prop: true, newprop: true }
     store.subscribe(
-        () => {},
+        () => { },
         () => false
     )
     store.subscribe(
-        () => {},
+        () => { },
         () => true
     )
     const output = store.applyPatch(patch)
@@ -133,11 +133,11 @@ test('filtered patches by createPatchAndUnpatchFromMutations must be the same as
     const store = createStore({ params: { a: 1, b: 2 } })
     const patch = { params: TYPE.Replace({ c: 3 }) }
     store.subscribe(
-        () => {},
+        () => { },
         () => false
     )
     store.subscribe(
-        () => {},
+        () => { },
         () => true
     )
     const output = store.applyPatch(patch)

test/getset.js

@@ -1,5 +1,5 @@
 import test from 'ava'
-import { getDeep } from '../src/util/getset'
+import { getDeep } from '../src/util/getset.js'
 
 test('getDeep', function (t) {
     const object = { first: 1, second: { third: 4 } }

test/merge.js

@@ -1,5 +1,5 @@
 import test from 'ava'
-import dop from '../src'
+import dop from '../src/index.js'
 import _ from 'lodash' // https://github.com/lodash/lodash/blob/master/test/merge.test.js
 import R from 'ramda'
 
@@ -50,7 +50,7 @@ function run(merge, name) {
     })
 
     test(name + ': should merge onto function `object` values', function (t) {
-        function Foo() {}
+        function Foo() { }
 
         var source = { a: 1 },
             actual = merge(Foo, source)
@@ -62,7 +62,7 @@ function run(merge, name) {
     test(
         name + ': should merge first source object properties to function',
         function (t) {
-            var fn = function () {},
+            var fn = function () { },
                 object = { prop: {} },
                 actual = merge({ prop: fn }, object)
 
@@ -72,9 +72,9 @@ function run(merge, name) {
 
     test(
         name +
-            ': should merge first and second source object properties to function',
+        ': should merge first and second source object properties to function',
         function (t) {
-            var fn = function () {},
+            var fn = function () { },
                 object = { prop: {} },
                 actual = merge({ prop: fn }, { prop: fn }, object)
 
@@ -85,7 +85,7 @@ function run(merge, name) {
     test(
         name + ': should not merge onto function values of sources',
         function (t) {
-            var source1 = { a: function () {} },
+            var source1 = { a: function () { } },
                 source2 = { a: { b: 2 } },
                 expected = { a: { b: 2 } },
                 actual = merge({}, source1, source2)
@@ -99,7 +99,7 @@ function run(merge, name) {
     )
 
     test(name + ': should merge onto non-plain `object` values', function (t) {
-        function Foo() {}
+        function Foo() { }
 
         var object = new Foo(),
             actual = merge(object, { a: 1 })
@@ -128,19 +128,19 @@ function run(merge, name) {
 
     test(
         name +
-            ': should assign non array/buffer/typed-array/plain-object source values directly',
+        ': should assign non array/buffer/typed-array/plain-object source values directly',
         function (t) {
-            function Foo() {}
+            function Foo() { }
 
             var values = [
-                    new Foo(),
-                    new Boolean(),
-                    new Date(),
-                    Foo,
-                    new Number(),
-                    new String(),
-                    new RegExp(),
-                ],
+                new Foo(),
+                new Boolean(),
+                new Date(),
+                Foo,
+                new Number(),
+                new String(),
+                new RegExp(),
+            ],
                 expected = _.map(values, () => true)
 
             var actual = _.map(values, function (value) {
@@ -190,7 +190,7 @@ function run(merge, name) {
 
     test(
         name +
-            ': should skip merging when `object` and `source` are the same value',
+        ': should skip merging when `object` and `source` are the same value',
         function (t) {
             var object = {},
                 pass = true
@@ -213,7 +213,7 @@ function run(merge, name) {
 
     test(
         name +
-            ': should convert strings to arrays when merging arrays of `source`',
+        ': should convert strings to arrays when merging arrays of `source`',
         function (t) {
             var object = { a: 'abcde' },
                 actual = merge(object, { a: ['x', 'y', 'z'] })
@@ -236,7 +236,7 @@ function run(merge, name) {
             symbol: Symbol('sym'),
             date: new Date(),
             regexp: /molamazo/g,
-            f: () => {},
+            f: () => { },
             function: function () {
                 console.log(arguments)
             },