Upgrade JS SDK to v11, which has clients without bound traffic type

Author: EmilianoSanchez

package-lock.json

@@ -63,7 +63,7 @@
   },
   "homepage": "https://github.com/splitio/react-client#readme",
   "dependencies": {
-    "@splitsoftware/splitio": "10.28.1-rc.2",
+    "@splitsoftware/splitio": "11.0.0-rc.1",
     "memoize-one": "^5.1.1",
     "shallowequal": "^1.1.0",
     "tslib": "^2.3.1"

package.json

@@ -8,7 +8,7 @@ import { useSplitClient } from './useSplitClient';
  * Children components will have access to the new client when accessing Split Context.
  *
  * The underlying SDK client can be changed during the component lifecycle
- * if the component is updated with a different splitKey or trafficType prop.
+ * if the component is updated with a different splitKey prop.
  *
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#advanced-instantiate-multiple-sdk-clients}
  */

src/SplitClient.tsx

@@ -344,7 +344,7 @@ describe('SplitClient', () => {
     function Component({ attributesFactory, attributesClient, splitKey, testSwitch, factory }: TestComponentProps) {
       return (
         <SplitFactoryProvider factory={factory} attributes={attributesFactory} >
-          <SplitClient splitKey={splitKey} attributes={attributesClient} trafficType='user' >
+          <SplitClient splitKey={splitKey} attributes={attributesClient} >
             {() => {
               testSwitch(done, splitKey);
               return null;

src/__tests__/SplitClient.test.tsx

@@ -26,15 +26,15 @@ function parseKey(key: SplitIO.SplitKey): SplitIO.SplitKey {
     };
   }
 }
-function buildInstanceId(key: any, trafficType: string | undefined) {
+function buildInstanceId(key: any, trafficType?: string) {
   return `${key.matchingKey ? key.matchingKey : key}-${key.bucketingKey ? key.bucketingKey : key}-${trafficType !== undefined ? trafficType : ''}`;
 }
 
 export function mockSdk() {
 
   return jest.fn((config: SplitIO.IBrowserSettings, __updateModules) => {
 
-    function mockClient(_key: SplitIO.SplitKey, _trafficType?: string) {
+    function mockClient(_key: SplitIO.SplitKey) {
       // Readiness
       let isReady = false;
       let isReadyFromCache = false;
@@ -135,11 +135,10 @@ export function mockSdk() {
 
     // Cache of clients
     const __clients__: { [instanceId: string]: any } = {};
-    const client = jest.fn((key?: string, trafficType?: string) => {
+    const client = jest.fn((key?: string) => {
       const clientKey = key || parseKey(config.core.key);
-      const clientTT = trafficType || config.core.trafficType;
-      const instanceId = buildInstanceId(clientKey, clientTT);
-      return __clients__[instanceId] || (__clients__[instanceId] = mockClient(clientKey, clientTT));
+      const instanceId = buildInstanceId(clientKey);
+      return __clients__[instanceId] || (__clients__[instanceId] = mockClient(clientKey));
     });
 
     // Factory destroy

src/__tests__/testUtils/mockSplitFactory.ts

@@ -56,12 +56,12 @@ describe('useSplitClient', () => {
       <SplitFactoryProvider factory={outerFactory} >
         {React.createElement(() => {
           (outerFactory.client as jest.Mock).mockClear();
-          client = useSplitClient({ splitKey: 'user2', trafficType: 'user' }).client;
+          client = useSplitClient({ splitKey: 'user2' }).client;
           return null;
         })}
       </SplitFactoryProvider>
     );
-    expect(outerFactory.client as jest.Mock).toBeCalledWith('user2', 'user');
+    expect(outerFactory.client as jest.Mock).toBeCalledWith('user2');
     expect(outerFactory.client as jest.Mock).toHaveReturnedWith(client);
   });
 
@@ -70,7 +70,7 @@ describe('useSplitClient', () => {
       render(
         React.createElement(() => {
           useSplitClient();
-          useSplitClient({ splitKey: 'user2', trafficType: 'user' });
+          useSplitClient({ splitKey: 'user2' });
           return null;
         })
       );
@@ -81,7 +81,7 @@ describe('useSplitClient', () => {
 
     // eslint-disable-next-line react/prop-types
     const InnerComponent = ({ splitKey, attributesClient, testSwitch }) => {
-      useSplitClient({ splitKey, trafficType: 'user', attributes: attributesClient });
+      useSplitClient({ splitKey, attributes: attributesClient });
       testSwitch(done, splitKey);
       return null;
     };
@@ -112,16 +112,16 @@ describe('useSplitClient', () => {
           <SplitContext.Consumer>
             {() => countSplitContext++}
           </SplitContext.Consumer>
-          <SplitClient splitKey={sdkBrowser.core.key} trafficType={sdkBrowser.core.trafficType}
+          <SplitClient splitKey={sdkBrowser.core.key}
             /* Disabling update props is ineffective because the wrapping SplitFactoryProvider has them enabled: */
             updateOnSdkReady={false} updateOnSdkReadyFromCache={false}
           >
             {() => { countSplitClient++; return null }}
           </SplitClient>
           {React.createElement(() => {
             // Equivalent to
-            // - Using config key and traffic type: `const { client } = useSplitClient(sdkBrowser.core.key, sdkBrowser.core.trafficType, { att1: 'att1' });`
-            // - Disabling update props, since the wrapping SplitFactoryProvider has them enabled: `const { client } = useSplitClient(undefined, undefined, { att1: 'att1' }, { updateOnSdkReady: false, updateOnSdkReadyFromCache: false });`
+            // - Using config key: `const { client } = useSplitClient({ splitKey: sdkBrowser.core.key, attributes: { att1: 'att1' } });`
+            // - Disabling update props, since the wrapping SplitFactoryProvider has them enabled: `const { client } = useSplitClient({ attributes: { att1: 'att1' }, updateOnSdkReady: false, updateOnSdkReadyFromCache: false });`
             const { client } = useSplitClient({ attributes: { att1: 'att1' } });
             expect(client).toBe(mainClient); // Assert that the main client was retrieved.
             expect(client!.getAttributes()).toEqual({ att1: 'att1' }); // Assert that the client was retrieved with the provided attributes.
@@ -141,7 +141,7 @@ describe('useSplitClient', () => {
             {() => { countSplitClientWithUpdate++; return null }}
           </SplitClient>
           {React.createElement(() => {
-            useSplitClient({ splitKey: sdkBrowser.core.key, trafficType: sdkBrowser.core.trafficType, updateOnSdkUpdate: true }).client;
+            useSplitClient({ splitKey: sdkBrowser.core.key, updateOnSdkUpdate: true }).client;
             countUseSplitClientWithUpdate++;
             return null;
           })}

src/__tests__/useSplitClient.test.tsx

@@ -62,31 +62,30 @@ describe('useTrack', () => {
     expect(track).toHaveReturnedWith(trackResult);
   });
 
-  test('returns the track method bound to a new client given a splitKey and optional trafficType.', () => {
+  test('returns the track method bound to a new client given a splitKey.', () => {
     const outerFactory = SplitFactory(sdkBrowser);
-    let boundTrack;
     let trackResult;
 
     render(
       <SplitFactoryProvider factory={outerFactory} >
         {React.createElement(() => {
-          boundTrack = useTrack('user2', tt);
-          trackResult = boundTrack(eventType, value, properties);
+          const boundTrack = useTrack('user2');
+          trackResult = boundTrack(tt, eventType, value, properties);
           return null;
         })}
       </SplitFactoryProvider>,
     );
-    const track = outerFactory.client('user2', tt).track as jest.Mock;
-    expect(track).toBeCalledWith(eventType, value, properties);
+    const track = outerFactory.client('user2').track as jest.Mock;
+    expect(track).toBeCalledWith(tt, eventType, value, properties);
     expect(track).toHaveReturnedWith(trackResult);
   });
 
   test('throws error if invoked outside of SplitFactoryProvider.', () => {
     expect(() => {
       render(
         React.createElement(() => {
-          const track = useTrack('user2', tt);
-          track(eventType, value, properties);
+          const track = useTrack('user2');
+          track(tt, eventType, value, properties);
           return null;
         }),
       );

src/__tests__/useTrack.test.tsx

@@ -145,12 +145,6 @@ export interface IUseSplitClientOptions extends IUpdateProps {
    */
   splitKey?: SplitIO.SplitKey;
 
-  /**
-   * Traffic type associated with the customer identifier.
-   * If no provided here or at the config object, it will be required on the client.track() calls.
-   */
-  trafficType?: string;
-
   /**
    * An object of type Attributes used to evaluate the feature flags.
    */

src/types.ts

@@ -11,7 +11,7 @@ export const DEFAULT_UPDATE_OPTIONS = {
 };
 
 /**
- * 'useSplitClient' is a hook that returns an Split Context object with the client and its status corresponding to the provided key and trafficType.
+ * 'useSplitClient' is a hook that returns an Split Context object with the client and its status corresponding to the provided key.
  * It uses the 'useContext' hook to access the context, which is updated by SplitFactoryProvider and SplitClient components in the hierarchy of components.
  *
  * @returns A Split Context object
@@ -25,7 +25,7 @@ export const DEFAULT_UPDATE_OPTIONS = {
  */
 export function useSplitClient(options?: IUseSplitClientOptions): ISplitContextValues {
   const {
-    updateOnSdkReady, updateOnSdkReadyFromCache, updateOnSdkTimedout, updateOnSdkUpdate, splitKey, trafficType, attributes
+    updateOnSdkReady, updateOnSdkReadyFromCache, updateOnSdkTimedout, updateOnSdkUpdate, splitKey, attributes
   } = { ...DEFAULT_UPDATE_OPTIONS, ...options };
 
   const context = useSplitContext();
@@ -34,7 +34,7 @@ export function useSplitClient(options?: IUseSplitClientOptions): ISplitContextV
   let client = contextClient as IClientWithContext;
   if (splitKey && factory) {
     // @TODO `getSplitClient` starts client sync. Move side effects to useEffect
-    client = getSplitClient(factory, splitKey, trafficType);
+    client = getSplitClient(factory, splitKey);
   }
   initAttributes(client, attributes);
 

src/useSplitClient.ts

@@ -11,8 +11,8 @@ const noOpFalse = () => false;
  *
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#track}
  */
-export function useTrack(splitKey?: SplitIO.SplitKey, trafficType?: string): SplitIO.IBrowserClient['track'] {
+export function useTrack(splitKey?: SplitIO.SplitKey): SplitIO.IBrowserClient['track'] {
   // All update options are false to avoid re-renders. The track method doesn't need the client to be operational.
-  const { client } = useSplitClient({ splitKey, trafficType, updateOnSdkReady: false, updateOnSdkReadyFromCache: false });
+  const { client } = useSplitClient({ splitKey, updateOnSdkReady: false, updateOnSdkReadyFromCache: false });
   return client ? client.track.bind(client) : noOpFalse;
 }