Unify the iOS and macOS storyboard templates

CHANGELOG.md

@@ -27,6 +27,9 @@
 * Since Swift 2 is no longer actively supported, we now consider those templates as "legacy" and cannot guarantee that there won't be issues with the generated code.  
   [David Jennes](https://github.com/djbe)
   [#53](https://github.com/SwiftGen/templates/issues/53)
+* The iOS and macOS storyboard templates have been unified into one. The generated code also no longer uses enum cases for scenes but instead uses a generic struct. See the documentation for some examples.  
+  [David Jennes](https://github.com/djbe)
+  [#57](https://github.com/SwiftGen/templates/issues/57)
 
 ### New Features
 

Documentation/MigrationGuide.md

@@ -36,9 +36,9 @@ Below is a list of renamed and removed templates, grouped by subcommand. If your
 | --- | --- | ------ |
 | default | swift2 | |
 | lowercase | **deleted** | No longer needed since we prefix classes with their module |
-| osx-default | macOS-swift2 | |
+| osx-default | **deleted** | Unified with the iOS template, just use `swift2` |
 | osx-lowercase | **deleted** | No longer needed since we prefix classes with their module |
-| osx-swift3 | macOS-swift3 | |
+| osx-swift3 | **deleted** | Unified with the iOS template, just use `swift3` |
 | uppercase | **deleted** | No longer needed since we prefix classes with their module |
 
 ### Strings ###

Documentation/storyboards/swift2.md

@@ -10,8 +10,8 @@
 ## When to use it
 
 - When you need to generate *Swift 2* code
-- You want to generate code for UIKit platforms (iOS, tvOS and watchOS)
-- **Warning**: Swift 2 is no longer actively supported, so we cannot guarantee that there won't be issues with the generated code.
+- The generated code supports both UIKit platforms (iOS, tvOS and watchOS) and AppKit platform (macOS)
+- **Warning**: Swift 2 is no longer actively supported, so we won't maintain this template and don't unit-test the generated code for it anymore.
 
 ## Customization
 
@@ -24,33 +24,25 @@ You can customize some elements of this template by overriding the following par
 
 ## Generated Code
 
+Note: the generated code may look differently depending on the platform the storyboard file is targeting.
+
 **Extract:**
 
 ```swift
 enum StoryboardScene {
-  enum Dependency: String, StoryboardSceneType {
+  enum Dependency: StoryboardType {
     static let storyboardName = "Dependency"
 
-    case DependentScene = "Dependent"
-    static func instantiateDependent() -> UIViewController {
-      return StoryboardScene.Dependency.DependentScene.viewController()
-    }
+    static let Dependent = SceneType<UIViewController>(Dependency.self, identifier: "Dependent")
   }
-  enum Message: String, StoryboardSceneType {
+  enum Message: StoryboardType {
     static let storyboardName = "Message"
 
-    case MessagesListScene = "MessagesList"
-    static func instantiateMessagesList() -> UITableViewController {
-      guard let vc = StoryboardScene.Message.MessagesListScene.viewController() as? UITableViewController
-      else {
-        fatalError("ViewController 'MessagesList' is not of the expected class UITableViewController.")
-      }
-      return vc
-    }
+    static let MessagesList = SceneType<UITableViewController>(Message.self, identifier: "MessagesList")
   }
 }
 enum StoryboardSegue {
-  enum Message: String, StoryboardSegueType {
+  enum Message: String, SegueType {
     case Embed
     case NonCustom
   }
@@ -62,11 +54,8 @@ enum StoryboardSegue {
 ## Usage example
 
 ```swift
-// You can instantiate scenes using the generic `viewController()` method:
-let vc = StoryboardScene.Dependency.DependentScene.viewController()
-
-// or the `instantiate...()` method (which will cast to the correct type):
-let vc2 = StoryboardScene.Message.instantiateMessagesList()
+// You can instantiate scenes using the `controller` property:
+let vc = StoryboardScene.Dependency.Dependent.controller
 
 // You can perform segues using:
 vc.performSegue(StoryboardSegue.Message.Embed)

Documentation/storyboards/swift3.md

@@ -10,7 +10,7 @@
 ## When to use it
 
 - When you need to generate *Swift 3* code
-- You want to generate code for UIKit platforms (iOS, tvOS and watchOS)
+- The generated code supports both UIKit platforms (iOS, tvOS and watchOS) and AppKit platform (macOS)
 
 ## Customization
 
@@ -23,33 +23,25 @@ You can customize some elements of this template by overriding the following par
 
 ## Generated Code
 
+Note: the generated code may look differently depending on the platform the storyboard file is targeting.
+
 **Extract:**
 
 ```swift
 enum StoryboardScene {
-  enum Dependency: String, StoryboardSceneType {
+  enum Dependency: StoryboardType {
     static let storyboardName = "Dependency"
 
-    case dependentScene = "Dependent"
-    static func instantiateDependent() -> UIViewController {
-      return StoryboardScene.Dependency.dependentScene.viewController()
-    }
+    static let dependent = SceneType<UIViewController>(storyboard: Dependency.self, identifier: "Dependent")
   }
-  enum Message: String, StoryboardSceneType {
+  enum Message: StoryboardType {
     static let storyboardName = "Message"
 
-    case messagesListScene = "MessagesList"
-    static func instantiateMessagesList() -> UITableViewController {
-      guard let vc = StoryboardScene.Message.messagesListScene.viewController() as? UITableViewController
-      else {
-        fatalError("ViewController 'MessagesList' is not of the expected class UITableViewController.")
-      }
-      return vc
-    }
+    static let messagesList = SceneType<UITableViewController>(storyboard: Message.self, identifier: "MessagesList")
   }
 }
 enum StoryboardSegue {
-  enum Message: String, StoryboardSegueType {
+  enum Message: String, SegueType {
     case embed
     case nonCustom
   }
@@ -61,11 +53,8 @@ enum StoryboardSegue {
 ## Usage example
 
 ```swift
-// You can instantiate scenes using the generic `viewController()` method:
-let vc = StoryboardScene.Dependency.dependentScene.viewController()
-
-// or the `instantiate...()` method (which will cast to the correct type):
-let vc2 = StoryboardScene.Message.instantiateMessagesList()
+// You can instantiate scenes using the `controller` property:
+let vc = StoryboardScene.Dependency.dependent.controller
 
 // You can perform segues using:
 vc.perform(segue: StoryboardSegue.Message.embed)