Merge Swift42 branch changes

README.md

@@ -14,6 +14,30 @@ Senseful wrote up a [nice summary of mogenerator's command-line options](http://
 
 ## Version History
 
+### v1.33: Date TBD
+
+* [NEW] Update Swift templates for better Swift style ([Aleksandar Vacić](https://github.com/rentzsch/mogenerator/pull/368))
+
+* [FIX] Fixed invalid call of `NSManagedObject.fetchRequest()` ([Vincent Esche](https://github.com/rentzsch/mogenerator/pull/372))
+
+* [NEW] Add support for URI and UUID attribute types ([Trevor Squires](https://github.com/rentzsch/mogenerator/pull/370))
+
+* [NEW] Expose information when custom type is set through userInfo ([Aleksandar Vacić](https://github.com/rentzsch/mogenerator/pull/369))
+
+* [NEW] Add Codable property support via a new attributeCodableTypeName user info key ([Tom Harrington](https://github.com/rentzsch/mogenerator/issues/375))
+
+* [CHANGE] Nullability annotations for generated primitive accessors ([Michael Babin](https://github.com/rentzsch/mogenerator/pull/363))
+
+* [FIX] Support for “Uses Scalar Type” ([Rok Gregorič](https://github.com/rentzsch/mogenerator/pull/352))
+
+* [FIX] Swift 3 `NSData` to `Data` ([Christopher Rogers](https://github.com/rentzsch/mogenerator/pull/350))
+
+* [FIX] Add specialized `fetchRequest()` func to Swift's machine generated files ([0xpablo](https://github.com/rentzsch/mogenerator/pull/358))
+
+* [FIX] Correct Swift machine template for singleton (fetchOne…) fetch request results ([Warren Burton](https://github.com/rentzsch/mogenerator/pull/359))
+
+* [FIX] Expose allAttributes and allRelationships ([Trevor Squires](https://github.com/rentzsch/mogenerator/pull/360))
+
 ### v1.32: Wed Jan 30 2019 [download](https://github.com/rentzsch/mogenerator/releases/tag/1.32)
 
 * [NEW] Support for URL and UUID property types ([Trevor Squires](https://github.com/tomekc/mogenerator/pull/1), [original PR](https://github.com/rentzsch/mogenerator/pull/370))

mogenerator.m

@@ -16,6 +16,7 @@
 
 static const NSString *const kAttributeValueScalarTypeKey = @"attributeValueScalarType";
 static const NSString *const kAdditionalHeaderFileNameKey = @"additionalHeaderFileName";
+static const NSString *const kUsesRawValueEnumType = @"attributeRawValueEnumType";
 static const NSString *const kAdditionalImportsKey = @"additionalImports";
 static const NSString *const kCustomBaseClass = @"mogenerator.customBaseClass";
 static const NSString *const kReadOnly = @"mogenerator.readonly";
@@ -457,6 +458,15 @@ - (BOOL)hasScalarAttributeType {
     }
 }
 
+- (BOOL)usesRawValueEnumType {
+    NSNumber *usesRawValueEnumType = [[self userInfo] objectForKey:kUsesRawValueEnumType];
+    return (usesRawValueEnumType != NULL);
+}
+
+- (NSString *)attributeRawValueEnumType {
+    return [[self userInfo] objectForKey:kUsesRawValueEnumType];
+}
+
 - (BOOL)usesScalarAttributeType {
     NSNumber *usesScalarAttributeType = [[self userInfo] objectForKey:kUsesScalarAttributeType];
 
@@ -586,6 +596,13 @@ - (NSString*)objectAttributeClassName {
         if (!result) {
             result = gSwift ? @"AnyObject" : @"NSObject";
         }
+    } else if (gSwift && [self attributeType] == NSBinaryDataAttributeType) {
+        NSString *codableName = [self userInfo][@"attributeCodableTypeName"];
+        if (!codableName) {
+            result = @"Data";
+        } else {
+            result = codableName;
+        }
     } else {
         // Forcibly generate the correct class name in case we are
         // running on macOS < 10.13
@@ -638,6 +655,10 @@ - (BOOL)usesCustomObjectAttributeType {
     return (attributeValueClassName != nil);
 }
 
+- (BOOL)usesCustomCodableAttributeType {
+    return [self userInfo][@"attributeCodableTypeName"] != NULL;
+}
+
 - (NSString*)objectAttributeType {
     NSString *result = [self objectAttributeClassName];
     if ([result isEqualToString:@"Class"]) {
@@ -1063,7 +1084,7 @@ - (int)application:(DDCliApplication*)app runWithArguments:(NSArray*)arguments {
     }
 
     if (_version) {
-        printf("mogenerator 1.32. By Jonathan 'Wolf' Rentzsch + friends.\n");
+        printf("mogenerator 1.33. By Jonathan 'Wolf' Rentzsch + friends.\n");
         return EXIT_SUCCESS;
     }
 

templates/human.swift.motemplate

@@ -1,6 +1,10 @@
 import Foundation
+import CoreData
+
+@objc(<$sanitizedManagedObjectClassName$>)
+open class <$sanitizedManagedObjectClassName$>: <$customSuperentity$> {
+
+	// Put custom code for <$sanitizedManagedObjectClassName$> here.
+	// This file will be created if it doesn't exist, but mogenerator will not replace an existing copy.
 
-@objc(<$managedObjectClassName$>)
-open class <$managedObjectClassName$>: _<$managedObjectClassName$> {
-	// Custom logic goes here.
 }