feat(spm): header-map + recursive HSP emulation, robust pod-ipc parse, fail-closed on mixed-language

chrfalch · claude · chrfalch · commit 62782b870947 · 2026-06-16T13:38:02.000+02:00
Four scaffolder fixes, each unblocking a real community library:

1. Header-map emulation (read-podspec + scaffold) — CocoaPods USE_HEADERMAP
   lets `#import "Flat.h"` resolve a header anywhere in the target. SPM has no
   header map, so flat-include libs (react-native-svg) failed with "X.h not
   found". We now add every header-containing subdir to HEADER_SEARCH_PATHS.

2. Recursive + multi-path HEADER_SEARCH_PATHS parsing — a single
   pod_target_xcconfig HSP value can hold several space-separated, individually
   quoted paths, some ending in `/**` (recursive). We shell-tokenize the value,
   strip quotes per token, and expand a `/**` marker into the base dir plus all
   its subdirs (skia needs cpp, cpp/skia, … on the search path).

3. Robust pod-ipc JSON extraction — some podspecs print diagnostics to stdout
   before the JSON (skia: `-- SK_GRAPHITE: OFF …`), so JSON.parse(stdout) threw
   and we silently fell back to the regex parser (partial: true → HSP dropped).
   We now slice from the first `{` to the last `}` before parsing.

4. Fail-closed on mixed-language deps — SPM can't compile Swift + ObjC/C++ in
   one target, and bidirectional-interop RN libs (react-native-screens) can't be
   split into two targets without a circular dependency. Instead of emitting a
   manifest that dies with a cryptic SPM resolve error, the scaffolder now skips
   (status: skipped-mixed-language, removing any stale manifest) and the
   autolinker reports a distinct, actionable error with an opt-out
   (react-native.config.js platforms: { ios: null }) and a binary alternative.

Verified end-to-end against a real RN 0.87 app: react-native-skia and
react-native-svg now build via the scaffolder; react-native-screens reports the
clean fail-closed error. SCAFFOLDER_VERSION bumped to 16 to force regen.
399 spm tests green (8 new).

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/packages/react-native/scripts/spm/__tests__/generate-spm-autolinking-test.js b/packages/react-native/scripts/spm/__tests__/generate-spm-autolinking-test.js
@@ -18,6 +18,7 @@ const {
   findSelfManagedPackageDir,
   generateAutolinkedPackageSwift,
   generateSynthPackageSwift,
+  hasMixedLanguageSources,
   hasPodspec,
   linkHeaderTree,
   reportMissingManifests,
@@ -872,4 +873,58 @@ describe('MissingManifestError + reportMissingManifests', () => {
     expect(line).toContain('no podspec');
     expect(line).toContain('react-native-baz');
   });
+
+  it('gives a mixed-language dep a DISTINCT error (not "run scaffold") with an opt-out + binary path', () => {
+    reportMissingManifests([
+      {
+        name: 'Screens',
+        npmName: 'react-native-screens',
+        hasPodspec: true,
+        mixed: true,
+      },
+    ]);
+    const line = errSpy.mock.calls[0][0];
+    expect(line.startsWith('error: ')).toBe(true);
+    expect(line).toContain('mixed Swift');
+    // Must NOT tell them to scaffold — scaffolding can't fix mixed-language.
+    expect(line).not.toContain('react-native spm scaffold');
+    // The two real escape hatches:
+    expect(line).toContain('react-native.config.js'); // opt out of autolinking
+    expect(line).toContain('platforms: { ios: null }');
+    expect(line).toContain('xcframework'); // or consume as a prebuilt binary
+  });
+});
+
+describe('hasMixedLanguageSources', () => {
+  let root;
+
+  beforeEach(() => {
+    root = fs.mkdtempSync(path.join(os.tmpdir(), 'spm-mixed-'));
+  });
+
+  afterEach(() => {
+    fs.rmSync(root, {recursive: true, force: true});
+  });
+
+  it('is true when both .swift and .mm exist under the source dir (screens shape)', () => {
+    fs.mkdirSync(path.join(root, 'ios'), {recursive: true});
+    fs.writeFileSync(path.join(root, 'ios', 'RNSScreen.swift'), '');
+    fs.writeFileSync(path.join(root, 'ios', 'RNSScreen.mm'), '');
+    expect(hasMixedLanguageSources(root)).toBe(true);
+  });
+
+  it('is false for a pure-ObjC++ lib (svg/skia shape)', () => {
+    fs.mkdirSync(path.join(root, 'apple'), {recursive: true});
+    fs.writeFileSync(path.join(root, 'apple', 'A.mm'), '');
+    fs.writeFileSync(path.join(root, 'apple', 'B.h'), '');
+    expect(hasMixedLanguageSources(root)).toBe(false);
+  });
+
+  it('ignores .swift that lives only under example/ or __tests__ (not real sources)', () => {
+    fs.mkdirSync(path.join(root, 'ios'), {recursive: true});
+    fs.writeFileSync(path.join(root, 'ios', 'A.mm'), '');
+    fs.mkdirSync(path.join(root, 'example', 'ios'), {recursive: true});
+    fs.writeFileSync(path.join(root, 'example', 'ios', 'App.swift'), '');
+    expect(hasMixedLanguageSources(root)).toBe(false);
+  });
 });
