Review changes

Author: gspencergoog

pkgs/dart_mcp/lib/src/api/initialization.dart

@@ -31,17 +31,19 @@ extension type InitializeRequest._fromMap(Map<String, Object?> _value)
       ProtocolVersion.tryParse(_value['protocolVersion'] as String);
 
   ClientCapabilities get capabilities {
-    if (_value['capabilities'] == null) {
+    final capabilities = _value['capabilities'] as ClientCapabilities?;
+    if (capabilities == null) {
       throw ArgumentError('Missing capabilities field in $InitializeRequest.');
     }
-    return _value['capabilities'] as ClientCapabilities;
+    return capabilities;
   }
 
   Implementation get clientInfo {
     if (_value['clientInfo'] == null) {
       throw ArgumentError('Missing clientInfo field in $InitializeRequest.');
+    } else {
+      return _value['clientInfo'] as Implementation;
     }
-    return _value['clientInfo'] as Implementation;
   }
 }
 

pkgs/dart_mcp/lib/src/api/prompts.dart

@@ -52,8 +52,9 @@ extension type GetPromptRequest.fromMap(Map<String, Object?> _value)
   String get name {
     if (_value['name'] == null) {
       throw ArgumentError('Missing name field in $GetPromptRequest.');
+    } else {
+      return _value['name'] as String;
     }
-    return _value['name'] as String;
   }
 
   /// Arguments to use for templating the prompt.

pkgs/dart_mcp/lib/src/api/resources.dart

@@ -81,10 +81,11 @@ extension type ReadResourceRequest.fromMap(Map<String, Object?> _value)
   /// The URI of the resource to read. The URI can use any protocol; it is
   /// up to the server how to interpret it.
   String get uri {
-    if (_value['uri'] == null) {
+    final uri = _value['uri'] as String?;
+    if (uri == null) {
       throw ArgumentError('Missing uri field in $ReadResourceRequest.');
     }
-    return _value['uri'] as String;
+    return uri;
   }
 }
 
@@ -134,10 +135,11 @@ extension type SubscribeRequest.fromMap(Map<String, Object?> _value)
   /// The URI of the resource to subscribe to. The URI can use any protocol;
   /// it is up to the server how to interpret it.
   String get uri {
-    if (_value['uri'] == null) {
+    final uri = _value['uri'] as String?;
+    if (uri == null) {
       throw ArgumentError('Missing uri field in $SubscribeRequest.');
     }
-    return _value['uri'] as String;
+    return uri;
   }
 }
 
@@ -157,10 +159,11 @@ extension type UnsubscribeRequest.fromMap(Map<String, Object?> _value)
 
   /// The URI of the resource to unsubscribe from.
   String get uri {
-    if (_value['uri'] == null) {
+    final uri = _value['uri'] as String?;
+    if (uri == null) {
       throw ArgumentError('Missing uri field in $UnsubscribeRequest.');
     }
-    return _value['uri'] as String;
+    return uri;
   }
 }