Merge pull request #45 from hoc081098/renovate/io.github.hoc081098-kmp-viewmodel-0.x

hoc081098 · web-flow · commit c8ef93ba24d3 · 2023-03-18T19:53:29.000+07:00
fix(deps): update dependency io.github.hoc081098:kmp-viewmodel to v0.3.0
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -82,6 +82,19 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		35E34EC229C5DE3C00ED7D75 /* Utils */ = {
+			isa = PBXGroup;
+			children = (
+				35737204287F4AE00061F94C /* kotlinxCoroutinesFlowExtensions.swift */,
+				3579B09A2883381700BD3B25 /* Once.swift */,
+				35B1166D288EA34900FFC3C3 /* Color+init.swift */,
+				3579B0A22885BD4E00BD3B25 /* LazyView.swift */,
+				3579B09E28846FBE00BD3B25 /* Napier.swift */,
+				3579B0982883380100BD3B25 /* UIColor+init.swift */,
+			);
+			path = Utils;
+			sourceTree = "<group>";
+		};
 		7555FF72242A565900829871 = {
 			isa = PBXGroup;
 			children = (
@@ -103,25 +116,20 @@
 		7555FF7D242A565900829871 /* iosApp */ = {
 			isa = PBXGroup;
 			children = (
+				35E34EC229C5DE3C00ED7D75 /* Utils */,
 				058557BA273AAA24004C7B11 /* Assets.xcassets */,
 				7555FF82242A565900829871 /* ContentView.swift */,
 				7555FF8C242A565B00829871 /* Info.plist */,
 				2152FB032600AC8F00CF470E /* iOSApp.swift */,
 				058557D7273AAEEB004C7B11 /* Preview Content */,
-				35737204287F4AE00061F94C /* kotlinxCoroutinesFlowExtensions.swift */,
 				3573720628813C6B0061F94C /* AppError+readableErrorMessage.swift */,
 				3573720828813C930061F94C /* DIContainer+get.swift */,
 				3579B0902883238D00BD3B25 /* GithubRepoItemsList.swift */,
 				3579B092288323B900BD3B25 /* GithubRepoItemsFirstPage.swift */,
 				3579B094288323DA00BD3B25 /* ErrorMessageAndButton.swift */,
 				3579B096288323F800BD3B25 /* GithubEmptySearch.swift */,
-				3579B0982883380100BD3B25 /* UIColor+init.swift */,
-				3579B09A2883381700BD3B25 /* Once.swift */,
 				3579B09C2883385600BD3B25 /* GithubRepoItemRow.swift */,
-				3579B09E28846FBE00BD3B25 /* Napier.swift */,
 				3579B0A02885BA4D00BD3B25 /* IOSGithubSearchViewModel.swift */,
-				3579B0A22885BD4E00BD3B25 /* LazyView.swift */,
-				35B1166D288EA34900FFC3C3 /* Color+init.swift */,
 			);
 			path = iosApp;
 			sourceTree = "<group>";
diff --git a/iosApp/iosApp/AppError+readableErrorMessage.swift b/iosApp/iosApp/AppError+readableErrorMessage.swift
@@ -2,7 +2,7 @@
 //  AppError+readableErrorMessage.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/15/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/15/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/DIContainer+get.swift b/iosApp/iosApp/DIContainer+get.swift
@@ -2,7 +2,7 @@
 //  DIContainer+get.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/15/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/15/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/ErrorMessageAndButton.swift b/iosApp/iosApp/ErrorMessageAndButton.swift
@@ -2,7 +2,7 @@
 //  ErrorMessageAndButton.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/16/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/16/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/GithubEmptySearch.swift b/iosApp/iosApp/GithubEmptySearch.swift
@@ -2,7 +2,7 @@
 //  GithubEmptySearch.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/16/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/16/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/GithubRepoItemRow.swift b/iosApp/iosApp/GithubRepoItemRow.swift
@@ -2,7 +2,7 @@
 //  GithubRepoItemRow.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/17/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/17/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/GithubRepoItemsFirstPage.swift b/iosApp/iosApp/GithubRepoItemsFirstPage.swift
@@ -2,7 +2,7 @@
 //  GithubRepoItemsFirstPage.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/16/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/16/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/GithubRepoItemsList.swift b/iosApp/iosApp/GithubRepoItemsList.swift
@@ -2,7 +2,7 @@
 //  GithubRepoItemsList.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/16/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/16/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/IOSGithubSearchViewModel.swift b/iosApp/iosApp/IOSGithubSearchViewModel.swift
@@ -2,7 +2,7 @@
 //  IOSGithubSearchViewModel.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/18/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/18/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/Color+init.swift b/iosApp/iosApp/Utils/Color+init.swift
@@ -2,7 +2,7 @@
 //  Color+init.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/25/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/25/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/LazyView.swift b/iosApp/iosApp/Utils/LazyView.swift
@@ -2,7 +2,7 @@
 //  LazyView.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/18/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/18/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/Napier.swift b/iosApp/iosApp/Utils/Napier.swift
@@ -2,7 +2,7 @@
 //  Napier.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/17/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/17/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
@@ -128,7 +128,7 @@ extension Napier {
     function: String
   ) {
     let message = items.map { "\($0)" }.joined(separator: separator)
-    
+
     let throwable: KotlinThrowable?
     if let error = error {
       throwable = NSErrorKt.asThrowable(error)
diff --git a/iosApp/iosApp/Utils/Once.swift b/iosApp/iosApp/Utils/Once.swift
@@ -2,7 +2,7 @@
 //  Once.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/17/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/17/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/UIColor+init.swift b/iosApp/iosApp/Utils/UIColor+init.swift
@@ -2,7 +2,7 @@
 //  UIColor+init.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/17/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/17/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/kotlinxCoroutinesFlowExtensions.swift b/iosApp/iosApp/Utils/kotlinxCoroutinesFlowExtensions.swift
@@ -0,0 +1,189 @@
+//
+//  flows.swift
+//  iosApp
+//
+//  Created by Petrus Nguyen Thai Hoc on 7/14/22.
+//  Copyright © 2022 orgName. All rights reserved.
+//
+
+import Foundation
+import shared
+import Combine
+
+private let emptyOnComplete = { }
+private let defaultOnError = { (error: Error) in
+  Napier.e(error: error, "Unhandled error")
+  fatalError("Unhandled error = \(error)")
+}
+
+extension StateFlow {
+  func typedValue<T>(_ type: T.Type = T.self) -> T { value as! T }
+}
+
+extension Flow {
+  // MARK: Flow<T>
+  @discardableResult
+  func subscribeNonNullFlow<T: AnyObject>(
+    _ type: T.Type = T.self,
+    scope: CoroutineScope,
+    onValue: @escaping (T) -> Void,
+    onError: ((Error) -> Void)? = nil,
+    onComplete: (() -> Void)? = nil
+  ) -> JoinableAndCloseable {
+    NonNullFlowWrapper<T>(flow: self).subscribe(
+      scope: scope,
+      onValue: onValue,
+      onError: { throwable in
+        (onError ?? defaultOnError)(throwable.asNSError())
+      },
+      onComplete: onComplete ?? emptyOnComplete
+    )
+  }
+
+  func asNonNullPublisher<T: AnyObject>(_ type: T.Type = T.self) -> AnyPublisher<T, Error> {
+    NonNullFlowPublisher(flow: self).eraseToAnyPublisher()
+  }
+
+  // MARK: - Flow<T?>
+  @discardableResult
+  func subscribeNullableFlow<T: AnyObject>(
+    _ type: T.Type = T.self,
+    scope: CoroutineScope,
+    onValue: @escaping (T?) -> Void,
+    onError: ((Error) -> Void)? = nil,
+    onComplete: (() -> Void)? = nil
+  ) -> JoinableAndCloseable {
+    NullableFlowWrapper<T>(flow: self).subscribe(
+      scope: scope,
+      onValue: onValue,
+      onError: { throwable in
+        (onError ?? defaultOnError)(throwable.asNSError())
+      },
+      onComplete: onComplete ?? emptyOnComplete
+    )
+  }
+
+  func asNullablePublisher<T: AnyObject>(_ type: T.Type = T.self) -> AnyPublisher<T?, Error> {
+    NullableFlowPublisher(flow: self).eraseToAnyPublisher()
+  }
+}
+
+// MARK: - NonNullFlowPublisher
+private struct NonNullFlowPublisher<T: AnyObject>: Publisher {
+  typealias Output = T
+  typealias Failure = Error
+
+  private let flow: Flow
+
+  init(flow: Flow) {
+    self.flow = flow
+  }
+
+  func receive<S>(subscriber: S) where S: Subscriber, Error == S.Failure, T == S.Input {
+    let subscription = NonNullFlowSubscription(
+      flow: flow,
+      subscriber: subscriber
+    )
+    subscriber.receive(subscription: subscription)
+  }
+}
+
+private class NonNullFlowSubscription<T: AnyObject, S: Subscriber>: Subscription where S.Input == T, S.Failure == Error {
+
+  private var subscriber: S?
+  private var closable: Closeable?
+
+  init(
+    flow: Flow,
+    subscriber: S
+  ) {
+    self.subscriber = subscriber
+
+    let dispatcher = DIContainer.shared
+      .get(for: AppCoroutineDispatchers.self)
+      .unconfined
+    let scope = CoroutineScopeKt.CoroutineScope(context: dispatcher)
+
+    self.closable = flow.subscribeNonNullFlow(
+      scope: scope,
+      onValue: {
+        _ = subscriber.receive($0)
+      },
+      onError: {
+        subscriber.receive(completion: .failure($0))
+      },
+      onComplete: {
+        subscriber.receive(completion: .finished)
+      }
+    )
+  }
+
+  func request(_ demand: Subscribers.Demand) { }
+
+  func cancel() {
+    self.subscriber = nil
+
+    self.closable?.close()
+    self.closable = nil
+  }
+}
+
+// MARK: - NullableFlowPublisher
+private struct NullableFlowPublisher<T: AnyObject>: Publisher {
+  typealias Output = T?
+  typealias Failure = Error
+
+  private let flow: Flow
+
+  init(flow: Flow) {
+    self.flow = flow
+  }
+
+  func receive<S>(subscriber: S) where S: Subscriber, Error == S.Failure, T? == S.Input {
+    let subscription = NullableFlowSubscription(
+      flow: flow,
+      subscriber: subscriber
+    )
+    subscriber.receive(subscription: subscription)
+  }
+}
+
+private class NullableFlowSubscription<T: AnyObject, S: Subscriber>: Subscription where S.Input == T?, S.Failure == Error {
+
+  private var subscriber: S?
+  private var closable: Closeable?
+
+  init(
+    flow: Flow,
+    subscriber: S
+  ) {
+    self.subscriber = subscriber
+
+    let dispatcher = DIContainer.shared
+      .get(for: AppCoroutineDispatchers.self)
+      .unconfined
+    let scope = CoroutineScopeKt.CoroutineScope(context: dispatcher)
+
+    self.closable = flow.subscribeNonNullFlow(
+      scope: scope,
+      onValue: {
+        _ = subscriber.receive($0)
+      },
+      onError: {
+        subscriber.receive(completion: .failure($0))
+      },
+      onComplete: {
+        subscriber.receive(completion: .finished)
+      }
+    )
+  }
+
+  func request(_ demand: Subscribers.Demand) { }
+
+  func cancel() {
+    self.subscriber = nil
+
+    self.closable?.close()
+    self.closable = nil
+  }
+}
diff --git a/iosApp/iosApp/kotlinxCoroutinesFlowExtensions.swift b/iosApp/iosApp/kotlinxCoroutinesFlowExtensions.swift
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
diff --git a/shared/src/iosMain/kotlin/com/hoc081098/github_search_kmm/utils/NonNullFlowWrapper.kt b/shared/src/iosMain/kotlin/com/hoc081098/github_search_kmm/utils/NonNullFlowWrapper.kt
