@applicaster/zapp-react-native-utils 15.0.0-alpha.1202274105 → 15.0.0-alpha.1257410812

package/appUtils/contextKeysManager/__tests__/getKeys/failure.test.ts

@@ -1,7 +1,12 @@
+import { NativeModules } from "react-native";
 import { ContextKeysManager } from "../..";
 
 describe("Context Keys Manager - getKeys", () => {
-  it("returns null if all keys are invalid", async () => {
+  beforeEach(() => {
+    delete NativeModules.ContextResolverBridge;
+  });
+
+  it("returns null if all keys are invalid 1", async () => {
     // setup
     const keys = [null];
 
@@ -24,7 +29,7 @@ describe("Context Keys Manager - getKeys", () => {
     expect(getKey.mock.calls).toEqual([[null]]);
   });
 
-  it("returns null if all keys are invalid", async () => {
+  it("returns null if all keys are invalid 2", async () => {
     // setup
     const keys = [null, undefined];
 

package/appUtils/contextKeysManager/__tests__/getKeys/success.test.ts

@@ -1,6 +1,11 @@
+import { NativeModules } from "react-native";
 import { ContextKeysManager } from "../..";
 
 describe("Context Keys Manager - getKeys", () => {
+  beforeEach(() => {
+    delete NativeModules.ContextResolverBridge;
+  });
+
   it("returns value if found by getKey", async () => {
     // setup
     const keys = ["namespace.key"];
@@ -165,4 +170,47 @@ describe("Context Keys Manager - getKeys", () => {
     expect(getKey).toHaveBeenCalledTimes(2);
     expect(getKey.mock.calls).toEqual([[keys[0]], [keys[1]]]);
   });
+
+  it("returns values from native bridge when available", async () => {
+    // setup
+    const keys = ["namespace.key1", "namespace.key2"];
+
+    const contextObj = [
+      { key: keys[0], required: true },
+      { key: keys[1], required: false },
+    ];
+
+    const resolved = {
+      [keys[0]]: "value1",
+      [keys[1]]: "value2",
+    };
+
+    const reactNative = require("react-native");
+
+    const bridgeMock = {
+      resolveContextKeys: jest.fn().mockResolvedValue(resolved),
+    };
+
+    reactNative.__setContextResolverBridgeMock(bridgeMock);
+
+    const contextManager = new ContextKeysManager({});
+    const getKey = jest.spyOn(contextManager, "getKey");
+
+    // run
+    const result = await contextManager.getKeys(keys, contextObj);
+
+    // verify
+    const map = new Map();
+    map.set(keys[0], "value1");
+    map.set(keys[1], "value2");
+
+    expect(result).toEqual(map);
+
+    expect(bridgeMock.resolveContextKeys).toHaveBeenCalledWith({
+      [keys[0]]: true,
+      [keys[1]]: false,
+    });
+
+    expect(getKey).not.toHaveBeenCalled();
+  });
 });

package/appUtils/contextKeysManager/contextResolver.ts

@@ -1,8 +1,10 @@
 import { ContextKeysManager } from "./index";
-import * as R from "ramda";
-import * as _ from "lodash";
+import { get, values } from "@applicaster/zapp-react-native-utils/utils";
 import { useScreenStateStore } from "../../reactHooks/navigation/useScreenStateStore";
 
+const contextKeyPattern = /@{([^/]+)\/([^}]*)}/;
+const contextVariablePattern = /@\{([^}]*)\}/g;
+
 export interface IResolver {
   resolve: (string) => Promise<string | number | object>;
 }
@@ -20,7 +22,7 @@ export class EntryResolver implements IResolver {
       return this.entry;
     }
 
-    return R.view(R.lensPath(key.split(".")), this.entry);
+    return get(this.entry, key.split("."));
   }
 }
 
@@ -39,7 +41,7 @@ export class ScreenStateResolver implements IResolver {
     }
 
     if (key.includes(".")) {
-      return R.view(R.lensPath(key.split(".")), screenState);
+      return get(screenState, key.split("."));
     }
 
     return screenState?.[key];
@@ -61,21 +63,16 @@ export const resolveObjectValues = async (
 
   const resolvedEntries = await Promise.all(
     entries.map(async ([key, value]) => {
-      if (typeof value !== "string") {
+      if (typeof value !== "string" || !value.startsWith("@")) {
         return [key, value];
       }
 
-      if (!value.startsWith("@")) {
-        return [key, value];
-      }
-
-      const regex = /@{([^/]+)\/([^}]*)}/;
+      const regex = contextKeyPattern;
 
       const match = (value as string).match(regex);
 
       if (match) {
-        const contextResolverName = match[1];
-        const compositeKey = match[2];
+        const [_, contextResolverName, compositeKey] = match;
 
         const resolver = exResolvers[contextResolverName] || exResolvers.ctx;
         const resolvedValue = await resolver.resolve(compositeKey);
@@ -90,18 +87,50 @@ export const resolveObjectValues = async (
   return Object.fromEntries(resolvedEntries);
 };
 
-export const extractAtValues = _.memoize((input: any): string[] => {
-  return _.flatMapDeep(input, (value: any) => {
-    if (_.isString(value)) {
-      const matches = value.match(/@\{([^}]*)\}/g);
+// Simple memoization cache
+const extractAtValuesCache = new Map<any, string[]>();
+
+const flatMapDeep = <T, U>(arr: T[], fn: (value: T) => U | U[]): U[] => {
+  const result: U[] = [];
 
-      return matches ? matches.map((match) => match.slice(2, -1)) : [];
+  const flatten = (items: any) => {
+    for (const item of items) {
+      if (Array.isArray(item)) {
+        flatten(item);
+      } else {
+        result.push(item);
+      }
     }
+  };
+
+  flatten(arr.map(fn));
 
-    if (_.isObject(value)) {
-      return extractAtValues(_.values(value));
+  return result;
+};
+
+export const extractAtValues = (input: any): string[] => {
+  if (extractAtValuesCache.has(input)) {
+    return extractAtValuesCache.get(input)!;
+  }
+
+  const result = flatMapDeep(
+    Array.isArray(input) ? input : [input],
+    (value: any) => {
+      if (typeof value === "string") {
+        const matches = value.match(contextVariablePattern);
+
+        return matches ? matches.map((match) => match.slice(2, -1)) : [];
+      }
+
+      if (typeof value === "object" && value !== null) {
+        return extractAtValues(values(value));
+      }
+
+      return [];
     }
+  );
 
-    return [];
-  });
-});
+  extractAtValuesCache.set(input, result);
+
+  return result;
+};

package/appUtils/contextKeysManager/index.ts

@@ -1,4 +1,4 @@
-import * as R from "ramda";
+import { isNil } from "@applicaster/zapp-react-native-utils/utils";
 
 import { StorageLevel, StorageType } from "./consts";
 import {
@@ -13,6 +13,7 @@ import {
   localStorage as LocalStorage,
   secureStorage as SecureStorage,
 } from "./storage";
+import { NativeModules } from "react-native";
 
 export { StorageLevel };
 
@@ -154,11 +155,65 @@ export class ContextKeysManager {
   }
 
   public async getKeys(
-    keys: Array<KeyName>
+    keys: Array<KeyName>,
+    contextObj?: { key: string; required?: boolean }[]
   ): Promise<Map<KeyName, ValueOrNothing>> {
-    const values = await Promise.all(keys.map((key) => this.getKey(key)));
+    if (NativeModules.ContextResolverBridge) {
+      const keysObj: Record<string, boolean> = {};
 
-    return new Map(R.zip(keys, values));
+      const requiredByKey = new Map(
+        contextObj?.map((item) => [item.key, item.required ?? false]) ?? []
+      );
+
+      let hasResolvableKeys = false;
+
+      const normalizedKeys: Array<{
+        original: KeyName;
+        normalized: string | null;
+      }> = [];
+
+      for (const key of keys) {
+        const {
+          isValid: isValidKey,
+          key: parsedKey,
+          namespace: parsedNamespace,
+        } = this.parseKey(key);
+
+        if (!isValidKey) {
+          normalizedKeys.push({ original: key, normalized: null });
+          continue;
+        }
+
+        const normalized = buildNamespaceKey(parsedKey, parsedNamespace);
+
+        keysObj[normalized] = requiredByKey.get(normalized) ?? false;
+        hasResolvableKeys = true;
+        normalizedKeys.push({ original: key, normalized });
+      }
+
+      if (!hasResolvableKeys) {
+        return new Map(
+          normalizedKeys.map(({ original }) => [original, NOTHING])
+        );
+      }
+
+      const res =
+        await NativeModules.ContextResolverBridge.resolveContextKeys(keysObj);
+
+      const resolved = res ?? {};
+
+      return new Map(
+        normalizedKeys.map(({ original, normalized }) => {
+          if (!normalized) return [original, NOTHING];
+
+          return [original, resolved[normalized] ?? NOTHING];
+        })
+      );
+    } else {
+      const values = await Promise.all(keys.map((key) => this.getKey(key)));
+
+      return new Map(keys.map((key, index) => [key, values[index]]));
+    }
   }
 
   public async getKey(key: KeyName): Promise<ValueOrNothing> {
@@ -181,7 +236,7 @@ export class ContextKeysManager {
       parsedNamespace
     );
 
-    if (!R.isNil(resultByReference)) {
+    if (!isNil(resultByReference)) {
       return resultByReference;
     }
 
@@ -192,7 +247,7 @@ export class ContextKeysManager {
         parsedNamespace
       );
 
-      if (!R.isNil(resultFromSessionStorage)) {
+      if (!isNil(resultFromSessionStorage)) {
         return resultFromSessionStorage;
       }
 
@@ -201,7 +256,7 @@ export class ContextKeysManager {
         parsedNamespace
       );
 
-      if (!R.isNil(resultFromLocalStorage)) {
+      if (!isNil(resultFromLocalStorage)) {
         return resultFromLocalStorage;
       }
 
@@ -210,7 +265,7 @@ export class ContextKeysManager {
         parsedNamespace
       );
 
-      if (!R.isNil(resultFromSecureStorage)) {
+      if (!isNil(resultFromSecureStorage)) {
         return resultFromSecureStorage;
       }
 
@@ -275,7 +330,7 @@ export class ContextKeysManager {
       keysProp.map((keyProp) => this.setKey(keyProp))
     );
 
-    return new Map(R.zip(keys, values));
+    return new Map(keys.map((key, index) => [key, values[index]]));
   }
 
   // when succeed saving - return true
@@ -384,7 +439,7 @@ export class ContextKeysManager {
   public async removeKeys(keys: KeyName[]): Promise<Map<KeyName, boolean>> {
     const values = await Promise.all(keys.map((key) => this.removeKey(key)));
 
-    return new Map(R.zip(keys, values));
+    return new Map(keys.map((key, index) => [key, values[index]]));
   }
   // REMOVE
 }

package/configurationUtils/__tests__/imageSrcFromMediaItem.test.ts

@@ -31,4 +31,42 @@ describe("imageSrcFromMediaItem", () => {
 
     expect(imageSrcFromMediaItem(badEntry, ["image_base"])).toBeUndefined();
   });
+
+  it("returns undefined when fallback is false and key is not found", () => {
+    const result = imageSrcFromMediaItem(entry as ZappEntry, [
+      "does_not_exist",
+      false,
+    ]);
+
+    expect(result).toBeUndefined();
+  });
+
+  it("returns src when fallback is false and key is found", () => {
+    const result = imageSrcFromMediaItem(entry as ZappEntry, [
+      "logo_thumbnail",
+      false,
+    ]);
+
+    expect(result).toEqual(entry.media_group[1].media_item[0].src);
+  });
+
+  it("returns image_base as fallback when fallback is explicitly true and key is not found", () => {
+    const result = imageSrcFromMediaItem(entry as ZappEntry, [
+      "does_not_exist",
+      true,
+    ]);
+
+    const fallback = entry.media_group[0].media_item[0];
+    expect(result).toEqual(fallback.src);
+    expect(fallback.key).toBe("image_base");
+  });
+
+  it("returns src when fallback is explicitly true and key is found", () => {
+    const result = imageSrcFromMediaItem(entry as ZappEntry, [
+      "logo_thumbnail",
+      true,
+    ]);
+
+    expect(result).toEqual(entry.media_group[1].media_item[0].src);
+  });
 });

package/configurationUtils/index.ts

@@ -155,9 +155,9 @@ export function getMediaItems(entry: ZappEntry): Option<ZappMediaItem[]> {
 
 /**
  * Retrieves the "src" value from a media item in the entry's media group,
- * based on a provided key, with fallback logic.
+ * based on a provided key, with optional fallback logic.
  *
- * Fallback order:
+ * Fallback order (when enabled):
  *   1. Attempts to find a media item with the specified key (or "image_base" if none provided).
  *   2. If not found, attempts to find a media item with the key "image_base".
  *   3. If still not found, falls back to the first available media item.
@@ -166,15 +166,19 @@ export function getMediaItems(entry: ZappEntry): Option<ZappMediaItem[]> {
  * since empty URIs are invalid in some platforms (e.g., React Native).
  *
  * @param {ZappEntry} entry - The entry object containing a media group.
- * @param {string[] | unknown} arg - A single-element array containing the key to look up, or any unknown value.
+ * @param {string[] | unknown} arg - Can be an array or any other value (treated as empty array).
+ *   When an array:
+ *   - First element: The key to look up. If omitted or undefined, defaults to "image_base".
+ *   - Second element: Boolean to enable/disable fallback logic. If omitted or undefined, defaults to true.
  * @returns {?string} The "src" URI from the matched media item, or undefined if not found or empty.
  */
 export function imageSrcFromMediaItem(
   entry: ZappEntry,
   arg: string[] | unknown
 ): Option<string> {
-  const args: unknown = R.unless(Array.isArray, Array)(arg || []);
+  const args: any = R.unless(Array.isArray, Array)(arg || []);
   const imageKey: string = args?.[0] || "image_base"; // always a single key in this function
+  const fallback: boolean = args?.[1] !== false;
 
   const mediaItems = getMediaItems(entry);
 
@@ -185,14 +189,16 @@ export function imageSrcFromMediaItem(
   // Try to find the item with the given key
   let foundItem = mediaItems.find((item) => item.key === imageKey);
 
-  // If not found and key was not "image_base", try to find "image_base"
-  if (!foundItem && imageKey !== "image_base") {
-    foundItem = mediaItems.find((item) => item.key === "image_base");
-  }
+  if (fallback) {
+    // If not found and key was not "image_base", try to find "image_base"
+    if (!foundItem && imageKey !== "image_base") {
+      foundItem = mediaItems.find((item) => item.key === "image_base");
+    }
 
-  // If still not found, default to first item
-  if (!foundItem) {
-    foundItem = mediaItems[0];
+    // If still not found, default to first item
+    if (!foundItem) {
+      foundItem = mediaItems[0];
+    }
   }
 
   const src = foundItem?.src;

package/manifestUtils/defaultManifestConfigurations/player.js

@@ -331,6 +331,35 @@ function getPlayerConfiguration({ platform, version }) {
         label_tooltip: "Hint for skip intro button accessibility",
         type: "text_input",
       },
+      {
+        type: "text_input",
+        label: "Text Tracks Label",
+        key: "text_tracks_label",
+        initial_value: "Subtitles",
+        label_tooltip: "Label for the text tracks list",
+      },
+      {
+        type: "text_input",
+        label: "Audio Tracks Label",
+        key: "audio_tracks_label",
+        initial_value: "Audio",
+        label_tooltip: "Label for the audio tracks list",
+      },
+      {
+        type: "text_input",
+        label: "Off Track Label",
+        key: "off_track_label",
+        initial_value: "Off",
+        label_tooltip: "Label for the 'Off' option in text tracks list",
+      },
+      {
+        type: "text_input",
+        label: "Default Track Label",
+        key: "default_track_label",
+        initial_value: "Default",
+        label_tooltip:
+          "Label for the 'Default' audio track in audio tracks list",
+      },
     ],
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "15.0.0-alpha.1202274105",
+  "version": "15.0.0-alpha.1257410812",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.0.0-alpha.1202274105",
+    "@applicaster/applicaster-types": "15.0.0-alpha.1257410812",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",

package/reactHooks/state/useRefWithInitialValue.ts

@@ -1,5 +1,9 @@
 import React from "react";
 
+type WithOptionalCleanup = {
+  cleanup?: () => void;
+};
+
 /**
  * returns a ref with an initial value that is lazily evaluated once
  * */
@@ -10,5 +14,11 @@ export const useRefWithInitialValue = <T>(initialValueGetter: () => T) => {
     ref.current = initialValueGetter();
   }
 
+  React.useEffect(() => {
+    return () => {
+      (ref.current as unknown as WithOptionalCleanup)?.cleanup?.();
+    };
+  }, []);
+
   return ref;
 };