Version 3.2.0-236.0.dev

Merge 6885e82 into dev

sdk/lib/_internal/wasm/lib/js_helper.dart

@@ -552,11 +552,6 @@ F _wrapDartFunction<F extends Function>(F f, WasmExternRef ref) {
 WasmExternRef? getConstructorRaw(String name) =>
     getPropertyRaw(globalThisRaw(), name.toExternRef);
 
-/// Equivalent to `Object.keys(object)`.
-// TODO(joshualitt): Make this a static helper on 'JSObject'.
-@js.JS('Object.keys')
-external JSArray objectKeys(JSObject object);
-
 /// Takes a [codeTemplate] string which must represent a valid JS function, and
 /// a list of optional arguments. The [codeTemplate] will be inserted into the
 /// JS runtime, and the call to [JS] will be replaced by a call to an external

sdk/lib/_internal/wasm/lib/js_types.dart

@@ -82,11 +82,14 @@ class JSAny {
   external factory JSAny._();
 }
 
-@JS()
+@JS('Object')
 @staticInterop
 class JSObject implements JSAny {
   /// Returns a new object literal.
   factory JSObject() => js.JSValue(js.newObjectRaw()) as JSObject;
+
+  /// Equivalent to `Object.keys(object)`.
+  external static JSArray keys(JSObject o);
 }
 
 @JS()

sdk/lib/_internal/wasm/lib/regexp_helper.dart

@@ -214,7 +214,7 @@ class _MatchImplementation implements RegExpMatch {
   Iterable<String> get groupNames {
     JSObject? groups = _match.groups;
     if (groups.isDefinedAndNotNull) {
-      return JSArrayIterableAdapter<String>(objectKeys(groups!));
+      return JSArrayIterableAdapter<String>(JSObject.keys(groups!));
     }
     return Iterable.empty();
   }

tests/web/wasm/js_util_test.dart

@@ -131,8 +131,7 @@ void dartObjectRoundTripTest() {
 
 void deepConversionsTest() {
   // Dart to JS.
-  // TODO(joshualitt): Consider supporting `null` in jsify.
-  // Expect.isNull(dartify(jsify(null)));
+  Expect.isNull(dartify(jsify(null)));
   Expect.equals(true, dartify(jsify(true)));
   Expect.equals(2.0, dartify(jsify(2.0)));
   Expect.equals('foo', dartify(jsify('foo')));

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 2
 PATCH 0
-PRERELEASE 235
+PRERELEASE 236
 PRERELEASE_PATCH 0