fix(ios): improve bundle identifier detection and replacement #87
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
smithemely
commented
Apr 22, 2025
smithemely
commented
- fix: handle both quoted and unquoted bundle identifiers
- feat: implement smarter base identifier detection logic
- fix: properly preserve extensions with multiple segments
…edGuy#86) * fix: handle both quoted and unquoted bundle identifiers * feat: implement smarter base identifier detection logic * fix: properly preserve extensions with multiple segments
|
I tested the updated implementation with various bundle identifier patterns in real projects, and it works correctly. The solution now handles:
This fix ensures bundle identifiers are consistently renamed throughout the project file while maintaining the structure of complex extension identifiers. It's more robust than the previous implementation. |
|
I'll test this once I get some free time. Although I was thinking of adding an additional property where users can provide the old package name, so no need for any complex logic. |
OutdatedGuy
changed the title
OutdatedGuy
requested changes
Aug 29, 2025
|
|
||
| // Extract all bundle identifiers, accounting for both quoted and unquoted formats | ||
| final bundleIdRegex = RegExp( | ||
| r'PRODUCT_BUNDLE_IDENTIFIER = "?([^";]+)"?;', |
There was a problem hiding this comment.
Should use only the allowed characters to match group. i.e. ``r'PRODUCT_BUNDLE_IDENTIFIER = "?([A-Za-z0-9.-_]+)"?;'`
| // Extract all bundle identifiers, accounting for both quoted and unquoted formats | ||
| final bundleIdRegex = RegExp( | ||
| r'PRODUCT_BUNDLE_IDENTIFIER = "?([^";]+)"?;', | ||
| multiLine: true, |
| final bundleIdentifierMatches = bundleIdRegex | ||
| .allMatches(iosProjectString) | ||
| .map((m) => m.group(1)!) | ||
| .toList(); |
There was a problem hiding this comment.
No need to convert to list. Iterable is fine and faster
| for (final identifier in bundleIdentifierMatches) { | ||
| bool isBaseForOthers = false; | ||
| for (final other in bundleIdentifierMatches) { | ||
| if (identifier != other && other.startsWith(identifier)) { |
There was a problem hiding this comment.
What is one value is com.example.app and other is com.example.application?
Comment on lines
+190
to
+201
| // Special case for RunnerTests which might not be caught by the pattern above | ||
| if (identifierReplacements.containsKey(baseIdentifier)) { | ||
| newIosProjectString = newIosProjectString.replaceAll( | ||
| RegExp('PRODUCT_BUNDLE_IDENTIFIER = "$baseIdentifier\\.RunnerTests";'), | ||
| 'PRODUCT_BUNDLE_IDENTIFIER = "$packageName.RunnerTests";', | ||
| ); | ||
|
|
||
| newIosProjectString = newIosProjectString.replaceAll( | ||
| RegExp('PRODUCT_BUNDLE_IDENTIFIER = $baseIdentifier\\.RunnerTests;'), | ||
| 'PRODUCT_BUNDLE_IDENTIFIER = $packageName.RunnerTests;', | ||
| ); | ||
| } |
There was a problem hiding this comment.
Is this necessary? Looks redundant to me. Are there any special cases you faced that requires this?
Comment on lines
+157
to
+188
| // Create a map of all identifiers to their new values | ||
| final identifierReplacements = <String, String>{}; | ||
|
|
||
| for (final identifier in bundleIdentifierMatches) { | ||
| if (identifier == baseIdentifier) { | ||
| identifierReplacements[identifier] = packageName; | ||
| } else if (identifier.startsWith(baseIdentifier)) { | ||
| // This is an extension | ||
| final extension = identifier.substring(baseIdentifier.length); | ||
| identifierReplacements[identifier] = '$packageName$extension'; | ||
| } else { | ||
| // This is an unrelated identifier, skip it | ||
| _logger.w('Skipping unrelated identifier: $identifier'); | ||
| } | ||
| } | ||
|
|
||
| // Apply all replacements to the project file | ||
| var newIosProjectString = iosProjectString; | ||
|
|
||
| identifierReplacements.forEach((oldId, newId) { | ||
| // Replace unquoted format | ||
| newIosProjectString = newIosProjectString.replaceAll( | ||
| 'PRODUCT_BUNDLE_IDENTIFIER = $oldId;', | ||
| 'PRODUCT_BUNDLE_IDENTIFIER = $newId;', | ||
| ); | ||
|
|
||
| // Replace quoted format | ||
| newIosProjectString = newIosProjectString.replaceAll( | ||
| 'PRODUCT_BUNDLE_IDENTIFIER = "$oldId";', | ||
| 'PRODUCT_BUNDLE_IDENTIFIER = "$newId";', | ||
| ); | ||
| }); |
There was a problem hiding this comment.
Can this be merged in a single logic? Like:
newIosProjectString = iosProjectString.replaceAllMapped(
'PRODUCT_BUNDLE_IDENTIFIER = ("?)$baseIdentifier',
(match) {
final quote = match.group(1) ?? '';
return 'PRODUCT_BUNDLE_IDENTIFIER = $quote$packageName';
},
);
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.