react-native-3rddigital-appupdate 1.0.17 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-3rddigital-appupdate",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "A React Native library for seamless over-the-air (OTA) updates with version checks, automatic bundle download, and customizable user prompts for iOS and Android.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/scripts/bundle.js

@@ -349,6 +349,14 @@ function choosePreferredBuildConfig(buildConfigs, preferredNames = []) {
   return buildConfigs[0] ?? null;
 }
 
+function buildIosEntryLabel({ targetName, buildConfiguration, appId }) {
+  const buildConfigurationLabel = buildConfiguration
+    ? ` [${buildConfiguration}]`
+    : '';
+  const appIdLabel = appId ? ` (${appId})` : '';
+  return `${targetName}${buildConfigurationLabel}${appIdLabel}`;
+}
+
 function getAndroidBuildGradlePath(projectRoot) {
   return findFirstExistingPath([
     path.join(projectRoot, 'android', 'app', 'build.gradle'),
@@ -486,6 +494,7 @@ function getIosTargetMetadata() {
     configObjects.map((config) => [
       config.id,
       {
+        id: config.id,
         name: cleanPbxString(readPbxValue(config.body, 'name')),
         version: cleanPbxString(readPbxValue(config.body, 'MARKETING_VERSION')),
         appId: cleanPbxString(
@@ -515,6 +524,18 @@ function getIosTargetMetadata() {
     ])
   );
 
+  const preferredConfigNames = ['Release', 'Profile', 'Debug'];
+  const fallbackConfigGroups = new Map();
+
+  for (const config of configMap.values()) {
+    const appIdKey = config.appId ?? `no-app-id::${config.id}`;
+    if (!fallbackConfigGroups.has(appIdKey)) {
+      fallbackConfigGroups.set(appIdKey, []);
+    }
+
+    fallbackConfigGroups.get(appIdKey).push(config);
+  }
+
   const targetObjects = parsePbxprojObjectsByIsa(
     pbxprojContent,
     'PBXNativeTarget'
@@ -545,41 +566,55 @@ function getIosTargetMetadata() {
 
       if (!buildConfigs.length) return null;
 
-      const configsByIdentity = new Map();
+      const buildConfigsWithAppId = buildConfigs.filter(
+        (config) => config.appId
+      );
 
-      for (const buildConfig of buildConfigs) {
-        const identity = `${buildConfig.appId ?? 'no-app-id'}::${buildConfig.name ?? 'no-config-name'}`;
-        if (!configsByIdentity.has(identity)) {
-          configsByIdentity.set(identity, []);
+      const configsByAppId = new Map();
+      for (const buildConfig of buildConfigsWithAppId) {
+        const appIdKey = buildConfig.appId;
+        if (!configsByAppId.has(appIdKey)) {
+          configsByAppId.set(appIdKey, []);
         }
 
-        configsByIdentity.get(identity).push(buildConfig);
+        configsByAppId.get(appIdKey).push(buildConfig);
       }
 
-      const distinctConfigs = Array.from(configsByIdentity.values())
-        .map((configGroup) =>
-          choosePreferredBuildConfig(configGroup, [
-            configList?.defaultName,
-            'Release',
-            'Profile',
-            'Debug',
-          ])
-        )
-        .filter(Boolean);
+      const targetPreferredConfigNames = [
+        configList?.defaultName,
+        'Release',
+        'Profile',
+        'Debug',
+      ].filter(Boolean);
+
+      const distinctConfigs =
+        configsByAppId.size <= 1
+          ? [
+              choosePreferredBuildConfig(
+                buildConfigsWithAppId.length
+                  ? buildConfigsWithAppId
+                  : buildConfigs,
+                targetPreferredConfigNames
+              ),
+            ].filter(Boolean)
+          : Array.from(configsByAppId.values())
+              .map((configGroup) =>
+                choosePreferredBuildConfig(
+                  configGroup,
+                  targetPreferredConfigNames
+                )
+              )
+              .filter(Boolean);
 
       return distinctConfigs.map((selectedConfig) => {
-        const buildConfigurationLabel = selectedConfig.name
-          ? ` [${selectedConfig.name}]`
-          : '';
-
-        const appIdLabel = selectedConfig.appId
-          ? ` (${selectedConfig.appId})`
-          : '';
-
         return {
-          name: `${targetName}::${selectedConfig.name ?? 'default'}::${selectedConfig.appId ?? 'no-app-id'}`,
+          name: `${targetName}::${selectedConfig.appId ?? selectedConfig.id ?? 'no-app-id'}`,
           targetName,
-          label: `${targetName}${buildConfigurationLabel}${appIdLabel}`,
+          label: buildIosEntryLabel({
+            targetName,
+            buildConfiguration: selectedConfig.name ?? null,
+            appId: selectedConfig.appId ?? null,
+          }),
           appId: selectedConfig.appId ?? null,
           version: selectedConfig.version ?? null,
           productName: selectedConfig.productName ?? targetName,
@@ -592,17 +627,70 @@ function getIosTargetMetadata() {
 
   const uniqueTargets = targets.filter(
     (target, index, allTargets) =>
-      allTargets.findIndex(
-        (candidate) =>
-          candidate.targetName === target.targetName &&
-          candidate.appId === target.appId &&
-          candidate.buildConfiguration === target.buildConfiguration
+      allTargets.findIndex((candidate) =>
+        candidate.appId
+          ? candidate.appId === target.appId
+          : candidate.targetName === target.targetName &&
+            candidate.buildConfiguration === target.buildConfiguration
       ) === index
   );
 
+  const existingAppIds = new Set(
+    uniqueTargets.map((target) => target.appId).filter(Boolean)
+  );
+
+  const fallbackEntries = Array.from(fallbackConfigGroups.entries())
+    .filter(([appId]) => !existingAppIds.has(appId))
+    .map(([appId, configs]) => {
+      const selectedConfig = choosePreferredBuildConfig(
+        configs,
+        preferredConfigNames
+      );
+      if (!selectedConfig) return null;
+
+      const targetName =
+        selectedConfig.productName &&
+        selectedConfig.productName !== '$(TARGET_NAME)'
+          ? selectedConfig.productName
+          : 'Default';
+
+      return {
+        name: `${targetName}::${appId}`,
+        targetName,
+        label: buildIosEntryLabel({
+          targetName,
+          buildConfiguration: selectedConfig.name ?? null,
+          appId: selectedConfig.appId ?? null,
+        }),
+        appId: selectedConfig.appId ?? null,
+        version: selectedConfig.version ?? null,
+        productName: selectedConfig.productName ?? targetName,
+        buildConfiguration: selectedConfig.name ?? null,
+      };
+    })
+    .filter(Boolean);
+
+  const mergedTargets = [...uniqueTargets, ...fallbackEntries];
+
+  if (!mergedTargets.length) {
+    const fallbackVersionMatch = pbxprojContent.match(
+      /MARKETING_VERSION\s*=\s*([^;]+);/
+    );
+
+    return {
+      defaultConfig: {
+        name: 'default',
+        label: 'Default',
+        appId: null,
+        version: cleanPbxString(fallbackVersionMatch?.[1]) ?? null,
+      },
+      targets: [],
+    };
+  }
+
   return {
-    defaultConfig: uniqueTargets[0] ?? null,
-    targets: uniqueTargets,
+    defaultConfig: mergedTargets[0] ?? null,
+    targets: mergedTargets,
   };
 }