@folklore/socket 0.4.24 → 0.4.26

package/dist/cjs.js

@@ -52,10 +52,9 @@ class PubNubSocket extends EventEmitter {
       this.emit('started');
     }
   }
-  onMessage(_ref) {
-    let {
-      message
-    } = _ref;
+  onMessage({
+    message
+  }) {
     this.emit('message', message);
     if (typeof message.event !== 'undefined') {
       this.emit(message.event, message.data || message);
@@ -88,10 +87,9 @@ class PubNubSocket extends EventEmitter {
   }
   loadPubNub() {
     debug$3('Load PubNub');
-    return import('pubnub').then(_ref2 => {
-      let {
-        default: PubNub
-      } = _ref2;
+    return import('pubnub').then(({
+      default: PubNub
+    }) => {
       this.PubNub = PubNub;
     });
   }
@@ -229,10 +227,9 @@ class SocketIOSocket extends EventEmitter {
     this.emit('message', message, channel);
   }
   init() {
-    import('socket.io-client').then(_ref => {
-      let {
-        default: IO
-      } = _ref;
+    import('socket.io-client').then(({
+      default: IO
+    }) => {
       this.Manager = IO.Manager;
     }).then(() => this.createManager()).then(() => this.onReady()).then(() => {
       if (this.shouldStart) {
@@ -412,10 +409,9 @@ class PusherSocket extends EventEmitter {
   }
   loadPusher() {
     debug$1('Load Pusher');
-    return import('pusher-js').then(_ref => {
-      let {
-        default: Pusher
-      } = _ref;
+    return import('pusher-js').then(({
+      default: Pusher
+    }) => {
       this.Pusher = Pusher;
     });
   }
@@ -787,21 +783,20 @@ const defaultProps = {
   autoStart: false,
   children: null
 };
-function SocketContainer(_ref) {
-  let {
-    children,
-    socket,
-    autoStart,
-    adapter,
-    host,
-    namespace,
-    uuid,
-    publishKey,
-    subscribeKey,
-    secretKey,
-    channels: initialChannels,
-    ...props
-  } = _ref;
+function SocketContainer({
+  children,
+  socket,
+  autoStart,
+  adapter,
+  host,
+  namespace,
+  uuid,
+  publishKey,
+  subscribeKey,
+  secretKey,
+  channels: initialChannels,
+  ...props
+}) {
   const finalSocket = React.useMemo(() => socket || new Socket({
     ...props,
     adapter,
@@ -827,11 +822,15 @@ function SocketContainer(_ref) {
   }, [updateChannels]);
   const removeToChannelsCount = React.useCallback(newChannels => {
     channelsCountRef.current = newChannels.reduce((map, channel) => {
-      const newCount = (map[channel] || 0) - 1;
+      const {
+        [channel]: currentCount = 0,
+        ...otherCount
+      } = map;
+      const newCount = (currentCount || 0) - 1;
       return newCount > 0 ? {
-        ...map,
+        ...otherCount,
         [channel]: newCount
-      } : map;
+      } : otherCount;
     }, channelsCountRef.current);
     updateChannels(Object.keys(channelsCountRef.current));
   }, [updateChannels]);
@@ -869,31 +868,26 @@ SocketContainer.defaultProps = defaultProps;
 const getDisplayName = WrappedComponent => WrappedComponent.displayName || WrappedComponent.name || 'Component';
 const withSocket = WrappedComponent => {
   const WithSocketComponent = props => /*#__PURE__*/jsxRuntime.jsx(SocketContext.Consumer, {
-    children: _ref => {
-      let {
-        socket,
-        subscribe,
-        unsubscribe
-      } = _ref;
-      return /*#__PURE__*/jsxRuntime.jsx(WrappedComponent, {
-        socket: socket,
-        socketSubscribe: subscribe,
-        socketUnsubscribe: unsubscribe,
-        ...props
-      });
-    }
+    children: ({
+      socket,
+      subscribe,
+      unsubscribe
+    }) => /*#__PURE__*/jsxRuntime.jsx(WrappedComponent, {
+      socket: socket,
+      socketSubscribe: subscribe,
+      socketUnsubscribe: unsubscribe,
+      ...props
+    })
   });
   WithSocketComponent.displayName = `WithSocket(${getDisplayName(WrappedComponent)})`;
   return WithSocketComponent;
 };
 
-const useSocket = function () {
-  let channelNames = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-  let {
-    socket: customSocket = null,
-    onMessage: customOnMessage = null,
-    keepAlive = true
-  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+const useSocket = (channelNames = null, {
+  socket: customSocket = null,
+  onMessage: customOnMessage = null,
+  keepAlive = true
+} = {}) => {
   const {
     socket: contextSocket,
     subscribe,
@@ -936,9 +930,9 @@ const useSocket = function () {
     if (socket === null) {
       return () => {};
     }
-    const onMessage = function () {
+    const onMessage = (...args) => {
       if (customOnMessage !== null) {
-        customOnMessage(...arguments);
+        customOnMessage(...args);
       }
     };
     socket.on('message', onMessage);

package/dist/es.js

@@ -48,10 +48,9 @@ class PubNubSocket extends EventEmitter {
       this.emit('started');
     }
   }
-  onMessage(_ref) {
-    let {
-      message
-    } = _ref;
+  onMessage({
+    message
+  }) {
     this.emit('message', message);
     if (typeof message.event !== 'undefined') {
       this.emit(message.event, message.data || message);
@@ -84,10 +83,9 @@ class PubNubSocket extends EventEmitter {
   }
   loadPubNub() {
     debug$3('Load PubNub');
-    return import('pubnub').then(_ref2 => {
-      let {
-        default: PubNub
-      } = _ref2;
+    return import('pubnub').then(({
+      default: PubNub
+    }) => {
       this.PubNub = PubNub;
     });
   }
@@ -225,10 +223,9 @@ class SocketIOSocket extends EventEmitter {
     this.emit('message', message, channel);
   }
   init() {
-    import('socket.io-client').then(_ref => {
-      let {
-        default: IO
-      } = _ref;
+    import('socket.io-client').then(({
+      default: IO
+    }) => {
       this.Manager = IO.Manager;
     }).then(() => this.createManager()).then(() => this.onReady()).then(() => {
       if (this.shouldStart) {
@@ -408,10 +405,9 @@ class PusherSocket extends EventEmitter {
   }
   loadPusher() {
     debug$1('Load Pusher');
-    return import('pusher-js').then(_ref => {
-      let {
-        default: Pusher
-      } = _ref;
+    return import('pusher-js').then(({
+      default: Pusher
+    }) => {
       this.Pusher = Pusher;
     });
   }
@@ -783,21 +779,20 @@ const defaultProps = {
   autoStart: false,
   children: null
 };
-function SocketContainer(_ref) {
-  let {
-    children,
-    socket,
-    autoStart,
-    adapter,
-    host,
-    namespace,
-    uuid,
-    publishKey,
-    subscribeKey,
-    secretKey,
-    channels: initialChannels,
-    ...props
-  } = _ref;
+function SocketContainer({
+  children,
+  socket,
+  autoStart,
+  adapter,
+  host,
+  namespace,
+  uuid,
+  publishKey,
+  subscribeKey,
+  secretKey,
+  channels: initialChannels,
+  ...props
+}) {
   const finalSocket = useMemo(() => socket || new Socket({
     ...props,
     adapter,
@@ -823,11 +818,15 @@ function SocketContainer(_ref) {
   }, [updateChannels]);
   const removeToChannelsCount = useCallback(newChannels => {
     channelsCountRef.current = newChannels.reduce((map, channel) => {
-      const newCount = (map[channel] || 0) - 1;
+      const {
+        [channel]: currentCount = 0,
+        ...otherCount
+      } = map;
+      const newCount = (currentCount || 0) - 1;
       return newCount > 0 ? {
-        ...map,
+        ...otherCount,
         [channel]: newCount
-      } : map;
+      } : otherCount;
     }, channelsCountRef.current);
     updateChannels(Object.keys(channelsCountRef.current));
   }, [updateChannels]);
@@ -865,31 +864,26 @@ SocketContainer.defaultProps = defaultProps;
 const getDisplayName = WrappedComponent => WrappedComponent.displayName || WrappedComponent.name || 'Component';
 const withSocket = WrappedComponent => {
   const WithSocketComponent = props => /*#__PURE__*/jsx(SocketContext.Consumer, {
-    children: _ref => {
-      let {
-        socket,
-        subscribe,
-        unsubscribe
-      } = _ref;
-      return /*#__PURE__*/jsx(WrappedComponent, {
-        socket: socket,
-        socketSubscribe: subscribe,
-        socketUnsubscribe: unsubscribe,
-        ...props
-      });
-    }
+    children: ({
+      socket,
+      subscribe,
+      unsubscribe
+    }) => /*#__PURE__*/jsx(WrappedComponent, {
+      socket: socket,
+      socketSubscribe: subscribe,
+      socketUnsubscribe: unsubscribe,
+      ...props
+    })
   });
   WithSocketComponent.displayName = `WithSocket(${getDisplayName(WrappedComponent)})`;
   return WithSocketComponent;
 };
 
-const useSocket = function () {
-  let channelNames = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-  let {
-    socket: customSocket = null,
-    onMessage: customOnMessage = null,
-    keepAlive = true
-  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+const useSocket = (channelNames = null, {
+  socket: customSocket = null,
+  onMessage: customOnMessage = null,
+  keepAlive = true
+} = {}) => {
   const {
     socket: contextSocket,
     subscribe,
@@ -932,9 +926,9 @@ const useSocket = function () {
     if (socket === null) {
       return () => {};
     }
-    const onMessage = function () {
+    const onMessage = (...args) => {
       if (customOnMessage !== null) {
-        customOnMessage(...arguments);
+        customOnMessage(...args);
       }
     };
     socket.on('message', onMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/socket",
-    "version": "0.4.24",
+    "version": "0.4.26",
     "description": "Socket utilities",
     "keywords": [
         "javascript",
@@ -35,7 +35,7 @@
     "scripts": {
         "clean": "rm -rf dist",
         "build": "rollup --bundleConfigAsCjs --config ../../rollup.config.js",
-        "prepare": "npm run clean && npm run build"
+        "prepublishOnly": "npm run clean && npm run build"
     },
     "dependencies": {
         "@babel/runtime": "^7.4.3",
@@ -56,5 +56,5 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
     },
-    "gitHead": "b6a18894ee220306fc027de04e02e08f1f60b1ba"
+    "gitHead": "a04cfaacb364f3b35307d65d8778b078dace4491"
 }