0.1.14

Author: agolovchuk

.eslintignore

@@ -0,0 +1,4 @@
+/lib
+/esm
+/coverage
+/flow-typed/npm

.eslintrc

@@ -0,0 +1,44 @@
+{
+  "parser": "babel-eslint",
+  "extends": [
+    "airbnb-base"
+  ],
+  "plugins": [
+    "flowtype"
+  ],
+  "rules": {
+    "max-len": 0,
+    "eqeqeq": [
+      "error",
+      "smart"
+    ],
+    "no-dupe-keys": "error",
+    "no-return-assign": "off",
+    "consistent-return": "off",
+    "no-redeclare": "off",
+    "object-curly-newline": "off",
+    "import/prefer-default-export": "off",
+    "import/no-extraneous-dependencies": "off",
+    "flowtype/define-flow-type": "error",
+    "flowtype/no-dupe-keys": "error",
+    "flowtype/no-mutable-array": "error",
+    "flowtype/no-primitive-constructor-types": "error",
+    "flowtype/no-types-missing-file-annotation": "error",
+    "flowtype/require-valid-file-annotation": [
+      "error",
+       "never",
+      {
+        "annotationStyle": "block"
+      }
+    ],
+    "flowtype/type-id-match": [
+      "error",
+      "^[A-Z][a-z0-9]*"
+    ],
+    "flowtype/use-flow-type": "error"
+  },
+  "env": {
+    "node": true,
+    "browser": true
+  }
+}

__tests__/adapter.spec.js

@@ -4,35 +4,33 @@ import {
   generalName,
   unCnownName,
 } from '../__mock__/channelName';
