expo-beacon 0.7.16 → 0.7.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-beacon",
-  "version": "0.7.16",
+  "version": "0.7.18",
   "description": "Expo module for scanning, pairing, and monitoring iBeacons on Android and iOS",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/build/withBeaconIOS.d.ts

@@ -1,5 +1,5 @@
 import { ConfigPlugin } from '@expo/config-plugins';
-export declare const IOS_PLUGIN_SWIFT = "import ExpoBeacon\nimport TSLocationManager\n\nfinal class BeaconGeoPlugin: BeaconLifecycleDelegate {\n    func beaconDidEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {\n        TSLocationManager.sharedInstance().start()\n    }\n    func beaconDidExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {\n        TSLocationManager.sharedInstance().stop()\n    }\n    func eddystoneDidEnter(identifier: String, namespace: String, instance: String, distance: Double) {\n        TSLocationManager.sharedInstance().start()\n    }\n    func eddystoneDidExit(identifier: String, namespace: String, instance: String, distance: Double) {\n        TSLocationManager.sharedInstance().stop()\n    }\n}\n";
+export declare function getIOSPluginSwift(): string;
 declare const withBeaconIOS: ConfigPlugin;
 export default withBeaconIOS;
 //# sourceMappingURL=withBeaconIOS.d.ts.map

package/plugin/build/withBeaconIOS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAM9B,eAAO,MAAM,gBAAgB,uvBAkB5B,CAAC;AA2RF,QAAA,MAAM,aAAa,EAAE,YAkCpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsC,MAAM,sBAAsB,CAAC;AAMxF,wBAAgB,iBAAiB,IAAI,MAAM,CAoB1C;AA+ED,QAAA,MAAM,aAAa,EAAE,YAmEpB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/plugin/build/withBeaconIOS.js

@@ -1,257 +1,149 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IOS_PLUGIN_SWIFT = void 0;
+exports.getIOSPluginSwift = getIOSPluginSwift;
 const config_plugins_1 = require("@expo/config-plugins");
 const fs = require("fs");
 const path = require("path");
 // ─── Generated Swift file ─────────────────────────────────────────────────────