diff --git a/packages/react-native/scripts/spm/__tests__/read-podspec-test.js b/packages/react-native/scripts/spm/__tests__/read-podspec-test.js
@@ -237,6 +237,26 @@ describe('flattenSubspecs', () => {
     expect(model.preprocessorDefines).toHaveLength(3);
   });
 
+  it('parses a multi-path HEADER_SEARCH_PATHS string with embedded quotes + recursive /** (skia shape)', () => {
+    const raw = {
+      name: 'react-native-skia',
+      version: '1.0',
+      pod_target_xcconfig: {
+        HEADER_SEARCH_PATHS:
+          '"$(PODS_TARGET_SRCROOT)/cpp/"/** "$(PODS_TARGET_SRCROOT)/cpp" "$(PODS_TARGET_SRCROOT)/cpp/skia" "$(PODS_TARGET_SRCROOT)/cpp/dawn/include"',
+      },
+    };
+    const model = flattenSubspecs(raw);
+    // Each space-separated, individually-quoted path becomes its own entry
+    // (quotes stripped); the `/**` recursive marker is preserved for translate.
+    expect(model.headerSearchPaths).toEqual([
+      '$(PODS_TARGET_SRCROOT)/cpp//**',
+      '$(PODS_TARGET_SRCROOT)/cpp',
+      '$(PODS_TARGET_SRCROOT)/cpp/skia',
+      '$(PODS_TARGET_SRCROOT)/cpp/dawn/include',
+    ]);
+  });
+
   it('lifts defines from s.xcconfig too, not just pod_target_xcconfig (reanimated shape)', () => {
     const raw = {
       name: 'RNReanimated',
diff --git a/packages/react-native/scripts/spm/__tests__/scaffold-package-swift-test.js b/packages/react-native/scripts/spm/__tests__/scaffold-package-swift-test.js
@@ -172,6 +172,53 @@ describe('translatePodspecToSpmTarget', () => {
     }
   });
 
+  it('header-map emulation: adds every header-containing subdir to the search path (flat-include libs like svg)', () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), 'hmap-scaffold-'));
+    try {
+      fs.mkdirSync(path.join(root, 'apple', 'Elements'), {recursive: true});
+      fs.mkdirSync(path.join(root, 'apple', 'Text'), {recursive: true});
+      fs.writeFileSync(path.join(root, 'apple', 'Elements', 'A.h'), '');
+      fs.writeFileSync(path.join(root, 'apple', 'Text', 'B.h'), '');
+      fs.writeFileSync(path.join(root, 'apple', 'C.mm'), '');
+      const model = podspec({
+        sourceFiles: [
+          'apple/Elements/A.h',
+          'apple/Text/B.h',
+          'apple/C.mm',
+        ],
+      });
+      const spec = translatePodspecToSpmTarget(
+        model,
+        autolinkedDep({name: 'react-native-svg', root}),
+      );
+      expect(spec.headerSearchPaths).toContain('apple/Elements');
+      expect(spec.headerSearchPaths).toContain('apple/Text');
+    } finally {
+      fs.rmSync(root, {recursive: true, force: true});
+    }
+  });
+
+  it('expands a recursive `/**` HEADER_SEARCH_PATH into the base dir + all subdirs (skia shape)', () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), 'rec-scaffold-'));
+    try {
+      fs.mkdirSync(path.join(root, 'cpp', 'skia', 'include', 'core'), {
+        recursive: true,
+      });
+      const model = podspec({
+        headerSearchPaths: ['$(PODS_TARGET_SRCROOT)/cpp//**'],
+      });
+      const spec = translatePodspecToSpmTarget(
+        model,
+        autolinkedDep({name: 'react-native-skia', root}),
+      );
+      expect(spec.headerSearchPaths).toContain('cpp'); // base
+      expect(spec.headerSearchPaths).toContain('cpp/skia'); // makes <include/core/X.h> resolve
+      expect(spec.headerSearchPaths).toContain('cpp/skia/include/core');
+    } finally {
+      fs.rmSync(root, {recursive: true, force: true});
+    }
+  });
+
   it('flags needsObjCPrefix (and adds "." to the search path) when the target has ObjC(++) sources', () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), 'objc-scaffold-'));
     try {
@@ -644,6 +691,29 @@ end
     expect(content).toContain(SCAFFOLDER_MARKER);
   });
 
