@applicaster/zapp-react-native-bridge 12.0.0-rc.3 → 12.0.0-rc.30

package/OfflineAssets/__tests__/__snapshots__/fileManager.test.ts.snap

@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`deleteFolders deletes each provided path 1`] = `true`;
+exports[`fileManager deleteFolders deletes each provided path 1`] = `true`;
 
-exports[`storeFiles calls the store file function of the native module with the provided args 1`] = `
+exports[`fileManager storeFiles calls the store file function of the native module with the provided args 1`] = `
 Object {
   "http://file": true,
   "http://file2": true,

package/OfflineAssets/__tests__/fileManager.test.ts

@@ -1,30 +1,27 @@
 import * as R from "ramda";
+import * as ReactNative from "react-native";
 
-jest.mock("react-native", () => ({
-  NativeModules: {
-    OfflineAssetsBridge: {
-      storeFiles: jest.fn((files) => {
-        if (files.includes("fail")) throw new Error("Error storing file");
+const { NativeModules } = ReactNative;
 
-        return Promise.resolve(
-          files.reduce((acc, curr) => {
-            return R.assoc(curr.url, true, acc);
-          }, {})
-        );
-      }),
-      delete: jest.fn((file) => {
-        if (file.includes("fail")) throw new Error("Error deleting file");
+const OfflineAssetsBridge = {
+  storeFiles: jest.fn((files) => {
+    if (files.includes("fail")) throw new Error("Error storing file");
+
+    return Promise.resolve(
+      files.reduce((acc, curr) => {
+        return R.assoc(curr.url, true, acc);
+      }, {})
+    );
+  }),
+  delete: jest.fn((file) => {
+    if (file.includes("fail")) throw new Error("Error deleting file");
 
-        return Promise.resolve(true);
-      }),
-      getFilesDirectory: jest.fn(() => Promise.resolve("/native/path/")),
-    },
-  },
-}));
+    return Promise.resolve(true);
+  }),
+  getFilesDirectory: jest.fn(() => Promise.resolve("/native/path/")),
+};
 
-const {
-  NativeModules: { OfflineAssetsBridge },
-} = require("react-native");
+NativeModules.OfflineAssetsBridge = OfflineAssetsBridge;
 
 const { storeFiles, deleteFolders, getNativeRootPath } = require("..");
 
@@ -34,47 +31,53 @@ function clearMocks() {
   OfflineAssetsBridge.getFilesDirectory.mockClear();
 }
 
-describe("storeFiles", () => {
-  beforeEach(clearMocks);
+describe("fileManager", () => {
+  describe("storeFiles", () => {
+    beforeEach(clearMocks);
 
-  it("calls the store file function of the native module with the provided args", async () => {
-    const files = [{ url: "http://file" }, { url: "http://file2" }];
-    const options = {};
+    it("calls the store file function of the native module with the provided args", async () => {
+      const files = [{ url: "http://file" }, { url: "http://file2" }];
+      const options = {};
 
-    const result = await storeFiles(files, options);
+      const result = await storeFiles(files, options);
 
-    expect(OfflineAssetsBridge.storeFiles).toHaveBeenCalledWith(files, options);
-    expect(result).toMatchSnapshot();
+      expect(OfflineAssetsBridge.storeFiles).toHaveBeenCalledWith(
+        files,
+        options
+      );
+
+      expect(result).toMatchSnapshot();
+    });
   });
-});
 
-describe("deleteFolders", () => {
-  beforeEach(clearMocks);
+  describe("deleteFolders", () => {
+    beforeEach(clearMocks);
 
-  it("deletes each provided path", async () => {
-    const folders = ["folder1", "folder2", "folder3"];
+    it("deletes each provided path", async () => {
+      const folders = ["folder1", "folder2", "folder3"];
 
-    const result = await deleteFolders(folders);
+      const result = await deleteFolders(folders);
 
-    expect.assertions(folders.length + 2);
-    expect(result).toMatchSnapshot();
-    expect(OfflineAssetsBridge.delete).toHaveBeenCalledTimes(folders.length);
+      expect.assertions(folders.length + 2);
+      expect(result).toMatchSnapshot();
+      expect(OfflineAssetsBridge.delete).toHaveBeenCalledTimes(folders.length);
 
-    folders.forEach((folder, index) => {
-      expect(OfflineAssetsBridge.delete).toHaveBeenNthCalledWith(
-        index + 1,
-        folder
-      );
+      folders.forEach((folder, index) => {
+        expect(OfflineAssetsBridge.delete).toHaveBeenNthCalledWith(
+          index + 1,
+          folder
+        );
+      });
     });
   });
-});
 
-describe("getNativeRootPath", () => {
-  beforeEach(clearMocks);
+  describe("getNativeRootPath", () => {
+    beforeEach(clearMocks);
 
-  it("returns the native root path", async () => {
-    const nativePath = await OfflineAssetsBridge.getFilesDirectory();
+    it("returns the native root path", async () => {
+      const nativePath = await OfflineAssetsBridge.getFilesDirectory();
 
-    await expect(getNativeRootPath()).resolves.toEqual(nativePath);
+      await expect(getNativeRootPath()).resolves.toEqual(nativePath);
+    });
   });
 });

package/OfflineAssets/index.ts

@@ -80,9 +80,12 @@ export const fileIsSaved = R.curry((savedFilesResult, { file }) => {
 export const remapAssetPath = (
   assets: FilesList,
   source: Record<string, any>,
-  localFiles: Record<string, string>
+  localFiles: Record<string, string>,
+  tag: string = "unknown"
 ): Record<string, any> => {
-  return assets.reduce((obj, { path, url }) => {
+  const startTime = performance.now();
+
+  const result = assets.reduce((obj, { path, url }) => {
     const localFile = localFiles[url];
 
     if (!localFile) {
@@ -108,7 +111,11 @@ export const remapAssetPath = (
     }
 
     return obj;
-  }, R.clone(source));
+  }, JSON.parse(JSON.stringify(source)));
+
+  bridgeLogger.log({ message: `remapAssetPath: remapping took ${performance.now() - startTime} ms, tag: ${tag}` });
+
+  return result;
 };
 
 export function collectAssets(object, nativeRootPath, source, path = []) {

package/QuickBrick/__tests__/quickBrickModule.test.ts

@@ -1,27 +1,21 @@
-jest.mock("react-native", () => {
-  // We're not using the vars defined below, cause jest doesn't allow mocks to refer
-  // to out of scope variables, as they would be undefined when jest loads the mock
-  return {
-    NativeModules: {
-      QuickBrickCommunicationModule: {
-        quickBrickEvent: jest.fn(),
-        accountId: 123,
-        accountsAccountId: "accountsAccountIDString1234",
-        broadcasterId: 145,
-        bundleIdentifier: "com.apptestname",
-        initialProps: {
-          foo: "bar",
-        },
-      },
-    },
-  };
-});
+import * as ReactNative from "react-native";
+
+ReactNative.NativeModules.QuickBrickCommunicationModule = {
+  quickBrickEvent: jest.fn(),
+  accountId: 123,
+  accountsAccountId: "accountsAccountIDString1234",
+  broadcasterId: 145,
+  bundleIdentifier: "com.apptestname",
+  initialProps: {
+    foo: "bar",
+  },
+};
 
 const {
   sendQuickBrickEvent,
   getAppData,
   getLegacyInitialProps,
-} = require("../index");
+} = require("..");
 
 const eventName = "event";
 const payload = {};
@@ -33,44 +27,46 @@ const bundleIdentifier = "com.apptestname";
 
 const { NativeModules } = require("react-native");
 
-describe("sendQuickBrickEvent", () => {
-  it("invokes the native module", () => {
-    sendQuickBrickEvent(eventName, payload);
+describe("QuickBrickModule", () => {
+  describe("sendQuickBrickEvent", () => {
+    it("invokes the native module", () => {
+      sendQuickBrickEvent(eventName, payload);
 
-    expect(
-      NativeModules.QuickBrickCommunicationModule.quickBrickEvent
-    ).toHaveBeenCalledWith(eventName, payload);
-  });
+      expect(
+        NativeModules.QuickBrickCommunicationModule.quickBrickEvent
+      ).toHaveBeenCalledWith(eventName, payload);
+    });
 
-  it("passes an empty object as payload if not provided", () => {
-    sendQuickBrickEvent(eventName);
+    it("passes an empty object as payload if not provided", () => {
+      sendQuickBrickEvent(eventName);
 
-    expect(
-      NativeModules.QuickBrickCommunicationModule.quickBrickEvent
-    ).toHaveBeenCalledWith(eventName, {});
-  });
+      expect(
+        NativeModules.QuickBrickCommunicationModule.quickBrickEvent
+      ).toHaveBeenCalledWith(eventName, {});
+    });
 
-  afterEach(() => {
-    NativeModules.QuickBrickCommunicationModule.quickBrickEvent.mockRestore();
+    afterEach(() => {
+      NativeModules.QuickBrickCommunicationModule.quickBrickEvent.mockRestore();
+    });
   });
-});
 
-describe("getAppData", () => {
-  it("returns the app data", () => {
-    const appData = getAppData();
-    expect(appData).toHaveProperty("accountId", accountId);
-    expect(appData).toHaveProperty("accountsAccountId", accountsAccountId);
-    expect(appData).toHaveProperty("broadcasterId", broadcasterId);
-    expect(appData).toHaveProperty("bundleIdentifier", bundleIdentifier);
+  describe("getAppData", () => {
+    it("returns the app data", () => {
+      const appData = getAppData();
+      expect(appData).toHaveProperty("accountId", accountId);
+      expect(appData).toHaveProperty("accountsAccountId", accountsAccountId);
+      expect(appData).toHaveProperty("broadcasterId", broadcasterId);
+      expect(appData).toHaveProperty("bundleIdentifier", bundleIdentifier);
+    });
   });
-});
 
-describe("getLegacyInitialProps", () => {
-  it("returns the initial props", () => {
-    const initialProps = getLegacyInitialProps();
+  describe("getLegacyInitialProps", () => {
+    it("returns the initial props", () => {
+      const initialProps = getLegacyInitialProps();
 
-    expect(initialProps).toEqual(
-      NativeModules.QuickBrickCommunicationModule.initialProps
-    );
+      expect(initialProps).toEqual(
+        NativeModules.QuickBrickCommunicationModule.initialProps
+      );
+    });
   });
 });

package/QuickBrick/__tests__/quickBrickModule_noModule.test.ts

@@ -1,10 +1,6 @@
-const mock_NativeModules = {
-  Foo: jest.fn(),
-};
+const { NativeModules } = require("react-native");
 
-jest.mock("react-native", () => ({
-  NativeModules: mock_NativeModules,
-}));
+NativeModules.Foo = jest.fn();
 
 jest.mock("../../logger", () => ({
   bridgeLogger: {
@@ -16,7 +12,7 @@ const {
   sendQuickBrickEvent,
   getAppData,
   getLegacyInitialProps,
-} = require("../index");
+} = require("../");
 
 const eventName = "event";
 const payload = {};
@@ -24,6 +20,11 @@ const payload = {};
 const { bridgeLogger } = require("../../logger");
 
 describe("when QuickBrickCommunication Module is undefined", () => {
+  beforeEach(() => {
+    jest.unmock("react-native");
+    jest.resetModules();
+  });
+
   describe("sendQuickBrickEvent", () => {
     it("throws an error", () => {
       expect(() => sendQuickBrickEvent(eventName, payload)).toThrow();

package/ZappStorage/StorageMultiSelectProvider.ts

@@ -33,11 +33,16 @@ export interface MultiSelectProvider {
 
 export class StorageMultiSelectProvider implements MultiSelectProvider {
   // TODO: Unsubscribe and remove when there is no listeners
-  private static multiSelectProviders: Record<string, StorageMultiSelectProvider> = {};
+  private static multiSelectProviders: Record<
+    string,
+    StorageMultiSelectProvider
+  > = {};
 
-  public static getProvider(keyNamespace:string): StorageMultiSelectProvider {
+  public static getProvider(keyNamespace: string): StorageMultiSelectProvider {
     if (!this.multiSelectProviders[keyNamespace]) {
-      this.multiSelectProviders[keyNamespace] = new StorageMultiSelectProvider(keyNamespace);
+      this.multiSelectProviders[keyNamespace] = new StorageMultiSelectProvider(
+        keyNamespace
+      );
     }
 
     return this.multiSelectProviders[keyNamespace];
@@ -45,8 +50,8 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
 
   private itemSubject: BehaviorSubject<string[] | null>;
 
-  private readonly key:string
-  private readonly namespace:string;
+  private readonly key: string;
+  private readonly namespace: string;
 
   private constructor(keyNamespace: string) {
     const { namespace, key } = getNamespaceAndKey(keyNamespace);
@@ -65,10 +70,13 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
     log_debug("StorageMultiSelectProvider: Initializing");
   }
 
-  private reloadItems = async ({ value }:StorageListenerArgs) => {
+  private reloadItems = async ({ value }: StorageListenerArgs) => {
     const selectedItems = value ? value.split(",") : [];
 
-    log_debug(`reloadItems: request to reload items for value: ${value}`, selectedItems);
+    log_debug(
+      `reloadItems: request to reload items for value: ${value}`,
+      selectedItems
+    );
 
     this.itemSubject.next(selectedItems);
   };
@@ -76,7 +84,10 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
   public getObservable = (): BehaviorSubject<string[]> => this.itemSubject;
 
   private async getSetOfCurrentItems() {
-    const currentResult: string = await localStorage.getItem(this.key, this.namespace);
+    const currentResult: string = await localStorage.getItem(
+      this.key,
+      this.namespace
+    );
 
     return new Set(currentResult ? currentResult.split(",") : []);
   }
@@ -89,49 +100,61 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
     this.itemSubject.next(arrayOfItems);
   }
 
-  public addItem = async(item: string): Promise<void> => {
+  public addItem = async (item: string): Promise<void> => {
     const currentItems = await this.getSetOfCurrentItems();
     currentItems.add(item);
     log_debug(`addItem: Adding new item: ${item}`);
 
     await this.updateItemsAndNotifyObservers(currentItems);
-  }
+  };
 
-  public addItems = async(items: string[]): Promise<void> => {
+  public addItems = async (items: string[]): Promise<void> => {
     const currentItems = await this.getSetOfCurrentItems();
 
     items.forEach((item) => currentItems.add(item));
 
-    log_debug(`addItems: Adding new items: ${items.join(",")}, current items: ${Array.from(currentItems).join(",")}`);
+    log_debug(
+      `addItems: Adding new items: ${items.join(
+        ","
+      )}, current items: ${Array.from(currentItems).join(",")}`
+    );
 
     await this.updateItemsAndNotifyObservers(currentItems);
-  }
+  };
 
-  public removeItem = async(item: string): Promise<void> => {
+  public removeItem = async (item: string): Promise<void> => {
     const currentItems = await this.getSetOfCurrentItems();
     currentItems.delete(item);
 
-    log_debug(`removeItem: Removing item: ${item}, current items: ${Array.from(currentItems).join(",")}`);
+    log_debug(
+      `removeItem: Removing item: ${item}, current items: ${Array.from(
+        currentItems
+      ).join(",")}`
+    );
 
     await this.updateItemsAndNotifyObservers(currentItems);
-  }
+  };
 
   public removeItems = async (items: string[]): Promise<void> => {
     const currentItems = await this.getSetOfCurrentItems();
 
     items.forEach((item) => currentItems.delete(item));
 
-    log_debug(`removeItems: Removing items: ${items.join(",")}, current items: ${Array.from(currentItems).join(",")}`);
+    log_debug(
+      `removeItems: Removing items: ${items.join(
+        ","
+      )}, current items: ${Array.from(currentItems).join(",")}`
+    );
 
     await this.updateItemsAndNotifyObservers(currentItems);
-  }
+  };
 
   public removeAllItems = async (): Promise<void> => {
     await localStorage.removeItem(this.key, this.namespace);
     log_debug(`removeAllItems: Removing all items, current items: ${[]}`);
 
     this.itemSubject.next([]);
-  }
+  };
 
   public getSelectedAsync = async (): Promise<string[]> => {
     const value = await localStorage.getItem(this.key, this.namespace);
@@ -139,15 +162,15 @@ export class StorageMultiSelectProvider implements MultiSelectProvider {
     this.itemSubject.next(selectedItems);
 
     return selectedItems;
-  }
+  };
 
   public getSelectedItems = (): string[] => {
     return this.itemSubject.getValue();
-  }
+  };
 
   setSelectedItems = async (items: string[]): Promise<void> => {
     log_debug(`setSelectedItems: Setting selected items: ${items.join(",")}`);
 
     await this.updateItemsAndNotifyObservers(new Set(items));
-  }
+  };
 }

package/ZappStorage/__tests__/__snapshots__/localStorage.test.ts.snap

@@ -1,25 +1,25 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`localStorage - getAllItems throws if an error happen on native side 1`] = `"An error occured while getting an item from native storage: namespace not found"`;
+exports[`localStorage getAllItems throws if an error happen on native side 1`] = `"An error occured while getting an item from native storage: namespace not found"`;
 
-exports[`localStorage - getItem throws if key is null 1`] = `"Requested key is null or undefined"`;
+exports[`localStorage getItem throws if key is null 1`] = `"Requested key is null or undefined"`;
 
-exports[`localStorage - getItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
+exports[`localStorage getItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
 
-exports[`localStorage - getItem throws if there is an error on the native side 1`] = `"An error occured while getting an item from native storage: failed to get item"`;
+exports[`localStorage getItem throws if there is an error on the native side 1`] = `"An error occured while getting an item from native storage: failed to get item"`;
 
-exports[`localStorage - removeItem throws if a native error is thrown 1`] = `"An error occured while removing an item from native  storage: failed to remove item"`;
+exports[`localStorage removeItem throws if a native error is thrown 1`] = `"An error occured while removing an item from native  storage: failed to remove item"`;
 
-exports[`localStorage - removeItem throws if key is null 1`] = `"Requested key is null or undefined"`;
+exports[`localStorage removeItem throws if key is null 1`] = `"Requested key is null or undefined"`;
 
-exports[`localStorage - removeItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
+exports[`localStorage removeItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
 
-exports[`localStorage - setItem throws if key is null 1`] = `"Requested key is null or undefined"`;
+exports[`localStorage setItem throws if key is null 1`] = `"Requested key is null or undefined"`;
 
-exports[`localStorage - setItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
+exports[`localStorage setItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
 
-exports[`localStorage - setItem throws if there is an error in the native module 1`] = `"An error occured while setting an item in native  storage: failed to set item"`;
+exports[`localStorage setItem throws if there is an error in the native module 1`] = `"An error occured while setting an item in native  storage: failed to set item"`;
 
-exports[`localStorage - setItem throws if value is null 1`] = `"Value to set in storage cannot be null or undefined"`;
+exports[`localStorage setItem throws if value is null 1`] = `"Value to set in storage cannot be null or undefined"`;
 
-exports[`localStorage - setItem throws if value is undefined 1`] = `"Value to set in storage cannot be null or undefined"`;
+exports[`localStorage setItem throws if value is undefined 1`] = `"Value to set in storage cannot be null or undefined"`;

package/ZappStorage/__tests__/__snapshots__/sessionStorage.test.ts.snap

@@ -1,25 +1,25 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`sessionStorage - getAllItems throws if an error happen on native side 1`] = `"An error occured while getting an item from native storage: namespace not found"`;
+exports[`sessionStorage getAllItems throws if an error happen on native side 1`] = `"An error occured while getting an item from native storage: namespace not found"`;
 
-exports[`sessionStorage - getItem throws if key is null 1`] = `"Requested key is null or undefined"`;
+exports[`sessionStorage getItem throws if key is null 1`] = `"Requested key is null or undefined"`;
 
-exports[`sessionStorage - getItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
+exports[`sessionStorage getItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
 
-exports[`sessionStorage - getItem throws if there is an error on the native side 1`] = `"An error occured while getting an item from native storage: failed to get item"`;
+exports[`sessionStorage getItem throws if there is an error on the native side 1`] = `"An error occured while getting an item from native storage: failed to get item"`;
 
-exports[`sessionStorage - removeItem throws if a native error is thrown 1`] = `"An error occured while removing an item from native  storage: failed to remove item"`;
+exports[`sessionStorage removeItem throws if a native error is thrown 1`] = `"An error occured while removing an item from native  storage: failed to remove item"`;
 
-exports[`sessionStorage - removeItem throws if key is null 1`] = `"Requested key is null or undefined"`;
+exports[`sessionStorage removeItem throws if key is null 1`] = `"Requested key is null or undefined"`;
 
-exports[`sessionStorage - removeItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
+exports[`sessionStorage removeItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
 
-exports[`sessionStorage - setItem throws if key is null 1`] = `"Requested key is null or undefined"`;
+exports[`sessionStorage setItem throws if key is null 1`] = `"Requested key is null or undefined"`;
 
-exports[`sessionStorage - setItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
+exports[`sessionStorage setItem throws if key is undefined 1`] = `"Requested key is null or undefined"`;
 
-exports[`sessionStorage - setItem throws if there is an error in the native module 1`] = `"An error occured while setting an item in native  storage: failed to set item"`;
+exports[`sessionStorage setItem throws if there is an error in the native module 1`] = `"An error occured while setting an item in native  storage: failed to set item"`;
 
-exports[`sessionStorage - setItem throws if value is null 1`] = `"Value to set in storage cannot be null or undefined"`;
+exports[`sessionStorage setItem throws if value is null 1`] = `"Value to set in storage cannot be null or undefined"`;
 
-exports[`sessionStorage - setItem throws if value is undefined 1`] = `"Value to set in storage cannot be null or undefined"`;
+exports[`sessionStorage setItem throws if value is undefined 1`] = `"Value to set in storage cannot be null or undefined"`;