[_js_interop_checks] Update pubspec to 3.8 and reformat.

fishythefish · Commit Queue · commit 3ef77d1247af · 2025-05-08T15:07:30.000-07:00
Change-Id: I8f7a8713ab668c49c51a710c4871d9e7f0c8e630 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/427565 Reviewed-by: Srujan Gaddam <srujzs@google.com> Commit-Queue: Srujan Gaddam <srujzs@google.com> Auto-Submit: Mayank Patke <fishythefish@google.com>
diff --git a/pkg/_js_interop_checks/lib/js_interop_checks.dart b/pkg/_js_interop_checks/lib/js_interop_checks.dart
@@ -639,11 +639,10 @@ class JsInteropChecks extends RecursiveVisitor {
               (pattern) => uri.path.contains(pattern),
             );
         if (allowedToImport) return;
-        final message =
-            dependencyUriString == 'dart:ffi'
-                ? messageDartFfiLibraryInDart2Wasm
-                : templateJsInteropDisallowedInteropLibraryInDart2Wasm
-                    .withArguments(dependencyUriString);
+        final message = dependencyUriString == 'dart:ffi'
+            ? messageDartFfiLibraryInDart2Wasm
+            : templateJsInteropDisallowedInteropLibraryInDart2Wasm
+                  .withArguments(dependencyUriString);
         _reporter.report(
           message,
           dependency.fileOffset,
@@ -797,8 +796,10 @@ class JsInteropChecks extends RecursiveVisitor {
           return false;
         }
         memberKind = 'extension type interop member';
-        memberName =
-            extensionIndex.getExtensionTypeDescriptor(member)!.name.text;
+        memberName = extensionIndex
+            .getExtensionTypeDescriptor(member)!
+            .name
+            .text;
         if (memberName.isEmpty) memberName = 'new';
       } else if (member.isExtensionMember) {
         // JS interop members can not be torn off.
@@ -1128,10 +1129,9 @@ class JsInteropChecks extends RecursiveVisitor {
       parameterTypeString =
           '$positionalParameterTypeString, {$namedParameterTypeString}';
     } else {
-      parameterTypeString =
-          namedParameterTypeString.isNotEmpty
-              ? '{$namedParameterTypeString}'
-              : positionalParameterTypeString;
+      parameterTypeString = namedParameterTypeString.isNotEmpty
+          ? '{$namedParameterTypeString}'
+          : positionalParameterTypeString;
     }
     return '${typeToString(functionType.returnType)} '
         'Function($parameterTypeString)';
@@ -1152,10 +1152,9 @@ class JsInteropChecks extends RecursiveVisitor {
       // There's only one type, so only report that one type instead of a
       // function type. This also avoids duplication in reporting external
       // fields, which are just a getter and a setter.
-      final accessorType =
-          isGetter
-              ? functionType.returnType
-              : functionType.positionalParameters[0];
+      final accessorType = isGetter
+          ? functionType.returnType
+          : functionType.positionalParameters[0];
       if (!_isAllowedExternalType(accessorType)) {
         _reporter.report(
           templateJsInteropStaticInteropExternalAccessorTypeViolation
diff --git a/pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart b/pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart
@@ -129,16 +129,15 @@ class JsUtilOptimizer extends Transformer {
            '_functionToJS$i',
          ),
        ),
-       _functionToJSCaptureThisTargets =
-           isDart2JS
-               ? List<Procedure>.generate(
-                 5,
-                 (i) => _coreTypes.index.getTopLevelProcedure(
-                   'dart:js_util',
-                   '_functionToJSCaptureThis$i',
-                 ),
-               )
-               : null,
+       _functionToJSCaptureThisTargets = isDart2JS
+           ? List<Procedure>.generate(
+               5,
+               (i) => _coreTypes.index.getTopLevelProcedure(
+                 'dart:js_util',
+                 '_functionToJSCaptureThis$i',
+               ),
+             )
+           : null,
        _functionToJSNTarget = _coreTypes.index.getTopLevelProcedure(
          'dart:js_util',
          '_functionToJSN',
@@ -255,11 +254,10 @@ class JsUtilOptimizer extends Transformer {
           )..fileOffset = node.fileOffset;
 
           if (!shouldTrustType) {
-            expression =
-                AsExpression(expression, node.getterType)
-                  ..isTypeError = true
-                  ..isForDynamic = true
-                  ..fileOffset = node.fileOffset;
+            expression = AsExpression(expression, node.getterType)
+              ..isTypeError = true
+              ..isForDynamic = true
+              ..fileOffset = node.fileOffset;
           }
 
           final statement = ReturnStatement(expression)
@@ -397,10 +395,9 @@ class JsUtilOptimizer extends Transformer {
       // dotted prefix.
       var className = getJSName(enclosingClass);
       if (className.isEmpty) {
-        className =
-            enclosingClass is Class
-                ? enclosingClass.name
-                : (enclosingClass as ExtensionTypeDeclaration).name;
+        className = enclosingClass is Class
+            ? enclosingClass.name
+            : (enclosingClass as ExtensionTypeDeclaration).name;
       }
       dottedPrefix = concatenateJSNames(dottedPrefix, className);
     }
@@ -453,8 +450,9 @@ class JsUtilOptimizer extends Transformer {
     bool shouldTrustType, [
     Expression? maybeReceiver,
   ]) {
-    final target =
-        shouldTrustType ? _getPropertyTrustTypeTarget : _getPropertyTarget;
+    final target = shouldTrustType
+        ? _getPropertyTrustTypeTarget
+        : _getPropertyTarget;
     final isInstanceInteropMember = _extensionIndex.isInstanceInteropMember(
       node,
     );
@@ -465,10 +463,9 @@ class JsUtilOptimizer extends Transformer {
       final positionalArgs = arguments.positional;
       assert(positionalArgs.length == (isInstanceInteropMember ? 1 : 0));
       // We clone the receiver as each invocation needs a fresh node.
-      final receiver =
-          maybeReceiver == null
-              ? positionalArgs.first
-              : _cloner.clone(maybeReceiver);
+      final receiver = maybeReceiver == null
+          ? positionalArgs.first
+          : _cloner.clone(maybeReceiver);
       final property = StringLiteral(name);
       return StaticInvocation(
           target,
@@ -502,10 +499,9 @@ class JsUtilOptimizer extends Transformer {
       // members.
       final positionalArgs = arguments.positional;
       assert(positionalArgs.length == (isInstanceInteropMember ? 2 : 1));
-      final receiver =
-          maybeReceiver == null
-              ? positionalArgs.first
-              : _cloner.clone(maybeReceiver);
+      final receiver = maybeReceiver == null
+          ? positionalArgs.first
+          : _cloner.clone(maybeReceiver);
       final property = StringLiteral(name);
       final value = positionalArgs.last;
       return _lowerSetProperty(
@@ -536,18 +532,18 @@ class JsUtilOptimizer extends Transformer {
     bool shouldTrustType, [
     Expression? maybeReceiver,
   ]) {
-    final target =
-        shouldTrustType ? _callMethodTrustTypeTarget : _callMethodTarget;
+    final target = shouldTrustType
+        ? _callMethodTrustTypeTarget
+        : _callMethodTarget;
     final isInstanceInteropMember = _extensionIndex.isInstanceInteropMember(
       node,
     );
     final name = _getMemberJSName(node);
     return (Arguments arguments, Expression invocation) {
       var positional = arguments.positional;
-      final receiver =
-          maybeReceiver == null
-              ? positional.first
-              : _cloner.clone(maybeReceiver);
+      final receiver = maybeReceiver == null
+          ? positional.first
+          : _cloner.clone(maybeReceiver);
       if (isInstanceInteropMember) {
         // Ignore `this` for extension and extension type members.
         positional = positional.sublist(1);
@@ -587,8 +583,9 @@ class JsUtilOptimizer extends Transformer {
     StaticInvocation Function(StaticInvocation)? invocationOptimizer;
     switch (operator) {
       case '[]':
-        target =
-            shouldTrustType ? _getPropertyTrustTypeTarget : _getPropertyTarget;
+        target = shouldTrustType
+            ? _getPropertyTrustTypeTarget
+            : _getPropertyTarget;
         break;
       case '[]=':
         target = _setPropertyTarget;
@@ -773,10 +770,9 @@ class JsUtilOptimizer extends Transformer {
     Arguments arguments = node.arguments;
     assert(arguments.positional.length == 3);
     assert(arguments.named.isEmpty);
-    List<Procedure> targets =
-        shouldTrustType
-            ? _callMethodUncheckedTrustTypeTargets
-            : _callMethodUncheckedTargets;
+    List<Procedure> targets = shouldTrustType
+        ? _callMethodUncheckedTrustTypeTargets
+        : _callMethodUncheckedTargets;
 
     return _lowerToCallUnchecked(
       node,
@@ -844,15 +840,14 @@ class JsUtilOptimizer extends Transformer {
       if (argumentsListConstant.entries.length >= callUncheckedTargets.length) {
         return node;
       }
-      callUncheckedArguments =
-          argumentsListConstant.entries
-              .map<Expression>(
-                (constant) => ConstantExpression(
-                  constant,
-                  constant.getType(_staticTypeContext),
-                ),
-              )
-              .toList();
+      callUncheckedArguments = argumentsListConstant.entries
+          .map<Expression>(
+            (constant) => ConstantExpression(
+              constant,
+              constant.getType(_staticTypeContext),
+            ),
+          )
+          .toList();
       entryType = argumentsListConstant.typeArgument;
     } else {
       // Skip lowering arguments in any other type of List.
diff --git a/pkg/_js_interop_checks/lib/src/transformations/shared_interop_transformer.dart b/pkg/_js_interop_checks/lib/src/transformations/shared_interop_transformer.dart
@@ -176,8 +176,9 @@ class SharedInteropTransformer extends Transformer {
       final typeArguments = invocation.arguments.types;
       assert(typeArguments.length == 1);
       final interopType = typeArguments[0];
-      final coreInteropType =
-          _extensionIndex.getCoreInteropType(interopType)?.node;
+      final coreInteropType = _extensionIndex
+          .getCoreInteropType(interopType)
+          ?.node;
       if (coreInteropType is ExtensionTypeDeclaration &&
           _extensionIndex.isJSType(coreInteropType)) {
         replacement = _createIsACheck(
@@ -513,13 +514,12 @@ class SharedInteropTransformer extends Transformer {
   ) {
     // In the case where the receiver wasn't a variable to begin with,
     // synthesize a var so that we don't evaluate the receiver multiple times.
-    final any =
-        receiver is VariableGet
-            ? receiver.variable
-            : (VariableDeclaration.forValue(
-              receiver,
-              type: ExtensionType(_jsAny, Nullability.nullable),
-            )..fileOffset = invocation.fileOffset);
+    final any = receiver is VariableGet
+        ? receiver.variable
+        : (VariableDeclaration.forValue(
+            receiver,
+            type: ExtensionType(_jsAny, Nullability.nullable),
+          )..fileOffset = invocation.fileOffset);
 
     Expression? check;
     final interopTypeDecl = interopType.extensionTypeDeclaration;
@@ -620,18 +620,13 @@ class SharedInteropTransformer extends Transformer {
     Expression nullCheck = EqualsNull(VariableGet(any));
     Expression notNullCheck = Not(EqualsNull(VariableGet(any)));
     if (check != null) {
-      check =
-          nullable
-              ? LogicalExpression(
-                nullCheck,
-                LogicalExpressionOperator.OR,
-                check,
-              )
-              : LogicalExpression(
-                notNullCheck,
-                LogicalExpressionOperator.AND,
-                check,
-              );
+      check = nullable
+          ? LogicalExpression(nullCheck, LogicalExpressionOperator.OR, check)
+          : LogicalExpression(
+              notNullCheck,
+              LogicalExpressionOperator.AND,
+              check,
+            );
     } else if (!nullable) {
       // `JSAny`
       check = notNullCheck;
diff --git a/pkg/_js_interop_checks/lib/src/transformations/static_interop_mock_validator.dart b/pkg/_js_interop_checks/lib/src/transformations/static_interop_mock_validator.dart
@@ -119,25 +119,19 @@ class StaticInteropMockValidator {
     for (var MapEntry(key: exportName, value: descriptors)
         in exportNameToDescriptors.entries) {
       String getAsErrorString(Iterable<ExtensionMemberDescriptor> descriptors) {
-        var withExtensionNameAndType =
-            descriptors.map((descriptor) {
-                var extension = _descriptorToExtensionName[descriptor]!;
-                var name = descriptor.name.text;
-                var type = _getTypeOfDescriptor(descriptor);
-                if (descriptor.isGetter) {
-                  type = FunctionType([], type, Nullability.nonNullable);
-                } else if (descriptor.isSetter) {
-                  type = FunctionType(
-                    [type],
-                    VoidType(),
-                    Nullability.nonNullable,
-                  );
-                  name += '=';
-                }
-                type = typeParameterResolver.resolve(type);
-                return '$extension.$name ($type)';
-              }).toList()
-              ..sort();
+        var withExtensionNameAndType = descriptors.map((descriptor) {
+          var extension = _descriptorToExtensionName[descriptor]!;
+          var name = descriptor.name.text;
+          var type = _getTypeOfDescriptor(descriptor);
+          if (descriptor.isGetter) {
+            type = FunctionType([], type, Nullability.nonNullable);
+          } else if (descriptor.isSetter) {
+            type = FunctionType([type], VoidType(), Nullability.nonNullable);
+            name += '=';
+          }
+          type = typeParameterResolver.resolve(type);
+          return '$extension.$name ($type)';
+        }).toList()..sort();
         return withExtensionNameAndType.join(', ');
       }
 
@@ -233,10 +227,9 @@ class StaticInteropMockValidator {
       assert(interopDescriptor.isMethod);
       // We don't care about the method's own type parameters to determine
       // subtyping. We simply substitute them by their bounds, if any.
-      final interopMemberType =
-          interopMember.function
-              .computeThisFunctionType(Nullability.nonNullable)
-              .withoutTypeParameters;
+      final interopMemberType = interopMember.function
+          .computeThisFunctionType(Nullability.nonNullable)
+          .withoutTypeParameters;
       // Ignore the first argument `this` in the generated procedure.
       return FunctionType(
         interopMemberType.positionalParameters.skip(1).toList(),
diff --git a/pkg/_js_interop_checks/pubspec.yaml b/pkg/_js_interop_checks/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   # Use min prerelease bound to get the latest formatter changes.
-  sdk: '^3.7.0'
+  sdk: '^3.8.0'
 
 resolution: workspace
 
