Better optional property behavior and other enhancements to Swift support

mogenerator.h

@@ -52,6 +52,9 @@
 @interface NSObject (JustHereToSuppressIsOrderedNotImplementedCompilerWarning)
 - (BOOL)isOrdered;
 @end
+@interface NSPropertyDescription (swiftOptionality)
+- (NSString*)swiftOptionality;
+@end
 
 @interface NSString (camelCaseString)
 - (NSString*)camelCaseString;

mogenerator.m

@@ -567,6 +567,52 @@ - (BOOL)jr_isOrdered {
 
 @end
 
+@implementation NSPropertyDescription (swiftOptionality)
+
+- (NSString*)swiftOptionality {
+    if(self.optional) {
+        return @"?";
+    }
+    else {
+        return @"";
+    }
+}
+
+@end
+
+@implementation NSAttributeDescription (swiftOptionality)
+
+- (NSString *)swiftOptionality {
+    if(!self.optional && !self.defaultValue) {
+        // This property will start out as nil, so let's make it an implicit optional.
+        return @"!";
+    }
+    else {
+        return [super swiftOptionality];
+    }
+}
+
+@end
+
+@implementation NSRelationshipDescription (swiftOptionality)
+
+- (NSString *)swiftOptionality {
+    if (self.isToMany) {
+        // To-many relationships become "optional" by being empty, not by being nil.
+        return @"";
+    }
+    else {
+        NSString * optionality = [super swiftOptionality];
+        if([optionality isEqualToString:@""]) {
+            // This relationship will start off as nil, so let's make it an implicit optional.
+            optionality = @"!";
+        }
+        return optionality;
+    }
+}
+
+@end
+
 @implementation NSString (camelCaseString)
 - (NSString*)camelCaseString {
     NSArray *lowerCasedWordArray = [[self wordArray] arrayByMakingObjectsPerformSelector:@selector(lowercaseString)];

templates/human.swift.motemplate

@@ -1,3 +1,5 @@
+import CoreData
+
 @objc(<$managedObjectClassName$>)
 class <$managedObjectClassName$>: _<$managedObjectClassName$> {
 

templates/machine.swift.motemplate

@@ -57,18 +57,18 @@ class _<$managedObjectClassName$>: <$customSuperentity$> {
 <$if Attribute.hasScalarAttributeType$>
 <$if Attribute.isReadonly$>
     @NSManaged
-    let <$Attribute.name$>: NSNumber?
+    let <$Attribute.name$>: NSNumber<$Attribute.swiftOptionality$>
 <$else$>
     @NSManaged
-    var <$Attribute.name$>: NSNumber?
+    var <$Attribute.name$>: NSNumber<$Attribute.swiftOptionality$>
 <$endif$>
 <$else$>
 <$if Attribute.isReadonly$>
     @NSManaged
-    let <$Attribute.name$>: <$Attribute.objectAttributeType$><$if Attribute.isOptional$>?<$endif$>
+    let <$Attribute.name$>: <$Attribute.objectAttributeType$><$Attribute.swiftOptionality$>
 <$else$>
     @NSManaged
-    var <$Attribute.name$>: <$Attribute.objectAttributeType$><$if Attribute.isOptional$>?<$endif$>
+    var <$Attribute.name$>: <$Attribute.objectAttributeType$><$Attribute.swiftOptionality$>
 <$endif$>
 <$endif$>
     // func validate<$Attribute.name.initialCapitalString$>(value: AutoreleasingUnsafePointer<AnyObject>, error: NSErrorPointer) {}
@@ -81,9 +81,15 @@ class _<$managedObjectClassName$>: <$customSuperentity$> {
     @NSManaged
     var <$Relationship.name$>: <$Relationship.immutableCollectionClassName$>
 
+    var <$Relationship.name$>Set: <$Relationship.mutableCollectionClassName$> {
+        willAccessValueForKey("<$Relationship.name$>")
+        let ret = mutable<$if Relationship.jr_isOrdered$>Ordered<$endif$>SetValueForKey("<$Relationship.name$>")
+        didAccessValueForKey("<$Relationship.name$>")
+        return ret
+    }
 <$else$>
     @NSManaged
-    var <$Relationship.name$>: <$Relationship.destinationEntity.managedObjectClassName$><$if Relationship.isOptional$>?<$endif$>
+    var <$Relationship.name$>: <$Relationship.destinationEntity.managedObjectClassName$><$Relationship.swiftOptionality$>
 
     // func validate<$Relationship.name.initialCapitalString$>(value: AutoreleasingUnsafePointer<AnyObject>, error: NSErrorPointer) {}
 <$endif$>