yaver-feedback-react-native 0.7.12 → 0.7.14

package/app.plugin.js

@@ -113,65 +113,42 @@ function withYaverHotReloadNativeModule(config) {
   // them into the app target. Without this, the files exist on disk
   // but are invisible to the build system.
   config = withXcodeProject(config, (config) => {
-    const pbx = config.modResults;
+    const proj = config.modResults;
     const appName = config.modRequest.projectName;
     if (!appName) return config;
 
-    // Ensure the PBX group we'll attach files to exists (it's the
-    // app's main Sources group — same one that holds AppDelegate.swift).
-    const group = pbx.pbxGroupByName(appName);
-    if (!group) return config;
-
-    // Find the group UUID by walking the pbxGroup section.
-    const groupSection = pbx.pbxGroupSection();
-    let groupUuid = null;
-    for (const uuid of Object.keys(groupSection)) {
-      if (uuid.endsWith("_comment")) continue;
-      if (groupSection[uuid] === group) {
-        groupUuid = uuid;
-        break;
-      }
-    }
-    if (!groupUuid) return config;
-
-    // Locate the app's "Sources" build phase so we can attach
-    // YaverHotReload.swift as a compile unit. AppDelegate.swift is
-    // already there — find its PBXBuildFile to get the build phase UUID.
-    const nativeTargetSection = pbx.pbxNativeTargetSection();
-    let sourcesBuildPhase = null;
-    for (const uuid of Object.keys(nativeTargetSection)) {
-      if (uuid.endsWith("_comment")) continue;
-      const target = nativeTargetSection[uuid];
-      if (target.name !== appName && target.productReference_comment !== appName) continue;
-      for (const phase of target.buildPhases || []) {
-        const phaseComment = (phase.comment || "").toLowerCase();
-        if (phaseComment.includes("sources")) {
-          sourcesBuildPhase = phase.value;
-          break;
+    // Look up the group key for the app's source folder (same group
+    // that holds AppDelegate.swift). Expo's naming is consistent —
+    // projectName === group name in the tree.
+    const groupKey =
+      proj.findPBXGroupKey({ name: appName }) ||
+      proj.findPBXGroupKey({ path: appName });
+    if (!groupKey) return config;
+
+    // Target UUID — getFirstTarget is the app target in a standard
+    // Expo project. For multi-target projects, users can opt out via
+    // enableHotReload: false.
+    const target = proj.getFirstTarget();
+    if (!target || !target.uuid) return config;
+
+    const filesToAdd = ["YaverHotReload.swift", "YaverHotReload.m"];
+    for (const fileName of filesToAdd) {
+      const relPath = `${appName}/${fileName}`;
+      // addSourceFile registers PBXFileReference + PBXBuildFile, adds
+      // the file to the group, and wires it into the target's
+      // Sources build phase — which is exactly what we need. It's
+      // idempotent in practice because the sdk-level copyFileSync
+      // step always writes the file, and addSourceFile is a no-op if
+      // the reference already exists.
+      if (!proj.hasFile || !proj.hasFile(relPath)) {
+        try {
+          proj.addSourceFile(relPath, { target: target.uuid }, groupKey);
+        } catch (e) {
+          // If a duplicate slips through, xcode-lib throws; safe to
+          // ignore since the file already being registered is the
+          // desired state.
         }
       }
-      if (sourcesBuildPhase) break;
-    }
-
-    const swiftName = "YaverHotReload.swift";
-    const objcName = "YaverHotReload.m";
-
-    // addSourceFile registers the file as a PBXFileReference, adds a
-    // PBXBuildFile entry, drops it into the pbx group, and adds it to
-    // the sources build phase — exactly what we need.
-    if (!pbxHasFile(pbx, swiftName)) {
-      pbx.addSourceFile(
-        `${appName}/${swiftName}`,
-        { target: findTargetUuidByName(pbx, appName) },
-        groupUuid,
-      );
-    }
-    if (!pbxHasFile(pbx, objcName)) {
-      pbx.addSourceFile(
-        `${appName}/${objcName}`,
-        { target: findTargetUuidByName(pbx, appName) },
-        groupUuid,
-      );
     }
 
     return config;
@@ -180,28 +157,6 @@ function withYaverHotReloadNativeModule(config) {
   return config;
 }
 
-function pbxHasFile(pbx, basename) {
-  const refs = pbx.pbxFileReferenceSection();
-  for (const uuid of Object.keys(refs)) {
-    if (uuid.endsWith("_comment")) continue;
-    const ref = refs[uuid];
-    if (!ref || typeof ref !== "object") continue;
-    const pathValue = (ref.path || "").replace(/"/g, "");
-    if (pathValue.endsWith(basename)) return true;
-  }
-  return false;
-}
-
-function findTargetUuidByName(pbx, appName) {
-  const section = pbx.pbxNativeTargetSection();
-  for (const uuid of Object.keys(section)) {
-    if (uuid.endsWith("_comment")) continue;
-    const target = section[uuid];
-    if (target && target.name === appName) return uuid;
-  }
-  return undefined;
-}
-
 /**
  * Patch AppDelegate to:
  * 1. Return hot-reloaded bundle URL on startup (so reloaded bundle persists)
@@ -233,9 +188,22 @@ function withYaverAppDelegateHook(config) {
       );
     }
 
-    // 2. Add reload notification handler and bridge recreation logic
-    // Insert before the closing brace of the class
-    const classCloseIndex = patched.lastIndexOf("}");
+    // 2. Add reload notification handler and bridge recreation logic.
+    //
+    // Must be inserted into the AppDelegate class — NOT ReactNativeDelegate
+    // (a separate class below it in the same file). The handler accesses
+    // `self.window`, `self.reactNativeDelegate`, `self.reactNativeFactory`,
+    // and `self.bindReactNativeFactory(...)` — all of which only exist
+    // on AppDelegate. An earlier version of this plugin used
+    // lastIndexOf("}"), which in modern Expo templates lands inside
+    // ReactNativeDelegate, producing build errors like
+    //   "cannot find 'setupYaverHotReload' in scope"
+    //   "value of type 'ReactNativeDelegate' has no member 'window'"
+    //
+    // The anchor we want is the closing brace of the AppDelegate class
+    // declaration itself. Find its opening, then walk braces to its
+    // matching close.
+    const classCloseIndex = findAppDelegateClassClose(patched);
     if (classCloseIndex > 0) {
       const reloadHandler = `
   // MARK: - Yaver Feedback SDK Hot Reload
@@ -343,6 +311,34 @@ function withYaverAppDelegateHook(config) {
   });
 }
 
+// Locate the closing brace of `class AppDelegate: ...` in an Expo
+// Swift AppDelegate file. Returns the index of the matching `}` for
+// the AppDelegate class's opening `{`, or -1 if not found. We need
+// this because Expo's modern template declares TWO classes in the
+// same file (AppDelegate + ReactNativeDelegate), and the SDK's
+// reload handler only makes sense on the AppDelegate one.
+function findAppDelegateClassClose(contents) {
+  // Match both `public class AppDelegate` and `class AppDelegate`,
+  // with either inheritance colon or a plain body.
+  const headerMatch = contents.match(/class\s+AppDelegate\s*[:{][^{]*\{/);
+  if (!headerMatch) return -1;
+  const bodyStart = headerMatch.index + headerMatch[0].length - 1; // index of the opening `{`
+  // Walk braces to find the matching close. Minimal — we don't try
+  // to parse strings/comments because the file is machine-generated
+  // by Expo, so braces inside strings are not a realistic concern
+  // at this layer.
+  let depth = 0;
+  for (let i = bodyStart; i < contents.length; i++) {
+    const ch = contents[i];
+    if (ch === "{") depth++;
+    else if (ch === "}") {
+      depth--;
+      if (depth === 0) return i;
+    }
+  }
+  return -1;
+}
+
 /**
  * Copy Android native module source files and register the package.
  * Also patches MainApplication to use hot-reloaded bundle on startup.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaver-feedback-react-native",
-  "version": "0.7.12",
+  "version": "0.7.14",
   "description": "Visual feedback SDK for Yaver — bug reports, screen recording, voice annotations, and local-first developer workflows",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",