Revert "Fix autolinking for libraries with multiple ReactPackage classes"

This reverts commit 71e4936.

Author: Summys

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GeneratePackageListTask.kt

@@ -69,13 +69,6 @@ abstract class GeneratePackageListTask : DefaultTask() {
     return match?.groupValues?.get(1)
   }
 
-  /**
-   * Extracts all fully qualified class names from one or more import statements. E.g., "import
-   * com.foo.bar.A;\nimport com.foo.bar.B;" -> ["com.foo.bar.A", "com.foo.bar.B"]
-   */
-  internal fun extractAllFqcnsFromImport(importStatements: String): List<String> =
-      Regex("import\\s+([\\w.]+)\\s*;").findAll(importStatements).map { it.groupValues[1] }.toList()
-
   internal fun composePackageInstance(
       packageName: String,
       packages: Map<String, ModelAutolinkingDependenciesPlatformAndroidJson>,
@@ -93,17 +86,15 @@ abstract class GeneratePackageListTask : DefaultTask() {
           val packageImportPath = dep.packageImportPath
           val interpolated = interpolateDynamicValues(packageInstance, packageName)
 
-          // Use FQCNs to avoid class name collisions between different packages.
-          // A library may register multiple ReactPackage classes (e.g. react-native-appsflyer),
-          // so we extract all FQCNs and replace each bare class name individually.
-          val fqcns =
-              extractAllFqcnsFromImport(interpolateDynamicValues(packageImportPath, packageName))
+          // Use FQCN to avoid class name collisions between different packages
+          val fqcn = extractFqcnFromImport(interpolateDynamicValues(packageImportPath, packageName))
           val fqcnInstance =
-              fqcns.fold(interpolated) { acc, fqcn ->
+              if (fqcn != null) {
                 val className = fqcn.substringAfterLast('.')
-                // Negative lookbehind (?<!\.) ensures we only replace bare class names,
-                // not ones already part of a fully qualified name (e.g. com.foo.ClassName).
-                acc.replace(Regex("(?<!\\.)\\b${Regex.escape(className)}\\b")) { fqcn }
+                // Replace the short class name with FQCN in the instance
+                interpolated.replace(Regex("\\b${Regex.escape(className)}\\b")) { fqcn }
+              } else {
+                interpolated
               }
 
           // Add comment with package name before each instance

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GeneratePackageListTaskTest.kt

@@ -56,34 +56,6 @@ class GeneratePackageListTaskTest {
     assertThat(result).isNull()
   }
 
-  @Test
-  fun extractAllFqcnsFromImport_withMultipleImports_returnsAll() {
-    val task = createTestTask<GeneratePackageListTask>()
-    val result =
-        task.extractAllFqcnsFromImport(
-            "import com.appsflyer.reactnative.RNAppsFlyerPackage;\nimport com.appsflyer.reactnative.PCAppsFlyerPackage;"
-        )
-    assertThat(result)
-        .containsExactly(
-            "com.appsflyer.reactnative.RNAppsFlyerPackage",
-            "com.appsflyer.reactnative.PCAppsFlyerPackage"
-        )
-  }
-
-  @Test
-  fun extractAllFqcnsFromImport_withSingleImport_returnsSingleElement() {
-    val task = createTestTask<GeneratePackageListTask>()
-    val result = task.extractAllFqcnsFromImport("import com.facebook.react.APackage;")
-    assertThat(result).containsExactly("com.facebook.react.APackage")
-  }
-
-  @Test
-  fun extractAllFqcnsFromImport_withNoValidImport_returnsEmpty() {
-    val task = createTestTask<GeneratePackageListTask>()
-    val result = task.extractAllFqcnsFromImport("not an import statement")
-    assertThat(result).isEmpty()
-  }
-
   @Test
   fun composePackageInstance_withNoPackages_returnsEmpty() {
     val task = createTestTask<GeneratePackageListTask>()
@@ -111,68 +83,6 @@ class GeneratePackageListTaskTest {
         )
   }
 
-  @Test
-  fun composePackageInstance_withMultiplePackagesPerLibrary_qualifiesAll() {
-    val task = createTestTask<GeneratePackageListTask>()
-    val packageName = "com.example.app"
-
-    val multiPackageDeps =
-        mapOf(
-            "react-native-appsflyer" to
-                ModelAutolinkingDependenciesPlatformAndroidJson(
-                    sourceDir = "./node_modules/react-native-appsflyer/android",
-                    packageImportPath =
-                        "import com.appsflyer.reactnative.RNAppsFlyerPackage;\nimport com.appsflyer.reactnative.PCAppsFlyerPackage;",
-                    packageInstance =
-                        "new RNAppsFlyerPackage(),\nnew PCAppsFlyerPackage()",
-                    buildTypes = emptyList(),
-                ),
-        )
-
-    val result = task.composePackageInstance(packageName, multiPackageDeps)
-    assertThat(result)
-        .isEqualTo(
-            """
-            ,
-                  // react-native-appsflyer
-                  new com.appsflyer.reactnative.RNAppsFlyerPackage(),
-            new com.appsflyer.reactnative.PCAppsFlyerPackage()
-            """
-                .trimIndent()
-        )
-  }
-
-  @Test
-  fun composePackageInstance_withPreQualifiedInstances_doesNotDoubleQualify() {
-    val task = createTestTask<GeneratePackageListTask>()
-    val packageName = "com.example.app"
-
-    val preQualifiedDeps =
-        mapOf(
-            "react-native-appsflyer" to
-                ModelAutolinkingDependenciesPlatformAndroidJson(
-                    sourceDir = "./node_modules/react-native-appsflyer/android",
-                    packageImportPath =
-                        "import com.appsflyer.reactnative.RNAppsFlyerPackage;\nimport com.appsflyer.reactnative.PCAppsFlyerPackage;",
-                    packageInstance =
-                        "new com.appsflyer.reactnative.RNAppsFlyerPackage(),\nnew com.appsflyer.reactnative.PCAppsFlyerPackage()",
-                    buildTypes = emptyList(),
-                ),
-        )
-
-    val result = task.composePackageInstance(packageName, preQualifiedDeps)
-    assertThat(result)
-        .isEqualTo(
-            """
-            ,
-                  // react-native-appsflyer
-                  new com.appsflyer.reactnative.RNAppsFlyerPackage(),
-            new com.appsflyer.reactnative.PCAppsFlyerPackage()
-            """
-                .trimIndent()
-        )
-  }
-
   @Test
   fun interpolateDynamicValues_withNoBuildConfigOrROccurrencies_doesNothing() {
     val packageName = "com.facebook.react"