chore: remove orphaned foundation files from rebase"

Author: ekjotmultani

packages/amplify_foundation/amplify_foundation_dart/README.md

@@ -1,3 +1,7 @@
-# Amplify Foundation Dart
+# amplify_foundation_dart
 
 Common types and utilities for Amplify packages.
+
+## Getting Started
+
+### Visit our [Web Site](https://docs.amplify.aws/) to learn more about AWS Amplify.

packages/amplify_foundation/amplify_foundation_dart/dart_test.yaml

@@ -15,20 +15,17 @@ void main() async {
   print('End maxCustomization');
 }
 
-// Min Customization — register a simple printer sink and use AmplifyLogging
+// Min Customization — register a simple printer sink, use AmplifyLogging,
+// and create an AWSCredentialsProvider from a Cognito client
 Future<void> minCustomization() async {
   // Register a console log sink at info level
   final logSink = AmplifySimplePrinterLogSink(logLevel: LogLevel.info);
   AmplifyLogging.addSink(logSink);
 
-  final loggerProvider = AmplifyLoggerProvider(
-    createLogger: AmplifyLogging.logger,
-  );
-
   final cognitoConfig = AmplifyCognitoClientConfig(id: 'UserPoolId');
 
   final amplifyCognitoClient = AmplifyCognitoClient(
-    loggerProvider: loggerProvider,
+    createLogger: AmplifyLogging.logger,
     config: cognitoConfig,
   );
 
@@ -37,22 +34,21 @@ Future<void> minCustomization() async {
 
   final amplifyS3Client = AmplifyS3Client(
     awsCredentialsProvider: credentialsProvider,
-    loggerProvider: loggerProvider,
+    createLogger: AmplifyLogging.logger,
     config: s3Config,
   );
 
   final result = await amplifyS3Client.upload('FilePath');
-  result.handle(
-    onSuccess: (data) => print('onSuccess - ${data.value}'),
-    onFailure: (error) => print('onFailure - ${error.message}'),
-  );
+  switch (result) {
+    case Ok(:final value):
+      print('ok - ${value.value}');
+    case Error(:final error):
+      print('error - $error');
+  }
 }
 
-// Max Customization — custom LogSink and LoggerProvider
+// Max Customization — custom LogSink and logger factory
 class MyLogSink implements LogSink {
-  @override
-  final String id = 'my-custom-sink';
-
   @override
   bool isEnabled(LogLevel logLevel) => true; // Accept all levels
 
@@ -75,29 +71,30 @@ Future<void> maxCustomization() async {
 
   // Use a custom sink with a BroadcastLogger
   final customSink = MyLogSink();
-  final loggerProvider = AmplifyLoggerProvider(
-    createLogger: (name) => BroadcastLogger(name: name, sinks: [customSink]),
-  );
+  Logger createLogger(String name) =>
+      BroadcastLogger(name: name, sinks: [customSink]);
 
   final s3Config = AmplifyS3ClientConfig(id: 'S3BucketId');
 
   final amplifyS3Client = AmplifyS3Client(
     awsCredentialsProvider: credentialsProvider,
-    loggerProvider: loggerProvider,
+    createLogger: createLogger,
     config: s3Config,
   );
 
   final result = await amplifyS3Client.upload('FilePath');
-  result.handle(
-    onSuccess: (data) => print('onSuccess - ${data.value}'),
-    onFailure: (error) => print('onFailure - ${error.message}'),
-  );
+  switch (result) {
+    case Ok(:final value):
+      print('ok - ${value.value}');
+    case Error(:final error):
+      print('error - $error');
+  }
 }
 
 // Cognito Client Code
 class AmplifyCognitoClientConfig {
   AmplifyCognitoClientConfig({required this.id});
-  String id;
+  final String id;
 }
 
 class CognitoCredentialProvider implements AWSCredentialsProvider {
@@ -108,12 +105,12 @@ class CognitoCredentialProvider implements AWSCredentialsProvider {
 }
 
 class AmplifyCognitoClient {
-  AmplifyCognitoClient({required this.loggerProvider, required this.config});
+  AmplifyCognitoClient({required this.createLogger, required this.config});
 
-  LoggerProvider loggerProvider;
-  AmplifyCognitoClientConfig config;
+  final Logger Function(String name) createLogger;
+  final AmplifyCognitoClientConfig config;
 
-  Logger get _logger => loggerProvider.resolve('AmplifyCognitoClient');
+  Logger get _logger => createLogger('AmplifyCognitoClient');
 
   AWSCredentialsProvider toAWSCredentialsProvider() {
     _logger.verbose('Creating CognitoCredentialProvider');
@@ -125,7 +122,7 @@ class AmplifyCognitoClient {
 class UnknownAmplifyException extends AmplifyException {
   UnknownAmplifyException({super.cause})
     : super(
-        message: 'An unknown error has occured',
+        message: 'An unknown error has occurred',
         recoverySuggestion: 'Please open an issue on the Amplify Github',
       );
 }
@@ -138,36 +135,33 @@ class UploadResult {
 
 class AmplifyS3ClientConfig {
   AmplifyS3ClientConfig({required this.id});
-  String id;
+  final String id;
 }
 
 class AmplifyS3Client {
   AmplifyS3Client({
     required this.awsCredentialsProvider,
-    required this.loggerProvider,
+    required this.createLogger,
     required this.config,
   });
 
-  AWSCredentialsProvider awsCredentialsProvider;
-  LoggerProvider loggerProvider;
-  AmplifyS3ClientConfig config;
+  final AWSCredentialsProvider awsCredentialsProvider;
+  final Logger Function(String name) createLogger;
+  final AmplifyS3ClientConfig config;
 
-  Logger get _logger => loggerProvider.resolve('AmplifyS3Client');
+  Logger get _logger => createLogger('AmplifyS3Client');
 
-  Future<Result<UploadResult, AmplifyException>> upload(String file) async {
+  Future<Result<UploadResult>> upload(String file) async {
     try {
       _logger.info('upload called with file: $file');
 
       final result = await _upload(file);
 
       _logger.info('someAction returned with: $result');
-      return Success(result);
-    } on AmplifyException catch (error, stackTrace) {
-      _logger.error('Error calling someAction', error, stackTrace);
-      return Failure(error);
-    } on Object catch (error, stackTrace) {
+      return Result.ok(result);
+    } on Exception catch (error, stackTrace) {
       _logger.error('Error calling someAction', error, stackTrace);
-      return Failure(UnknownAmplifyException(cause: error));
+      return Result.error(error);
     }
   }
 

packages/amplify_foundation/amplify_foundation_dart/example/amplify_foundation_example.dart

@@ -17,10 +17,8 @@ export 'package:amplify_foundation_dart/src/logger/log_level.dart';
 export 'package:amplify_foundation_dart/src/logger/log_message.dart';
 export 'package:amplify_foundation_dart/src/logger/log_sink.dart';
 export 'package:amplify_foundation_dart/src/logger/logger.dart';
-export 'package:amplify_foundation_dart/src/logger/logger_provider.dart';
 // Results
 export 'package:amplify_foundation_dart/src/result/result.dart';
-export 'package:amplify_foundation_dart/src/result/result_failure_exception.dart';
 // Utils
 export 'package:amplify_foundation_dart/src/util/globals.dart';
 export 'package:amplify_foundation_dart/src/util/print.dart';

packages/amplify_foundation/amplify_foundation_dart/lib/amplify_foundation_dart.dart

@@ -23,5 +23,5 @@ abstract class AmplifyException implements Exception {
 
   @override
   String toString() =>
-      'AmplifyException: $message\nRecovery suggestion: $recoverySuggestion';
+      '$runtimeType: $message\nRecovery suggestion: $recoverySuggestion';
 }

packages/amplify_foundation/amplify_foundation_dart/lib/src/amplify_exception/amplify_exception.dart

@@ -15,23 +15,26 @@ import 'package:amplify_foundation_dart/src/logger/logger.dart';
 final class AmplifyLogging {
   AmplifyLogging._();
 
-  static final Map<String, LogSink> _registeredLogSinks = {};
+  static final Set<LogSink> _registeredLogSinks = {};
 
   /// Adds a [LogSink] to receive log messages.
   static void addSink(LogSink logSink) {
-    _registeredLogSinks[logSink.id] = logSink;
+    _registeredLogSinks.add(logSink);
   }
 
   /// Removes a previously registered [LogSink].
   static void removeSink(LogSink logSink) {
-    _registeredLogSinks.remove(logSink.id);
+    _registeredLogSinks.remove(logSink);
   }
 
   /// Creates a named [Logger] that broadcasts to all registered sinks.
+  ///
+  /// Returns a logger bound to the sinks registered at the time of the call.
+  /// Sinks added later will not affect previously created loggers.
   static Logger logger(String name) {
     return BroadcastLogger(
       name: name,
-      sinks: List.unmodifiable(_registeredLogSinks.values),
+      sinks: List.unmodifiable(_registeredLogSinks),
     );
   }
 }

packages/amplify_foundation/amplify_foundation_dart/lib/src/logger/amplify_logging.dart

@@ -5,7 +5,6 @@ import 'package:amplify_foundation_dart/src/logger/log_level.dart';
 import 'package:amplify_foundation_dart/src/logger/log_message.dart';
 import 'package:amplify_foundation_dart/src/logger/log_sink.dart';
 import 'package:amplify_foundation_dart/src/util/print.dart';
-import 'package:uuid/uuid.dart';
 
 /// {@template amplify_foundation_dart.amplify_simple_printer_log_sink}
 /// A [LogSink] implementation that prints log messages to the console.
@@ -15,11 +14,7 @@ import 'package:uuid/uuid.dart';
 /// {@endtemplate}
 final class AmplifySimplePrinterLogSink implements LogSink {
   /// {@macro amplify_foundation_dart.amplify_simple_printer_log_sink}
-  AmplifySimplePrinterLogSink({required this.logLevel})
-    : id = 'AmplifySimplePrinterLogSink-${const Uuid().v4()}';
-
-  @override
-  final String id;
+  AmplifySimplePrinterLogSink({required this.logLevel});
 
   /// The maximum log level that this sink will emit.
   final LogLevel logLevel;

packages/amplify_foundation/amplify_foundation_dart/lib/src/logger/amplify_simple_printer_log_sink.dart

@@ -62,7 +62,9 @@ final class BroadcastLogger implements Logger {
       stackTrace: stackTrace,
     );
     for (final sink in sinks) {
-      sink.emit(logMessage);
+      if (sink.isEnabled(logLevel)) {
+        sink.emit(logMessage);
+      }
     }
   }
 }

packages/amplify_foundation/amplify_foundation_dart/lib/src/logger/broadcast_logger.dart

@@ -34,15 +34,15 @@ enum LogLevel implements Comparable<LogLevel> {
   @override
   int compareTo(LogLevel other) => value.compareTo(other.value);
 
-  /// Returns true if [other] is less than or equal to this level.
+  /// Returns true if this level is strictly less than [other].
   bool operator <(LogLevel other) => value < other.value;
 
-  /// Returns true if [other] is less than or equal to this level.
+  /// Returns true if this level is less than or equal to [other].
   bool operator <=(LogLevel other) => value <= other.value;
 
-  /// Returns true if [other] is greater than this level.
+  /// Returns true if this level is strictly greater than [other].
   bool operator >(LogLevel other) => value > other.value;
 
-  /// Returns true if [other] is greater than or equal to this level.
+  /// Returns true if this level is greater than or equal to [other].
   bool operator >=(LogLevel other) => value >= other.value;
 }

packages/amplify_foundation/amplify_foundation_dart/lib/src/logger/log_level.dart

@@ -4,7 +4,7 @@
 import 'package:amplify_foundation_dart/amplify_foundation_dart.dart';
 
 /// {@template amplify_foundation_dart.log_message}
-/// A struct representing a single log message.
+/// A class representing a single log message.
 /// {@endtemplate}
 final class LogMessage {
   /// {@macro amplify_foundation_dart.log_message}