implementation of new hooks with options object

src/__tests__/SplitTreatments.test.tsx

@@ -159,7 +159,7 @@ describe.each([
     </SplitTreatments>
   ),
   ({ names, attributes }) => {
-    useSplitTreatments(names, attributes);
+    useSplitTreatments({ names, attributes });
     renderTimes++;
     return null;
   }

src/__tests__/useSplitClient.test.tsx

@@ -40,7 +40,7 @@ test('useSplitClient must update on SDK events', () => {
           // 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 SplitFactory has them enabled: `const { client } = useSplitClient(undefined, undefined, { att1: 'att1' }, { updateOnSdkReady: false, updateOnSdkReadyFromCache: false });`
-          const { client } = useSplitClient(undefined, undefined, { att1: 'att1' });
+          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.
           countUseSplitClient++;
@@ -50,7 +50,7 @@ test('useSplitClient must update on SDK events', () => {
           {() => { countSplitClientUser2++; return null }}
         </SplitClient>
         {React.createElement(() => {
-          const { client } = useSplitClient('user_2');
+          const { client } = useSplitClient({ splitKey: 'user_2' });
           expect(client).toBe(user2Client);
           countUseSplitClientUser2++;
           return null;
@@ -59,21 +59,21 @@ test('useSplitClient must update on SDK events', () => {
           {() => { countSplitClientWithUpdate++; return null }}
         </SplitClient>
         {React.createElement(() => {
-          useSplitClient(sdkBrowser.core.key, sdkBrowser.core.trafficType, undefined, { updateOnSdkUpdate: true }).client;
+          useSplitClient({ splitKey: sdkBrowser.core.key, trafficType: sdkBrowser.core.trafficType, updateOnSdkUpdate: true }).client;
           countUseSplitClientWithUpdate++;
           return null;
         })}
         <SplitClient splitKey={'user_2'} updateOnSdkUpdate={true}>
           {() => { countSplitClientUser2WithUpdate++; return null }}
         </SplitClient>
         {React.createElement(() => {
-          useSplitClient('user_2', undefined, undefined, { updateOnSdkUpdate: true });
+          useSplitClient({ splitKey: 'user_2', updateOnSdkUpdate: true });
           countUseSplitClientUser2WithUpdate++;
           return null;
         })}
         <SplitClient splitKey={'user_2'} updateOnSdkUpdate={true}>
           {React.createElement(() => {
-            const status = useSplitClient('user_2', undefined, undefined, { updateOnSdkUpdate: true });
+            const status = useSplitClient({ splitKey: 'user_2', updateOnSdkUpdate: true });
             expect(status.client).toBe(user2Client);
 
             // useSplitClient doesn't re-render twice if it is in the context of a SplitClient with same user key and there is a SDK event
@@ -143,7 +143,7 @@ test('useSplitClient must support changes in update props', () => {
   let rendersCount = 0;
 
   function InnerComponent(updateOptions) {
-    useSplitClient(undefined, undefined, undefined, updateOptions);
+    useSplitClient(updateOptions);
     rendersCount++;
     return null;
   }

src/__tests__/useSplitTreatments.test.tsx

@@ -51,21 +51,21 @@ test('useSplitTreatments must update on SDK events', async () => {
           {() => { countSplitTreatments++; return null }}
         </SplitTreatments>
         {React.createElement(() => {
-          const context = useSplitTreatments(['split_test'], { att1: 'att1' });
+          const context = useSplitTreatments({ names: ['split_test'], attributes: { att1: 'att1' } });
           expect(context.client).toBe(mainClient); // Assert that the main client was retrieved.
           validateTreatments(context);
           countUseSplitTreatments++;
           return null;
         })}
         {React.createElement(() => {
-          const context = useSplitTreatments(['split_test'], undefined, 'user_2');
+          const context = useSplitTreatments({ names: ['split_test'], splitKey: 'user_2' });
           expect(context.client).toBe(user2Client);
           validateTreatments(context);
           countUseSplitTreatmentsUser2++;
           return null;
         })}
         {React.createElement(() => {
-          const context = useSplitTreatments(['split_test'], undefined, 'user_2', { updateOnSdkUpdate: true });
+          const context = useSplitTreatments({ names: ['split_test'], splitKey: 'user_2', updateOnSdkUpdate: true });
           expect(context.client).toBe(user2Client);
           validateTreatments(context);
           countUseSplitTreatmentsUser2WithUpdate++;

src/types.ts

@@ -102,7 +102,7 @@ export interface ISplitFactoryChildProps extends ISplitContextValues { }
 
 /**
  * SplitFactory Props interface. These are the props accepted by SplitFactory component,
- * used to instantiate a factory and client instances, update the Split context, and listen for SDK events.
+ * used to instantiate a factory and client instance, update the Split context, and listen for SDK events.
  */
 export interface ISplitFactoryProps extends IUpdateProps {
 
@@ -129,22 +129,15 @@ export interface ISplitFactoryProps extends IUpdateProps {
 }
 
 /**
- * SplitClient Child Props interface. These are the props that the child component receives from the 'SplitClient' component.
- */
-// @TODO remove next type (breaking-change)
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface ISplitClientChildProps extends ISplitContextValues { }
-
-/**
- * SplitClient Props interface. These are the props accepted by SplitClient component,
- * used to instantiate a new client instances, update the Split context, and listen for SDK events.
+ * useSplitClient options interface. This is the options object accepted by useSplitClient hook,
+ * used to retrieve a client instance with the Split context, and listen for SDK events.
  */
-export interface ISplitClientProps extends IUpdateProps {
+export interface IUseSplitClientOptions extends IUpdateProps {
 
   /**
    * The customer identifier.
    */
-  splitKey: SplitIO.SplitKey;
+  splitKey?: SplitIO.SplitKey;
 
   /**
    * Traffic type associated with the customer identifier.
@@ -156,13 +149,39 @@ export interface ISplitClientProps extends IUpdateProps {
    * An object of type Attributes used to evaluate the feature flags.
    */
   attributes?: SplitIO.Attributes;
+}
+
+/**
+ * SplitClient Child Props interface. These are the props that the child component receives from the 'SplitClient' component.
+ */
+// @TODO remove next type (breaking-change)
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ISplitClientChildProps extends ISplitContextValues { }
+
+/**
+ * SplitClient Props interface. These are the props accepted by SplitClient component,
+ * used to instantiate a new client instance, update the Split context, and listen for SDK events.
+ */
+export interface ISplitClientProps extends IUseSplitClientOptions {
 
   /**
    * Children of the SplitFactory component. It can be a functional component (child as a function) or a React element.
    */
   children: ((props: ISplitClientChildProps) => ReactNode) | ReactNode;
 }
 
+/**
+ * useSplitTreatments options interface. This is the options object accepted by useSplitTreatments hook,
+ * used to call 'client.getTreatmentsWithConfig()' and retrieve the result together with the Split context.
+ */
+export interface IUseSplitTreatmentsOptions extends IUseSplitClientOptions {
+
+  /**
+   * list of feature flag names
+   */
+  names: string[]
+}
+
 /**
  * SplitTreatments Child Props interface. These are the props that the child component receives from the 'SplitTreatments' component.
  */

src/useClient.ts

@@ -8,6 +8,6 @@ import { useSplitClient } from './useSplitClient';
  * @return A Split Client instance, or null if used outside the scope of SplitFactory
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#advanced-instantiate-multiple-sdk-clients}
  */
-export function useClient(key?: SplitIO.SplitKey, trafficType?: string, attributes?: SplitIO.Attributes): SplitIO.IBrowserClient | null {
-  return useSplitClient(key, trafficType, attributes).client;
+export function useClient(splitKey?: SplitIO.SplitKey, trafficType?: string, attributes?: SplitIO.Attributes): SplitIO.IBrowserClient | null {
+  return useSplitClient({ splitKey, trafficType, attributes }).client;
 }

src/useSplitClient.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { SplitContext } from './SplitContext';
 import { getSplitClient, initAttributes, IClientWithContext, getStatus } from './utils';
-import { ISplitContextValues, IUpdateProps } from './types';
+import { ISplitContextValues, IUseSplitClientOptions } from './types';
 
 export const DEFAULT_UPDATE_OPTIONS = {
   updateOnSdkUpdate: false,
@@ -17,17 +17,17 @@ export const DEFAULT_UPDATE_OPTIONS = {
  * @return A Split Context object
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#advanced-instantiate-multiple-sdk-clients}
  */
-export function useSplitClient(key?: SplitIO.SplitKey, trafficType?: string, attributes?: SplitIO.Attributes, options?: IUpdateProps): ISplitContextValues {
+export function useSplitClient(options?: IUseSplitClientOptions): ISplitContextValues {
   const {
-    updateOnSdkReady, updateOnSdkReadyFromCache, updateOnSdkTimedout, updateOnSdkUpdate
+    updateOnSdkReady, updateOnSdkReadyFromCache, updateOnSdkTimedout, updateOnSdkUpdate, splitKey, trafficType, attributes
   } = { ...DEFAULT_UPDATE_OPTIONS, ...options };
 
   const context = React.useContext(SplitContext);
   const { client: contextClient, factory } = context;
 
   let client = contextClient as IClientWithContext;
-  if (key && factory) {
-    client = getSplitClient(factory, key, trafficType);
+  if (splitKey && factory) {
+    client = getSplitClient(factory, splitKey, trafficType);
   }
   initAttributes(client, attributes);
 

src/useSplitTreatments.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { getControlTreatmentsWithConfig } from './constants';
 import { IClientWithContext, memoizeGetTreatmentsWithConfig } from './utils';
-import { ISplitTreatmentsChildProps, IUpdateProps } from './types';
+import { ISplitTreatmentsChildProps, IUseSplitTreatmentsOptions } from './types';
 import { useSplitClient } from './useSplitClient';
 
 /**
@@ -11,15 +11,16 @@ import { useSplitClient } from './useSplitClient';
  * @return A Split Context object extended with a TreatmentsWithConfig instance, that might contain control treatments if the client is not available or ready, or if split names do not exist.
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#get-treatments-with-configurations}
  */
-export function useSplitTreatments(splitNames: string[], attributes?: SplitIO.Attributes, key?: SplitIO.SplitKey, options?: IUpdateProps): ISplitTreatmentsChildProps {
-  const context = useSplitClient(key, undefined, undefined, options);
-  const client = context.client;
+export function useSplitTreatments(options: IUseSplitTreatmentsOptions): ISplitTreatmentsChildProps {
+  const context = useSplitClient({...options, attributes: undefined });
+  const { client, lastUpdate } = context;
+  const { names, attributes } = options;
 
   const getTreatmentsWithConfig = React.useMemo(memoizeGetTreatmentsWithConfig, []);
 
   const treatments = client && (client as IClientWithContext).__getStatus().isOperational ?
-    getTreatmentsWithConfig(client, context.lastUpdate, splitNames, attributes, { ...client.getAttributes() }) :
-    getControlTreatmentsWithConfig(splitNames);
+    getTreatmentsWithConfig(client, lastUpdate, names, attributes, { ...client.getAttributes() }) :
+    getControlTreatmentsWithConfig(names);
 
   return {
     ...context,

src/useTrack.ts

@@ -1,4 +1,4 @@
-import { useClient } from './useClient';
+import { useSplitClient } from './useSplitClient';
 
 // no-op function that returns false
 const noOpFalse = () => false;
@@ -10,7 +10,8 @@ const noOpFalse = () => false;
  * @return A track function bound to a Split client. If the client is not available, the result is a no-op function that returns false.
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#track}
  */
-export function useTrack(key?: SplitIO.SplitKey, trafficType?: string): SplitIO.IBrowserClient['track'] {
-  const client = useClient(key, trafficType);
+export function useTrack(splitKey?: SplitIO.SplitKey, trafficType?: string): 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 });
   return client ? client.track.bind(client) : noOpFalse;
 }

src/useTreatments.ts

@@ -8,6 +8,6 @@ import { useSplitTreatments } from './useSplitTreatments';
  * @return A TreatmentsWithConfig instance, that might contain control treatments if the client is not available or ready, or if feature flag names do not exist.
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#get-treatments-with-configurations}
  */
-export function useTreatments(featureFlagNames: string[], attributes?: SplitIO.Attributes, key?: SplitIO.SplitKey): SplitIO.TreatmentsWithConfig {
-  return useSplitTreatments(featureFlagNames, attributes, key).treatments;
+export function useTreatments(featureFlagNames: string[], attributes?: SplitIO.Attributes, splitKey?: SplitIO.SplitKey): SplitIO.TreatmentsWithConfig {
+  return useSplitTreatments({ names: featureFlagNames, attributes, splitKey }).treatments;
 }

types/types.d.ts

@@ -84,7 +84,7 @@ export interface ISplitFactoryChildProps extends ISplitContextValues {
 }
 /**
  * SplitFactory Props interface. These are the props accepted by SplitFactory component,
- * used to instantiate a factory and client instances, update the Split context, and listen for SDK events.
+ * used to instantiate a factory and client instance, update the Split context, and listen for SDK events.
  */
 export interface ISplitFactoryProps extends IUpdateProps {
     /**
@@ -106,19 +106,14 @@ export interface ISplitFactoryProps extends IUpdateProps {
     children: ((props: ISplitFactoryChildProps) => ReactNode) | ReactNode;
 }
 /**
- * SplitClient Child Props interface. These are the props that the child component receives from the 'SplitClient' component.
- */
-export interface ISplitClientChildProps extends ISplitContextValues {
-}
-/**
- * SplitClient Props interface. These are the props accepted by SplitClient component,
- * used to instantiate a new client instances, update the Split context, and listen for SDK events.
+ * useSplitClient options interface. This is the options object accepted by useSplitClient hook,
+ * used to retrieve a client instance with the Split context, and listen for SDK events.
  */
-export interface ISplitClientProps extends IUpdateProps {
+export interface IUseSplitClientOptions extends IUpdateProps {
     /**
      * The customer identifier.
      */
-    splitKey: SplitIO.SplitKey;
+    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.
@@ -128,11 +123,32 @@ export interface ISplitClientProps extends IUpdateProps {
      * An object of type Attributes used to evaluate the feature flags.
      */
     attributes?: SplitIO.Attributes;
+}
+/**
+ * SplitClient Child Props interface. These are the props that the child component receives from the 'SplitClient' component.
+ */
+export interface ISplitClientChildProps extends ISplitContextValues {
+}
+/**
+ * SplitClient Props interface. These are the props accepted by SplitClient component,
+ * used to instantiate a new client instance, update the Split context, and listen for SDK events.
+ */
+export interface ISplitClientProps extends IUseSplitClientOptions {
     /**
      * Children of the SplitFactory component. It can be a functional component (child as a function) or a React element.
      */
     children: ((props: ISplitClientChildProps) => ReactNode) | ReactNode;
 }
+/**
+ * useSplitTreatments options interface. This is the options object accepted by useSplitTreatments hook,
+ * used to call 'client.getTreatmentsWithConfig()' and retrieve the result together with the Split context.
+ */
+export interface IUseSplitTreatmentsOptions extends IUseSplitClientOptions {
+    /**
+     * list of feature flag names
+     */
+    names: string[];
+}
 /**
  * SplitTreatments Child Props interface. These are the props that the child component receives from the 'SplitTreatments' component.
  */

types/useClient.d.ts

@@ -6,4 +6,4 @@
  * @return A Split Client instance, or null if used outside the scope of SplitFactory
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#advanced-instantiate-multiple-sdk-clients}
  */
-export declare function useClient(key?: SplitIO.SplitKey, trafficType?: string, attributes?: SplitIO.Attributes): SplitIO.IBrowserClient | null;
+export declare function useClient(splitKey?: SplitIO.SplitKey, trafficType?: string, attributes?: SplitIO.Attributes): SplitIO.IBrowserClient | null;

types/useSplitClient.d.ts

@@ -1,4 +1,4 @@
-import { ISplitContextValues, IUpdateProps } from './types';
+import { ISplitContextValues, IUseSplitClientOptions } from './types';
 export declare const DEFAULT_UPDATE_OPTIONS: {
     updateOnSdkUpdate: boolean;
     updateOnSdkTimedout: boolean;
@@ -12,4 +12,4 @@ export declare const DEFAULT_UPDATE_OPTIONS: {
  * @return A Split Context object
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#advanced-instantiate-multiple-sdk-clients}
  */
-export declare function useSplitClient(key?: SplitIO.SplitKey, trafficType?: string, attributes?: SplitIO.Attributes, options?: IUpdateProps): ISplitContextValues;
+export declare function useSplitClient(options?: IUseSplitClientOptions): ISplitContextValues;

types/useSplitTreatments.d.ts

@@ -1,9 +1,9 @@
-import { ISplitTreatmentsChildProps, IUpdateProps } from './types';
+import { ISplitTreatmentsChildProps, IUseSplitTreatmentsOptions } from './types';
 /**
  * 'useSplitTreatments' is a hook that returns an SplitContext object extended with a `treatments` property containing an object of feature flag evaluations (i.e., treatments).
  * It uses the 'useSplitClient' hook to access the client from the Split context, and invokes the 'getTreatmentsWithConfig' method.
  *
  * @return A Split Context object extended with a TreatmentsWithConfig instance, that might contain control treatments if the client is not available or ready, or if split names do not exist.
  * @see {@link https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK#get-treatments-with-configurations}
  */
-export declare function useSplitTreatments(splitNames: string[], attributes?: SplitIO.Attributes, key?: SplitIO.SplitKey, options?: IUpdateProps): ISplitTreatmentsChildProps;
+export declare function useSplitTreatments(options: IUseSplitTreatmentsOptions): ISplitTreatmentsChildProps;