Rework (#1)

- service -> component

Author: tib

LICENSE

@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2018-2022 Tibor Bödecs
-Copyright (c) 2022-2023 Binary Birds Ltd.
+Copyright (c) 2022-2024 Binary Birds Ltd.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

Package.resolved

@@ -14,8 +14,8 @@ let package = Package(
         .library(name: "FeatherRelationalDatabaseDriverPostgres", targets: ["FeatherRelationalDatabaseDriverPostgres"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/feather-framework/feather-relational-database", .upToNextMinor(from: "0.1.1")),
-        .package(url: "https://github.com/vapor/postgres-kit", from: "2.12.0"),
+        .package(url: "https://github.com/feather-framework/feather-relational-database", .upToNextMinor(from: "0.2.0")),
+        .package(url: "https://github.com/vapor/postgres-kit", from: "2.0.0"),
     ],
     targets: [
         .target(

Package.swift

@@ -1,6 +1,6 @@
 # Feather SQL Database
 
-An abstract sql-database service for Feather CMS.
+An abstract sql-database component for Feather CMS.
 
 ## Getting started
 

README.md

@@ -1,31 +1,31 @@
 //
-//  File 2.swift
-//  
+//  PostgresRelationalDatabaseComponent.swift
+//  PostgresRelationalDatabaseDriverPostgres
 //
 //  Created by Tibor Bodecs on 03/12/2023.
 //
 
-import FeatherService
+import FeatherComponent
 import FeatherRelationalDatabase
 import SQLKit
 import PostgresKit
 @preconcurrency import AsyncKit
 
 @dynamicMemberLookup
-struct PostgresRelationalDatabaseService: RelationalDatabaseService {
+struct PostgresRelationalDatabaseComponent: RelationalDatabaseComponent {
 
-    public let config: ServiceConfig
+    public let config: ComponentConfig
     let pool: EventLoopGroupConnectionPool<PostgresConnectionSource>
 
     subscript<T>(
-        dynamicMember keyPath: KeyPath<PostgresRelationalDatabaseServiceContext, T>
+        dynamicMember keyPath: KeyPath<PostgresRelationalDatabaseComponentContext, T>
     ) -> T {
-        let context = config.context as! PostgresRelationalDatabaseServiceContext
+        let context = config.context as! PostgresRelationalDatabaseComponentContext
         return context[keyPath: keyPath]
     }
 
     init(
-        config: ServiceConfig,
+        config: ComponentConfig,
         pool: EventLoopGroupConnectionPool<PostgresConnectionSource>
     ) {
         self.config = config

…/PostgresRelationalDatabaseService.swift …ostgresRelationalDatabaseComponent.swiftSources/FeatherRelationalDatabaseDriverPostgres/Driver/PostgresRelationalDatabaseService.swift renamed to Sources/FeatherRelationalDatabaseDriverPostgres/Driver/PostgresRelationalDatabaseComponent.swift Sources/FeatherRelationalDatabaseDriverPostgres/Driver/PostgresRelationalDatabaseService.swift renamed to Sources/FeatherRelationalDatabaseDriverPostgres/Driver/PostgresRelationalDatabaseComponent.swift

@@ -0,0 +1,33 @@
+//
+//  PostgresRelationalDatabaseComponentBuilder.swift
+//  PostgresRelationalDatabaseDriverPostgres
+//
+//  Created by Tibor Bodecs on 18/11/2023.
+//
+
+import FeatherComponent
+import AsyncKit
+import PostgresKit
+
+struct PostgresRelationalDatabaseComponentBuilder: ComponentBuilder {
+
+    let context: PostgresRelationalDatabaseComponentContext
+    let pool: EventLoopGroupConnectionPool<PostgresConnectionSource>
+    
+    init(context: PostgresRelationalDatabaseComponentContext) {
+        self.context = context
+        
+        self.pool = EventLoopGroupConnectionPool(
+            source: context.connectionSource,
+            on: context.eventLoopGroup
+        )
+    }
+    
+    func build(using config: ComponentConfig) throws -> Component {
+        PostgresRelationalDatabaseComponent(config: config, pool: pool)
+    }
+    
+    func shutdown() throws {
+        pool.shutdown()
+    }
+}

Sources/FeatherRelationalDatabaseDriverPostgres/Driver/PostgresRelationalDatabaseComponentBuilder.swift

@@ -1,14 +1,14 @@
 //
-//  SQLDatabaseContext.swift
-//  FeatherServiceTests
+//  PostgresRelationalDatabaseComponentContext.swift
+//  PostgresRelationalDatabaseDriverPostgres
 //
 //  Created by Tibor Bodecs on 18/11/2023.
 //
 
-import FeatherService
+import FeatherComponent
 @preconcurrency import PostgresKit
 
-public struct PostgresRelationalDatabaseServiceContext: ServiceContext {
+public struct PostgresRelationalDatabaseComponentContext: ComponentContext {
 
     let eventLoopGroup: EventLoopGroup
     let connectionSource: PostgresConnectionSource
@@ -21,7 +21,7 @@ public struct PostgresRelationalDatabaseServiceContext: ServiceContext {
         self.connectionSource = connectionSource
     }
 
-    public func make() throws -> ServiceBuilder {
-        PostgresRelationalDatabaseServiceBuilder(context: self)
+    public func make() throws -> ComponentBuilder {
+        PostgresRelationalDatabaseComponentBuilder(context: self)
     }
 }

…esRelationalDatabaseServiceContext.swift …RelationalDatabaseComponentContext.swiftSources/FeatherRelationalDatabaseDriverPostgres/Driver/PostgresRelationalDatabaseServiceContext.swift renamed to Sources/FeatherRelationalDatabaseDriverPostgres/Driver/PostgresRelationalDatabaseComponentContext.swift Sources/FeatherRelationalDatabaseDriverPostgres/Driver/PostgresRelationalDatabaseServiceContext.swift renamed to Sources/FeatherRelationalDatabaseDriverPostgres/Driver/PostgresRelationalDatabaseComponentContext.swift

@@ -1,13 +1,13 @@
 //
-//  FeatherSQLDatabaseTests.swift
-//  FeatherSQLDatabaseTests
+//  FeatherRelationalDatabaseDriverPostgresTests.swift
+//  FeatherRelationalDatabaseDriverPostgresTests
 //
 //  Created by Tibor Bodecs on 2023. 01. 16..
 //
 
 import NIO
 import XCTest
-import FeatherService
+import FeatherComponent
 import FeatherRelationalDatabase
 import FeatherRelationalDatabaseDriverPostgres
 import PostgresKit
@@ -32,7 +32,7 @@ final class FeatherRelationalDatabaseDriverPostgresTests: XCTestCase {
 
     func testExample() async throws {
         do {
-            let registry = ServiceRegistry()
+            let registry = ComponentRegistry()
 
             let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
             let threadPool = NIOThreadPool(numberOfThreads: 1)
@@ -51,15 +51,15 @@ final class FeatherRelationalDatabaseDriverPostgresTests: XCTestCase {
             )
 
             try await registry.addRelationalDatabase(
-                PostgresRelationalDatabaseServiceContext(
+                PostgresRelationalDatabaseComponentContext(
                     eventLoopGroup: eventLoopGroup,
                     connectionSource: connectionSource
                 )
             )
 
             try await registry.run()
-            let dbService = try await registry.relationalDatabase()
-            let db = try await dbService.connection()
+            let dbComponent = try await registry.relationalDatabase()
+            let db = try await dbComponent.connection()
 
             do {