Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.
Support - in package name
Kabir Oberaiaa9b7b186a3c
diff --git a/Sources/SupersignCLISupport/DevNewCommand.swift b/Sources/SupersignCLISupport/DevNewCommand.swiftindex c99c0fe..41cfcfc 100644--- a/Sources/SupersignCLISupport/DevNewCommand.swift+++ b/Sources/SupersignCLISupport/DevNewCommand.swift@@ -12,20 +12,20 @@ struct DevNewCommand: AsyncParsableCommand {func run() async throws {let name = try await Console.promptRequired("Package name: ", existing: self.name)- // TODO: support '-' in package name, replace with _ or CamelCase in Swift identifiers.var allowedFirstCharacters: CharacterSet = ["_"]allowedFirstCharacters.insert(charactersIn: "a"..."z")allowedFirstCharacters.insert(charactersIn: "A"..."Z")var allowedOtherCharacters = allowedFirstCharactersallowedOtherCharacters.insert(charactersIn: "0"..."9")+ allowedOtherCharacters.insert("-")// promptRequired validates !isEmptylet firstScalar = name.unicodeScalars.first!guard allowedFirstCharacters.contains(firstScalar) else {throw Console.Error("""Package name '\(name)' is invalid. \- The package name must start with [a-z, A-Z, or _]. Found '\(firstScalar)'.+ The package name must start with one of [a-z, A-Z, _]. Found '\(firstScalar)'.""")}@@ -33,7 +33,7 @@ struct DevNewCommand: AsyncParsableCommand {let invalidValue = name[firstInvalid]throw Console.Error("""Package name '\(name)' is invalid. \- The package name may only contain [a-z, A-Z, 0-9, and _]. Found '\(invalidValue)'.+ The package name may only contain [a-z, A-Z, 0-9, _, -]. Found '\(invalidValue)'.""")}@@ -45,6 +45,8 @@ struct DevNewCommand: AsyncParsableCommand {print("Creating package: \(name)")+ let moduleName = name.replacingOccurrences(of: "-", with: "_")+let files: [(String, String)] = [("Package.swift",@@ -63,13 +65,13 @@ struct DevNewCommand: AsyncParsableCommand {// A Swiftpack project should contain exactly one library target,// representing the main app..library(- name: "\(name)",- targets: ["\(name)"]+ name: "\(moduleName)",+ targets: ["\(moduleName)"]),],targets: [.target(- name: "\(name)"+ name: "\(moduleName)"),])@@ -113,12 +115,12 @@ struct DevNewCommand: AsyncParsableCommand {),(- "Sources/\(name)/\(name)App.swift",+ "Sources/\(moduleName)/\(moduleName)App.swift","""import SwiftUI@main- struct \(name)App: App {+ struct \(moduleName)App: App {var body: some Scene {WindowGroup {ContentView()@@ -129,7 +131,7 @@ struct DevNewCommand: AsyncParsableCommand {),(- "Sources/\(name)/ContentView.swift",+ "Sources/\(moduleName)/ContentView.swift","""import SwiftUI