rename Service and cleanup Exports

Alchemy/AlchemyX/Application+AlchemyX.swift

@@ -1,4 +1,5 @@
 import AlchemyX
+import Foundation
 
 extension Application {
     @discardableResult

Alchemy/AlchemyX/Database+Resource.swift

@@ -1,5 +1,6 @@
 import AlchemyX
 import Collections
+import Foundation
 
 extension Database {
     /// Adds or alters a database table to match the schema of the Resource.

Alchemy/Application/Lifecycle.swift

@@ -13,7 +13,7 @@ public final class Lifecycle {
     let plugins: [Plugin]
 
     private var group: ServiceGroup?
-    private var services: [ServiceLifecycle.Service] = []
+    private var services: [Service] = []
     private let lock = NIOLock()
 
     init(app: Application) {
@@ -65,7 +65,7 @@ public final class Lifecycle {
         lock.withLock { shutdownTasks.append(action) }
     }
 
-    public func addService(_ service: ServiceLifecycle.Service) {
+    public func addService(_ service: Service) {
         lock.withLock { services.append(service) }
     }
 

Alchemy/Cache/Cache.swift

@@ -1,6 +1,6 @@
 /// A type for accessing a persistant cache. Supported providers are
 /// `RedisCache`, `DatabaseCache`, and `MemoryCache`.
-public final class Cache: Service {
+public final class Cache: IdentifiedService {
     public typealias Identifier = ServiceIdentifier<Cache>
 
     private let provider: CacheProvider

Alchemy/Cache/Providers/DatabaseCache.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// A SQL based provider for `Cache`.
 final class DatabaseCache: CacheProvider {
     private let db: Database

Alchemy/Cache/Providers/MemoryCache.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// An in memory provider for `Cache` for testing.
 public final class MemoryCache: CacheProvider {
     var data: [String: MemoryCacheItem] = [:]

Alchemy/Command/Make/FileCreator.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Rainbow
 
 /// Used to generate files related to an alchemy project.

Alchemy/Command/Terminal.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 struct Terminal {
     static var columns: Int = {
         guard let string = try? shell("tput cols").trimmingCharacters(in: .whitespacesAndNewlines), let columns = Int(string) else {

Alchemy/Database/Database.swift

@@ -1,5 +1,5 @@
 /// Used for interacting with an SQL database.
-public final class Database: Service {
+public final class Database: IdentifiedService {
     public typealias Identifier = ServiceIdentifier<Database>
 
     /// The provider of this database.

Alchemy/Database/Migrations/Database+Migration.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 extension Database {
     /// Represents a table for storing migration data. Alchemy will use
     /// this table for keeping track of the various batches of

Alchemy/Database/Providers/MySQL/MySQLConfiguration.swift

@@ -1,4 +1,5 @@
 import AsyncKit
+import Foundation
 import NIOSSL
 import MySQLNIO
 

Alchemy/Database/Providers/Postgres/Postgres+SQLValue.swift

@@ -1,3 +1,4 @@
+import Foundation
 import PostgresNIO
 
 extension PostgresBindings {

Alchemy/Database/Providers/Postgres/PostgresConfiguration.swift

@@ -1,5 +1,6 @@
 import AsyncKit
 import Atomics
+import Foundation
 import PostgresNIO
 
 public struct PostgresConfiguration: ConnectionPoolSource {

Alchemy/Database/Providers/Postgres/PostgresDatabaseProvider.swift

@@ -1,4 +1,5 @@
 import AsyncKit
+import Foundation
 import PostgresNIO
 
 /// A concrete `Database` for connecting to and querying a PostgreSQL

Alchemy/Database/Providers/SQLite/Database+SQLite.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 extension Database {
     /// An in memory SQLite database configuration.
     public static var memory: Database {

Alchemy/Database/Providers/SQLite/SQLite+SQLValue.swift

@@ -1,3 +1,4 @@
+import Foundation
 import SQLiteNIO
 
 extension SQLiteData: SQLValueConvertible {

Alchemy/Database/Providers/SQLite/SQLiteConfiguration.swift

@@ -1,4 +1,5 @@
 import AsyncKit
+import Foundation
 import SQLiteNIO
 
 public struct SQLiteConfiguration: ConnectionPoolSource {

Alchemy/Database/Query/Query.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// An SQL query.
 open class Query<Result: QueryResult>: SQLConvertible {
     let db: Database

Alchemy/Database/Rune/Model/Coding/SQLRowDecoder.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 struct SQLRowDecoder: Decoder {
     /// A `KeyedDecodingContainerProtocol` used to decode keys from a
     /// `SQLRow`.

Alchemy/Database/Rune/Model/Coding/SQLRowEncoder.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 final class SQLRowEncoder: Encoder {
     /// Used to decode keyed values from a Model.
     private struct _KeyedEncodingContainer<Key: CodingKey>: KeyedEncodingContainerProtocol {

Alchemy/Database/Rune/Model/Coding/SQLRowReader.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public struct SQLRowReader {
     public let row: SQLRow
     public let keyMapping: KeyMapping

Alchemy/Database/Rune/Model/Coding/SQLRowWriter.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public struct SQLRowWriter {
     public internal(set) var fields: SQLFields
     let keyMapping: KeyMapping

Alchemy/Database/Rune/Model/Model+CRUD.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// Useful extensions for various CRUD operations of a `Model`.
 extension Model {
 

Alchemy/Database/Rune/Model/Model.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Pluralize
 
 /// An ActiveRecord-esque type used for modeling a table in a relational

Alchemy/Database/Rune/Model/ModelProperty.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 // For custom logic around loading and saving properties on a Model.
 public protocol ModelProperty {
     init(key: String, on row: SQLRowReader) throws

Alchemy/Database/Rune/Model/PrimaryKeyProtocol.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// Represents a type that may be the primary key of a database table. Out of
 /// the box, `UUID`, `String` and `Int` are supported but you can easily
 /// support your own by conforming to this protocol.

Alchemy/Database/Rune/Model/SoftDeletes.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public protocol SoftDeletes {
     static var deletedAtKey: String { get }
 }

Alchemy/Database/Rune/Model/Timestamped.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public protocol Timestamped {
     static var createdAtKey: String { get }
     static var updatedAtKey: String { get }

Alchemy/Database/SQL/SQLConvertible.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// Something that's convertible to an SQL statement or expression.
 public protocol SQLConvertible {
     var sql: SQL { get }

Alchemy/Database/SQL/SQLRow.swift

@@ -1,4 +1,5 @@
 import Collections
+import Foundation
 
 /// A row of data returned by an SQL query.
 public struct SQLRow: ExpressibleByDictionaryLiteral {

Alchemy/Database/SQL/SQLValue.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// A value that can be stored and loaded from fields in an SQL table.
 public enum SQLValue: Hashable, CustomStringConvertible {
     /// An `Int` value.

Alchemy/Database/SQL/SQLValueConvertible.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public protocol SQLValueConvertible: SQLConvertible {
     var sqlValue: SQLValue { get }
 }

Alchemy/Database/Schema/CreateColumnBuilder.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// A type erased `CreateColumnBuilder`.
 protocol ColumnBuilderErased {
     /// Generate the `CreateColumn` data associated with this builder.

Alchemy/Database/Schema/CreateTableBuilder.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// A builder with useful functions for creating a table.
 public class CreateTableBuilder {
     /// The grammar with which this builder will compile SQL

Alchemy/Encryption/Encrypted.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 @propertyWrapper
 public struct Encrypted: ModelProperty, Codable {
     public var wrappedValue: String

Alchemy/Encryption/Encrypter.swift

@@ -1,4 +1,5 @@
 import Crypto
+import Foundation
 
 extension SymmetricKey {
     public static var app: SymmetricKey = {

Alchemy/Environment/Environment.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// Handles any environment info of your application. Loads any environment
 /// variables from the file a `.env` or `.env.{APP_ENV}` if `APP_ENV` is
 /// set in the current environment.

Alchemy/Events/EventBus.swift

@@ -1,6 +1,6 @@
 import NIOConcurrencyHelpers
 
-public final class EventBus: Service {
+public final class EventBus: IdentifiedService {
     public typealias Identifier = ServiceIdentifier<EventBus>
 
     public typealias Handler<E: Event> = (E) async throws -> Void

Alchemy/Exports.swift

@@ -3,9 +3,6 @@
 // Argument Parser
 @_exported import ArgumentParser
 
-// Foundation
-@_exported import Foundation
-
 // HTTPTypes
 @_exported import struct HTTPTypes.HTTPField
 @_exported import struct HTTPTypes.HTTPFields
@@ -20,13 +17,6 @@
 
 // NIO
 @_exported import struct NIO.ByteBuffer
-@_exported import class NIO.EmbeddedEventLoop
 @_exported import protocol NIO.EventLoop
 @_exported import protocol NIO.EventLoopGroup
-@_exported import struct NIO.NonBlockingFileIO
-@_exported import class NIO.NIOThreadPool
-@_exported import enum NIO.System
 @_exported import struct NIO.TimeAmount
-
-// NIOCore
-@_exported import enum NIOCore.SocketAddress

Alchemy/Filesystem/File.swift

@@ -1,3 +1,4 @@
+import Foundation
 import MultipartKit
 
 /// Represents a file from either a filesystem (on disk, in AWS S3, etc) or from

Alchemy/Filesystem/Filesystem.swift

@@ -1,7 +1,8 @@
+import Foundation
 import NIOConcurrencyHelpers
 
 /// An abstraction around local or remote file storage.
-public final class Filesystem: Service {
+public final class Filesystem: IdentifiedService {
     public typealias Identifier = ServiceIdentifier<Filesystem>
 
     private var provider: FilesystemProvider

Alchemy/Filesystem/FilesystemProvider.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public protocol FilesystemProvider {
     /// The root directory for storing and fetching files.
     var root: String { get }

Alchemy/Filesystem/Providers/LocalFilesystem.swift

@@ -1,4 +1,5 @@
-import NIOCore
+import Foundation
+import NIO
 
 extension Filesystem {
     /// Create a filesystem backed by the local filesystem at the given root

Alchemy/HTTP/Bytes.swift

@@ -1,4 +1,5 @@
 import AsyncHTTPClient
+import Foundation
 import HummingbirdCore
 
 /// A collection of bytes that is either a single buffer or a stream of buffers.

Alchemy/HTTP/Client.swift

@@ -1,4 +1,5 @@
 import AsyncHTTPClient
+import Foundation
 import NIOCore
 import NIOHTTP1
 
@@ -10,7 +11,7 @@ import NIOHTTP1
 ///     let response = try await Http.get("https://swift.org")
 ///
 /// See `Client.Builder` for the request builder interface.
-public final class Client: Service {
+public final class Client: IdentifiedService {
     public typealias Identifier = ServiceIdentifier<Client>
 
     /// A type for making http requests with a `Client`. Supports static or

Alchemy/HTTP/Coding/HTTPCoding+JSON.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 extension HTTPEncoder where Self == JSONEncoder {
     public static var json: JSONEncoder { JSONEncoder() }
 }

Alchemy/HTTP/Protocols/HTTPBuilder.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Hummingbird
 import MultipartKit
 

Alchemy/HTTP/Protocols/HTTPInspector.swift

@@ -1,3 +1,4 @@
+import Foundation
 import MultipartKit
 
 public protocol HTTPInspector {

Alchemy/HTTP/Protocols/RequestBuilder.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public protocol RequestBuilder: HTTPBuilder {
     associatedtype Res
 

Alchemy/HTTP/Protocols/RequestInspector.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public protocol RequestInspector: HTTPInspector {
     var method: HTTPRequest.Method { get }
     var urlComponents: URLComponents { get }

Alchemy/HTTP/Request.swift

@@ -1,3 +1,6 @@
+import Foundation
+import NIOCore
+
 /// A type that represents inbound requests to your application.
 public final class Request: RequestInspector {
     /// Represents a dynamic parameter inside the path. Parameter placeholders

Alchemy/HTTP/Response.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 /// A type representing the response from an HTTP endpoint. This response can be
 /// a failure or success case depending on the status code in the `head`.
 public final class Response {

Alchemy/HTTP/Serving/Responder.swift

@@ -1,4 +1,6 @@
+import Foundation
 import Hummingbird
+import NIOCore
 
 actor Responder: HTTPResponder {
     struct Context: RequestContext {

Alchemy/Hashing/Hasher.swift

@@ -1,4 +1,4 @@
-public struct Hasher: Service {
+public struct Hasher: IdentifiedService {
     public typealias Identifier = ServiceIdentifier<Database>
 
     private let algorithm: HashAlgorithm

Alchemy/Hashing/Providers/BCryptHasher.swift

@@ -1,4 +1,5 @@
 import CAlchemy
+import Foundation
 
 extension HashAlgorithm where Self == BCryptHasher {
     public static var bcrypt: BCryptHasher {

Alchemy/Hashing/Providers/SHA256Hasher.swift

@@ -1,4 +1,5 @@
 import Crypto
+import Foundation
 
 extension HashAlgorithm where Self == SHA256Hasher {
     public static var sha256: SHA256Hasher {

Alchemy/Logging/Logger+Utilities.swift

@@ -10,7 +10,7 @@
 /// // In Application.boot...
 /// Log.logger = Logger(label: "my_default_logger")
 /// ```
-extension Logger: Service {
+extension Logger: IdentifiedService {
     public typealias Identifier = ServiceIdentifier<Logger>
 
     // MARK: Conveniences

Alchemy/Logging/Loggers.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public struct Loggers: Plugin {
     public let `default`: Logger.Identifier?
     public let loggers: [Logger.Identifier: Logger]