new libs, fix lint rules

le0pard · le0pard · commit 9cfbea4153ce · 2023-12-02T16:38:46.000+02:00
diff --git a/.eslintrc b/.eslintrc
@@ -145,7 +145,7 @@
         "terms": ["todo", "fixme"]
       }
     ],
-    "object-curly-spacing": 2,
+    "object-curly-spacing": [2, "always"],
     "padded-blocks": [2, "never"],
     "quote-props": [0, "as-needed"],
     "quotes": [
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
@@ -1,7 +1,7 @@
 # https://prettier.io/docs/en/options.html
 semi: false
 singleQuote: true
-bracketSpacing: false
+bracketSpacing: true
 arrowParens: always
 printWidth: 100
 trailingComma: none
diff --git a/packages/web/src/index.js b/packages/web/src/index.js
@@ -10,8 +10,8 @@ import {
   WORKER_MSG_ERROR_COMMAND,
   ALL_COMMANDS
 } from './../../../shared/constants'
-import {uuid} from './../../../shared/uuid'
-import {activateVisibilityAPI} from './visibility'
+import { uuid } from './../../../shared/uuid'
+import { activateVisibilityAPI } from './visibility'
 
 const DEFAULT_OPTIONS = {
   workerOptions: {
@@ -44,13 +44,13 @@ const triggerSubscriptionForChannel = (id, data) => {
   }
 }
 
-const handleWorkerMessages = ({event, options = {}}) => {
+const handleWorkerMessages = ({ event, options = {} }) => {
   const message = event?.data || {}
 
   switch (message?.command) {
     case PING_COMMAND: {
       // always response on ping
-      workerPort.postMessage({command: PONG_COMMAND})
+      workerPort.postMessage({ command: PONG_COMMAND })
       return
     }
     case WEBSOCKET_MESSAGE_COMMAND: {
@@ -92,7 +92,7 @@ const startWorker = ({
     return reject('Error to create worker')
   }
 
-  workerPort.addEventListener('message', (event) => handleWorkerMessages({event, options}))
+  workerPort.addEventListener('message', (event) => handleWorkerMessages({ event, options }))
   if (options.onError) {
     workerPort.addEventListener('error', (event) => options.onError(event.toString()))
     workerPort.addEventListener('messageerror', (event) => options.onError(event.toString()))
@@ -107,15 +107,15 @@ const startWorker = ({
       timeout: options.visibilityTimeout,
       visible: (isChannelsWasPaused) => {
         if (isChannelsWasPaused) {
-          workerPort.postMessage({command: VISIBILITY_SHOW_COMMAND})
+          workerPort.postMessage({ command: VISIBILITY_SHOW_COMMAND })
         }
         if (options.onVisibilityChange) {
           options.onVisibilityChange(true, isChannelsWasPaused)
         }
       },
       hidden: (isChannelsWasPaused) => {
         if (isChannelsWasPaused) {
-          workerPort.postMessage({command: VISIBILITY_HIDDEN_COMMAND})
+          workerPort.postMessage({ command: VISIBILITY_HIDDEN_COMMAND })
         }
         if (options.onVisibilityChange) {
           options.onVisibilityChange(false, isChannelsWasPaused)
@@ -129,7 +129,7 @@ const startWorker = ({
       if (ALL_COMMANDS.indexOf(command) >= 0) {
         throw new Error(`Command ${command} busy by cable-shared-worker`)
       }
-      workerPort.postMessage({command, data})
+      workerPort.postMessage({ command, data })
     }
   })
 }
@@ -144,7 +144,7 @@ const initWorker = (workerUrl, options = {}) =>
       return reject('Need to provide worker url')
     }
 
-    const {workerOptions, ...restOptions} = options
+    const { workerOptions, ...restOptions } = options
 
     const mergedOptions = {
       ...DEFAULT_OPTIONS,
@@ -208,7 +208,7 @@ const createChannel = (channel, params = {}, onReceiveMessage = () => ({})) =>
         if (workerPort) {
           workerPort.postMessage({
             command: WEBSOCKET_PERFORM_COMMAND,
-            subscription: {id},
+            subscription: { id },
             perform: {
               action: performAction,
               params: performParams
@@ -230,7 +230,7 @@ const createChannel = (channel, params = {}, onReceiveMessage = () => ({})) =>
         if (workerPort) {
           workerPort.postMessage({
             command: UNSUBSCRIBE_FROM_CHANNEL,
-            subscription: {id}
+            subscription: { id }
           })
         }
       }
diff --git a/packages/web/src/visibility.js b/packages/web/src/visibility.js
@@ -12,7 +12,7 @@ const getVisibilityPropertyNames = () => {
 
 const [visibilityState, visibilityChange] = getVisibilityPropertyNames()
 
-export const activateVisibilityAPI = ({timeout, visible, hidden}) => {
+export const activateVisibilityAPI = ({ timeout, visible, hidden }) => {
   let visibilityTimer = null
   let isChannelsWasPaused = false
 
diff --git a/packages/worker/src/cableWrapper.js b/packages/worker/src/cableWrapper.js
@@ -1,4 +1,4 @@
-import {ACTIONCABLE_TYPE, WEBSOCKET_MESSAGE_COMMAND} from './../../../shared/constants'
+import { ACTIONCABLE_TYPE, WEBSOCKET_MESSAGE_COMMAND } from './../../../shared/constants'
 
 const UNSUBSCRIBE_CHECK_TIMEOUT = 300 // give time to unsubscribe from channels
 
@@ -71,10 +71,10 @@ export const initCableWrapper = (apiType = ACTIONCABLE_TYPE, api, options = {},
         }
         return resolve()
       }),
-    subscribeTo: ({port, portID, id, channel, params = {}}) => {
+    subscribeTo: ({ port, portID, id, channel, params = {} }) => {
       resumeConnectionIfNeeded()
 
-      const channelData = {channel, params}
+      const channelData = { channel, params }
 
       const addSubscription = (subscriptionChannel) => {
         portReceiverMapping = {
@@ -97,7 +97,7 @@ export const initCableWrapper = (apiType = ACTIONCABLE_TYPE, api, options = {},
           },
           {
             received: (data) => {
-              port.postMessage({command: WEBSOCKET_MESSAGE_COMMAND, data, id})
+              port.postMessage({ command: WEBSOCKET_MESSAGE_COMMAND, data, id })
             }
           }
         )
@@ -106,22 +106,22 @@ export const initCableWrapper = (apiType = ACTIONCABLE_TYPE, api, options = {},
       } else {
         return websocketConnection.subscribeTo(channel, params).then((subscriptionChannel) => {
           subscriptionChannel.on('message', (data) => {
-            port.postMessage({command: WEBSOCKET_MESSAGE_COMMAND, data, id})
+            port.postMessage({ command: WEBSOCKET_MESSAGE_COMMAND, data, id })
           })
 
           return addSubscription(subscriptionChannel)
         })
       }
     },
-    performInChannel: (portID, id, {action, params = {}}) => {
+    performInChannel: (portID, id, { action, params = {} }) => {
       if (portReceiverMapping[portID] && portReceiverMapping[portID][id]?.channel) {
-        const {channel} = portReceiverMapping[portID][id]
+        const { channel } = portReceiverMapping[portID][id]
         channel.perform(action, params)
       }
     },
     unsubscribeFrom: (portID, id) => {
       if (portReceiverMapping[portID] && portReceiverMapping[portID][id]?.channel) {
-        const {channel} = portReceiverMapping[portID][id]
+        const { channel } = portReceiverMapping[portID][id]
         if (isActioncableAPI) {
           channel.unsubscribe()
         } else {
@@ -158,7 +158,7 @@ export const initCableWrapper = (apiType = ACTIONCABLE_TYPE, api, options = {},
           if (portKey === portID) {
             Object.keys(portReceiverMapping[portKey]).forEach((keySub) => {
               if (portReceiverMapping[portKey][keySub]?.channel) {
-                const {channel} = portReceiverMapping[portKey][keySub]
+                const { channel } = portReceiverMapping[portKey][keySub]
                 if (isActioncableAPI) {
                   channel.unsubscribe()
                 } else {
@@ -179,7 +179,7 @@ export const initCableWrapper = (apiType = ACTIONCABLE_TYPE, api, options = {},
         setTimeout(() => pauseConnectionIfNeeded(), UNSUBSCRIBE_CHECK_TIMEOUT)
       }
     },
-    resumeChannels: ({id, port}) => {
+    resumeChannels: ({ id, port }) => {
       if (portReceiverMapping[id]) {
         resumeConnectionIfNeeded()
 
@@ -201,15 +201,15 @@ export const initCableWrapper = (apiType = ACTIONCABLE_TYPE, api, options = {},
                 portReceiverMapping[id][keySub]?.channelData &&
                 !portReceiverMapping[id][keySub]?.channel
               ) {
-                const {channel, params} = portReceiverMapping[id][keySub].channelData
+                const { channel, params } = portReceiverMapping[id][keySub].channelData
                 const subscriptionChannel = websocketConnection.subscriptions.create(
                   {
                     ...params,
                     channel
                   },
                   {
                     received: (data) => {
-                      port.postMessage({command: WEBSOCKET_MESSAGE_COMMAND, data, id: keySub})
+                      port.postMessage({ command: WEBSOCKET_MESSAGE_COMMAND, data, id: keySub })
                     }
                   }
                 )
@@ -236,13 +236,13 @@ export const initCableWrapper = (apiType = ACTIONCABLE_TYPE, api, options = {},
                 portReceiverMapping[id][keySub]?.channelData &&
                 !portReceiverMapping[id][keySub]?.channel
               ) {
-                const {channelData} = portReceiverMapping[id][keySub]
-                const {channel, params} = channelData
+                const { channelData } = portReceiverMapping[id][keySub]
+                const { channel, params } = channelData
                 return websocketConnection
                   .subscribeTo(channel, params)
                   .then((subscriptionChannel) => {
                     subscriptionChannel.on('message', (data) => {
-                      port.postMessage({command: WEBSOCKET_MESSAGE_COMMAND, data, id: keySub})
+                      port.postMessage({ command: WEBSOCKET_MESSAGE_COMMAND, data, id: keySub })
                     })
 
                     return [
@@ -275,7 +275,7 @@ export const initCableWrapper = (apiType = ACTIONCABLE_TYPE, api, options = {},
         }
       }
     },
-    pauseChannels: ({id}) => {
+    pauseChannels: ({ id }) => {
       if (portReceiverMapping[id]) {
         portReceiverMapping = {
           ...portReceiverMapping,
@@ -284,7 +284,7 @@ export const initCableWrapper = (apiType = ACTIONCABLE_TYPE, api, options = {},
               portReceiverMapping[id][keySub]?.channel &&
               portReceiverMapping[id][keySub]?.channelData
             ) {
-              const {channel, ...restData} = portReceiverMapping[id][keySub]
+              const { channel, ...restData } = portReceiverMapping[id][keySub]
               if (isActioncableAPI) {
                 channel.unsubscribe()
               } else {
diff --git a/packages/worker/src/index.js b/packages/worker/src/index.js
@@ -8,8 +8,8 @@ import {
   WORKER_MSG_ERROR_COMMAND,
   ALL_COMMANDS
 } from './../../../shared/constants'
-import {addPortForStore, updatePortPongTime, recurrentPortsChecks} from './workerPorts'
-import {loadCableApiWrapper} from './workerCable'
+import { addPortForStore, updatePortPongTime, recurrentPortsChecks } from './workerPorts'
+import { loadCableApiWrapper } from './workerCable'
 
 const DEFAULT_OPTIONS = {
   cableType: 'actioncable', // anycable, actioncable
@@ -46,7 +46,7 @@ const activateChannelInQueue = () => {
   return
 }
 
-const subscribeToChannel = ({id, port}, channelSettings = {}) => {
+const subscribeToChannel = ({ id, port }, channelSettings = {}) => {
   const params = {
     portID: id,
     port,
@@ -86,31 +86,31 @@ const performInChannel = (portID, id, perform) => {
   return
 }
 
-const resumeChannelsForPort = ({id, port}) => {
+const resumeChannelsForPort = ({ id, port }) => {
   if (!cableAPI || cableAPI.isDisconnected()) {
     return
   }
 
-  cableAPI.resumeChannels({id, port})
+  cableAPI.resumeChannels({ id, port })
 
   return
 }
 
-const pauseChannelsForPort = ({id, port}) => {
+const pauseChannelsForPort = ({ id, port }) => {
   if (!cableAPI || cableAPI.isDisconnected()) {
     return
   }
 
-  cableAPI.pauseChannels({id, port})
+  cableAPI.pauseChannels({ id, port })
 
   return
 }
 
-const captureWorkerError = ({port, event}) => {
-  port.postMessage({command: WORKER_MSG_ERROR_COMMAND, event: event.toString()})
+const captureWorkerError = ({ port, event }) => {
+  port.postMessage({ command: WORKER_MSG_ERROR_COMMAND, event: event.toString() })
 }
 
-const handleWorkerMessages = ({id, event, port}) => {
+const handleWorkerMessages = ({ id, event, port }) => {
   const message = event?.data || {}
 
   switch (message?.command) {
@@ -120,7 +120,7 @@ const handleWorkerMessages = ({id, event, port}) => {
       return
     }
     case SUBSCRIBE_TO_CHANNEL: {
-      subscribeToChannel({id, port}, message?.subscription)
+      subscribeToChannel({ id, port }, message?.subscription)
       return
     }
     case UNSUBSCRIBE_FROM_CHANNEL: {
@@ -132,11 +132,11 @@ const handleWorkerMessages = ({id, event, port}) => {
       return
     }
     case VISIBILITY_SHOW_COMMAND: {
-      resumeChannelsForPort({id, port})
+      resumeChannelsForPort({ id, port })
       return
     }
     case VISIBILITY_HIDDEN_COMMAND: {
-      pauseChannelsForPort({id, port})
+      pauseChannelsForPort({ id, port })
       return
     }
     default: {
@@ -146,15 +146,15 @@ const handleWorkerMessages = ({id, event, port}) => {
           if (ALL_COMMANDS.indexOf(command) >= 0) {
             throw new Error(`Command ${command} busy by cable-shared-worker`)
           }
-          port.postMessage({command, data})
+          port.postMessage({ command, data })
         }
         cableOptions.handleCustomWebCommand(message?.command, message?.data, responseFn)
       }
     }
   }
 }
 
-const disconnectSubscriptionsFromPort = ({id}) => {
+const disconnectSubscriptionsFromPort = ({ id }) => {
   if (!cableAPI) {
     return
   }
@@ -166,8 +166,8 @@ const disconnectSubscriptionsFromPort = ({id}) => {
 
 const registerPort = (port) => {
   const id = addPortForStore(port)
-  port.addEventListener('message', (event) => handleWorkerMessages({port, id, event}))
-  port.addEventListener('messageerror', (event) => captureWorkerError({port, id, event}))
+  port.addEventListener('message', (event) => handleWorkerMessages({ port, id, event }))
+  port.addEventListener('messageerror', (event) => captureWorkerError({ port, id, event }))
 }
 
 if (isSharedWorker) {
@@ -198,13 +198,13 @@ const initCableLibrary = (options = {}) => {
   if (cableAPI) {
     return cableAPI
   }
-  cableOptions = {...DEFAULT_OPTIONS, ...options}
-  const {cableType, cableLibrary, ...restOptions} = cableOptions
+  cableOptions = { ...DEFAULT_OPTIONS, ...options }
+  const { cableType, cableLibrary, ...restOptions } = cableOptions
   cableAPI = loadCableApiWrapper(cableType, cableLibrary, restOptions, {
     connect: afterConnect,
     disconnect: afterDisconnect
   })
   return cableAPI
 }
 
-export {initCableLibrary}
+export { initCableLibrary }
diff --git a/packages/worker/src/workerCable.js b/packages/worker/src/workerCable.js
@@ -1,5 +1,5 @@
-import {ACTIONCABLE_TYPE, ANYCABLE_TYPE} from './../../../shared/constants'
-import {initCableWrapper} from './cableWrapper'
+import { ACTIONCABLE_TYPE, ANYCABLE_TYPE } from './../../../shared/constants'
+import { initCableWrapper } from './cableWrapper'
 
 export const loadCableApiWrapper = (
   cableType = ACTIONCABLE_TYPE,
diff --git a/packages/worker/src/workerPorts.js b/packages/worker/src/workerPorts.js
diff --git a/rollup.config.js b/rollup.config.js

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@`
`145`	`145`	`"terms": ["todo", "fixme"]`
`146`	`146`	`}`
`147`	`147`	`],`
`148`		`- "object-curly-spacing": 2,`
	`148`	`+ "object-curly-spacing": [2, "always"],`
`149`	`149`	`"padded-blocks": [2, "never"],`
`150`	`150`	`"quote-props": [0, "as-needed"],`
`151`	`151`	`"quotes": [`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import {`
`8`	`8`	`WORKER_MSG_ERROR_COMMAND,`
`9`	`9`	`ALL_COMMANDS`
`10`	`10`	`} from './../../../shared/constants'`
`11`		`-import {addPortForStore, updatePortPongTime, recurrentPortsChecks} from './workerPorts'`
`12`		`-import {loadCableApiWrapper} from './workerCable'`
	`11`	`+import { addPortForStore, updatePortPongTime, recurrentPortsChecks } from './workerPorts'`
	`12`	`+import { loadCableApiWrapper } from './workerCable'`
`13`	`13`
`14`	`14`	`const DEFAULT_OPTIONS = {`
`15`	`15`	`cableType: 'actioncable', // anycable, actioncable`
`@@ -46,7 +46,7 @@ const activateChannelInQueue = () => {`
`46`	`46`	`return`
`47`	`47`	`}`
`48`	`48`
`49`		`-const subscribeToChannel = ({id, port}, channelSettings = {}) => {`
	`49`	`+const subscribeToChannel = ({ id, port }, channelSettings = {}) => {`
`50`	`50`	`const params = {`
`51`	`51`	`portID: id,`
`52`	`52`	`port,`
`@@ -86,31 +86,31 @@ const performInChannel = (portID, id, perform) => {`
`86`	`86`	`return`
`87`	`87`	`}`
`88`	`88`
`89`		`-const resumeChannelsForPort = ({id, port}) => {`
	`89`	`+const resumeChannelsForPort = ({ id, port }) => {`
`90`	`90`	`if (!cableAPI \|\| cableAPI.isDisconnected()) {`
`91`	`91`	`return`
`92`	`92`	`}`
`93`	`93`
`94`		`- cableAPI.resumeChannels({id, port})`
	`94`	`+ cableAPI.resumeChannels({ id, port })`
`95`	`95`
`96`	`96`	`return`
`97`	`97`	`}`
`98`	`98`
`99`		`-const pauseChannelsForPort = ({id, port}) => {`
	`99`	`+const pauseChannelsForPort = ({ id, port }) => {`
`100`	`100`	`if (!cableAPI \|\| cableAPI.isDisconnected()) {`
`101`	`101`	`return`
`102`	`102`	`}`
`103`	`103`
`104`		`- cableAPI.pauseChannels({id, port})`
	`104`	`+ cableAPI.pauseChannels({ id, port })`
`105`	`105`
`106`	`106`	`return`
`107`	`107`	`}`
`108`	`108`
`109`		`-const captureWorkerError = ({port, event}) => {`
`110`		`- port.postMessage({command: WORKER_MSG_ERROR_COMMAND, event: event.toString()})`
	`109`	`+const captureWorkerError = ({ port, event }) => {`
	`110`	`+ port.postMessage({ command: WORKER_MSG_ERROR_COMMAND, event: event.toString() })`
`111`	`111`	`}`
`112`	`112`
`113`		`-const handleWorkerMessages = ({id, event, port}) => {`
	`113`	`+const handleWorkerMessages = ({ id, event, port }) => {`
`114`	`114`	`const message = event?.data \|\| {}`
`115`	`115`
`116`	`116`	`switch (message?.command) {`
`@@ -120,7 +120,7 @@ const handleWorkerMessages = ({id, event, port}) => {`
`120`	`120`	`return`
`121`	`121`	`}`
`122`	`122`	`case SUBSCRIBE_TO_CHANNEL: {`
`123`		`- subscribeToChannel({id, port}, message?.subscription)`
	`123`	`+ subscribeToChannel({ id, port }, message?.subscription)`
`124`	`124`	`return`
`125`	`125`	`}`
`126`	`126`	`case UNSUBSCRIBE_FROM_CHANNEL: {`
`@@ -132,11 +132,11 @@ const handleWorkerMessages = ({id, event, port}) => {`
`132`	`132`	`return`
`133`	`133`	`}`
`134`	`134`	`case VISIBILITY_SHOW_COMMAND: {`
`135`		`- resumeChannelsForPort({id, port})`
	`135`	`+ resumeChannelsForPort({ id, port })`
`136`	`136`	`return`
`137`	`137`	`}`
`138`	`138`	`case VISIBILITY_HIDDEN_COMMAND: {`
`139`		`- pauseChannelsForPort({id, port})`
	`139`	`+ pauseChannelsForPort({ id, port })`
`140`	`140`	`return`
`141`	`141`	`}`
`142`	`142`	`default: {`
`@@ -146,15 +146,15 @@ const handleWorkerMessages = ({id, event, port}) => {`
`146`	`146`	`if (ALL_COMMANDS.indexOf(command) >= 0) {`
`147`	`147`	throw new Error(`Command ${command} busy by cable-shared-worker`)
`148`	`148`	`}`
`149`		`- port.postMessage({command, data})`
	`149`	`+ port.postMessage({ command, data })`
`150`	`150`	`}`
`151`	`151`	`cableOptions.handleCustomWebCommand(message?.command, message?.data, responseFn)`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`-const disconnectSubscriptionsFromPort = ({id}) => {`
	`157`	`+const disconnectSubscriptionsFromPort = ({ id }) => {`
`158`	`158`	`if (!cableAPI) {`
`159`	`159`	`return`
`160`	`160`	`}`
`@@ -166,8 +166,8 @@ const disconnectSubscriptionsFromPort = ({id}) => {`
`166`	`166`
`167`	`167`	`const registerPort = (port) => {`
`168`	`168`	`const id = addPortForStore(port)`
`169`		`- port.addEventListener('message', (event) => handleWorkerMessages({port, id, event}))`
`170`		`- port.addEventListener('messageerror', (event) => captureWorkerError({port, id, event}))`
	`169`	`+ port.addEventListener('message', (event) => handleWorkerMessages({ port, id, event }))`
	`170`	`+ port.addEventListener('messageerror', (event) => captureWorkerError({ port, id, event }))`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`if (isSharedWorker) {`
`@@ -198,13 +198,13 @@ const initCableLibrary = (options = {}) => {`
`198`	`198`	`if (cableAPI) {`
`199`	`199`	`return cableAPI`
`200`	`200`	`}`
`201`		`- cableOptions = {...DEFAULT_OPTIONS, ...options}`
`202`		`- const {cableType, cableLibrary, ...restOptions} = cableOptions`
	`201`	`+ cableOptions = { ...DEFAULT_OPTIONS, ...options }`
	`202`	`+ const { cableType, cableLibrary, ...restOptions } = cableOptions`
`203`	`203`	`cableAPI = loadCableApiWrapper(cableType, cableLibrary, restOptions, {`
`204`	`204`	`connect: afterConnect,`
`205`	`205`	`disconnect: afterDisconnect`
`206`	`206`	`})`
`207`	`207`	`return cableAPI`
`208`	`208`	`}`
`209`	`209`
`210`		`-export {initCableLibrary}`
	`210`	`+export { initCableLibrary }`