feat: handle localization items properly

Author: KristianDD

lib/pbxProject.js

@@ -517,6 +517,7 @@ pbxProject.prototype.findMainPbxGroup = function () {
 
 pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceTree, opt) {
     opt = opt || {};
+    var srcRootPath = $path.dirname($path.dirname(this.filepath));
     var oldGroup = this.pbxGroupByName(name);
     if (oldGroup) {
         this.removePbxGroup(name, path);
@@ -560,7 +561,6 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
             continue;
         }
 
-        var srcRootPath = $path.dirname($path.dirname(this.filepath));
         var relativePath = $path.relative(srcRootPath, filePath);
         var file = new pbxFile(opt.filesRelativeToProject ? relativePath : filePath);
         file.uuid = this.generateUuid();
@@ -569,22 +569,21 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
             file.target = opt.target;
         }
         if (fs.existsSync(filePath) && fs.lstatSync(filePath).isDirectory() && !isAssetFileType(file.lastKnownFileType)) {
-            file.fileRef = file.uuid;
-            var files = fs.readdirSync(filePath).map(p => $path.join(filePath, p));
             if($path.extname(filePath) === ".lproj") {
-                addLocalizationGroup.call(this, pbxGroup, file, files, srcRootPath, opt);
-            } else {
-                this.addToPbxFileReferenceSection(file);    // PBXFileReference
-                this.addToPbxBuildFileSection(file);
-                pbxGroup.children.push(pbxGroupChild(file));
-                this.addPbxGroup(files, $path.basename(filePath), filePath, null, {uuid: file.uuid, filesRelativeToProject: opt.filesRelativeToProject, target: opt.target});
+                continue;
             }
+            file.fileRef = file.uuid;
+            var files = fs.readdirSync(filePath).map(p => $path.join(filePath, p));
+            this.addToPbxFileReferenceSection(file);    // PBXFileReference
+            this.addToPbxBuildFileSection(file);
+            pbxGroup.children.push(pbxGroupChild(file));
+            this.addPbxGroup(files, $path.basename(filePath), filePath, null, {uuid: file.uuid, filesRelativeToProject: opt.filesRelativeToProject, target: opt.target});
         } else {
             this.addToPbxFileReferenceSection(file);    // PBXFileReference
             pbxGroup.children.push(pbxGroupChild(file));
             if(isHeaderFileType(file.lastKnownFileType) || isPlist(file.lastKnownFileType)) {
                 continue;
-            } 
+            }
 
             if(isEntitlement(file.lastKnownFileType)) {
                 this.addToBuildSettings('CODE_SIGN_ENTITLEMENTS', file.path, opt.target);
@@ -601,6 +600,8 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
         }
     }
 
+    handleLocalization.call(this, filePathsArray, pbxGroup, srcRootPath, opt);
+
     if (groups) {
         groups[pbxGroupUuid] = pbxGroup;
         groups[commentKey] = name;
@@ -618,26 +619,55 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
     return {uuid: pbxGroupUuid, pbxGroup: pbxGroup};
 }
 
-function addLocalizationGroup(pbxGroup, variantFile, files, srcRootPath, opt) {
-    for (var i = 0; i < files.length; i++) {
-        var variantGroupName = $path.parse($path.basename(files[i])).name + ".storyboard";
-        var variantGroup = this.findPBXVariantGroupKey({name: variantGroupName});
-        if(!variantGroup) {
-            variantGroup = this.addLocalizationVariantGroup(variantGroupName, { target: opt.target, skipAddToResourcesGroup: true });
-            pbxGroup.children.push(pbxGroupChild(variantGroup));
+function handleLocalization(files, pbxGroup, srcRootPath, opt) {
+    var storyboardNames = {};
+    var allNames = {};
+    var regions = {};
+
+    for (let i = 0; i < files.length; i++) {
+        const filePath = files[i];
+        const parsedPath = $path.parse(filePath);
+        if($path.extname(filePath) === ".lproj") {
+            var regionName = parsedPath.name;
+            var region = regions[regionName] = {};
+            var regionFiles =  fs.readdirSync(filePath);
+            this.addKnownRegion(regionName);
+            for (let j = 0; j < regionFiles.length; j++) {
+                var regionFilePath = regionFiles[j];
+                var parsedRegionFilePath = $path.parse(regionFilePath);
+                var regionFileName = parsedRegionFilePath.name;
+                if(parsedRegionFilePath.ext === ".storyboard") {
+                    storyboardNames[parsedRegionFilePath.name] = true;
+                }
+                fileRegions = allNames[parsedRegionFilePath.name] = allNames[parsedRegionFilePath.name] || [];
+                fileRegions.push(regionName);
+                region[regionFileName] = $path.join(filePath, regionFilePath);
+            }
         }
-        var refFile = new pbxFile($path.relative(srcRootPath, files[i]), {basename: $path.parse(variantFile.basename).name});
-        refFile.fileRef = this.generateUuid();
-        this.addToPbxFileReferenceSection(refFile);
-        this.addToPbxVariantGroup(refFile, variantGroup.fileRef);
     }
-}
+
+    for (var name in allNames) {
+        fileRegions = allNames[name]
+        var variantGroupName = storyboardNames[name] ? name + ".storyboard" : name + ".strings";
+
+        var variantGroup = this.addLocalizationVariantGroup(variantGroupName, { target: opt.target, skipAddToResourcesGroup: true });
+        pbxGroup.children.push(pbxGroupChild(variantGroup));
+        for (let k = 0; k < fileRegions.length; k++) {
+            var file = regions[fileRegions[k]][name];
+            var refFile = new pbxFile($path.relative(srcRootPath, file), {basename: fileRegions[k]});
+            refFile.fileRef = this.generateUuid();
+            this.addToPbxFileReferenceSection(refFile);
+            this.addToPbxVariantGroup(refFile, variantGroup.fileRef);
+        }
+    }
+};
 
 pbxProject.prototype.removePbxGroup = function(groupName, path) {
-    var group = this.pbxGroupByName(groupName);
-    if (!group) { 
+    var groupKey = this.findPBXGroupKey({name: groupName}) || this.findPBXVariantGroupKey({name: groupName});
+    if (!groupKey) {
         return;
     }
+    var group = this.getPBXGroupByKey(groupKey) || this.getPBXVariantGroupByKey(groupKey)
 
     path = path || "";
 
@@ -663,8 +693,12 @@ pbxProject.prototype.removePbxGroup = function(groupName, path) {
         }
     }
 
-    var section = this.hash.project.objects['PBXGroup'],
-        key, itemKey;
+    var section, key, itemKey;
+    if(unquote(group.isa) === "PBXVariantGroup") {
+        section = this.hash.project.objects['PBXVariantGroup'];
+    } else {
+        section = this.hash.project.objects['PBXGroup'];
+    }
 
     for (key in section) {
         // only look for comments