feat: Implement adding and removing of pbx groups

*support for c++ files added
*recursively add pbxGroup and its children
*recursively remove pbxGroup and its children
*make sure pbx group name is not duplicated on adding new group

Author: tdermendjiev

lib/pbxProject.js

@@ -18,22 +18,25 @@
 var util = require('util'),
     f = util.format,
     EventEmitter = require('events').EventEmitter,
-    path = require('path'),
+    $path = require('path'),
     uuid = require('uuid'),
     fork = require('child_process').fork,
     pbxWriter = require('./pbxWriter'),
-    pbxFile = require('./pbxFile'),
+    pbxFile = require('./pbxFile').pbxFile,
+    pbxFileTypes = require('./pbxFile').fileTypes,
     fs = require('fs'),
     parser = require('./parser/pbxproj'),
     plist = require('simple-plist'),
     COMMENT_KEY = /_comment$/,
-    NO_SPECIAL_SYMBOLS = /^[a-zA-Z0-9_\.\$]+\.[a-zA-Z]+$/;
+    NO_SPECIAL_SYMBOLS = /^[a-zA-Z0-9_\.\$]+\.[a-zA-Z]+$/,
+    HEADER_FILE_TYPE_SUFFIX = ".h",
+    SOURCE_CODE_FILE_TYPE_PREFIX = "sourcecode.";
 
 function pbxProject(filename) {
     if (!(this instanceof pbxProject))
         return new pbxProject(filename);
 
-    this.filepath = path.resolve(filename)
+    this.filepath = $path.resolve(filename)
 }
 
 util.inherits(pbxProject, EventEmitter)
@@ -492,17 +495,37 @@ pbxProject.prototype.removeFromPbxBuildFileSection = function(file) {
     }
 }
 
-pbxProject.prototype.addPbxGroup = function(filePathsArray, name, path, sourceTree) {
+pbxProject.prototype.findMainPbxGroup = function () {
+    var groups = this.hash.project.objects['PBXGroup'];
+    var candidates = [];
+    for (var key in groups) {
+        if (!groups[key].path && !groups[key].name && groups[key].isa) {
+            candidates.push(groups[key]);
+        }
+    }
+    if (candidates.length == 1) {
+        return candidates[0];
+    }
+
+    return null;
+}
+
+pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceTree, opt) {
+
+    var oldGroup = this.pbxGroupByName(name);
+    if (oldGroup) {
+        this.removePbxGroup(name, path);
+    }
+
     var groups = this.hash.project.objects['PBXGroup'],
-        pbxGroupUuid = this.generateUuid(),
+        pbxGroupUuid = opt.uuid || this.generateUuid(),
         commentKey = f("%s_comment", pbxGroupUuid),
         pbxGroup = {
             isa: 'PBXGroup',
             children: [],
             name: name,
-            path: path,
             sourceTree: sourceTree ? sourceTree : '"<group>"'
-        },
+        },//path is mandatory only for the main group
         fileReferenceSection = this.pbxFileReferenceSection(),
         filePathToReference = {};
 
@@ -527,23 +550,64 @@ pbxProject.prototype.addPbxGroup = function(filePathsArray, name, path, sourceTr
             continue;
         }
 
-        var file = new pbxFile(filePath);
-        file.uuid = this.generateUuid();
-        file.fileRef = this.generateUuid();
-        this.addToPbxFileReferenceSection(file);    // PBXFileReference
-        this.addToPbxBuildFileSection(file);        // PBXBuildFile
-        pbxGroup.children.push(pbxGroupChild(file));
+        var srcRootPath = $path.dirname($path.dirname(this.filepath));
+        var file = new pbxFile($path.relative(srcRootPath, filePath));
+        if (fs.lstatSync(filePath).isDirectory()) {
+            file.uuid = this.generateUuid();
+            file.fileRef = file.uuid;
+            this.addToPbxFileReferenceSection(file);    // PBXFileReference
+            this.addToPbxBuildFileSection(file);
+            pbxGroup.children.push(pbxGroupChild(file));
+            var files = fs.readdirSync(filePath).map(p => $path.join(filePath, p));
+            this.addPbxGroup(files, $path.basename(filePath), filePath, null, {uuid: file.uuid});
+        }else if (file.lastType.startsWith(SOURCE_CODE_FILE_TYPE_PREFIX)) {
+            file.uuid = this.generateUuid();
+            file.fileRef = this.generateUuid();
+            this.addToPbxFileReferenceSection(file);    // PBXFileReference
+            this.addToPbxBuildFileSection(file);        // PBXBuildFile
+            if (!file.lastType.endsWith(HEADER_FILE_TYPE_SUFFIX)) {
+                this.addToPbxSourcesBuildPhase(file);
+            }
+            pbxGroup.children.push(pbxGroupChild(file));
+        }
+
     }
 
     if (groups) {
         groups[pbxGroupUuid] = pbxGroup;
         groups[commentKey] = name;
     }
 
