Prevent duplicate property names in generated Swift code

Author: inquisitiveSoft

XCAssetPacker.xcodeproj/project.pbxproj

@@ -194,11 +194,13 @@
 					4A56D1461DE5B573000B40D8 = {
 						CreatedOnToolsVersion = 8.1;
 						DevelopmentTeam = D92MT22EX5;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					4AD71E7B1EA4CCBA00016A1A = {
 						CreatedOnToolsVersion = 8.3.1;
 						DevelopmentTeam = D92MT22EX5;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -372,7 +374,8 @@
 			buildSettings = {
 				DEVELOPMENT_TEAM = D92MT22EX5;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -381,7 +384,8 @@
 			buildSettings = {
 				DEVELOPMENT_TEAM = D92MT22EX5;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -397,7 +401,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.inquisitiveSoftware.XCAssetPacker-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -412,7 +417,8 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.inquisitiveSoftware.XCAssetPacker-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

XCAssetPacker/AssetCatalogGenerator.swift

@@ -239,18 +239,21 @@ class AssetCatalogGenerator {
         }
 
 
-        // Create the folder structure, the metadata and copy the images across
-        var result = try applyChanges(forNode: rootNode, dryRun: dryRun, logLevel: logLevel)
-        
-        
         // Generate Swift code
+        let generatedCode: String?
+        
         if let swiftFileURL = swiftFileURL {
             let code = try swiftCode(forTarget: swiftTarget, rootNode: rootNode)
-            result.code = code
-            
             try code.write(to: swiftFileURL, atomically: true, encoding: .utf8)
+            generatedCode = code
+        } else {
+            generatedCode = nil
         }
-    
+        
+        // Create the folder structure, the metadata and copy the images across
+        var result = try applyChanges(forNode: rootNode, dryRun: dryRun, logLevel: logLevel)
+        result.code = generatedCode
+        
         return result
     }
 

XCAssetPacker/CommandLine/CommandLineKit/CommandLine.swift

@@ -316,10 +316,10 @@ public class CommandLine {
       }
 
       /* Remove attached argument from flag */
-      let splitFlag = flagWithArg.split(by: argumentAttacher, maxSplits: 1)
-      let flag = splitFlag[0]
-      let attachedArg: String? = splitFlag.count == 2 ? splitFlag[1] : nil
-
+      let splitFlag = flagWithArg.split(separator: argumentAttacher, maxSplits: 1)
+      let flag = String(splitFlag[0])
+      let attachedArg: String? = splitFlag.count == 2 ? String(splitFlag[1]) : nil
+      
       var flagMatched = false
       for option in _options where option.flagMatch(flag) {
         let vals = self._getFlagValues(idx, attachedArg)

XCAssetPacker/CommandLine/CommandLineKit/StringExtensions.swift

@@ -95,14 +95,14 @@ internal extension String {
     for i in self.characters.indices {
       let c = self[i]
       if c == by && (maxSplits == 0 || numSplits < maxSplits) {
-        s.append(self[curIdx..<i])
+        s.append(String(self[curIdx..<i]))
         curIdx = self.index(after: i)
         numSplits += 1
       }
     }
 
     if curIdx != self.endIndex {
-      s.append(self[curIdx..<self.endIndex])
+      s.append(String(self[curIdx..<self.endIndex]))
     }
 
     return s

XCAssetPacker/ImageProperties.swift

@@ -4,7 +4,7 @@
 //
 //  Created by Harry Jordan on 23/11/2016.
 //  Copyright © 2016 Inquisitive Software. All rights reserved.
-//	
+//    
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
 //  You may obtain a copy of the License at
@@ -38,7 +38,7 @@ struct ImageProperties {
 
         // Look for an image scale e.g. @2x or @3x
         if let match = ImageProperties.scaleRegularExpression.firstMatch(in: adaptedName, range: adaptedName.asNSRange), match.numberOfRanges >= 2 {
-            let rangeOfDigits = match.rangeAt(1)
+            let rangeOfDigits = match.range(at: 1)
             let digitString = (adaptedName as NSString).substring(with: rangeOfDigits)
 
             if let scaleNumber = Int(digitString) {

XCAssetPacker/SwiftGeneration.swift

@@ -21,6 +21,12 @@
 import Foundation
 
 
+enum SwiftGenerationError: Error {
+    case duplicateProperty(name: String, originalFileName: String)
+}
+
+
+
 enum SwiftTarget {
     case cocoa, iOS, watch
 
@@ -108,9 +114,14 @@ extension AssetCatalogGenerator {
 
         for child in childNodes where child.isDirectory && child.isImageSet && !child.isAppIcon {
             let propertyName = child.swiftPropertyName(withinGroup: groupPropertyName)
-            propertyNames.append(propertyName)
 
-            generatedCode += firstIndent + "var \(propertyName): \(target.imageClassName) { return image(named: \"\(child.swiftCatalogName)\") }\n"
+            if propertyNames.contains(propertyName) {
+                throw SwiftGenerationError.duplicateProperty(name: propertyName, originalFileName: child.name)
+            } else {
+                propertyNames.append(propertyName)
+                
+                generatedCode += firstIndent + "var \(propertyName): \(target.imageClassName) { return image(named: \"\(child.swiftCatalogName)\") }\n"
+            }
         }
 
         for child in node.children where child.isDirectory && !child.isImageSet && !child.isAppIcon {

XCAssetPacker/main.swift

@@ -146,6 +146,13 @@ do {
         print(description)
         exit(EX_IOERR)
     }
+} catch let error as SwiftGenerationError {
+    switch error {
+    case .duplicateProperty(let name, originalFileName: let originalFileName):
+        print("Conflicting property '\(name)' for \(originalFileName)")
+        print("Images need to have distinct llama case representations")
+        exit(EX_IOERR)
+    }
 } catch let error {
     print("Unexpected error: \(String(describing: error))")
     exit(EX_IOERR)