feature: Add groups created by addPbxGroup() to the meta PBXGroup

Current implementation doesn't add created groups to the main/meta PBXGroup and therefore they don't show up in the file tree.

Author: tdermendjiev

lib/pbxFile.js

@@ -11,6 +11,19 @@ var path = require('path'),
     DEFAULT_SOURCE_TREE = '"<group>"',
     DEFAULT_FILE_ENCODING = 4;
 
+function fileTypes() {
+    return {
+        SOURCE_FILE: SOURCE_FILE,
+        HEADER_FILE: HEADER_FILE,
+        BUNDLE: BUNDLE,
+        XIB_FILE: XIB_FILE,
+        FRAMEWORK: FRAMEWORK,
+        DYLIB: DYLIB,
+        ARCHIVE: ARCHIVE,
+        PNG_IMAGE: PNG_IMAGE
+    }
+}
+
 function detectLastType(path) {
     if (M_EXTENSION.test(path))
         return SOURCE_FILE;
@@ -102,4 +115,7 @@ function pbxFile(filepath, opt) {
     }
 }
 
-module.exports = pbxFile;
+module.exports = {
+    pbxFile: pbxFile,
+    fileTypes: fileTypes
+}

lib/pbxProject.js

@@ -5,7 +5,8 @@ var util = require('util'),
     uuid = require('node-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'),
     COMMENT_KEY = /_comment$/,
@@ -286,6 +287,21 @@ pbxProject.prototype.removeFromPbxBuildFileSection = function (file) {
     }
 }
 
+pbxProject.prototype.findMainPbxGroup = function () {
+    var groups = this.hash.project.objects['PBXGroup'];
+    var candidates = [];
+    for (var key in groups) {
+        if (groups[key].path == undefined && groups[key].name == undefined && groups[key].isa) {
+            candidates.push(groups[key]);
+        }
+    }
+    if (candidates.length == 1) {
+        return candidates[0];
+    }
+
+    return null;
+}
+
 pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceTree) {
     var groups = this.hash.project.objects['PBXGroup'],
         pbxGroupUuid = this.generateUuid(),
@@ -320,20 +336,39 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
             pbxGroup.children.push(pbxGroupChild(filePathToReference[filePathQuoted]));
             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));
+        if (file.lastType == pbxFileTypes().SOURCE_FILE || file.lastType == pbxFileTypes().HEADER_FILE || fs.lstatSync(file.path).isDirectory()) {
+            file.uuid = this.generateUuid();
+            file.fileRef = this.generateUuid();
+            this.addToPbxFileReferenceSection(file);    // PBXFileReference
+            this.addToPbxBuildFileSection(file);        // PBXBuildFile
+            if (file.lastType == pbxFileTypes().SOURCE_FILE) {
+                this.addToPbxSourcesBuildPhase(file);
+            }
+            pbxGroup.children.push(pbxGroupChild(file));
+        }
+
     }
 
     if (groups) {
         groups[pbxGroupUuid] = pbxGroup;
         groups[commentKey] = name;
     }
-    
+
+    let mainGroup = this.findMainPbxGroup();
+    if (mainGroup) {
+        var file = new pbxFile(pbxGroup.path);
+        file.fileRef = pbxGroupUuid;
+        // Following check is just for readability. 'file.basename' will be the comment for the child group in the main/meta PBXGroup.
+        //'basename' is set by pbxFile to path's basename. Because we search for 'src' folder in plugins for source code, without this check
+        // all root groups will have the same 'src' comment in the .pbxproject.x
+        if (file.basename !== name) {
+            file.basename = name;
+        }
+        mainGroup.children.push(pbxGroupChild(file));
+    }
+
     return {uuid: pbxGroupUuid, pbxGroup: pbxGroup};
 }