+  it('skips (does not write) a mixed-language dep — Swift + ObjC(++) cannot share one SPM target', () => {
+    // react-native-screens shape: a single source glob mixing .swift and .mm.
+    const podspecPath = path.join(depRoot, 'react-native-foo.podspec');
+    fs.writeFileSync(
+      podspecPath,
+      `
+Pod::Spec.new do |s|
+  s.name = "react-native-foo"
+  s.version = "1.0"
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
+  s.dependency "React-Core"
+end
+`,
+    );
+    fs.mkdirSync(path.join(depRoot, 'ios'), {recursive: true});
+    fs.writeFileSync(path.join(depRoot, 'ios', 'Foo.swift'), '');
+    fs.writeFileSync(path.join(depRoot, 'ios', 'Foo.mm'), '');
+    const result = scaffoldPackageSwiftForDep(makeDep(), makeCtx());
+    expect(result.status).toBe('skipped-mixed-language');
+    // Fail-closed: no half-baked manifest left behind.
+    expect(fs.existsSync(path.join(depRoot, 'Package.swift'))).toBe(false);
+  });
+
   it('computes app paths relative to the libs/<SwiftName> symlink, not dep.root (fresh-resolve correctness)', () => {
     makePodspec();
     const result = scaffoldPackageSwiftForDep(makeDep(), makeCtx());
diff --git a/packages/react-native/scripts/spm/generate-spm-autolinking.js b/packages/react-native/scripts/spm/generate-spm-autolinking.js
@@ -307,6 +307,56 @@ function hasPodspec(absSource /*: string */) /*: boolean */ {
   return false;
 }
 
+/**
+ * True when a dep has BOTH Swift and C-family (.m/.mm/.c/.cpp) sources. SPM
+ * cannot compile mixed-language sources in a single target, and RN libs that
+ * mix them are typically bidirectionally coupled (ObjC↔Swift) — which can't be
+ * split into two targets either (it would be a circular dependency). So such a
+ * dep is unsupportable by the scaffolder; we surface a clear, distinct error
+ * instead of emitting a manifest that fails with a cryptic SPM resolve error.
+ * Heuristic filesystem scan (bounded depth; skips examples/tests/build noise).
+ */
+function hasMixedLanguageSources(absSource /*: string */) /*: boolean */ {
+  const SKIP /*: Set<string> */ = new Set([
+    'node_modules',
+    'Pods',
+    'build',
+    '.git',
+    '__tests__',
+    'example',
+    'Example',
+    'examples',
+  ]);
+  let hasSwift = false;
+  let hasClang = false;
+  const walk = (dir /*: string */, depth /*: number */) => {
+    if (depth > 6 || (hasSwift && hasClang)) return;
+    let entries /*: Array<{name: string, isDirectory(): boolean}> */;
+    try {
+      // $FlowFixMe[incompatible-type] Dirent typing
+      entries = fs.readdirSync(dir, {withFileTypes: true});
+    } catch {
+      return;
+    }
+    for (const e of entries) {
+      // $FlowFixMe[incompatible-type] Dirent.name is string|Buffer in stubs
+      const name /*: string */ = e.name;
+      if (e.isDirectory()) {
+        if (!name.startsWith('.') && !SKIP.has(name)) {
+          walk(path.join(dir, name), depth + 1);
+        }
+      } else if (/\.swift$/i.test(name)) {
+        hasSwift = true;
+      } else if (/\.(mm?|c|cc|cpp|cxx)$/i.test(name)) {
+        hasClang = true;
+      }
+      if (hasSwift && hasClang) return;
+    }
+  };
+  walk(absSource, 0);
+  return hasSwift && hasClang;
+}
+
 /**
  * Error thrown when one or more autolinked community npm deps have no Swift
  * Package Manager manifest (neither a shipped Package.swift nor a scaffolded
@@ -316,9 +366,9 @@ function hasPodspec(absSource /*: string */) /*: boolean */ {
  * (the Xcode build phase keys off it to fail the build).
  */
 class MissingManifestError extends Error {
-  /*:: missingManifests: Array<{name: string, npmName: string, hasPodspec: boolean}>; */
+  /*:: missingManifests: Array<{name: string, npmName: string, hasPodspec: boolean, mixed?: boolean}>; */
   constructor(
-    deps /*: Array<{name: string, npmName: string, hasPodspec: boolean}> */,
+    deps /*: Array<{name: string, npmName: string, hasPodspec: boolean, mixed?: boolean}> */,
   ) {
     super(
       `${deps.length} autolinked native module(s) have no Package.swift. ` +
@@ -336,9 +386,18 @@ class MissingManifestError extends Error {
  * the thrown error never drift.
  */
 function reportMissingManifests(
-  deps /*: Array<{name: string, npmName: string, hasPodspec: boolean}> */,
+  deps /*: Array<{name: string, npmName: string, hasPodspec: boolean, mixed?: boolean}> */,
 ) /*: MissingManifestError */ {
   for (const d of deps) {
+    if (d.mixed === true) {
+      console.error(
+        `error: "${d.npmName}" has mixed Swift + Objective-C/C++ sources, which Swift Package Manager cannot compile in a single target (and its Swift↔ObjC interop typically can't be split into two targets without a circular dependency).\n` +
+          `  • Opt it out of SPM autolinking in your app's react-native.config.js:\n` +
+          `      module.exports = { dependencies: { '${d.npmName}': { platforms: { ios: null } } } };\n` +
+          `  • Or consume ${d.npmName} as a prebuilt binary (xcframework) instead.`,
+      );
+      continue;
+    }
     if (d.hasPodspec) {
       console.error(
         `error: Package.swift is missing for library "${d.npmName}" — it ships no Swift Package Manager support.\n` +
@@ -1188,7 +1247,7 @@ function main(argv /*:: ?: Array<string> */) /*: void */ {
   // fail with an actionable message after the classification pass. spmModules
   // (app-local, podspec-less, explicitly declared in react-native.config.js)
   // keep their synth wrappers: there is nothing to scaffold for them.
-  const missingManifests /*: Array<{name: string, npmName: string, hasPodspec: boolean}> */ =
+  const missingManifests /*: Array<{name: string, npmName: string, hasPodspec: boolean, mixed?: boolean}> */ =
     [];
 
   for (const entry of entries) {
@@ -1223,10 +1282,13 @@ function main(argv /*:: ?: Array<string> */) /*: void */ {
     }
     if (entry.origin === 'npm') {
       // No shipped or scaffolded manifest — this is the gap we now surface.
+      // A mixed-language dep is reported distinctly (it can't be scaffolded at
+      // all, so "run spm scaffold" would be misleading).
       missingManifests.push({
         name: target.name,
         npmName: entry.npmName ?? target.name,
         hasPodspec: hasPodspec(absSource),
+        mixed: hasMixedLanguageSources(absSource),
       });
       // Drop any stale wrapper from a previous synth-mode run so SPM doesn't
       // resolve against it.
@@ -1551,6 +1613,7 @@ module.exports = {
   expandSpmSourceGlobs,
   findSelfManagedPackageDir,
   hasPodspec,
+  hasMixedLanguageSources,
   MissingManifestError,
   reportMissingManifests,
   AUTOGEN_MARKER,
diff --git a/packages/react-native/scripts/spm/read-podspec.js b/packages/react-native/scripts/spm/read-podspec.js
@@ -124,8 +124,18 @@ function runPodIpcSpec(podspecPath /*: string */) /*: RawSpec | null */ {
   if (typeof result.stdout !== 'string' || result.stdout.length === 0) {
     return null;
   }
+  // Some podspecs print diagnostics to stdout during evaluation (e.g. skia:
+  // `-- SK_GRAPHITE: OFF ...`) before `pod ipc` emits the JSON. Parsing the
+  // raw stdout then throws and we'd silently fall back to the (much weaker)
+  // regex parser. Extract just the JSON object (first `{` … last `}`).
+  const stdout = result.stdout;
+  const start = stdout.indexOf('{');
+  const end = stdout.lastIndexOf('}');
+  if (start < 0 || end <= start) {
+    return null;
+  }
   try {
-    return JSON.parse(result.stdout);
+    return JSON.parse(stdout.slice(start, end + 1));
   } catch {
     return null;
   }
@@ -420,25 +430,33 @@ function flattenSubspecs(rawSpec /*: RawSpec */) /*: PodspecModel */ {
 
   function mergeHeaderSearchPaths() /*: Array<string> */ {
     const out /*: Array<string> */ = [];
+    // HSP can live in any of the xcconfig blocks, and a single value often
+    // PACKS multiple space-separated paths, each individually quoted, plus a
+    // CocoaPods `/**` recursive-glob suffix (e.g. skia:
+    // `"$(SRCROOT)/cpp/"/** "$(SRCROOT)/cpp/skia" ...`). Shell-tokenize to keep
+    // each path intact, then strip ALL quotes (not just wrapping) per token.
+    const XCCONFIG_KEYS = [
+      'pod_target_xcconfig',
+      'xcconfig',
+      'user_target_xcconfig',
+    ];
     for (const layer of layers) {
-      // $FlowFixMe[incompatible-use] layer narrowed from `mixed`; runtime-validated below
-      const xc =
-        layer != null && typeof layer === 'object'
-          ? layer.pod_target_xcconfig
-          : null;
-      if (xc == null || typeof xc !== 'object') continue;
-      // $FlowFixMe[incompatible-use] xc narrowed from `mixed`; HEADER_SEARCH_PATHS access is intentional
-      const hsp = xc.HEADER_SEARCH_PATHS;
-      if (typeof hsp === 'string') {
-        // Single string — split on whitespace, strip quotes
-        for (const tok of hsp.split(/\s+/)) {
-          if (tok.length > 0) out.push(stripWrappingQuotes(tok));
-        }
-      } else if (Array.isArray(hsp)) {
-        for (const v of hsp) {
-          if (typeof v !== 'string') continue;
-          for (const tok of v.split(/\s+/)) {
-            if (tok.length > 0) out.push(stripWrappingQuotes(tok));
+      if (layer == null || typeof layer !== 'object') continue;
+      for (const xcKey of XCCONFIG_KEYS) {
+        // $FlowFixMe[incompatible-use] layer narrowed from `mixed`
+        const xc = layer[xcKey];
+        if (xc == null || typeof xc !== 'object') continue;
+        const hsp = xc.HEADER_SEARCH_PATHS;
+        const values =
+          typeof hsp === 'string'
+            ? [hsp]
+            : Array.isArray(hsp)
+              ? hsp.filter(v => typeof v === 'string')
+              : [];
+        for (const v of values) {
+          for (const tok of shellTokenize(v)) {
+            const cleaned = tok.replace(/['"]/g, '');
+            if (cleaned.length > 0) out.push(cleaned);
           }
         }
       }
diff --git a/packages/react-native/scripts/spm/scaffold-package-swift.js b/packages/react-native/scripts/spm/scaffold-package-swift.js
diff --git a/packages/react-native/scripts/spm/spm-types.js b/packages/react-native/scripts/spm/spm-types.js