-    return { uuid: pbxGroupUuid, pbxGroup: pbxGroup };
+    if (opt.isMain) {
+        let mainGroup = this.findMainPbxGroup();
+        if (mainGroup) {
+            var file = new pbxFile($path.relative(this.filepath, path));
+            file.fileRef = pbxGroupUuid;
+            mainGroup.children.push(pbxGroupChild(file));
+        }
+    }
+
+    return {uuid: pbxGroupUuid, pbxGroup: pbxGroup};
 }
 
-pbxProject.prototype.removePbxGroup = function (groupName) {
+pbxProject.prototype.removePbxGroup = function(groupName, path) {
+        var group = this.pbxGroupByName(groupName);
+        if (!group) {
+            return;
+        }
+
+    var children = group.children;
+
+    for(i in children) {
+        var file = new pbxFile($path.join(path, children[i].comment));
+        file.fileRef = children[i].value;
+        file.uuid = file.fileRef;
+        this.removePbxGroup(children[i].comment, $path.join(path, children[i].comment));
+        this.removeFromPbxFileReferenceSection(file);
+        this.removeFromPbxBuildFileSection(file);
+        this.removeFromPbxSourcesBuildPhase(file);
+    }
+
     var section = this.hash.project.objects['PBXGroup'],
         key, itemKey;
 
@@ -616,12 +680,12 @@ pbxProject.prototype.addToXcVersionGroupSection = function(file) {
             isa: 'XCVersionGroup',
             children: file.models.map(function (el) { return el.fileRef; }),
             currentVersion: file.currentModel.fileRef,
-            name: path.basename(file.path),
+            name: $path.basename(file.path),
             path: file.path,
             sourceTree: '"<group>"',
             versionGroupType: 'wrapper.xcdatamodel'
         };
-        this.xcVersionGroupSection()[commentKey] = path.basename(file.path);
+        this.xcVersionGroupSection()[commentKey] = $path.basename(file.path);
     }
 }
 
@@ -1416,7 +1480,7 @@ pbxProject.prototype.addTarget = function(name, type, subfolder) {
             isa: 'XCBuildConfiguration',
             buildSettings: {
                 GCC_PREPROCESSOR_DEFINITIONS: ['"DEBUG=1"', '"$(inherited)"'],
-                INFOPLIST_FILE: '"' + path.join(targetSubfolder, targetSubfolder + '-Info.plist' + '"'),
+                INFOPLIST_FILE: '"' + $path.join(targetSubfolder, targetSubfolder + '-Info.plist' + '"'),
                 LD_RUNPATH_SEARCH_PATHS: '"$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"',
                 PRODUCT_NAME: '"' + targetName + '"',
                 SKIP_INSTALL: 'YES'
@@ -1426,7 +1490,7 @@ pbxProject.prototype.addTarget = function(name, type, subfolder) {
             name: 'Release',
             isa: 'XCBuildConfiguration',
             buildSettings: {
-                INFOPLIST_FILE: '"' + path.join(targetSubfolder, targetSubfolder + '-Info.plist' + '"'),
+                INFOPLIST_FILE: '"' + $path.join(targetSubfolder, targetSubfolder + '-Info.plist' + '"'),
                 LD_RUNPATH_SEARCH_PATHS: '"$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"',
                 PRODUCT_NAME: '"' + targetName + '"',
                 SKIP_INSTALL: 'YES'
@@ -1616,7 +1680,7 @@ function pbxBuildFileComment(file) {
 }
 
 function pbxFileReferenceComment(file) {
-    return file.basename || path.basename(file.path);
+    return file.basename || $path.basename(file.path);
 }
 
 function pbxNativeTargetComment(target) {
@@ -1656,7 +1720,7 @@ function searchPathForFile(file, proj) {
 
     var plugins = proj.pbxGroupByName('Plugins'),
         pluginsPath = plugins ? plugins.path : null,
-        fileDir = path.dirname(file.path);
+        fileDir = $path.dirname(file.path);
 
     if (fileDir == '.') {
         fileDir = '';
@@ -2071,7 +2135,7 @@ pbxProject.prototype.addDataModelDocument = function(filePath, group, opt) {
     var modelFiles = fs.readdirSync(file.path);
     for (var index in modelFiles) {
         var modelFileName = modelFiles[index];
-        var modelFilePath = path.join(filePath, modelFileName);
+        var modelFilePath = $path.join(filePath, modelFileName);
 
         if (modelFileName == '.xccurrentversion') {
             currentVersionName = plist.readFileSync(modelFilePath)._XCCurrentVersionName;