Merge branch 'main' into yj-dartdevembedder-4

Author: jyameo

dwds/CHANGELOG.md

@@ -3,6 +3,7 @@
 - Update to be forward compatible with changes to `package:shelf_web_socket`.
 - Added support for some debugging APIs with the DDC library bundle format. - [#2537](https://github.com/dart-lang/webdev/issues/2537),[#2544](https://github.com/dart-lang/webdev/issues/2544)
 
+
 ## 24.2.0
 
 - Consolidate `FrontendServerDdcStrategyProvider` and `FrontendServerRequireStrategyProvider` under a shared parent class. - [#2517](https://github.com/dart-lang/webdev/issues/2517)

dwds/lib/src/debugging/dart_runtime_debugger.dart

@@ -108,16 +108,16 @@ class DartRuntimeDebugger {
     return _wrapInIIFE(expression);
   }
 
-  /// Generates a JS expression for retrieving extension names.
-  String getExtensionNamesJsExpression() {
+  /// Generates a JS expression for retrieving Dart Developer Extension Names.
+  String getDartDeveloperExtensionNamesJsExpression() {
     return _generateJsExpression(
       "${_loadStrategy.loadModuleSnippet}('dart_sdk').developer._extensions.keys.toList();",
       'dartDevEmbedder.debugger.extensionNames',
     );
   }
 
-  /// Generates a JS expression for retrieving library metadata.
-  String getLibraryMetadataJsExpression(String libraryUri) {
+  /// Generates a JS expression for retrieving metadata of classes in a library.
+  String getClassesInLibraryJsExpression(String libraryUri) {
     final expression = _buildExpression(
       '',
       "getLibraryMetadata('$libraryUri')",
@@ -136,10 +136,14 @@ class DartRuntimeDebugger {
     );
   }
 
-  /// Generates a JS expression for dynamically loading an object's field.
-  String dloadReplJsExpression(String fieldName) {
+  /// Generates a JS expression for getting a property from a JS object.
+  String getPropertyJsExpression(String fieldName) {
     return _generateJsExpression(
-      _wrapWithSdkLoader('', 'dloadRepl(this, "$fieldName")'),
+      '''
+      function() {
+        return this["$fieldName"];
+      }
+      ''',
       '''
       function() {
         return this["$fieldName"];

dwds/lib/src/debugging/inspector.dart

@@ -193,7 +193,7 @@ class AppInspector implements AppInspectorInterface {
   @override
   Future<RemoteObject> loadField(RemoteObject receiver, String fieldName) {
     final load = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
-        .dloadReplJsExpression(fieldName);
+        .getPropertyJsExpression(fieldName);
     return jsCallFunctionOn(receiver, load, []);
   }
 
@@ -746,7 +746,7 @@ class AppInspector implements AppInspectorInterface {
   /// Runs an eval on the page to compute all existing registered extensions.
   Future<List<String>> _getExtensionRpcs() async {
     final expression = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
-        .getExtensionNamesJsExpression();
+        .getDartDeveloperExtensionNamesJsExpression();
     final extensionRpcs = <String>[];
     final params = {
       'expression': expression,

dwds/lib/src/debugging/libraries.dart

@@ -83,7 +83,7 @@ class LibraryHelper extends Domain {
     if (libraryId == null || libraryUri == null) return null;
     // Fetch information about all the classes in this library.
     final expression = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
-        .getLibraryMetadataJsExpression(libraryUri);
+        .getClassesInLibraryJsExpression(libraryUri);
 
     RemoteObject? result;
     try {

dwds/test/instances/common/patterns_inspection_common.dart

@@ -5,6 +5,7 @@
 import 'package:test/test.dart';
 import 'package:test_common/logging.dart';
 import 'package:test_common/test_sdk_configuration.dart';
+import 'package:test_common/utilities.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../fixtures/context.dart';
@@ -96,11 +97,24 @@ void runTests({
       await onBreakPoint('testPatternCase2', (event) async {
         final frame = event.topFrame!;
 
-        expect(await getFrameVariables(frame), {
-          'obj': matchListInstance(type: 'Object'),
-          'a': matchPrimitiveInstance(kind: InstanceKind.kString, value: 'b'),
-          'n': matchPrimitiveInstance(kind: InstanceKind.kDouble, value: 3.14),
-        });
+        if (dartSdkIsAtLeast('3.7.0-246.0.dev')) {
+          expect(await getFrameVariables(frame), {
+            'obj': matchListInstance(type: 'Object'),
+            // Renamed to avoid shadowing variables from previous case.
+            'a\$':
+                matchPrimitiveInstance(kind: InstanceKind.kString, value: 'b'),
+            'n\$':
+                matchPrimitiveInstance(kind: InstanceKind.kDouble, value: 3.14),
+          });
+        } else {
+          expect(await getFrameVariables(frame), {
+            'obj': matchListInstance(type: 'Object'),
+            // Renamed to avoid shadowing variables from previous case.
+            'a': matchPrimitiveInstance(kind: InstanceKind.kString, value: 'b'),
+            'n':
+                matchPrimitiveInstance(kind: InstanceKind.kDouble, value: 3.14),
+          });
+        }
       });
     });
 

dwds/test/instances/instance_inspection_amd_canary_test.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2024, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 

dwds/test/instances/instance_inspection_amd_test.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2024, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 

webdev/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.7.1-wip
+
 ## 3.7.0
 
 - Update `dwds` constraint to `24.2.0`.

webdev/lib/src/version.dart

@@ -1,6 +1,6 @@
 name: webdev
 # Every time this changes you need to run `dart run build_runner build`.
-version: 3.7.0
+version: 3.7.1-wip
 # We should not depend on a dev SDK before publishing.
 # publish_to: none
 description: >-