@applicaster/zapp-react-native-bridge 14.0.0-rc.9 → 15.0.0-rc.2

package/OfflineAssets/index.ts

@@ -102,7 +102,11 @@ export const remapAssetPath = (
 
       // Traverse the path to the appropriate nested object
       for (let i = 0; i < path.length - 1; i++) {
-        target = target[path[i]] = target[path[i]];
+        if (typeof target[path[i]] !== "object" || target[path[i]] === null) {
+          target[path[i]] = {};
+        }
+
+        target = target[path[i]];
       }
 
       if (!target) {

package/PushNotifications/index.ts

@@ -7,7 +7,7 @@ interface PushBridgeInterface {
 }
 
 // eslint-disable-next-line prefer-promise-reject-errors
-const nullPromise = () => Promise.reject("Push Notification bridge is null");
+const nullPromise = () => Promise.resolve(["Push Notification bridge is null"]);
 
 const defaultPushNotification = {
   registerTags: nullPromise,

package/QuickBrick/index.ts

@@ -1,5 +1,4 @@
 import * as R from "ramda";
-import { Platform } from "react-native";
 import uuidv4 from "uuid/v4";
 
 import { bridgeLogger } from "../logger";
@@ -27,7 +26,7 @@ export interface QuickBrickCommunicationModuleI extends AppData {
   ) => void;
 }
 
-const { NativeModules } = require("react-native");
+const { NativeModules, Platform } = require("react-native");
 
 /**
  * sends an event to the native QuickBrick manager module

package/ZappStorage/LocalStorage/index.ts

@@ -32,7 +32,7 @@ function getLocalStorageAndroid(): NativeLocalStorageI {
   };
 }
 
-const LocalStorage = platformSelect({
+const LocalStorage: NativeLocalStorageI = platformSelect({
   android: getLocalStorageAndroid(),
   amazon: getLocalStorageAndroid(),
   android_tv: getLocalStorageAndroid(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-bridge",
-  "version": "14.0.0-rc.9",
+  "version": "15.0.0-rc.2",
   "description": "Applicaster Zapp React Native modules",
   "main": "index.js",
   "types": "index.d.ts",
@@ -32,14 +32,13 @@
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
     "@applicaster/zapp-pipes-dev-kit": "1.4.7",
-    "@applicaster/zapp-react-native-utils": "14.0.0-rc.9",
+    "@applicaster/zapp-react-native-utils": "15.0.0-rc.2",
     "md5": "^2.3.0",
     "uuid": "^3.3.2"
   },
   "peerDependencies": {
     "@applicaster/zapp-pipes-v2-client": "*",
     "@react-native-community/netinfo": "*",
-    "immer": "*",
     "react": "*",
     "react-native": "*",
     "uglify-js": "*",

package/ZappStorage/StorageMultiSelectProvider.ts

@@ -1,176 +0,0 @@
-import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
-import { bridgeLogger } from "../logger";
-import { BehaviorSubject } from "rxjs";
-import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
-import { getNamespaceAndKey } from "@applicaster/zapp-react-native-utils/appUtils/contextKeysManager/utils";
-
-export const { log_verbose, log_debug, log_warning, log_info, log_error } =
-  createLogger({
-    category: "StorageMultiSelectProvider",
-    subsystem: "zapp-react-native-bridge",
-    parent: bridgeLogger,
-  });
-
-export interface MultiSelectProvider {
-  getObservable(): BehaviorSubject<string[]>;
-
-  addItem(item: string): Promise<void>;
-
-  addItems(items: string[]): Promise<void>;
-
-  setSelectedItems(items: string[]): Promise<void>;
-
-  removeItem(item: string): Promise<void>;
-
-  removeItems(items: string[]): Promise<void>;
-
-  removeAllItems(): Promise<void>;
-
-  getSelectedItems(): string[];
-
-  getSelectedAsync(): Promise<string[]>;
-}
-
-export class StorageMultiSelectProvider implements MultiSelectProvider {
-  // TODO: Unsubscribe and remove when there is no listeners
-  private static multiSelectProviders: Record<
-    string,
-    StorageMultiSelectProvider
-  > = {};
-
-  public static getProvider(keyNamespace: string): StorageMultiSelectProvider {
-    if (!this.multiSelectProviders[keyNamespace]) {
-      this.multiSelectProviders[keyNamespace] = new StorageMultiSelectProvider(
-        keyNamespace
-      );
-    }
-
-    return this.multiSelectProviders[keyNamespace];
-  }
-
-  private itemSubject: BehaviorSubject<string[] | null>;
-
-  private readonly key: string;
-  private readonly namespace: string;
-
-  private constructor(keyNamespace: string) {
-    const { namespace, key } = getNamespaceAndKey(keyNamespace);
-
-    if (!key) {
-      throw new Error("StorageMultiSelectProvider: Key is required");
-    }
-
-    this.key = key;
-    this.namespace = namespace;
-    localStorage.addListener?.({ key, namespace }, this.reloadItems);
-
-    this.itemSubject = new BehaviorSubject([]);
-
-    void this.getSelectedAsync();
-    log_debug("StorageMultiSelectProvider: Initializing");
-  }
-
-  private reloadItems = async ({ value }: StorageListenerArgs) => {
-    const selectedItems = value ? value.split(",") : [];
-
-    log_debug(
-      `reloadItems: request to reload items for value: ${value}`,
-      selectedItems
-    );
-
-    this.itemSubject.next(selectedItems);
-  };
-
-  public getObservable = (): BehaviorSubject<string[]> => this.itemSubject;
-
-  private async getSetOfCurrentItems() {
-    const currentResult: string = await localStorage.getItem(
-      this.key,
-      this.namespace
-    );
-
-    return new Set(currentResult ? currentResult.split(",") : []);
-  }
-
-  private async updateItemsAndNotifyObservers(currentItems: Set<string>) {
-    const arrayOfItems = Array.from(currentItems);
-    const newValue = arrayOfItems.join(",");
-    await localStorage.setItem(this.key, newValue, this.namespace);
-
-    this.itemSubject.next(arrayOfItems);
-  }
-
-  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> => {
-    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(",")}`
-    );
-
-    await this.updateItemsAndNotifyObservers(currentItems);
-  };
-
-  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(",")}`
-    );
-
-    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(",")}`
-    );
-
-    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);
-    const selectedItems = value ? value.split(",") : [];
-    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/StorageSingleSelectProvider.ts

@@ -1,108 +0,0 @@
-import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
-import { bridgeLogger } from "../logger";
-import { BehaviorSubject } from "rxjs";
-import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
-import { getNamespaceAndKey } from "@applicaster/zapp-react-native-utils/appUtils/contextKeysManager/utils";
-
-export const { log_verbose, log_debug, log_warning, log_info, log_error } =
-  createLogger({
-    category: "StorageSingleValueProvider",
-    subsystem: "zapp-react-native-bridge",
-    parent: bridgeLogger,
-  });
-
-export interface SingleValueProvider {
-  getObservable(): BehaviorSubject<string | null>;
-
-  setValue(value: string): Promise<void>;
-  getValue(): string | null;
-  getValueAsync(): Promise<string | null>;
-  clearValue(): Promise<void>;
-}
-
-interface StorageListenerArgs {
-  value: string | null;
-}
-
-export class StorageSingleValueProvider implements SingleValueProvider {
-  // Static cache of providers by namespace
-  private static singleValueProviders: Record<
-    string,
-    StorageSingleValueProvider
-  > = {};
-
-  public static getProvider(keyNamespace: string): StorageSingleValueProvider {
-    if (!this.singleValueProviders[keyNamespace]) {
-      this.singleValueProviders[keyNamespace] = new StorageSingleValueProvider(
-        keyNamespace
-      );
-    }
-
-    return this.singleValueProviders[keyNamespace];
-  }
-
-  private valueSubject: BehaviorSubject<string | null>;
-
-  private readonly key: string;
-  private readonly namespace: string;
-
-  private constructor(keyNamespace: string) {
-    const { namespace, key } = getNamespaceAndKey(keyNamespace);
-
-    if (!key) {
-      throw new Error("StorageSingleValueProvider: Key is required");
-    }
-
-    this.key = key;
-    this.namespace = namespace;
-    localStorage.addListener?.({ key, namespace }, this.reloadValue);
-
-    this.valueSubject = new BehaviorSubject<string | null>(null);
-
-    void this.getValueAsync();
-    log_debug("StorageSingleValueProvider: Initializing");
-  }
-
-  private reloadValue = async ({ value }: StorageListenerArgs) => {
-    log_debug(`reloadValue: request to reload value: ${value}`);
-
-    this.valueSubject.next(value);
-  };
-
-  public getObservable = (): BehaviorSubject<string | null> =>
-    this.valueSubject;
-
-  private async updateValueAndNotifyObservers(value: string | null) {
-    if (value === null) {
-      await localStorage.removeItem(this.key, this.namespace);
-    } else {
-      await localStorage.setItem(this.key, value, this.namespace);
-    }
-
-    this.valueSubject.next(value);
-  }
-
-  public setValue = async (value: string): Promise<void> => {
-    log_debug(`setValue: Setting new value: ${value}`);
-
-    await this.updateValueAndNotifyObservers(value);
-  };
-
-  public clearValue = async (): Promise<void> => {
-    await localStorage.removeItem(this.key, this.namespace);
-    log_debug("clearValue: Removing value");
-
-    this.valueSubject.next(null);
-  };
-
-  public getValueAsync = async (): Promise<string | null> => {
-    const value = await localStorage.getItem(this.key, this.namespace);
-    this.valueSubject.next(value);
-
-    return value;
-  };
-
-  public getValue = (): string | null => {
-    return this.valueSubject.getValue();
-  };
-}