Skip to content

fix: shallow-merging nested objects for split sections #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erisu wants to merge 1 commit into
base: master
Choose a base branch
from
+80 −16
Open

fix: shallow-merging nested objects for split sections #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 40 additions & 2 deletions lib/parser/pbxproj.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,47 @@ function peg$parse(input, options) {
peg$c6 = function() { return Object.create(null) },
peg$c7 = function(list) {
var returnObject = list[0][0];
for(var i = 1; i < list.length; i++){

for (var i = 1; i < list.length; i++) {

@GitToTheHub GitToTheHub Jun 13, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can for...of be used here?

for (const another of list) {
  ...
}

or forEach()

list.forEach((another) => {
   ...
});

var another = list[i][0];
returnObject = Object.assign(returnObject, another);

/*
* Ensure previously parsed section entries are not lost
*
* Example:
*
* If "returnObject" contains:
*
* {
* PBXTargetDependency: {
* 'A': {},
* 'A_comment': 'PBXTargetDependency'
* }
* }
*
* And "another" contains:
*
* {
* PBXTargetDependency: {
* 'B': {},
* 'B_comment': 'PBXTargetDependency'
* }
* }
*
* Using "Object.assign(returnObject, another)" would lose
* "A" as it would replace the entire PBXTargetDependency.
*
* Instead, we will merge each top-level property of the
* objects, if it exists and is an object else add.
*/
for (var key in another) {
returnObject[key] = (
returnObject[key] &&
another[key] &&
typeof returnObject[key] === 'object' &&
typeof another[key] === 'object'
) ? Object.assign(returnObject[key], another[key]) : another[key];
}
}
return returnObject;
},
Expand Down
54 changes: 40 additions & 14 deletions lib/parser/pbxproj.pegjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,6 @@
under the License.
*/

{
function merge_obj(obj, secondObj) {
if (!obj)
return secondObj;

for(var i in secondObj)
obj[i] = merge_obj(obj[i], secondObj[i]);

return obj;
}
}

/*
* Project: point of entry from pbxproj file
*/
Expand Down Expand Up @@ -60,9 +48,47 @@ AssignmentList
= _ list:((a:Assignment / d:DelimitedSection) _)+
{
var returnObject = list[0][0];
for(var i = 1; i < list.length; i++){

for (var i = 1; i < list.length; i++) {
var another = list[i][0];
returnObject = merge_obj(returnObject, another);

/*
* Ensure previously parsed section entries are not lost
*
* Example:
*
* If "returnObject" contains:
*
* {
* PBXTargetDependency: {
* 'A': {},
* 'A_comment': 'PBXTargetDependency'
* }
* }
*
* And "another" contains:
*
* {
* PBXTargetDependency: {
* 'B': {},
* 'B_comment': 'PBXTargetDependency'
* }
* }
*
* Using "Object.assign(returnObject, another)" would lose
* "A" as it would replace the entire PBXTargetDependency.
*
* Instead, we will merge each top-level property of the
* objects, if it exists and is an object else add.
*/
for (var key in another) {
returnObject[key] = (
returnObject[key] &&
another[key] &&
typeof returnObject[key] === 'object' &&
typeof another[key] === 'object'
) ? Object.assign(returnObject[key], another[key]) : another[key];
}
}
return returnObject;
}
Expand Down
Loading