Add LocalFileURLProvider Package

Modules/Contracts/Providers/LocalFileURLProviderContract/Package.swift

@@ -0,0 +1,20 @@
+// swift-tools-version: 5.8
+
+import PackageDescription
+
+let package = Package(
+    name: "LocalFileURLProviderContract",
+    platforms: [
+        .macOS(.v12)
+    ],
+    products: [
+        .library(
+            name: "LocalFileURLProviderContract",
+            targets: ["LocalFileURLProviderContract"])
+    ],
+    targets: [
+        .target(
+            name: "LocalFileURLProviderContract"
+        )
+    ]
+)

Modules/Contracts/Providers/LocalFileURLProviderContract/README.md

@@ -0,0 +1,3 @@
+# LocalFileURLProviderContract
+
+A description of this package.

Modules/Contracts/Providers/LocalFileURLProviderContract/Sources/LocalFileURLProviderContract/LocalFileURLProviderContract.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+public protocol LocalFileURLProviderProtocol {
+    func localFileURL() -> URL?
+}

Modules/Features/GenerateFeature/Package.swift

@@ -15,6 +15,7 @@ let package = Package(
     dependencies: [
         .package(path: "../../Contracts/DataStores/GenerateFeatureDataStoreContract"),
         .package(path: "../../Contracts/Generators/ProjectGeneratorContract"),
+        .package(path: "../../Contracts/Providers/LocalFileURLProviderContract"),
         .package(path: "../../Contracts/Syncers/PBXProjectSyncerContract"),
         .package(path: "../../Entities/PhoenixDocument"),
         .package(path: "../../Support/AccessibilityIdentifiers")
@@ -25,6 +26,7 @@ let package = Package(
             dependencies: [
                 "GenerateFeatureDataStoreContract",
                 "ProjectGeneratorContract",
+                "LocalFileURLProviderContract",
                 "PBXProjectSyncerContract",
                 "PhoenixDocument",
                 "AccessibilityIdentifiers"

Modules/Features/GenerateFeature/Sources/GenerateFeature/FileURLs/AshFileURLGetter.swift

@@ -1,28 +1,28 @@
-import AppKit
-import Foundation
-
-struct AshFileURLGetter: LocalFileURLGetter {
-    let fileURL: URL?
-
-    func getUrl() -> URL? {
-        let openPanel = NSOpenPanel()
-
-        openPanel.directoryURL = fileURL?.deletingLastPathComponent()
-        openPanel.allowsMultipleSelection = false
-        openPanel.canChooseFiles = true
-        openPanel.canChooseDirectories = true
-        openPanel.canCreateDirectories = true
-        openPanel.allowedContentTypes = [
-            .init(filenameExtension: "ash",
-                  conformingTo: .init("com.apple.package")!)
-        ].compactMap { $0 }
-
-        openPanel.runModal()
-
-        var url = openPanel.url
-        if url?.lastPathComponent.hasSuffix(".ash") == true {
-            url = url?.deletingLastPathComponent()
-        }
-        return url
-    }
-}
+//import AppKit
+//import Foundation
+//
+//struct AshFileURLGetter: LocalFileURLGetter {
+//    let fileURL: URL?
+//
+//    func getUrl() -> URL? {
+//        let openPanel = NSOpenPanel()
+//        
+//        openPanel.directoryURL = fileURL?.deletingLastPathComponent()
+//        openPanel.allowsMultipleSelection = false
+//        openPanel.canChooseFiles = true
+//        openPanel.canChooseDirectories = true
+//        openPanel.canCreateDirectories = true
+//        openPanel.allowedContentTypes = [
+//            .init(filenameExtension: "ash",
+//                  conformingTo: .init("com.apple.package")!)
+//        ].compactMap { $0 }
+//        
+//        openPanel.runModal()
+//        
+//        var url = openPanel.url
+//        if url?.lastPathComponent.hasSuffix(".ash") == true {
+//            url = url?.deletingLastPathComponent()
+//        }
+//        return url
+//    }
+//}

Modules/Features/GenerateFeature/Sources/GenerateFeature/FileURLs/LocalFileURLGetter.swift

@@ -1,5 +1,5 @@
-import Foundation
-
-protocol LocalFileURLGetter {
-    func getUrl() -> URL?
-}
+//import Foundation
+//
+//protocol LocalFileURLGetter {
+//    func getUrl() -> URL?
+//}

Modules/Features/GenerateFeature/Sources/GenerateFeature/FileURLs/XcodeProjURLGetter.swift

@@ -1,24 +1,24 @@
-import AppKit
-import Foundation
-
-struct XcodeProjURLGetter: LocalFileURLGetter {
-    let fileURL: URL?
-
-    func getUrl() -> URL? {
-        let openPanel = NSOpenPanel()
-
-        openPanel.directoryURL = fileURL?.deletingLastPathComponent()
-        openPanel.allowsMultipleSelection = false
-        openPanel.canChooseFiles = true
-        openPanel.canChooseDirectories = false
-        openPanel.canCreateDirectories = true
-        openPanel.allowedContentTypes = [
-            .init(filenameExtension: "xcodeproj",
-                  conformingTo: .init("com.apple.package")!)
-        ].compactMap { $0 }
-
-        openPanel.runModal()
-
-        return openPanel.url
-    }
-}
+//import AppKit
+//import Foundation
+//
+//struct XcodeProjURLGetter: LocalFileURLGetter {
+//    let fileURL: URL?
+//    
+//    func getUrl() -> URL? {
+//        let openPanel = NSOpenPanel()
+//        
+//        openPanel.directoryURL = fileURL?.deletingLastPathComponent()
+//        openPanel.allowsMultipleSelection = false
+//        openPanel.canChooseFiles = true
+//        openPanel.canChooseDirectories = false
+//        openPanel.canCreateDirectories = true
+//        openPanel.allowedContentTypes = [
+//            .init(filenameExtension: "xcodeproj",
+//                  conformingTo: .init("com.apple.package")!)
+//        ].compactMap { $0 }
+//        
+//        openPanel.runModal()
+//        
+//        return openPanel.url
+//    }
+//}

Modules/Features/GenerateFeature/Sources/GenerateFeature/GenerateFeatureView.swift

@@ -1,23 +1,30 @@
 import AccessibilityIdentifiers
 import GenerateFeatureDataStoreContract
+import LocalFileURLProviderContract
 import PBXProjectSyncerContract
 import PhoenixDocument
 import ProjectGeneratorContract
 import SwiftUI
 
 public struct GenerateFeatureDependencies {
+    let ashFileURLGetter: LocalFileURLProviderProtocol
     let dataStore: GenerateFeatureDataStoreProtocol
     let projectGenerator: ProjectGeneratorProtocol
     let pbxProjectSyncer: PBXProjectSyncerProtocol
+    let xcodeProjURLGetter: LocalFileURLProviderProtocol
 
     public init(
+        ashFileURLGetter: LocalFileURLProviderProtocol,
         dataStore: GenerateFeatureDataStoreProtocol,
         projectGenerator: ProjectGeneratorProtocol,
-        pbxProjectSyncer: PBXProjectSyncerProtocol
+        pbxProjectSyncer: PBXProjectSyncerProtocol,
+        xcodeProjURLGetter: LocalFileURLProviderProtocol
     ) {
+        self.ashFileURLGetter = ashFileURLGetter
         self.dataStore = dataStore
         self.projectGenerator = projectGenerator
         self.pbxProjectSyncer = pbxProjectSyncer
+        self.xcodeProjURLGetter = xcodeProjURLGetter
     }
 }
 
@@ -70,8 +77,8 @@ final class GenerateFeatureViewModel: ObservableObject {
     }
 
     // File URLs Managers
-    var ashFileURLGetter: LocalFileURLGetter
-    var xcodeProjURLGetter: LocalFileURLGetter
+    var ashFileURLGetter: LocalFileURLProviderProtocol
+    var xcodeProjURLGetter: LocalFileURLProviderProtocol
     var dataStore: GenerateFeatureDataStoreProtocol
     var fileAccessValidator: FileAccessValidatorProtocol
 
@@ -83,8 +90,8 @@ final class GenerateFeatureViewModel: ObservableObject {
         self.onGenerate = onGenerate
         self.onAlert = onAlert
 
-        ashFileURLGetter = AshFileURLGetter(fileURL: fileURL)
-        xcodeProjURLGetter = XcodeProjURLGetter(fileURL: fileURL)
+        ashFileURLGetter = dependencies.ashFileURLGetter
+        xcodeProjURLGetter = dependencies.xcodeProjURLGetter
         fileAccessValidator = FileAccessValidator()
 
         dataStore = dependencies.dataStore
@@ -106,11 +113,11 @@ final class GenerateFeatureViewModel: ObservableObject {
     }
 
     func onOpenModulesFolder() {
-        ashFileURLGetter.getUrl().map { modulesURL = $0 }
+        ashFileURLGetter.localFileURL().map { modulesURL = $0 }
     }
 
     func onOpenXcodeProject() {
-        xcodeProjURLGetter.getUrl().map { xcodeProjectURL = $0 }
+        xcodeProjURLGetter.localFileURL().map { xcodeProjectURL = $0 }
     }
 
     func onSkipXcodeProject(_ value: Bool) {

Modules/Features/ValidationFeature/Package.swift

@@ -13,12 +13,14 @@ let package = Package(
             targets: ["ValidationFeature"])
     ],
     dependencies: [
+        .package(path: "../../Contracts/Providers/LocalFileURLProviderContract"),
         .package(path: "../../Contracts/Validators/ProjectValidatorContract")
     ],
     targets: [
         .target(
             name: "ValidationFeature",
             dependencies: [
+                "LocalFileURLProviderContract",
                 "ProjectValidatorContract"
             ]
         ),

Modules/Modules.ash/Feature/GenerateFeature.json

@@ -26,6 +26,19 @@
         "Contract"
       ]
     },
+    {
+      "name" : {
+        "family" : "Provider",
+        "given" : "LocalFileURL"
+      },
+      "targetTypes" : [
+        {
+          "isTests" : false,
+          "name" : "Implementation"
+        },
+        "Contract"
+      ]
+    },
     {
       "name" : {
         "family" : "Syncer",

Modules/Modules.ash/Feature/ValidationFeature.json

@@ -1,5 +1,18 @@
 {
   "localDependencies" : [
+    {
+      "name" : {
+        "family" : "Provider",
+        "given" : "LocalFileURL"
+      },
+      "targetTypes" : [
+        {
+          "isTests" : false,
+          "name" : "Implementation"
+        },
+        "Contract"
+      ]
+    },
     {
       "name" : {
         "family" : "Validator",

Modules/Modules.ash/Provider/LocalFileURLProvider.json

@@ -0,0 +1,14 @@
+{
+  "macOSVersion" : "v12",
+  "modules" : {
+    "Contract" : "undefined",
+    "Implementation" : "undefined"
+  },
+  "name" : {
+    "family" : "Provider",
+    "given" : "LocalFileURL"
+  },
+  "resources" : [
+
+  ]
+}

Modules/Modules.ash/appversion

@@ -1 +1 @@
-4.2.2
+4.3

Modules/Providers/LocalFileURLProvider/Package.swift

@@ -0,0 +1,32 @@
+// swift-tools-version: 5.8
+
+import PackageDescription
+
+let package = Package(
+    name: "LocalFileURLProvider",
+    platforms: [
+        .macOS(.v12)
+    ],
+    products: [
+        .library(
+            name: "LocalFileURLProvider",
+            targets: ["LocalFileURLProvider"])
+    ],
+    dependencies: [
+        .package(path: "../../Contracts/Providers/LocalFileURLProviderContract")
+    ],
+    targets: [
+        .target(
+            name: "LocalFileURLProvider",
+            dependencies: [
+                "LocalFileURLProviderContract"
+            ]
+        ),
+        .testTarget(
+            name: "LocalFileURLProviderTests",
+            dependencies: [
+                "LocalFileURLProvider"
+            ]
+        )
+    ]
+)

Modules/Providers/LocalFileURLProvider/README.md

@@ -0,0 +1,3 @@
+# LocalFileURLProvider
+
+A description of this package.

Modules/Providers/LocalFileURLProvider/Sources/LocalFileURLProvider/AshFileURLProvider.swift

@@ -0,0 +1,34 @@
+import AppKit
+import Foundation
+import LocalFileURLProviderContract
+import UniformTypeIdentifiers
+
+public struct AshFileURLProvider: LocalFileURLProviderProtocol {
+    let initialURL: URL?
+
+    public init(initialURL: URL?) {
+        self.initialURL = initialURL
+    }
+
+    public func localFileURL() -> URL? {
+        let openPanel = NSOpenPanel()
+
+        openPanel.directoryURL = initialURL?.deletingLastPathComponent()
+        openPanel.allowsMultipleSelection = false
+        openPanel.canChooseFiles = true
+        openPanel.canChooseDirectories = true
+        openPanel.canCreateDirectories = true
+        openPanel.allowedContentTypes = [
+            .init(filenameExtension: "ash",
+                  conformingTo: .init("com.apple.package")!)
+        ].compactMap { $0 }
+
+        openPanel.runModal()
+
+        var url = openPanel.url
+        if url?.lastPathComponent.hasSuffix(".ash") == true {
+            url = url?.deletingLastPathComponent()
+        }
+        return url
+    }
+}