wip: okay actually add all updates to commit lol

Package.swift

@@ -801,7 +801,6 @@ import Foundation
 struct PlayerClient: _Client {
     var dependencies: any Dependencies {
         Architecture()
-        DatabaseClient()
         ModuleClient()
         SharedModels()
         Styling()
@@ -888,7 +887,7 @@ extension _Client {
 
 struct ComposableArchitecture: PackageDependency {
     var dependency: Package.Dependency {
-        .package(url: "https://github.com/pointfreeco/swift-composable-architecture", exact: "1.2.0")
+        .package(url: "https://github.com/pointfreeco/swift-composable-architecture", exact: "1.4.2")
     }
 }
 //
@@ -1075,6 +1074,7 @@ struct ContentCore: _Feature {
         LoggerClient()
         Tagged()
         ComposableArchitecture()
+        Styling()
     }
 }
 //
@@ -1450,6 +1450,7 @@ let package = Package {
     Search()
     Settings()
     VideoPlayer()
+    ContentCore()
 
     MochiApp()
 } testTargets: {

Package/Sources/Clients/PlayerClient.swift

@@ -11,7 +11,6 @@ import Foundation
 struct PlayerClient: _Client {
     var dependencies: any Dependencies {
         Architecture()
-        DatabaseClient()
         ModuleClient()
         SharedModels()
         Styling()

Package/Sources/Dependencies/ComposableArchitecture.swift

@@ -8,6 +8,6 @@
 
 struct ComposableArchitecture: PackageDependency {
     var dependency: Package.Dependency {
-        .package(url: "https://github.com/pointfreeco/swift-composable-architecture", exact: "1.2.0")
+        .package(url: "https://github.com/pointfreeco/swift-composable-architecture", exact: "1.4.2")
     }
 }

Package/Sources/Features/ContentCore.swift

@@ -16,5 +16,6 @@ struct ContentCore: _Feature {
         LoggerClient()
         Tagged()
         ComposableArchitecture()
+        Styling()
     }
 }

Package/Sources/Index.swift

@@ -19,6 +19,7 @@ let package = Package {
     Search()
     Settings()
     VideoPlayer()
+    ContentCore()
 
     MochiApp()
 } testTargets: {

Sources/Clients/BuildClient/BuildClient.swift

@@ -13,8 +13,8 @@ import Semver
 // MARK: - BuildClient
 
 public struct BuildClient {
-    public let version: Semver
-    public let buildNumber: Int
+    public var version: Semver
+    public var buildNumber: Int
 }
 
 // MARK: TestDependencyKey

Sources/Clients/DatabaseClient/Client.swift

@@ -17,13 +17,20 @@ public struct DatabaseClient: Sendable {
     public var insert: @Sendable (any Entity) async throws -> any Entity
     public var update: @Sendable (any Entity) async throws -> any Entity
     public var delete: @Sendable (any Entity) async throws -> Void
-    var fetch: @Sendable (any Entity.Type, Any) async throws -> [any Entity]
+    var fetch: @Sendable (any Entity.Type, any _Request) async throws -> [any Entity]
+    var observe: @Sendable (any Entity.Type, any _Request) -> AsyncStream<[any Entity]>
 }
 
 public extension DatabaseClient {
     func fetch<T: Entity>(_ request: Request<T>) async throws -> [T] {
         try await (fetch(T.self, request) as? [T]) ?? []
     }
+
+    func observe<T: Entity>(_ request: Request<T>) -> AsyncStream<[T]> {
+         self.observe(T.self, request)
+            .compactMap { ($0 as? [T]) ?? [] }
+            .eraseToStream()
+    }
 }
 
 // MARK: DatabaseClient.Error

Sources/Clients/DatabaseClient/Live.swift

@@ -65,6 +65,24 @@ public extension DatabaseClient {
             try await persistence.schedule { context in
                 try context.fetch(entityType, request).compactMap { try entityType.init(id: $0.objectID, context: context) }
             }
+        } observe: { entityType, request in
+            .init { continuation in
+                Task.detached {
+                    let fetchValues = {
+                        try? await persistence.schedule { ctx in
+                            try ctx.fetch(entityType, request).compactMap { try entityType.init(id: $0.objectID, context: ctx) }
+                        }
+                    }
+
+                    await continuation.yield(fetchValues() ?? [])
+
+                    let observe = NotificationCenter.default.notifications(named: NSManagedObjectContext.didSaveObjectsNotification)
+
+                    for await _ in observe {
+                        await continuation.yield(fetchValues() ?? [])
+                    }
+                }
+            }
         }
     }()
 }

Sources/Clients/DatabaseClient/Supporting Files/Request.swift

@@ -8,9 +8,16 @@
 import CoreData
 import Foundation
 
+protocol _Request {
+    associatedtype SomeEntity: Entity
+    var fetchLimit: Int? { get set }
+    var predicate: NSPredicate? { get set }
+    var sortDescriptors: [SortDescriptor] { get set }
+}
+
 // MARK: - Request
 
-public struct Request<SomeEntity: Entity> {
+public struct Request<SomeEntity: Entity>: _Request {
     var fetchLimit: Int?
     var predicate: NSPredicate?
     var sortDescriptors: [SortDescriptor] = []

Sources/Clients/ModuleClient/Client.swift

@@ -16,8 +16,9 @@ import XCTestDynamicOverlay
 
 public struct ModuleClient: Sendable {
     public var initialize: @Sendable () async throws -> Void
-    public var getModule: @Sendable (_ repoModuleID: RepoModuleID) async throws -> Self.Instance
-    public var removeModule: @Sendable (_ repoModuleID: RepoModuleID) async throws -> Void
+    public var getModule: @Sendable (_ repoModuleId: RepoModuleID) async throws -> Self.Instance
+    public var removeCachedModule: @Sendable (_ repoModuleId: RepoModuleID) async throws -> Void
+    public var removeCachedModules: @Sendable (_ repoID: Repo.ID) async throws -> Void
 }
 
 public extension ModuleClient {
@@ -67,7 +68,8 @@ extension ModuleClient: TestDependencyKey {
     public static let testValue = Self(
         initialize: unimplemented(),
         getModule: unimplemented(),
-        removeModule: unimplemented()
+        removeCachedModule: unimplemented(),
+        removeCachedModules: unimplemented()
     )
 }
 

Sources/Clients/ModuleClient/Extensions/JSContext+.swift

@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  JSContext+.swift
 //  
 //
 //  Created by ErrorErrorError on 11/17/23.

Sources/Clients/ModuleClient/Extensions/JSValue+.swift

@@ -1,9 +1,74 @@
 //
-//  File.swift
+//  JSValue+.swift
 //  
 //
 //  Created by ErrorErrorError on 11/17/23.
 //  
 //
 
 import Foundation
+import JavaScriptCore
+
+extension JSValue {
+    subscript(_ key: String) -> JSValue? {
+        guard !isOptional else {
+            return nil
+        }
+        guard let value = forProperty(key) else {
+            return nil
+        }
+        return !value.isOptional ? value : nil
+    }
+
+    var isOptional: Bool { isNull || isUndefined }
+
+    @discardableResult
+    func value(_ function: String) async throws -> JSValue {
+        try await withCheckedThrowingContinuation { continuation in
+            let onFufilled: @convention(block) (JSValue) -> Void = { value in
+                continuation.resume(returning: value)
+            }
+
+            let onRejected: @convention(block) (JSValue) -> Void = { value in
+                continuation.resume(throwing: value.toError(function))
+            }
+
+            self.invokeMethod(
+                "then",
+                withArguments: [
+                    unsafeBitCast(onFufilled, to: JSValue.self),
+                    unsafeBitCast(onRejected, to: JSValue.self)
+                ]
+            )
+        }
+    }
+
+    func toError(_ functionName: String? = nil, stackTrace: Bool = true) -> JSValueError { .init(self, functionName) }
+}
+
+struct JSValueError: Error, LocalizedError, CustomStringConvertible {
+    var functionName: String?
+    var name: String?
+    var errorDescription: String?
+    var failureReason: String?
+    var stackTrace: String?
+
+    init(_ value: JSValue, _ functionName: String? = nil, stackTrace: Bool = true) {
+        self.functionName = functionName
+        self.name = value["name"]?.toString()
+        self.errorDescription = value["message"]?.toString()
+        self.failureReason = value["cause"]?.toString()
+        if stackTrace {
+            self.stackTrace = value["stack"]?.toString()
+        }
+    }
+
+    // TODO: Allow stack trace
+    var description: String {
+        """
+        Instance\(functionName.flatMap { ".\($0)" } ?? "") => \
+        \(name ?? "Error"): \(errorDescription ?? "No Message")
+        \(failureReason.flatMap { "    \($0)" } ?? "\\")
+        """
+    }
+}

Sources/Clients/ModuleClient/Instance.swift

@@ -10,7 +10,6 @@ import Foundation
 import JavaScriptCore
 import os
 import SharedModels
-import WebKit
 
 public extension ModuleClient {
     struct Instance {
@@ -39,7 +38,23 @@ public extension ModuleClient {
     }
 }
 
+extension ModuleClient.Instance {
+    private func reportError<R>(_ callback: @autoclosure @escaping () async throws -> R) async rethrows -> R {
+        do {
+            return try await callback()
+        } catch {
+            self.logger.error("\(error)")
+            throw error
+        }
+    }
+}
+
+/// Available SourceModule Methods
 public extension ModuleClient.Instance {
+    func searchFilters() async throws -> [SearchFilter] {
+        try await reportError(await runtime.searchFilters())
+    }
+
     func search(_ query: SearchQuery) async throws -> Paging<Playlist> {
         try await reportError(await runtime.search(query))
     }
@@ -48,14 +63,13 @@ public extension ModuleClient.Instance {
         try await reportError(await runtime.discoverListings(request))
     }
 
-    func searchFilters() async throws -> [SearchFilter] {
-        try await reportError(await runtime.searchFilters())
-    }
-
     func playlistDetails(_ id: Playlist.ID) async throws -> Playlist.Details {
         try await reportError(await runtime.playlistDetails(id))
     }
+}
 
+/// Available VideoContent Methods
+public extension ModuleClient.Instance {
     func playlistEpisodes(_ id: Playlist.ID, _ options: Playlist.ItemsRequestOptions?) async throws -> Playlist.ItemsResponse {
         try await reportError(await runtime.playlistEpisodes(id, options))
     }
@@ -67,13 +81,4 @@ public extension ModuleClient.Instance {
     func playlistEpisodeServer(_ request: Playlist.EpisodeServerRequest) async throws -> Playlist.EpisodeServerResponse {
         try await reportError(await runtime.playlistEpisodeServer(request))
     }
-
-    private func reportError<R>(_ callback: @autoclosure @escaping () async throws -> R) async rethrows -> R {
-        do {
-            return try await callback()
-        } catch {
-            self.logger.error("\(error)")
-            throw error
-        }
-    }
 }

Sources/Clients/ModuleClient/JS+Bindings/JSContext+Console.swift

@@ -1,9 +1,39 @@
 //
-//  File.swift
+//  JSContext+Console.swift
 //  
 //
 //  Created by ErrorErrorError on 11/17/23.
 //  
 //
 
 import Foundation
+import JavaScriptCore
+
+extension JSContext {
+    func setConsoleBinding(_ logger: @escaping (MessageLog, String) -> Void) {
+        exceptionHandler = { _, exception in
+            guard let exception else {
+                return
+            }
+
+            logger(.error, exception.toError().description)
+        }
+
+        let console = JSValue(newObjectIn: self)
+
+        let logger = { (type: MessageLog) in {
+            guard let arguments = JSContext.currentArguments()?.compactMap({ $0 as? JSValue }) else {
+                return
+            }
+
+            let msg = arguments.compactMap { $0.toString() }
+                .joined(separator: " ")
+
+            logger(type, msg)
+        } as @convention(block) () -> Void }
+
+        MessageLog.allCases.forEach { console?.setObject(logger($0), forKeyedSubscript: $0.rawValue) }
+
+        setObject(console, forKeyedSubscript: "console" as NSString)
+    }
+}