react-native 0.88.0-rc.0 → 0.88.0-rc.1

package/scripts/spm/scaffold-package-swift.js

@@ -38,11 +38,14 @@ import type {
 const {
   SpmNameCollisionError,
   defaultReadConfig,
+  defaultReadPodspec,
   defaultResolveDep,
   expandSpmDependencies,
+  resolveSwiftName,
 } = require('./expand-spm-dependencies');
 const {expandSpmSourceGlobs} = require('./generate-spm-autolinking');
-const {readPodspec} = require('./read-podspec');
+const {MIN_IOS_VERSION_SUPPORTED} = require('./ios-deployment-target');
+const {findPodspecs, readPodspecCached} = require('./read-podspec');
 const {
   REACT_CODEGEN_PACKAGE_NAME,
   REACT_CODEGEN_PRODUCTS,
@@ -51,12 +54,12 @@ const {
   SCAFFOLDER_MARKER,
   makeLogger,
   remotePackageConfig,
-  toSwiftName,
 } = require('./spm-utils');
+const {readSwiftpmConfig, writeSwiftpmName} = require('./swiftpm-config');
 const fs = require('node:fs');
 const path = require('node:path');
 
-const {log} = makeLogger('scaffold-package-swift');
+const {log, warn} = makeLogger('scaffold-package-swift');
 
 // SCAFFOLDER_MARKER lives in spm-utils.js (shared, no import cycle). It must NOT
 // contain the autolinker's AUTOGEN_MARKER ('// AUTO-GENERATED by
@@ -105,7 +108,9 @@ const {log} = makeLogger('scaffold-package-swift');
 // v19: scaffolded C++ targets carry DEBUG/NDEBUG config defines so their Fabric
 // ABI matches the prebuilt React.framework (Release strips DebugStringConvertible
 // under NDEBUG). Bumped so existing scaffolds regenerate with the defines.
-const SCAFFOLDER_VERSION = 19;
+// v20: the platform floor is the app's iOS deployment target in string form
+// (the `.v15` enum cannot express a dependency minimum like 16.4).
+const SCAFFOLDER_VERSION = 20;
 const SCAFFOLDER_VERSION_LINE_RE = /^\/\/ AUTO-SCAFFOLDED-VERSION: (\d+)$/m;
 
 const AUTOGEN_MARKER =
@@ -246,22 +251,16 @@ function translatePodspecToSpmTarget(
 ) /*: SpmScaffoldSpec */ {
   const warnings = [...model.warnings];
 
-  // Swift target name: whatever the autolinker resolved for this dep — its
-  // `spm.name` override when set, else toSwiftName(npm-name). The autolinker
-  // registers the dep under that name in its aggregator (and in any sibling
-  // spm.dependencies refs), so the scaffolded Package.swift's product/library
-  // name must match it exactly — otherwise SPM resolution fails with a name
-  // mismatch on `.product(name: "X", package: "X")`.
-  //
-  // The podspec's `header_dir` is captured separately: when it changes the
-  // include surface (e.g. `<reanimated/...>` instead of `<ReactNativeReanimated/...>`),
-  // header resolution already works via the -I flags from headerSearchPaths
-  // (path-style includes like safe-area-context's
-  // `<react/renderer/components/safeareacontext/...>` resolve through
-  // `-I common/cpp/`). Module-style includes that NEED the target name to
-  // match (e.g. reanimated's `<reanimated/X.h>` via SwiftPM's auto-generated
-  // module map) are what `spm.name` is for.
-  const swiftName = dep.swiftName ?? toSwiftName(dep.name);
+  // Whatever the autolinker resolved (see resolveSwiftName). It registers the
+  // dep under that name in its aggregator and in any sibling spm.dependencies
+  // refs, so the scaffolded product/library name must match it exactly —
+  // otherwise SPM fails to resolve `.product(name: "X", package: "X")`.
+  const swiftName = dep.swiftName;
+  if (swiftName == null) {
+    throw new Error(
+      `react-native spm scaffold: no resolved Swift name for '${dep.name}'. expandSpmDependencies must resolve every dep's name before a manifest is written.`,
+    );
+  }
 
   // Header search paths — substitute Xcode build-setting tokens against the
   // dep root. Anything we can't substitute is dropped + warned (avoids
@@ -566,6 +565,7 @@ type EmitContext = {
   // Relative path to the app's local xcframeworks package
   // (<appRoot>/build/xcframeworks). Only referenced when remote == null.
   localXcfwPackageDir?: ?string,
+  iosDeploymentTarget?: ?string,
 };
 */
 
@@ -582,6 +582,8 @@ function emitScaffoldedPackageSwift(
 ) /*: string */ {
   const slotComment =
     ctx.cacheSlotLabel != null ? `\n// Cache slot: ${ctx.cacheSlotLabel}` : '';
+  const iosDeploymentTarget /*: string */ =
+    ctx.iosDeploymentTarget ?? MIN_IOS_VERSION_SUPPORTED;
 
   // React headers need NO search paths — they come from the React /
   // ReactNativeHeaders binaryTargets and the ReactAppHeaders product (see
@@ -658,8 +660,7 @@ function emitScaffoldedPackageSwift(
 
   // Dependencies block. Always declares ReactNative if any React-core dep
   // was in the podspec; sibling RN deps come from autolinking's existing
-  // .package(path: ...) graph — we reference them by toSwiftName(npmName)
-  // since that's what the autolinker registers them under.
+  // .package(path: ...) graph, under the names the autolinker resolved.
   const packageDeps /*: Array<string> */ = [];
   const targetDeps /*: Array<string> */ = [];
   if (spec.coreReactNative) {
@@ -704,8 +705,12 @@ function emitScaffoldedPackageSwift(
     }
   }
   for (const siblingName of spec.siblingNames) {
-    const swiftSibling =
-      spec.siblingSwiftNames?.[siblingName] ?? toSwiftName(siblingName);
+    const swiftSibling = spec.siblingSwiftNames?.[siblingName];
+    if (swiftSibling == null) {
+      throw new Error(
+        `react-native spm scaffold: no resolved Swift name for the sibling '${siblingName}'. expandSpmDependencies must resolve every dep's name before a manifest is written.`,
+      );
+    }
     // The autolinker references each self-managed (scaffolded) dep through a
     // `libs/<SwiftName>` symlink, and SPM resolves a manifest's relative
     // package paths against that symlink location — so a sibling lives at
@@ -766,7 +771,7 @@ import PackageDescription
 
 let package = Package(
     name: "${spec.swiftName}",
-    platforms: [.iOS(.v15)],
+    platforms: [.iOS("${iosDeploymentTarget}")],
     products: [
         .library(name: "${spec.swiftName}", targets: ["${spec.swiftName}"]),
     ],
@@ -784,6 +789,61 @@ ${packageDepsBlock}    targets: [
 `;
 }
 
+const PODSPEC_KEY_ORIGINS = {
+  header_dir: "its podspec's 'header_dir'",
+  module_name: "its podspec's 'module_name'",
+  name: 'its pod name',
+};
+
+// Null when the caller resolved the name without recording where it came from,
+// since the alternative is inventing an origin.
+function swiftNameOrigin(dep /*: AutolinkedDep */) /*: ?string */ {
+  switch (dep.swiftNameSource) {
+    case 'config':
+      return "its declared 'swiftpmConfig.name'";
+    case 'podspec':
+      return PODSPEC_KEY_ORIGINS[dep.swiftNamePodspecKey ?? 'name'];
+    case 'npm':
+      return 'its npm package name';
+    default:
+      return null;
+  }
+}
+
+/**
+ * Says which SwiftPM name the library got and where that name came from. The
+ * name is the prefix every `#import <Name/Header.h>` against the library has to
+ * spell, and a podspec-derived one is written into the library's package.json,
+ * so it is not a decision to make silently.
+ */
+function reportSwiftName(
+  dep /*: AutolinkedDep */,
+  swiftName /*: string */,
+  model /*: PodspecModel */,
+) /*: void */ {
+  const origin = swiftNameOrigin(dep);
+  if (origin == null) {
+    return;
+  }
+  log(`${dep.name}: SwiftPM name '${swiftName}' (from ${origin}).`);
+  // Two declared namespaces, one name: CocoaPods compiles the module as
+  // `module_name` while consumers import through `header_dir`, so a library
+  // that declares both loses one of them here.
+  const {headerDir, moduleName} = model;
+  if (
+    dep.swiftNamePodspecKey === 'header_dir' &&
+    headerDir != null &&
+    moduleName != null &&
+    headerDir !== moduleName
+  ) {
+    warn(
+      `${dep.name}'s podspec declares both a 'header_dir' ('${headerDir}') and a 'module_name' ('${moduleName}'): ` +
+        `'${swiftName}' is the SwiftPM name, and '${moduleName}' is not used. ` +
+        `Set 'swiftpmConfig.name' in its package.json to override that choice.`,
+    );
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Per-dep orchestrator
 // ---------------------------------------------------------------------------
@@ -806,9 +866,10 @@ type ScaffoldContext = {
   // `s.dependency` names (e.g. "RNWorklets") wire to the right sibling.
   podToNpm?: Map<string, string>,
   // npm-name → resolved Swift name over all autolinked deps, so sibling
-  // references honor each sibling's `spm.name`.
+  // references honor each sibling's declared name.
   swiftNameByNpm?: Map<string, string>,
   remote: ?{url: string, version: string, identity: string},
+  iosDeploymentTarget?: ?string,
 };
 */
 
@@ -839,14 +900,14 @@ function scaffoldPackageSwiftForDep(
     };
   }
 
-  // Dep can opt out via its own react-native.config.js.
-  const cfg = defaultReadConfig(dep.root);
-  // $FlowFixMe[prop-missing] config has dynamic shape
-  if (cfg != null && cfg.spm != null && cfg.spm.scaffold === false) {
+  // Dep can opt out in its own package.json.
+  if (
+    readSwiftpmConfig(dep.root, defaultReadConfig(dep.root))?.scaffold === false
+  ) {
     return {
       depName,
       status: 'skipped-opt-out',
-      reason: 'react-native.config.js sets spm.scaffold = false.',
+      reason: "the library sets 'swiftpmConfig.scaffold' to false.",
     };
   }
 
@@ -925,25 +986,10 @@ function scaffoldPackageSwiftForDep(
     }
   }
 
-  // Find a podspec to read. autolinking.json may have provided podspecPath;
-  // otherwise glob for *.podspec in dep root.
+  // autolinking.json may have provided podspecPath; otherwise search dep.root.
   // $FlowFixMe[prop-missing] dynamic shape from autolinking.json
-  let podspecPath /*: ?string */ = dep.platforms.ios.podspecPath ?? null;
-  if (podspecPath == null) {
-    try {
-      const entries = fs.readdirSync(dep.root);
-      // Skip a crashed run's leftover patched copy (read-podspec.js stages it
-      // as `.spm-scaffold-<pid>-<name>.podspec` next to the original).
-      const candidate = entries.find(
-        e => e.endsWith('.podspec') && !e.startsWith('.spm-scaffold-'),
-      );
-      if (candidate != null) {
-        podspecPath = path.join(dep.root, candidate);
-      }
-    } catch {
-      // dep.root may not exist; treat as no-podspec
-    }
-  }
+  const podspecPath /*: ?string */ =
+    dep.platforms.ios.podspecPath ?? findPodspecs(dep.root)[0];
   if (podspecPath == null || !fs.existsSync(podspecPath)) {
     return {
       depName,
@@ -954,7 +1000,7 @@ function scaffoldPackageSwiftForDep(
 
   let model;
   try {
-    model = readPodspec(podspecPath);
+    model = readPodspecCached(podspecPath);
   } catch (e) {
     return {
       depName,
@@ -1023,6 +1069,7 @@ function scaffoldPackageSwiftForDep(
   const content = emitScaffoldedPackageSwift(spec, {
     cacheSlotLabel: ctx.cacheSlotLabel,
     remote: ctx.remote,
+    iosDeploymentTarget: ctx.iosDeploymentTarget,
     codegenPackageDir: relFromManifest('build', 'generated', 'ios'),
     localXcfwPackageDir: relFromManifest('build', 'xcframeworks'),
   });
@@ -1064,15 +1111,171 @@ function scaffoldPackageSwiftForDep(
     }
   }
 
+  reportSwiftName(dep, spec.swiftName, model);
+
+  // Migration: record a name we derived from the podspec, so the library can
+  // drop the podspec. A declared name is already where it belongs, and a name
+  // guessed from the npm name would freeze a guess into someone's config.
+  const swiftpmName =
+    dep.swiftNameSource === 'podspec'
+      ? writeSwiftpmName(dep.root, spec.swiftName, {dryRun: ctx.dryRun})
+      : undefined;
+
   return {
     depName,
     status: 'written',
     packageSwiftPath: pkgSwiftPath,
     warnings: spec.warnings,
     previouslyExisted,
+    swiftpmName,
   };
 }
 
+/**
+ * The dependency set the autolinker considers: the iOS entries of
+ * autolinking.json plus their transitive SwiftPM dependencies. Null when the
+ * file declares none; throws when it cannot be read or parsed. `onSkipped`
+ * reports the entries dropped for having no iOS platform.
+ */
+function collectAutolinkedDeps(
+  opts /*: {
+    autolinkingJsonPath: string,
+    remote: ?{url: string, version: string, identity: string},
+    onSkipped?: (name: string) => void,
+  } */,
+) /*: ?Array<AutolinkedDep> */ {
+  const {autolinkingJsonPath, remote, onSkipped} = opts;
+  /*:: type AutolinkingJson = {dependencies?: ?{[string]: {root?: string, platforms?: {ios?: ?{...}, ...}, ...}}, ...}; */
+  // $FlowFixMe[incompatible-type] JSON.parse returns any
+  const data /*: AutolinkingJson */ = JSON.parse(
+    fs.readFileSync(autolinkingJsonPath, 'utf8'),
+  );
+  const deps = data.dependencies;
+  if (deps == null) {
+    return null;
+  }
+
+  const directDeps /*: Array<AutolinkedDep> */ = [];
+  for (const name of Object.keys(deps)) {
+    const raw = deps[name];
+    if (raw == null) continue;
+    const root = raw.root;
+    const ios = raw.platforms?.ios;
+    if (typeof root !== 'string' || ios == null) {
+      onSkipped?.(name);
+      continue;
+    }
+    // $FlowFixMe[incompatible-type] `ios` shape is runtime-validated above
+    const iosPlatform /*: AutolinkingIosPlatform */ = ios;
+    directDeps.push({name, root, platforms: {ios: iosPlatform}});
+  }
+
+  try {
+    return expandSpmDependencies(directDeps, {
+      readConfig: defaultReadConfig,
+      resolveDep: defaultResolveDep,
+      readPodspec: defaultReadPodspec,
+      extraReservedNames: remote != null ? [remote.identity] : undefined,
+    });
+  } catch (e) {
+    if (e instanceof SpmNameCollisionError) {
+      throw e;
+    }
+    // A transitive-resolution failure shouldn't abort the whole pass; fall back
+    // to the direct deps so at least those are covered. They are named the way
+    // the autolinker names them — a manifest written under any other name
+    // outlives this error on disk and then fails to resolve.
+    log(`Transitive dependency expansion failed: ${e.message}`);
+    return directDeps.map(dep => {
+      const resolved = resolveSwiftName(
+        dep.name,
+        readSwiftpmConfig(dep.root, defaultReadConfig(dep.root)),
+        defaultReadPodspec(dep.root, dep.platforms.ios.podspecPath),
+      );
+      return {
+        ...dep,
+        swiftName: resolved.name,
+        swiftNameSource: resolved.source,
+        swiftNamePodspecKey: resolved.podspecKey,
+      };
+    });
+  }
+}
+
+// The `.iOS(...)` element of the emitted platforms array — the `.v15` enum form
+// pre-v20 scaffolds carry included, and without the array's closing bracket so
+// a user-extended array (`[.iOS(…), .macOS(…)]`) is still matched.
+const PLATFORM_FLOOR_RE = /platforms: \[\.iOS\((\.v\d+|"[^"]*")\)/;
+
+/**
+ * Bring the platform floor of already-scaffolded manifests up to the app's
+ * deployment target — `spm add`/`update` must not leave a dep pinned below the
+ * app (SwiftPM would refuse to link it), and re-scaffolding is the user's call.
+ * Only the platform line of a file carrying our own marker is rewritten; no
+ * file is created. `from` is the previous token, verbatim (`15.1` or `.v15`).
+ */
+function refreshScaffoldedPlatformFloors(
+  opts /*: {appRoot: string, autolinkingJsonPath?: string, iosDeploymentTarget: string} */,
+) /*: Array<{depName: string, path: string, from: string, to: string}> */ {
+  const {appRoot, iosDeploymentTarget} = opts;
+  const autolinkingJsonPath =
+    opts.autolinkingJsonPath ??
+    path.join(appRoot, 'build', 'generated', 'autolinking', 'autolinking.json');
+  const refreshed = [];
+
+  // Best-effort: an unreadable autolinking.json, a name collision or a
+  // malformed remote config is the autolinker's error to report a moment
+  // later, not this pass's.
+  let deps /*: ?Array<AutolinkedDep> */ = null;
+  try {
+    deps = collectAutolinkedDeps({
+      autolinkingJsonPath,
+      remote: remotePackageConfig(appRoot),
+    });
+  } catch {
+    return refreshed;
+  }
+  if (deps == null) {
+    return refreshed;
+  }
+
+  for (const {name: depName, root} of deps) {
+    const manifestPath = path.join(root, 'Package.swift');
+    let content;
+    try {
+      content = fs.readFileSync(manifestPath, 'utf8');
+    } catch {
+      continue;
+    }
+    if (
+      !content.includes(SCAFFOLDER_MARKER) ||
+      content.includes(AUTOGEN_MARKER)
+    ) {
+      continue;
+    }
+    const match = content.match(PLATFORM_FLOOR_RE);
+    if (match == null) {
+      continue;
+    }
+    const from = match[1].replace(/"/g, '');
+    if (from === iosDeploymentTarget) {
+      continue;
+    }
+    fs.writeFileSync(
+      manifestPath,
+      content.replace(match[0], `platforms: [.iOS("${iosDeploymentTarget}")`),
+      'utf8',
+    );
+    refreshed.push({
+      depName,
+      path: manifestPath,
+      from,
+      to: iosDeploymentTarget,
+    });
+  }
+  return refreshed;
+}
+
 // ---------------------------------------------------------------------------
 // Multi-dep orchestrator
 // ---------------------------------------------------------------------------
@@ -1086,6 +1289,7 @@ type ScaffoldAllOptions = {
   dryRun?: boolean,
   cacheSlotLabel?: ?string,
   autolinkingJsonPath?: string,
+  iosDeploymentTarget?: ?string,
   // npm dep names to skip entirely — used when the user declined the
   // confirmation prompt for first-time scaffolds. Skipped deps still
   // appear in the returned results array with status='skipped-opt-out'.
@@ -1113,62 +1317,29 @@ function scaffoldAll(
     return [];
   }
 
-  /*:: type AutolinkingJson = {dependencies?: ?{[string]: {root?: string, platforms?: {ios?: ?{...}, ...}, ...}}, ...}; */
-  // $FlowFixMe[incompatible-type] JSON.parse returns any
-  const data /*: AutolinkingJson */ = JSON.parse(
-    fs.readFileSync(autolinkingJsonPath, 'utf8'),
-  );
-  const deps = data.dependencies;
-  if (deps == null) {
-    return [];
-  }
-
-  // Narrow the direct autolinking.json entries with an iOS platform, then
-  // expand transitive `spm.dependencies` so the scaffolder covers EXACTLY the
-  // set the autolinker considers. Without this, a transitive native dep that
+  // The scaffolder covers EXACTLY the set the autolinker considers, transitive
+  // `spm.dependencies` included. Without them, a transitive native dep that
   // ships no Package.swift would be flagged by the autolinker but never
   // scaffolded here — leaving `react-native spm scaffold` unable to clear the
   // autolinker's missing-manifest error.
   const results /*: Array<ScaffoldResult> */ = [];
-  const directDeps /*: Array<AutolinkedDep> */ = [];
-  for (const name of Object.keys(deps)) {
-    const raw = deps[name];
-    if (raw == null) continue;
-    const root = raw.root;
-    const ios = raw.platforms?.ios;
-    if (typeof root !== 'string' || ios == null) {
+  // Outside collectAutolinkedDeps' own try: a malformed remote config
+  // (RemoteVersionError) is a misconfiguration to surface, not an expansion
+  // failure to degrade past.
+  const remote = remotePackageConfig(appRoot);
+  const allDeps = collectAutolinkedDeps({
+    autolinkingJsonPath,
+    remote,
+    onSkipped: name => {
       results.push({
         depName: name,
         status: 'skipped-no-ios',
         reason: 'no iOS platform in autolinking.json',
       });
-      continue;
-    }
-    // $FlowFixMe[incompatible-type] `ios` shape is runtime-validated above
-    const iosPlatform /*: AutolinkingIosPlatform */ = ios;
-    directDeps.push({name, root, platforms: {ios: iosPlatform}});
-  }
-
-  // Outside the try: a malformed remote config (RemoteVersionError) is a
-  // misconfiguration to surface, not an expansion failure to degrade past.
-  const remote = remotePackageConfig(appRoot);
-
-  let allDeps /*: Array<AutolinkedDep> */ = [];
-  try {
-    allDeps = expandSpmDependencies(directDeps, {
-      readConfig: defaultReadConfig,
-      resolveDep: defaultResolveDep,
-      extraReservedNames: remote != null ? [remote.identity] : undefined,
-      log,
-    });
-  } catch (e) {
-    if (e instanceof SpmNameCollisionError) {
-      throw e;
-    }
-    // A transitive-resolution failure shouldn't abort the whole scaffold pass;
-    // fall back to the direct deps so at least those get manifests.
-    log(`Transitive spm.dependencies expansion failed: ${e.message}`);
-    allDeps = directDeps;
+    },
+  });
+  if (allDeps == null) {
+    return results;
   }
 
   // Index every autolinked dep's podspec name → its npm name, so a dep that
@@ -1187,14 +1358,8 @@ function scaffoldAll(
       // discover the podspec at the dep root so podspec-name sibling deps
       // (e.g. `s.dependency "TestLibraryCommon"`) still wire to their npm
       // package.
-      try {
-        for (const f of fs.readdirSync(dep.root)) {
-          if (f.endsWith('.podspec') && !f.startsWith('.spm-scaffold-')) {
-            podToNpm.set(path.basename(f, '.podspec'), dep.name);
-          }
-        }
-      } catch {
-        // unreadable dep root — sibling wiring falls back to the warning path
+      for (const found of findPodspecs(dep.root)) {
+        podToNpm.set(path.basename(found, '.podspec'), dep.name);
       }
     }
   }
@@ -1213,6 +1378,7 @@ function scaffoldAll(
     force: opts.force === true,
     dryRun: opts.dryRun === true,
     cacheSlotLabel: opts.cacheSlotLabel ?? null,
+    iosDeploymentTarget: opts.iosDeploymentTarget ?? null,
     podToNpm,
     swiftNameByNpm,
     remote,
@@ -1238,6 +1404,7 @@ function scaffoldAll(
 }
 
 module.exports = {
+  refreshScaffoldedPlatformFloors,
   scaffoldAll,
   scaffoldPackageSwiftForDep,
   translatePodspecToSpmTarget,

package/scripts/spm/spm-pbxproj.js

@@ -267,19 +267,16 @@ function findProjectObject(text /*: string */) /*: ObjectRange | null */ {
   return findObjectByUuid(text, m[1]);
 }
 
-/**
- * Every PBXNativeTarget whose productType is an application. Returns uuid +
- * name + body range for each. Used to pick the app target to inject into
- * (and to refuse on ambiguity).
- */
-function findApplicationTargets(
+/** Visit every top-level object of a section, in file order. */
+function forEachObjectInSection(
   text /*: string */,
-) /*: Array<{uuid: string, name: string, bodyOpen: number, bodyClose: number}> */ {
-  const section = findSection(text, 'PBXNativeTarget');
+  name /*: string */,
+  fn /*: (obj: {uuid: string, comment: ?string, bodyOpen: number, bodyClose: number}) => void */,
+) /*: void */ {
+  const section = findSection(text, name);
   if (section == null) {
-    return [];
+    return;
   }
-  const out = [];
   const re = /\n\t\t([0-9A-Fa-f]{24})(?: \/\* (.*?) \*\/)? = \{/g;
   re.lastIndex = section.contentStart;
   for (;;) {
@@ -287,25 +284,42 @@ function findApplicationTargets(
     if (m == null || m.index >= section.end) {
       break;
     }
-    const uuid = m[1];
-    const comment = m[2];
     const bodyOpen = text.indexOf('{', m.index);
     const bodyClose = scanToClose(text, bodyOpen);
-    const obj = {uuid, bodyOpen, bodyClose};
-    const productType = findField(text, obj, 'productType');
-    if (
-      productType != null &&
-      /com\.apple\.product-type\.application/.test(productType.value)
-    ) {
+    fn({uuid: m[1], comment: m[2], bodyOpen, bodyClose});
+    re.lastIndex = bodyClose;
+  }
+}
+
+/**
+ * Every PBXNativeTarget whose productType is an application. Returns uuid +
+ * name + body range for each. Used to pick the app target to inject into
+ * (and to refuse on ambiguity).
+ */
+function findApplicationTargets(
+  text /*: string */,
+) /*: Array<{uuid: string, name: string, bodyOpen: number, bodyClose: number}> */ {
+  const out = [];
+  forEachObjectInSection(
+    text,
+    'PBXNativeTarget',
+    ({uuid, comment, bodyOpen, bodyClose}) => {
+      const obj = {uuid, bodyOpen, bodyClose};
+      const productType = findField(text, obj, 'productType');
+      if (
+        productType == null ||
+        !/com\.apple\.product-type\.application/.test(productType.value)
+      ) {
+        return;
+      }
       const nameField = findField(text, obj, 'name');
       const name =
         nameField != null
           ? nameField.value.replace(/^"|"$/g, '')
           : (comment ?? uuid);
       out.push({uuid, name, bodyOpen, bodyClose});
-    }
-    re.lastIndex = bodyClose;
-  }
+    },
+  );
   return out;
 }
 
@@ -766,6 +780,7 @@ module.exports = {
   findSection,
   findProjectObject,
   findApplicationTargets,
+  forEachObjectInSection,
   uuidsInArray,
   detectFieldIndent,
   insertObjectsIntoSection,