-import { getParamsFromChannelName, getThreadFromChannelFactory } from '../src/adapters';
+import { getParamsFromChannelName } from '../src/adapters';
 
 describe('Adapters', () => {
-
   it('Should return Document params', () => {
-    expect(getParamsFromChannelName(documentName)).toEqual({
+    expect(getParamsFromChannelName('local', documentName)).toEqual({
       env: 'local',
       companyId: 'a1ae760ff7',
       documentId: 'e9ff6bcb686c4ca7c2350bed5bc6346f.pdf',
       users: [
         '[email protected]',
         '[email protected]',
-      ]
+      ],
     });
   });
 
   it('Should return General params', () => {
-    expect(getParamsFromChannelName(generalName)).toEqual({
+    expect(getParamsFromChannelName('staging', generalName)).toEqual({
       env: 'staging',
       companyId: 'ed70da07f4',
       users: [
         '[email protected]',
         '[email protected]',
-      ]
+      ],
     });
   });
 
   it('Should return NULL in uncnown env', () => {
-    expect(getParamsFromChannelName(unCnownName)).toBeNull();
+    expect(getParamsFromChannelName('local', unCnownName)).toBeNull();
   });
-
 });

__tests__/connect.spec.js

@@ -11,9 +11,9 @@ describe('Connect to SendBird', () => {
   it('Should be connected', () => {
     sbCreatInstance(keys.apiKey);
     return sbConnect(keys.userId, keys.accessToken)
-      .then(user => {
+      .then((user) => {
         expect(user.userId).toEqual(keys.userId);
         sbDisconnect();
-      })
+      });
   });
 });

__tests__/groupChennel.spec.js

@@ -1,30 +1,22 @@
 /* @flow */
-import sinon from 'sinon';
 import keys from '../__mock__/keys';
 import { sbCreatInstance, sbGetInstance } from '../src/instance';
 import { sbConnect, sbDisconnect } from '../src/connect';
 import { sbChannelList } from '../src/groupChannel';
-import { channelsToThreads } from '../src/imAdapters';
-
-const fs = require('fs');
 
 describe('Group Channel', () => {
-
   beforeAll((done) => {
     sbCreatInstance(keys.apiKey);
-    return sbConnect(keys.userId, keys.accessToken).then(() => { done(); })
+    return sbConnect(keys.userId, keys.accessToken).then(() => { done(); });
   });
 
-  afterAll((done) => {
-    return sbDisconnect().then(() => { done(); });
-  })
+  afterAll(done => sbDisconnect().then(() => { done(); }));
 
   it('Should get channel list', () => {
-    expect(sbGetInstance().getConnectionState()).toEqual('OPEN')
+    expect(sbGetInstance().getConnectionState()).toEqual('OPEN');
     return sbChannelList()
-      .then(channel => {
+      .then((channel) => {
         expect(Array.isArray(channel)).toBeTruthy();
       });
   });
-
-});
+});

__tests__/imadapters.spec.js

@@ -9,7 +9,6 @@ import {
 } from '../src/imAdapters';
 
 describe('Immutamle Adapters', () => {
-
   it('Should transform groupChannels to store data', () => {
     const threads = channelsToThreads('local', groupChannel);
     const documentThread = threads.get(documentName);
@@ -26,6 +25,5 @@ describe('Immutamle Adapters', () => {
     expect(res.messages.get(0).message).toEqual(userMessage.message);
     expect(res.messages.get(0).messageId).toEqual(userMessage.messageId);
     expect(res.messages.get(0).sender.userId).toEqual(userMessage.sender.userId);
-  })
-
+  });
 });

__tests__/instance.spec.js

@@ -1,6 +1,6 @@
 /* @flow */
 import keys from '../__mock__/keys';
-import { sbGetInstance, sbCreatInstance } from '../src/instance';
+import { sbCreatInstance } from '../src/instance';
 
 describe('SendBird instance', () => {
   it('Should be created instance', () => {

__tests__/jsadapters.spec.js

@@ -4,7 +4,6 @@ import userMessage from '../__mock__/userMessage.json';
 import {
   documentName,
   generalName,
-  unCnownName,
 } from '../__mock__/channelName';
 import {
   channelsToThreads,
@@ -23,7 +22,7 @@ describe('JS Adapters', () => {
   });
 
   it('Document adapter', () => {
-    const threads = channelsToThreads('local', groupChannel);
+    const threads = channelsToThreads('staging', groupChannel);
     expect(threads).toBeObject();
     const generalThread = threads[generalName];
     expect(generalThread.name).toEqual(generalName);
@@ -40,6 +39,5 @@ describe('JS Adapters', () => {
     expect(res.messages[0].message).toEqual(userMessage.message);
     expect(res.messages[0].messageId).toEqual(userMessage.messageId);
     expect(res.messages[0].sender.userId).toEqual(userMessage.sender.userId);
-  })
-
+  });
 });

babel.config.js

@@ -1,4 +1,4 @@
-module.exports = function(api) {
+module.exports = function config(api) {
   return {
     plugins: [
       '@babel/plugin-proposal-class-properties',
@@ -13,9 +13,9 @@ module.exports = function(api) {
             node: 6,
             browsers: ['last 4 version', '> 1%', 'not dead'],
           },
-          forceAllTransforms: api.env("production"),
+          forceAllTransforms: api.env('production'),
         },
-      ]
+      ],
     ],
     env: {
       test: {
@@ -28,5 +28,5 @@ module.exports = function(api) {
         ],
       },
     },
-  }
+  };
 };

package.json

@@ -1,21 +1,20 @@
 {
   "name": "sendbird-helpers",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "SendBird helpers",
   "main": "lib/index.js",
   "repository": "https://github.com/agolovchuk/sendBird-helpers.git",
   "author": "Alexandr Golovchuk <[email protected]>",
   "license": "MIT",
   "scripts": {
-    "lint": "yarn lint:md && yarn lint:js",
+    "lint": "yarn lint:js",
     "lint:js": "eslint .",
-    "lint:md": "node scripts/mdlint",
     "flow": "flow",
     "test": "jest --env=node",
     "test:watch": "jest --env=node --watch",
     "test:coverage": "jest --env=node --coverage",
     "build": "rollup -c",
-    "precommit": "yarn lint && yarn flow && yarn test",
+    "precommit": "yarn lint && npx flow && yarn test",
     "preversion": "git checkout master && yarn precommit",
     "postversion": "git push --follow-tags"
   },
@@ -29,16 +28,21 @@
     "babel-jest": "^23.6.0",
     "babel-plugin-transform-es2015-classes": "^6.24.1",
     "eslint": "^5.12.0",
+    "eslint-config-airbnb-base": "^13.1.0",
+    "eslint-plugin-flowtype": "^3.2.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-jest": "^22.1.3",
     "flow-bin": "^0.91.0",
     "flow-typed": "^2.5.1",
     "jest": "^23.6.0",
     "jest-extended": "^0.11.0",
     "regenerator-runtime": "^0.13.1",
-    "rollup": "^1.0.1",
-    "rollup-plugin-babel": "^4.2.0",
+    "rollup": "^1.1.2",
+    "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-clear": "^2.0.7",
     "rollup-plugin-commonjs": "^9.2.0",
-    "rollup-plugin-flow-entry": "^0.2.1",
+    "rollup-plugin-flow": "^1.1.1",
+    "rollup-plugin-flow-entry": "0.2.0",
     "sinon": "^7.2.3"
   },
   "dependencies": {

rollup.config.js

@@ -2,14 +2,17 @@ import commonjs from 'rollup-plugin-commonjs';
 import babel from 'rollup-plugin-babel';
 import flowEntry from 'rollup-plugin-flow-entry';
 import clear from 'rollup-plugin-clear';
+import flow from 'rollup-plugin-flow';
 
 import packageJson from './package.json';
 
+const configuredFlow = flow({ all: true, pretty: true });
+
 const { dependencies } = packageJson;
 
 const deps = dependencies && Object.keys(dependencies).join('|');
 const reg = deps && new RegExp(`^(${deps})($|/)`);
-const baseDistPath = 'lib/';
+const baseDistPath = './lib/';
 
 const banner = `
 /**
@@ -20,7 +23,7 @@ const banner = `
 
 export default [
   {
-    input: 'src/index.js',
+    input: './src/index.js',
     output: {
       file: `${baseDistPath}index.js`,
       format: 'cjs',
@@ -31,28 +34,12 @@ export default [
         targets: ['lib'],
       }),
       flowEntry(),
+      configuredFlow,
       babel(),
       commonjs(),
     ],
     external: id => !!reg && reg.test(id),
   },
-  {
-    input: 'src/index.js',
-    output: {
-      file: 'esm/index.mjs',
-      format: 'esm',
-      banner,
-    },
-    plugins: [
-      clear({
-        targets: ['esm'],
-      }),
-      flowEntry(),
-      babel({ presets: [['@babel/env', { targets: { node: 10 } }]] }),
-      commonjs(),
-    ],
-    external: id => !!reg && reg.test(id),
-  },
   {
     input: 'src/jsAdapters.js',
     output: {
@@ -65,6 +52,7 @@ export default [
         targets: ['lib'],
       }),
       flowEntry(),
+      configuredFlow,
       babel(),
       commonjs(),
     ],
@@ -82,6 +70,7 @@ export default [
         targets: ['lib'],
       }),
       flowEntry(),
+      configuredFlow,
       babel(),
       commonjs(),
     ],

src/adapters.js

@@ -1,7 +1,5 @@
 /* @flow */
 import type { GroupChannel } from 'sendbird';
-import { DOCUMENT_CHAT_TYPE } from './constants';
-import { ChatError } from './error';
 
 export type EnvType = 'staging' | 'development' | 'production' | 'local';
 
@@ -10,21 +8,22 @@ export type ChannelAdapter<P, T = *> = (channel: $ReadOnly<GroupChannel>, params
 export type GeneralChannelParamsType = {|
   env: EnvType,
   companyId: string,
-  users: string[],
+  users: $ReadOnlyArray<string>,
 |}
 
 export type DocumentChannelParamsType = {|
   env: EnvType,
   companyId: string,
-  users: string[],
+  users: $ReadOnlyArray<string>,
   documentId: string,
 |}
 
 export type ParamsChannel = GeneralChannelParamsType | DocumentChannelParamsType;
 
-export function getParamsFromChannelName(channelName: string): ParamsChannel | null {
+export function getParamsFromChannelName(buildEnv: EnvType, channelName: string): ParamsChannel | null {
   const params = channelName.split('#');
   const env = params[0];
+  if (env !== buildEnv) return null;
   if (env !== 'staging' && env !== 'development' && env !== 'production' && env !== 'local') {
     return null;
     // throw new ChatError(`Unknown environment`, { env, channelName });
@@ -44,14 +43,14 @@ export function getParamsFromChannelName(channelName: string): ParamsChannel | n
   }: GeneralChannelParamsType);
 }
 
-export function getThreadFromChannelFactory(env: EnvType) {
+export function getThreadFromChannelFactory(buildEnv: EnvType) {
   return function getThreadFromChannel(
     channel: GroupChannel,
     documentChannelAdapter: ChannelAdapter<$ReadOnly<DocumentChannelParamsType>, *>,
     generalChannelAdapter: ChannelAdapter<$ReadOnly<GeneralChannelParamsType>, *>,
     n: ChannelAdapter<null, *>,
   ) {
-    const params = getParamsFromChannelName(channel.name);
+    const params = getParamsFromChannelName(buildEnv, channel.name);
 
     if (params) {
       if (params.documentId) {
@@ -61,5 +60,5 @@ export function getThreadFromChannelFactory(env: EnvType) {
       return generalChannelAdapter(channel, params);
     }
     return n(channel, params);
-  }
+  };
 }