tech(cleaning): Rename IdentityMap and remove Observer protocol (#61)

pjechris · Oct 24, 2023 · 41c846b · 41c846b
1 parent 9b9d85b
commit 41c846b
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 20 deletions.
diff --git a/Sources/CohesionKit/Identity/AliasKey.swift → Sources/CohesionKit/AliasKey.swift b/Sources/CohesionKit/Identity/AliasKey.swift → Sources/CohesionKit/AliasKey.swift
diff --git a/Sources/CohesionKit/Combine/EntityObserver Publisher.swift b/Sources/CohesionKit/Combine/EntityObserver Publisher.swift
@@ -1,7 1,7 @@
 #if canImport(Combine)
 import Combine
 
-extension Observer {
 extension EntityObserver {
  /// A `Publisher` emitting the observer current value and subscribing to any subsequents new values
  public var asPublisher: AnyPublisher<T, Never> {
  let subject = CurrentValueSubject<T, Never>(value)

diff --git a/.../CohesionKit/Identity/IdentityStore.swift → Sources/CohesionKit/EntityStore.swift b/.../CohesionKit/Identity/IdentityStore.swift → Sources/CohesionKit/EntityStore.swift
diff --git a/Sources/CohesionKit/Identity/Logger.swift → Sources/CohesionKit/Logger.swift b/Sources/CohesionKit/Identity/Logger.swift → Sources/CohesionKit/Logger.swift
diff --git a/Sources/CohesionKit/Observer/EntityObserver.swift b/Sources/CohesionKit/Observer/EntityObserver.swift
@@ -1,7 1,7 @@
 import Foundation
 
 /// A type registering observers on a given entity from identity storage
-public struct EntityObserver<T>: Observer {
 public struct EntityObserver<T> {
  public typealias OnChange = (T) -> Void
 
  public let value: T

diff --git a/Sources/CohesionKit/Observer/Observer.swift b/Sources/CohesionKit/Observer/Observer.swift
diff --git a/...s/CohesionKitTests/IdentityMapTests.swift → ...s/CohesionKitTests/EntityStoreTests.swift b/...s/CohesionKitTests/IdentityMapTests.swift → ...s/CohesionKitTests/EntityStoreTests.swift
@@ -2,7 2,7 @@ import XCTest
 @testable import CohesionKit
 
 // MARK: Store
-class IdentityMapTests: XCTestCase {
 class EntityStoreTests: XCTestCase {
  func test_storeAggregate_nestedEntitiesAreStored() {
  let entity = RootFixture(
  id: 1,
@@ -154,7 154,7 @@ class IdentityMapTests: XCTestCase {
 }
 
 // MARK: Find
-extension IdentityMapTests {
 extension EntityStoreTests {
  func test_find_entityStored_noObserverAdded_returnNil() {
  let identityMap = IdentityMap()
  let entity = SingleNodeFixture(id: 1)
@@ -277,7 277,7 @@ extension IdentityMapTests {
 
 // MARK: Update
 
-extension IdentityMapTests {
 extension EntityStoreTests {
 
  func test_update_entityIsAlreadyInserted_entityIsUpdated() {
  let identityMap = IdentityMap()

diff --git a/...ohesionKitTests/Identity/LoggerMock.swift → Tests/CohesionKitTests/LoggerMock.swift b/...ohesionKitTests/Identity/LoggerMock.swift → Tests/CohesionKitTests/LoggerMock.swift