From c9500a6a1cc289ce9096c86ab2a30e437246b423 Mon Sep 17 00:00:00 2001
From: Klim <yarklim96@gmail.com>
Date: Sun, 3 May 2026 20:06:12 +0300
Subject: [PATCH] fix(cherrypick): rename Provider typedefs to ProviderFactory

---
 cherrypick/lib/src/binding.dart          |  4 ++--
 cherrypick/lib/src/binding_resolver.dart | 25 ++++++++++++------------
 cherrypick/lib/src/scope.dart            |  1 -
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cherrypick/lib/src/binding.dart b/cherrypick/lib/src/binding.dart
index cde465d..ceb6138 100644
--- a/cherrypick/lib/src/binding.dart
+++ b/cherrypick/lib/src/binding.dart
@@ -233,7 +233,7 @@ class Binding<T> {
   ///
   /// Prefer this over [toProvide] when the provider is async, so the resolver
   /// is type-safe and avoids runtime detection overhead.
-  Binding<T> toProvideAsync(AsyncProvider<T> value) {
+  Binding<T> toProvideAsync(AsyncProviderFactory<T> value) {
     _resolver = ProviderResolver.async<T>(value);
     return this;
   }
@@ -242,7 +242,7 @@ class Binding<T> {
   ///
   /// Prefer this over [toProvideWithParams] when the provider is async, so the resolver
   /// is type-safe and avoids runtime detection overhead.
-  Binding<T> toProvideAsyncWithParams(AsyncProviderWithParams<T> value) {
+  Binding<T> toProvideAsyncWithParams(AsyncProviderFactoryWithParams<T> value) {
     _resolver = ProviderResolver.asyncWithParams<T>(value);
     return this;
   }
diff --git a/cherrypick/lib/src/binding_resolver.dart b/cherrypick/lib/src/binding_resolver.dart
index 7fadab2..c51ebb1 100644
--- a/cherrypick/lib/src/binding_resolver.dart
+++ b/cherrypick/lib/src/binding_resolver.dart
@@ -14,16 +14,16 @@
 import 'dart:async';
 
 /// Synchronous factory: `T Function()`.
-typedef Provider<T> = T Function();
+typedef ProviderFactory<T> = T Function();
 
 /// Parameterized synchronous factory: `T Function(dynamic)`.
-typedef ProviderWithParams<T> = T Function(dynamic);
+typedef ProviderFactoryWithParams<T> = T Function(dynamic);
 
 /// Asynchronous factory: `Future<T> Function()`.
-typedef AsyncProvider<T> = Future<T> Function();
+typedef AsyncProviderFactory<T> = Future<T> Function();
 
 /// Parameterized asynchronous factory: `Future<T> Function(dynamic)`.
-typedef AsyncProviderWithParams<T> = Future<T> Function(dynamic);
+typedef AsyncProviderFactoryWithParams<T> = Future<T> Function(dynamic);
 
 /// Internal interface for resolvers managed by [Binding].
 abstract class BindingResolver<T> {
@@ -88,7 +88,7 @@ abstract class _BaseProviderResolver<T> implements BindingResolver<T> {
 
 /// Resolves [Binding.toProvide] with a sync `T Function()` provider.
 class SyncProviderResolver<T> extends _BaseProviderResolver<T> {
-  final Provider<T> _provider;
+  final ProviderFactory<T> _provider;
   Object? _cached;
   bool _isCached = false;
 
@@ -113,7 +113,7 @@ class SyncProviderResolver<T> extends _BaseProviderResolver<T> {
 
 /// Resolves [Binding.toProvideWithParams] with a sync `T Function(dynamic)` provider.
 class SyncProviderWithParamsResolver<T> extends _BaseProviderResolver<T> {
-  final ProviderWithParams<T> _provider;
+  final ProviderFactoryWithParams<T> _provider;
   Object? _cached;
   bool _isCached = false;
 
@@ -142,7 +142,7 @@ class SyncProviderWithParamsResolver<T> extends _BaseProviderResolver<T> {
 
 /// Resolves [Binding.toProvide] with an async `Future<T> Function()` provider.
 class AsyncProviderResolver<T> extends _BaseProviderResolver<T> {
-  final AsyncProvider<T> _provider;
+  final AsyncProviderFactory<T> _provider;
   Future<T>? _cache;
   bool _isCached = false;
 
@@ -171,7 +171,7 @@ class AsyncProviderResolver<T> extends _BaseProviderResolver<T> {
 
 /// Resolves [Binding.toProvideWithParams] with an async `Future<T> Function(dynamic)` provider.
 class AsyncProviderWithParamsResolver<T> extends _BaseProviderResolver<T> {
-  final AsyncProviderWithParams<T> _provider;
+  final AsyncProviderFactoryWithParams<T> _provider;
   Future<T>? _cache;
   bool _isCached = false;
 
@@ -342,23 +342,24 @@ class ProviderResolver {
   }
 
   /// Explicit sync resolver without parameters.
-  static BindingResolver<T> sync<T>(Provider<T> provider) {
+  static BindingResolver<T> sync<T>(ProviderFactory<T> provider) {
     return SyncProviderResolver<T>(provider);
   }
 
   /// Explicit sync resolver with parameters.
-  static BindingResolver<T> syncWithParams<T>(ProviderWithParams<T> provider) {
+  static BindingResolver<T> syncWithParams<T>(
+      ProviderFactoryWithParams<T> provider) {
     return SyncProviderWithParamsResolver<T>(provider);
   }
 
   /// Explicit async resolver without parameters.
-  static BindingResolver<T> async<T>(AsyncProvider<T> provider) {
+  static BindingResolver<T> async<T>(AsyncProviderFactory<T> provider) {
     return AsyncProviderResolver<T>(provider);
   }
 
   /// Explicit async resolver with parameters.
   static BindingResolver<T> asyncWithParams<T>(
-      AsyncProviderWithParams<T> provider) {
+      AsyncProviderFactoryWithParams<T> provider) {
     return AsyncProviderWithParamsResolver<T>(provider);
   }
 }
diff --git a/cherrypick/lib/src/scope.dart b/cherrypick/lib/src/scope.dart
index fd6f708..edd853a 100644
--- a/cherrypick/lib/src/scope.dart
+++ b/cherrypick/lib/src/scope.dart
@@ -20,7 +20,6 @@ import 'package:cherrypick/src/binding_resolver.dart';
 import 'package:cherrypick/src/module.dart';
 import 'package:cherrypick/src/observer.dart';
 
-
 /// Represents a DI scope (container) for modules, subscopes,
 /// and dependency resolution (sync/async) in CherryPick.
 ///