fix: allow adding resource, source... to a target when it was already added to another target (#21)

Author: farfromrefug

lib/pbxProject.js

@@ -119,8 +119,8 @@ pbxProject.prototype.addPluginFile = function(path, opt) {
     file.plugin = true; // durr
     correctForPluginsPath(file, this);
 
-    // null is better for early errors
-    if (this.hasFile(file.path)) return null;
+    const existingFile = this.hasFile(file.path);
+    if (existingFile) return {...file, fileRef: existingFile.fileRef};
 
     file.fileRef = this.generateUuid();
 
@@ -256,19 +256,25 @@ pbxProject.prototype.addResourceFile = function(path, opt, group) {
     opt = opt || {};
 
     var file;
+    var fileIsAlreadyAdded = false;
 
     if (opt.plugin) {
         file = this.addPluginFile(path, opt);
         if (!file) return false;
     } else {
         file = new pbxFile(path, opt);
-        if (this.hasFile(file.path)) return false;
+        const existingFile = this.hasFile(file.path);
+        fileIsAlreadyAdded = !!existingFile;
+        if (existingFile) {
+            // use existing fileRef
+            file.fileRef = existingFile.fileRef;
+        }
     }
 
     file.uuid = this.generateUuid();
     file.target = opt ? opt.target : undefined;
 
-    if (!opt.plugin) {
+    if (!opt.plugin && !fileIsAlreadyAdded) {
         correctForResourcesPath(file, this);
         file.fileRef = this.generateUuid();
     }
@@ -278,7 +284,7 @@ pbxProject.prototype.addResourceFile = function(path, opt, group) {
         this.addToPbxResourcesBuildPhase(file);     // PBXResourcesBuildPhase
     }
 
-    if (!opt.plugin) {
+    if (!opt.plugin && !fileIsAlreadyAdded) {
         this.addToPbxFileReferenceSection(file);    // PBXFileReference
         if (group) {
             if (this.getPBXGroupByKey(group)) {
@@ -345,8 +351,7 @@ pbxProject.prototype.addFramework = function(fpath, opt) {
 
     var fileReference = this.hasFile(file.path);
     if (fileReference) {
-        var key = this.getFileKey(file.path);
-        file.fileRef = key;
+        file.fileRef = fileReference.fileRef;
     } else {
         this.addToPbxFileReferenceSection(file);    // PBXFileReference
         this.addToFrameworksPbxGroup(file);         // PBXGroup
@@ -424,13 +429,14 @@ pbxProject.prototype.addCopyfile = function(fpath, opt) {
     // catch duplicates
     if (this.hasFile(file.path)) {
         file = this.hasFile(file.path);
+    } else {
+        file.fileRef = this.generateUuid();
+        this.addToPbxFileReferenceSection(file);    // PBXFileReference
     }
-
-    file.fileRef = file.uuid = this.generateUuid();
+    file.uuid = this.generateUuid();
     file.target = opt ? opt.target : undefined;
 
     this.addToPbxBuildFileSection(file);        // PBXBuildFile
-    this.addToPbxFileReferenceSection(file);    // PBXFileReference
     this.addToPbxCopyfilesBuildPhase(file);     // PBXCopyFilesBuildPhase
 
     return file;
@@ -470,19 +476,24 @@ pbxProject.prototype.addStaticLibrary = function(path, opt) {
     opt = opt || {};
 
     var file;
+    var fileIsAlreadyAdded = false;
 
     if (opt.plugin) {
         file = this.addPluginFile(path, opt);
         if (!file) return false;
     } else {
         file = new pbxFile(path, opt);
-        if (this.hasFile(file.path)) return false;
+        const existingFile = this.hasFile(file.path);
+        fileIsAlreadyAdded = !!existingFile;
+        if (existingFile) {
+            file.fileRef = existingFile.fileRef;
+        }
     }
 
     file.uuid = this.generateUuid();
     file.target = opt ? opt.target : undefined;
 
-    if (!opt.plugin) {
+    if (!opt.plugin && !fileIsAlreadyAdded) {
         file.fileRef = this.generateUuid();
         this.addToPbxFileReferenceSection(file);    // PBXFileReference
     }
@@ -859,20 +870,20 @@ pbxProject.prototype.removeFromPluginsPbxGroup = function(file) {
     }
 }
 
-pbxProject.prototype.addToResourcesPbxGroup = function(file) {
-    var pluginsGroup = this.pbxGroupByName('Resources');
+pbxProject.prototype.addToResourcesPbxGroup = function(file, groupName = 'Resources') {
+    var pluginsGroup = this.pbxGroupByName(groupName);
     if (!pluginsGroup) {
-        this.addPbxGroup([file.path], 'Resources');
+        this.addPbxGroup([file.path], groupName);
     } else {
         pluginsGroup.children.push(pbxGroupChild(file));
     }
 }
 
-pbxProject.prototype.removeFromResourcesPbxGroup = function(file) {
-    if (!this.pbxGroupByName('Resources')) {
+pbxProject.prototype.removeFromResourcesPbxGroup = function(file, groupName = 'Resources') {
+    if (!this.pbxGroupByName(groupName)) {
         return null;
     }
-    var pluginsGroupChildren = this.pbxGroupByName('Resources').children, i;
+    var pluginsGroupChildren = this.pbxGroupByName(groupName).children, i;
     for (i in pluginsGroupChildren) {
         if (pbxGroupChild(file).value == pluginsGroupChildren[i].value &&
             pbxGroupChild(file).comment == pluginsGroupChildren[i].comment) {
@@ -1680,7 +1691,7 @@ pbxProject.prototype.hasFile = function(filePath) {
     for (id in files) {
         file = files[id];
         if (file.path == filePath || file.path == ('"' + filePath + '"')) {
-            return file;
+            return {...file,  fileRef: id};
         }
     }
 
@@ -2058,7 +2069,7 @@ function pbxFileReferenceObj(file) {
         fileObject.name = "\"" + fileObject.name + "\"";
     }
 
-    if(!file.path.match(NO_SPECIAL_SYMBOLS)) {
+    if(file.path && !file.path.match(NO_SPECIAL_SYMBOLS)) {
         fileObject.path = "\"" + fileObject.path + "\"";
     }
 
@@ -2525,10 +2536,11 @@ pbxProject.prototype.getPBXObject = function(name) {
 pbxProject.prototype.addFile = function (path, group, opt) {
     var file = new pbxFile(path, opt);
 
-    // null is better for early errors
-    if (this.hasFile(file.path)) return null;
+    const existingFile = this.hasFile(file.path);
+    if (existingFile) return {...file,  fileRef: existingFile.fileRef};
 
     file.fileRef = this.generateUuid();
+    file.target = opt ? opt.target : undefined;
 
     this.addToPbxFileReferenceSection(file);    // PBXFileReference