mjs nodejs support

provider/websocket.js

@@ -1,5 +0,0 @@
-/**
- * @module provider/websocket
- */
-
-export * from './websocket/WebSocketProvider.js'

provider/websocket.mjs

@@ -0,0 +1,5 @@
+/**
+ * @module provider/websocket
+ */
+
+export * from './websocket/WebSocketProvider.mjs'

provider/websocket/WebSocketProvider.mjs

@@ -4,8 +4,8 @@
 
 /* eslint-env browser */
 
-import * as Y from '../../index.js'
-export * from '../../index.js'
+import * as Y from '../../index.mjs'
+export * from '../../index.mjs'
 
 const messageSync = 0
 const messageAwareness = 1

provider/websocket/server.mjs

@@ -2,8 +2,9 @@
  * @module provider/websocket
  */
 
-const Y = require('../../build/yjs.umd.js')
-const WebSocket = require('ws')
+import * as Y from '../../index.mjs'
+import WebSocket from 'ws'
+
 const wss = new WebSocket.Server({ port: 1234 })
 const docs = new Map()
 

provider/ydb/NamedEventHandler.mjs

@@ -2,7 +2,7 @@
  * @module provider/ydb
  */
 
-import * as globals from './globals.js'
+import * as globals from './globals.mjs'
 
 export const Class = class NamedEventHandler {
   constructor () {

provider/ydb/YdbClient.mjs

@@ -3,19 +3,19 @@
  */
 
 /* eslint-env browser */
-import * as idbactions from './idbactions.js'
-import * as globals from '../../lib/globals.js'
-import * as message from './message.js'
-import * as bc from './broadcastchannel.js'
-import * as encoding from '../../lib/encoding.js'
-import * as logging from '../../lib/logging.js'
-import * as idb from '../../lib/idb.js'
-import * as decoding from '../../lib/decoding.js'
-import { Y } from '../../utils/Y.js'
-import { integrateRemoteStruct } from '../MessageHandler/integrateRemoteStructs.js'
-import { createMutualExclude } from '../../lib/mutualExclude.js'
+import * as idbactions from './idbactions.mjs'
+import * as globals from '../../lib/globals.mjs'
+import * as message from './message.mjs'
+import * as bc from './broadcastchannel.mjs'
+import * as encoding from '../../lib/encoding.mjs'
+import * as logging from '../../lib/logging.mjs'
+import * as idb from '../../lib/idb.mjs'
+import * as decoding from '../../lib/decoding.mjs'
+import { Y } from '../../utils/Y.mjs'
+import { integrateRemoteStruct } from '../MessageHandler/integrateRemoteStructs.mjs'
+import { createMutualExclude } from '../../lib/mutualExclude.mjs'
 
-import * as NamedEventHandler from './NamedEventHandler.js'
+import * as NamedEventHandler from './NamedEventHandler.mjs'
 
 /**
  * @typedef RoomState

provider/ydb/YdbClient.test.mjs

@@ -4,11 +4,11 @@
 
 /* eslint-env browser */
 
-import * as test from './test.js'
-import * as ydbClient from './YdbClient.js'
-import * as globals from './globals.js'
-import * as idbactions from './idbactions.js'
-import * as logging from './logging.js'
+import * as test from './test.mjs'
+import * as ydbClient from './YdbClient.mjs'
+import * as globals from './globals.mjs'
+import * as idbactions from './idbactions.mjs'
+import * as logging from './logging.mjs'
 
 const wsUrl = 'ws://127.0.0.1:8899/ws'
 const testRoom = 'testroom'

provider/ydb/broadcastchannel.mjs

@@ -4,10 +4,10 @@
 
 /* eslint-env browser */
 
-import * as decoding from '../../lib/decoding.js'
-import * as encoding from '../../lib/encoding.js'
-import * as globals from '../../lib/globals.js'
-import * as NamedEventHandler from './NamedEventHandler.js'
+import * as decoding from '../../lib/decoding.mjs'
+import * as encoding from '../../lib/encoding.mjs'
+import * as globals from '../../lib/globals.mjs'
+import * as NamedEventHandler from './NamedEventHandler.mjs'
 
 const bc = new BroadcastChannel('ydb-client')
 /**
@@ -15,7 +15,8 @@ const bc = new BroadcastChannel('ydb-client')
  */
 const datasubs = globals.createMap()
 /**
- * @type {Set<any>} Set of Ydb instances
+ * Set of Ydb instances
+ * @type {Set<any>}
  */
 const ydbinstances = globals.createSet()
 

provider/ydb/idbactions.mjs

@@ -33,11 +33,11 @@
  *   - A client may update a room when the room is in either US or Co
  */
 
-import * as encoding from '../../lib/encoding.js'
-import * as decoding from '../../lib/decoding.js'
-import * as idb from '../../lib/idb.js'
-import * as globals from '../../lib/globals.js'
-import * as message from './message.js'
+import * as encoding from '../../lib/encoding.mjs'
+import * as decoding from '../../lib/decoding.mjs'
+import * as idb from '../../lib/idb.mjs'
+import * as globals from '../../lib/globals.mjs'
+import * as message from './message.mjs'
 
 /**
  * Get 'client-unconfirmed' store from transaction
@@ -68,10 +68,16 @@ const getStoreUS = t => idb.getStore(t, STORE_US)
 /**
  * @param {string} room
  * @param {number} offset
- * @return {[string, number]}
+ * @return {HUTableKey}
  */
 const encodeHUKey = (room, offset) => [room, offset]
 
+/**
+ * Array of length 2: [string, number]
+ * @typedef HUTableKey
+ * @type {any}
+ */
+
 /**
  * @typedef RoomAndOffset
  * @type {Object}
@@ -80,7 +86,7 @@ const encodeHUKey = (room, offset) => [room, offset]
  */
 
 /**
- * @param {[string, number]} key
+ * @param {HUTableKey} key
  * @return {RoomAndOffset}
  */
 const decodeHUKey = key => {

provider/ydb/idbactions.test.mjs

@@ -1,6 +1,6 @@
-import * as globals from '../../lib/globals.js'
-import * as idbactions from './idbactions.js'
-import * as test from '../../lib/testing.js'
+import * as globals from '../../lib/globals.mjs'
+import * as idbactions from './idbactions.mjs'
+import * as test from '../../lib/testing.mjs'
 
 idbactions.deleteDB().then(() => idbactions.openDB()).then(db => {
   test.run('update lifetime 1', async (testname) => {

provider/ydb/index.mjs

@@ -2,7 +2,7 @@
  * @module provider/ydb
  */
 
-import * as ydbclient from './YdbClient.js'
+import * as ydbclient from './YdbClient.mjs'
 
 /**
  * @param {string} url

provider/ydb/message.mjs

@@ -2,11 +2,11 @@
  * @module provider/ydb
  */
 
-import * as encoding from './encoding.js'
-import * as decoding from './decoding.js'
-import * as idbactions from './idbactions.js'
-import * as logging from './logging.js'
-import * as bc from './broadcastchannel.js'
+import * as encoding from './encoding.mjs'
+import * as decoding from './decoding.mjs'
+import * as idbactions from './idbactions.mjs'
+import * as logging from './logging.mjs'
+import * as bc from './broadcastchannel.mjs'
 
 /* make sure to update message.go in ydb when updating these values.. */
 export const MESSAGE_UPDATE = 0 // TODO: rename host_unconfirmed?