@react-native-vector-icons/common 12.0.0-beta.1 → 12.0.1

package/src/dynamicLoading/dynamic-font-loading.ts

@@ -5,20 +5,17 @@
 // @ts-expect-error missing types
 // eslint-disable-next-line import/no-extraneous-dependencies,import/no-unresolved
 import { getAssetByID } from '@react-native/assets-registry/registry';
-import type { Image } from 'react-native';
-// @ts-expect-error missing types
-// eslint-disable-next-line import/no-extraneous-dependencies
-import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
-import { getErrorCallback } from './dynamic-loading-setting';
+import { Image } from 'react-native';
+import { assertExpoModulesPresent, getErrorCallback } from './dynamic-loading-setting';
 import type { DynamicLoader, FontSource } from './types';
 
 const loadPromises: { [fontSource: string]: Promise<void> } = {};
 
 const loadFontAsync = async (fontFamily: string, fontSource: FontSource): Promise<void> => {
-  const expoModules = globalThis?.expo?.modules;
-  if (!expoModules) {
-    throw new Error('Expo is not available. Dynamic font loading is not available.');
-  }
+  const globalRef = globalThis;
+  assertExpoModulesPresent(globalRef);
+
+  const expoModules = globalRef.expo.modules;
 
   if (loadPromises[fontFamily]) {
     return loadPromises[fontFamily];
@@ -66,8 +63,7 @@ const getLocalFontUrl = (fontModuleId: number, fontFamily: string) => {
     throw new Error(`no asset found for font family "${fontFamily}", moduleId: ${String(fontModuleId)}`);
   }
 
-  const resolver: typeof Image.resolveAssetSource = resolveAssetSource;
-  const assetSource = resolver(fontModuleId);
+  const assetSource = Image.resolveAssetSource(fontModuleId);
 
   return { ...assetMeta, ...assetSource };
 };
@@ -78,13 +74,10 @@ const isLoadedNative = (fontFamily: string) => {
   if (fontFamily in loadedFontsCache) {
     return true;
   }
+  const globalRef = globalThis;
+  assertExpoModulesPresent(globalRef);
 
-  const { expo } = globalThis;
-  if (!expo) {
-    throw new Error('Expo is not available. Dynamic font loading is not available.');
-  }
-
-  const loadedNativeFonts = expo.modules.ExpoFontLoader.getLoadedFonts();
+  const loadedNativeFonts = globalRef.expo.modules.ExpoFontLoader.getLoadedFonts();
   loadedNativeFonts.forEach((font) => {
     loadedFontsCache[font] = true;
   });

package/src/dynamicLoading/dynamic-loading-setting.ts

@@ -1,19 +1,23 @@
 import type { FontSource } from './types';
 
+type ExpoAssetModule = {
+  // definition from
+  // https://github.com/expo/expo/blob/1f5a5991d14aad09282d1ce1612b44d30e7e7d3d/packages/expo-asset/ios/AssetModule.swift#L23
+  downloadAsync: (uri: string, hash: string | undefined, type: string) => Promise<string>;
+};
+
+type ExpoFontLoaderModule = {
+  // definition from
+  // https://github.com/expo/expo/blob/1f5a5991d14aad09282d1ce1612b44d30e7e7d3d/packages/expo-font/ios/FontLoaderModule.swift#L18
+  getLoadedFonts: () => string[];
+  loadAsync: (fontFamilyAlias: string, fileUri: string) => Promise<void>;
+};
+
 declare global {
   interface ExpoGlobal {
     modules: {
-      ExpoAsset: {
-        // definition from
-        // https://github.com/expo/expo/blob/1f5a5991d14aad09282d1ce1612b44d30e7e7d3d/packages/expo-asset/ios/AssetModule.swift#L23
-        downloadAsync: (uri: string, hash: string | undefined, type: string) => Promise<string>;
-      };
-      ExpoFontLoader: {
-        // definition from
-        // https://github.com/expo/expo/blob/1f5a5991d14aad09282d1ce1612b44d30e7e7d3d/packages/expo-font/ios/FontLoaderModule.swift#L18
-        getLoadedFonts: () => string[];
-        loadAsync: (fontFamilyAlias: string, fileUri: string) => Promise<void>;
-      };
+      ExpoAsset?: ExpoAssetModule;
+      ExpoFontLoader?: ExpoFontLoaderModule;
     };
   }
 
@@ -21,10 +25,34 @@ declare global {
   var expo: ExpoGlobal | undefined;
 }
 
+type ExpoGlobalType = {
+  modules: {
+    ExpoAsset: ExpoAssetModule;
+    ExpoFontLoader: ExpoFontLoaderModule;
+  };
+};
+
+// biome-ignore lint/suspicious/noExplicitAny: this is used internally with globalThis
+function getIsDynamicLoadingSupported(globalObj: any): globalObj is {
+  expo: ExpoGlobalType;
+} {
+  return (
+    globalObj?.expo &&
+    typeof globalObj.expo.modules?.ExpoAsset?.downloadAsync === 'function' &&
+    typeof globalObj.expo.modules?.ExpoFontLoader?.getLoadedFonts === 'function' &&
+    typeof globalObj.expo.modules?.ExpoFontLoader?.loadAsync === 'function'
+  );
+}
+
+export function assertExpoModulesPresent(globalObj: unknown): asserts globalObj is { expo: ExpoGlobalType } {
+  if (!getIsDynamicLoadingSupported(globalObj)) {
+    throw new Error('Dynamic font loading for Expo is not available.');
+  }
+}
+
 const hasNecessaryExpoModules = !!globalThis.expo?.modules?.ExpoAsset && !!globalThis.expo?.modules?.ExpoFontLoader;
 
-const hasNecessaryExpoFeatures =
-  hasNecessaryExpoModules && typeof globalThis.expo?.modules.ExpoFontLoader.getLoadedFonts === 'function';
+const hasNecessaryExpoFeatures = getIsDynamicLoadingSupported(globalThis);
 
 let dynamicFontLoadingEnabled = hasNecessaryExpoFeatures;
 

package/src/get-image-library.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-mutable-exports
-export let NativeIconAPI: typeof import('@react-native-vector-icons/get-image') | null = null;
+let NativeIconAPI: typeof import('@react-native-vector-icons/get-image') | null = null;
 
 try {
   // eslint-disable-next-line global-require,import/no-extraneous-dependencies,@typescript-eslint/no-require-imports
@@ -16,4 +16,6 @@ export const ensureGetImageAvailable = () => {
   }
 
   NativeIconAPI.ensureNativeModuleAvailable();
+
+  return NativeIconAPI;
 };