-exports.IOS_PLUGIN_SWIFT = `\
+function getIOSPluginSwift() {
+    return `\
 import ExpoBeacon
 import TSLocationManager
 
 final class BeaconGeoPlugin: BeaconLifecycleDelegate {
     func beaconDidEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
-        TSLocationManager.sharedInstance().start()
+        TSLocationManager.sharedManager().start()
     }
     func beaconDidExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) {
-        TSLocationManager.sharedInstance().stop()
+        TSLocationManager.sharedManager().stop()
     }
     func eddystoneDidEnter(identifier: String, namespace: String, instance: String, distance: Double) {
-        TSLocationManager.sharedInstance().start()
+        TSLocationManager.sharedManager().start()
     }
     func eddystoneDidExit(identifier: String, namespace: String, instance: String, distance: Double) {
-        TSLocationManager.sharedInstance().stop()
+        TSLocationManager.sharedManager().stop()
     }
 }
 `;
-const IOS_PLUGIN_FILENAME = 'BeaconGeoPlugin.swift';
-// ─── Helpers ──────────────────────────────────────────────────────────────────
-/**
- * Finds the UUID (key) of a PBXGroup by name, handling both quoted and unquoted
- * name values produced by node-xcode's parser.
- */
-function normalizePBXValue(value) {
-    return typeof value === 'string' ? value.replace(/^"|"$/g, '') : '';
 }
-function findPBXGroupKeyByName(xcodeProject, name) {
-    var _a;
-    const pbxGroups = (_a = xcodeProject.hash.project.objects['PBXGroup']) !== null && _a !== void 0 ? _a : {};
-    // Prefer a group whose `path` equals the name — that group IS the filesystem
-    // directory. A group matched only by `name` may be a virtual (path-less)
-    // container whose children resolve relative to its parent, not itself.
-    let nameMatch = null;
-    for (const key of Object.keys(pbxGroups)) {
-        if (key.endsWith('_comment'))
-            continue;
-        const group = pbxGroups[key];
-        if (normalizePBXValue(group.path) === name)
-            return key;
-        if (normalizePBXValue(group.name) === name && nameMatch === null) {
-            nameMatch = key;
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+function modifyAppDelegateSwift(contents) {
+    const importLine = 'import ExpoBeacon';
+    // 1. Add import after the last existing import line.
+    if (!contents.includes(importLine)) {
+        const lines = contents.split('\n');
+        const lastImportIdx = lines.reduce((last, line, i) => (line.trimStart().startsWith('import ') ? i : last), -1);
+        if (lastImportIdx >= 0) {
+            lines.splice(lastImportIdx + 1, 0, importLine);
         }
-    }
-    return nameMatch;
-}
-function findPBXFileReferences(xcodeProject, filename) {
-    var _a;
-    const refs = (_a = xcodeProject.hash.project.objects['PBXFileReference']) !== null && _a !== void 0 ? _a : {};
-    const matches = [];
-    for (const key of Object.keys(refs)) {
-        if (key.endsWith('_comment'))
-            continue;
-        const ref = refs[key];
-        if (typeof ref !== 'object' || ref === null)
-            continue;
-        const refPath = normalizePBXValue(ref.path);
-        const refName = normalizePBXValue(ref.name);
-        if (path.posix.basename(refPath) === filename ||
-            path.posix.basename(refName) === filename) {
-            matches.push({ key, ref });
+        else {
+            lines.splice(0, 0, importLine, '');
         }
+        contents = lines.join('\n');
     }
-    return matches;
-}
-function removeFileReferenceFromAllGroups(xcodeProject, fileRefKeys) {
-    var _a;
-    if (fileRefKeys.length === 0)
-        return;
-    const fileRefKeySet = new Set(fileRefKeys);
-    const pbxGroups = (_a = xcodeProject.hash.project.objects['PBXGroup']) !== null && _a !== void 0 ? _a : {};
-    for (const key of Object.keys(pbxGroups)) {
-        if (key.endsWith('_comment'))
-            continue;
-        const group = pbxGroups[key];
-        if (!Array.isArray(group.children))
-            continue;
-        group.children = group.children.filter((child) => { var _a; return !fileRefKeySet.has((_a = child.value) !== null && _a !== void 0 ? _a : ''); });
+    // 2. Insert registration call before `return super.application(…didFinishLaunchingWithOptions…)`.
+    const registrationCall = 'BeaconLifecycleRegistry.register(BeaconGeoPlugin())';
+    if (contents.includes(registrationCall)) {
+        return contents; // already patched
     }
-}
-function findPBXBuildFileKeys(xcodeProject, fileRefKeys, filename) {
-    var _a;
-    const fileRefKeySet = new Set(fileRefKeys);
-    const buildFiles = (_a = xcodeProject.hash.project.objects['PBXBuildFile']) !== null && _a !== void 0 ? _a : {};
-    return Object.keys(buildFiles).filter((key) => {
-        if (key.endsWith('_comment'))
-            return false;
-        const buildFile = buildFiles[key];
-        if (typeof buildFile !== 'object' || buildFile === null)
-            return false;
-        return (fileRefKeySet.has(buildFile.fileRef) ||
-            normalizePBXValue(buildFile.fileRef_comment) === filename);
-    });
-}
-function removePBXBuildFiles(xcodeProject, buildFileKeys) {
-    var _a;
-    if (buildFileKeys.length === 0)
-        return;
-    const buildFiles = (_a = xcodeProject.hash.project.objects['PBXBuildFile']) !== null && _a !== void 0 ? _a : {};
-    for (const key of buildFileKeys) {
-        delete buildFiles[key];
-        delete buildFiles[`${key}_comment`];
+    if (/return super\.application\(application,\s*didFinishLaunching/.test(contents)) {
+        contents = contents.replace(/([ \t]*)(return super\.application\(application,\s*didFinishLaunchingWithOptions[^)]*\))/, `$1${registrationCall}\n$1$2`);
+        return contents;
     }
-}
-function removePBXSourcesBuildPhaseEntries(xcodeProject, buildFileKeys, filename) {
-    var _a;
-    if (buildFileKeys.length === 0)
-        return;
-    const buildFileKeySet = new Set(buildFileKeys);
-    const sourcePhases = (_a = xcodeProject.hash.project.objects['PBXSourcesBuildPhase']) !== null && _a !== void 0 ? _a : {};
-    for (const key of Object.keys(sourcePhases)) {
-        if (key.endsWith('_comment'))
-            continue;
-        const phase = sourcePhases[key];
-        if (!Array.isArray(phase.files))
-            continue;
-        phase.files = phase.files.filter((file) => {
-            var _a;
-            return !buildFileKeySet.has((_a = file.value) !== null && _a !== void 0 ? _a : '') &&
-                normalizePBXValue(file.comment) !== `${filename} in Sources`;
-        });
+    // Fallback: no `didFinishLaunchingWithOptions` override found — inject one before
+    // the last closing brace of the class so it is always picked up by the compiler.
+    const methodOverride = `
+  override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    ${registrationCall}
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+`;
+    const lastBraceIdx = contents.lastIndexOf('}');
+    if (lastBraceIdx >= 0) {
+        contents = contents.slice(0, lastBraceIdx) + methodOverride + contents.slice(lastBraceIdx);
     }
+    return contents;
 }
-function removePBXFileReferences(xcodeProject, fileReferences) {
-    var _a;
-    if (fileReferences.length === 0)
-        return;
-    const refs = (_a = xcodeProject.hash.project.objects['PBXFileReference']) !== null && _a !== void 0 ? _a : {};
-    for (const { key } of fileReferences) {
-        delete refs[key];
-        delete refs[`${key}_comment`];
+/** Return the first subdirectory of `platformRoot` that contains AppDelegate.swift. */
+function findAppDir(platformRoot) {
+    let entries;
+    try {
+        entries = fs.readdirSync(platformRoot);
     }
-}
-/**
- * Returns the key of the project's mainGroup — the root PBXGroup that is
- * always present in every Xcode project.
- */
-function getMainGroupKey(xcodeProject) {
-    var _a;
-    const pbxProjects = (_a = xcodeProject.hash.project.objects['PBXProject']) !== null && _a !== void 0 ? _a : {};
-    for (const key of Object.keys(pbxProjects)) {
-        if (key.endsWith('_comment'))
-            continue;
-        const proj = pbxProjects[key];
-        if (proj === null || proj === void 0 ? void 0 : proj.mainGroup)
-            return proj.mainGroup;
+    catch {
+        return null;
     }
-    return undefined;
-}
-function ensureIOSPluginSourceFile(xcodeProject, projectName) {
-    var _a, _b, _c;
-    const pbxGroups = (_a = xcodeProject.hash.project.objects['PBXGroup']) !== null && _a !== void 0 ? _a : {};
-    const groupKey = (_b = findPBXGroupKeyByName(xcodeProject, projectName)) !== null && _b !== void 0 ? _b : undefined;
-    // A physical group has `path` equal to the project name; its children resolve
-    // relative to ios/<AppName>/. A virtual (name-only) group has no `path`, so
-    // its children resolve relative to its parent — typically SOURCE_ROOT (ios/).
-    const groupHasPhysicalPath = groupKey != null &&
-        normalizePBXValue((_c = pbxGroups[groupKey]) === null || _c === void 0 ? void 0 : _c.path) === projectName;
-    // The PBXFileReference `path` that makes Xcode resolve ios/<AppName>/file:
-    // • physical group → just the basename (the group chain supplies the dir)
-    // • virtual / no group → SOURCE_ROOT-relative path
-    const fileRefPath = groupHasPhysicalPath
-        ? IOS_PLUGIN_FILENAME
-        : `${projectName}/${IOS_PLUGIN_FILENAME}`;
-    // IMPORTANT: xcodeProject.addSourceFile() MUST always receive a group key.
-    // Without one it calls addPluginFile() which looks up a "Plugins" PBXGroup
-    // that may not exist, dereferencing null and crashing prebuild.
-    // Fall back to the project's mainGroup, which is guaranteed to be present.
-    const effectiveGroupKey = groupKey !== null && groupKey !== void 0 ? groupKey : getMainGroupKey(xcodeProject);
-    const existingFileReferences = findPBXFileReferences(xcodeProject, IOS_PLUGIN_FILENAME);
-    const existingBuildFileKeys = findPBXBuildFileKeys(xcodeProject, existingFileReferences.map(({ key }) => key), IOS_PLUGIN_FILENAME);
-    if (existingFileReferences.length === 1 &&
-        existingBuildFileKeys.length === 1) {
-        // Repair the single existing entry in-place.
-        const [existingFileReference] = existingFileReferences;
-        existingFileReference.ref.name = `"${IOS_PLUGIN_FILENAME}"`;
-        existingFileReference.ref.sourceTree = '"<group>"';
-        existingFileReference.ref.path = `"${fileRefPath}"`;
-        if (effectiveGroupKey) {
-            removeFileReferenceFromAllGroups(xcodeProject, [existingFileReference.key]);
-            xcodeProject.addToPbxGroup({ fileRef: existingFileReference.key, basename: IOS_PLUGIN_FILENAME }, effectiveGroupKey);
+    for (const entry of entries) {
+        const dirPath = path.join(platformRoot, entry);
+        try {
+            if (!fs.statSync(dirPath).isDirectory())
+                continue;
         }
-        return;
-    }
-    // Remove any stale/duplicate entries before re-adding.
-    if (existingFileReferences.length > 0 || existingBuildFileKeys.length > 0) {
-        removePBXSourcesBuildPhaseEntries(xcodeProject, existingBuildFileKeys, IOS_PLUGIN_FILENAME);
-        removePBXBuildFiles(xcodeProject, existingBuildFileKeys);
-        removeFileReferenceFromAllGroups(xcodeProject, existingFileReferences.map(({ key }) => key));
-        removePBXFileReferences(xcodeProject, existingFileReferences);
-    }
-    // Always pass effectiveGroupKey so the xcode library never falls through to
-    // its addPluginFile / Plugins-group lookup path.
-    xcodeProject.addSourceFile(IOS_PLUGIN_FILENAME, null, effectiveGroupKey);
-    // For non-physical groups the file reference path defaults to the bare
-    // filename; patch it to the SOURCE_ROOT-relative path so Xcode finds the
-    // file at ios/<AppName>/BeaconGeoPlugin.swift.
-    if (!groupHasPhysicalPath) {
-        const newRefs = findPBXFileReferences(xcodeProject, IOS_PLUGIN_FILENAME);
-        for (const { ref } of newRefs) {
-            ref.path = `"${fileRefPath}"`;
+        catch {
+            continue;
         }
-    }
-}
-function modifySwiftAppDelegate(contents) {
-    // Insert `import ExpoBeacon` after the last existing import line.
-    if (!contents.includes('import ExpoBeacon')) {
-        const lines = contents.split('\n');
-        const lastImportIdx = lines.reduce((last, line, i) => (line.trimStart().startsWith('import ') ? i : last), -1);
-        if (lastImportIdx >= 0) {
-            lines.splice(lastImportIdx + 1, 0, 'import ExpoBeacon');
-            contents = lines.join('\n');
+        const swiftPath = path.join(dirPath, 'AppDelegate.swift');
+        if (fs.existsSync(swiftPath)) {
+            return { appDir: entry, appDelegatePath: swiftPath };
         }
     }
-    // Insert `BeaconLifecycleRegistry.register(BeaconGeoPlugin())` immediately
-    // before `return super.application(`, preserving indentation.
-    const marker = 'BeaconLifecycleRegistry.register(BeaconGeoPlugin())';
-    if (!contents.includes(marker)) {
-        contents = contents.replace(/([ \t]*)(return super\.application\()/, `$1${marker}\n$1$2`);
-    }
-    return contents;
+    return null;
 }
 // ─── Plugin ───────────────────────────────────────────────────────────────────
 const withBeaconIOS = (config) => {
-    // Step 1 – write BeaconGeoPlugin.swift and add it to the Xcode project.
+    // Step 1 – write BeaconGeoPlugin.swift into the iOS app directory.
+    config = (0, config_plugins_1.withDangerousMod)(config, [
+        'ios',
+        (config) => {
+            const platformRoot = config.modRequest.platformProjectRoot;
+            const result = findAppDir(platformRoot);
+            if (!result) {
+                console.warn('[expo-beacon] Could not locate iOS app directory — BeaconGeoPlugin.swift was not written.');
+                return config;
+            }
+            const outputPath = path.join(platformRoot, result.appDir, 'BeaconGeoPlugin.swift');
+            fs.writeFileSync(outputPath, getIOSPluginSwift());
+            return config;
+        },
+    ]);
+    // Step 2 – add BeaconGeoPlugin.swift to the Xcode project target.
     config = (0, config_plugins_1.withXcodeProject)(config, (config) => {
         const xcodeProject = config.modResults;
-        const { projectName, platformProjectRoot } = config.modRequest;
-        if (!projectName || !platformProjectRoot)
-            return config;
-        const swiftFilePath = path.join(platformProjectRoot, projectName, IOS_PLUGIN_FILENAME);
-        fs.writeFileSync(swiftFilePath, exports.IOS_PLUGIN_SWIFT);
-        ensureIOSPluginSourceFile(xcodeProject, projectName);
-        return config;
-    });
-    // Step 2 – patch AppDelegate.swift to register the plugin before super.
-    config = (0, config_plugins_1.withAppDelegate)(config, (config) => {
-        if (config.modResults.language === 'swift') {
-            config.modResults.contents = modifySwiftAppDelegate(config.modResults.contents);
-        }
-        else {
-            console.warn('[expo-beacon] withBeaconIOS: AppDelegate is not Swift — ' +
-                'please add BeaconLifecycleRegistry.register(BeaconGeoPlugin()) manually.');
+        const projectName = config.modRequest.projectName;
+        const filePath = `${projectName}/BeaconGeoPlugin.swift`;
+        if (!xcodeProject.hasFile(filePath)) {
+            // pbxGroupByName returns the group object; addSourceFile needs the UUID key.
+            const groups = xcodeProject.hash.project.objects['PBXGroup'];
+            let groupKey;
+            for (const key of Object.keys(groups)) {
+                if (key.endsWith('_comment'))
+                    continue;
+                const g = groups[key];
+                if (g.name === projectName || g.path === projectName) {
+                    groupKey = key;
+                    break;
+                }
+            }
+            xcodeProject.addSourceFile(filePath, { target: xcodeProject.getFirstTarget().uuid }, groupKey);
         }
         return config;
     });
+    // Step 3 – patch AppDelegate.swift to register the plugin.
+    config = (0, config_plugins_1.withDangerousMod)(config, [
+        'ios',
+        (config) => {
+            const platformRoot = config.modRequest.platformProjectRoot;
+            const result = findAppDir(platformRoot);
+            if (!result) {
+                console.warn('[expo-beacon] AppDelegate.swift not found — ' +
+                    'please add BeaconLifecycleRegistry.register(BeaconGeoPlugin()) manually.');
+                return config;
+            }
+            const original = fs.readFileSync(result.appDelegatePath, 'utf-8');
+            fs.writeFileSync(result.appDelegatePath, modifyAppDelegateSwift(original));
+            return config;
+        },
+    ]);
     return config;
 };
 exports.default = withBeaconIOS;