Merge branch 'main' into sdk_copy_with_underscore

bkonyi · web-flow · commit 2a3b6efd6633 · 2025-01-08T15:31:37.000-05:00
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
@@ -1,8 +1,9 @@
+## 24.4.0-wip
+
 ## 24.3.0
 
 - 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)
-- 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)
+- 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),[#2548](https://github.com/dart-lang/webdev/issues/2548)
 - Fix issue where batched expression evals were failing if any subexpression failed. - [#2551](https://github.com/dart-lang/webdev/issues/2551)
 - Expose a partial implementation of
   `FrontendServerDdcLibraryBundleStrategyProvider`.
diff --git a/dwds/debug_extension/web/chrome_api.dart b/dwds/debug_extension/web/chrome_api.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 import 'package:js/js.dart';
diff --git a/dwds/debug_extension/web/cider_connection.dart b/dwds/debug_extension/web/cider_connection.dart
@@ -6,6 +6,8 @@
 library;
 
 import 'dart:convert';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:js_util';
 
 import 'package:js/js.dart';
diff --git a/dwds/debug_extension/web/copier.dart b/dwds/debug_extension/web/copier.dart
@@ -5,6 +5,8 @@
 @JS()
 library;
 
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 import 'package:js/js.dart';
diff --git a/dwds/debug_extension/web/debug_info.dart b/dwds/debug_extension/web/debug_info.dart
@@ -6,7 +6,11 @@
 library;
 
 import 'dart:convert';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:js';
 
 import 'package:dwds/data/debug_info.dart';
diff --git a/dwds/debug_extension/web/detector.dart b/dwds/debug_extension/web/detector.dart
@@ -6,7 +6,11 @@
 library;
 
 import 'dart:convert';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:js_util';
 
 import 'package:dwds/data/debug_info.dart';
diff --git a/dwds/debug_extension/web/devtools.dart b/dwds/debug_extension/web/devtools.dart
@@ -5,6 +5,8 @@
 @JS()
 library;
 
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 import 'package:dwds/data/debug_info.dart';
diff --git a/dwds/debug_extension/web/messaging.dart b/dwds/debug_extension/web/messaging.dart
@@ -7,6 +7,8 @@ library;
 
 import 'dart:async';
 import 'dart:convert';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:js_util';
 
 import 'package:js/js.dart';
diff --git a/dwds/debug_extension/web/panel.dart b/dwds/debug_extension/web/panel.dart
@@ -7,6 +7,8 @@ library;
 
 import 'dart:async';
 import 'dart:convert';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 import 'package:dwds/data/debug_info.dart';
diff --git a/dwds/debug_extension/web/popup.dart b/dwds/debug_extension/web/popup.dart
@@ -7,6 +7,8 @@ library;
 
 import 'dart:async';
 import 'dart:convert';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 import 'package:dwds/data/debug_info.dart';
diff --git a/dwds/debug_extension/web/storage.dart b/dwds/debug_extension/web/storage.dart
@@ -7,6 +7,8 @@ library;
 
 import 'dart:async';
 import 'dart:convert';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:js_util';
 
 import 'package:js/js.dart';
diff --git a/dwds/debug_extension/web/utils.dart b/dwds/debug_extension/web/utils.dart
@@ -6,6 +6,8 @@
 library;
 
 import 'dart:async';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:js_util';
 
 import 'package:js/js.dart';
diff --git a/dwds/debug_extension/web/web_api.dart b/dwds/debug_extension/web/web_api.dart
@@ -1,7 +1,12 @@
 // Copyright (c) 2022, 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.
+
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:js_util' as js_util;
 
 import 'package:js/js.dart';
diff --git a/dwds/lib/src/debugging/dart_runtime_debugger.dart b/dwds/lib/src/debugging/dart_runtime_debugger.dart
@@ -169,4 +169,34 @@ class DartRuntimeDebugger {
       'getRecordFields(this)',
     );
   }
+
+  /// Generates a JS expression for retrieving the fields of a record type.
+  String getRecordTypeFieldsJsExpression() {
+    return _buildExpression(
+      '',
+      'getRecordTypeFields(this)',
+      'getRecordTypeFields(this)',
+    );
+  }
+
+  /// Generates a JS expression for calling an instance method on an object.
+  String callInstanceMethodJsExpression(String methodName) {
+    String generateInstanceMethodJsExpression(String functionCall) {
+      return '''
+        function () {
+          if (!Object.getPrototypeOf(this)) { return 'Instance of PlainJavaScriptObject'; }
+          return $functionCall;
+        }
+      ''';
+    }
+
+    return _generateJsExpression(
+      generateInstanceMethodJsExpression(
+        '${_loadStrategy.loadModuleSnippet}("dart_sdk").dart.dsendRepl(this, "$methodName", arguments)',
+      ),
+      generateInstanceMethodJsExpression(
+        'dartDevEmbedder.debugger.callInstanceMethod(this, "$methodName", arguments)',
+      ),
+    );
+  }
 }
diff --git a/dwds/lib/src/debugging/inspector.dart b/dwds/lib/src/debugging/inspector.dart
@@ -210,12 +210,8 @@ class AppInspector implements AppInspectorInterface {
       throw UnsupportedError('Named arguments are not yet supported');
     }
     // We use the JS pseudo-variable 'arguments' to get the list of all arguments.
-    final send = '''
-        function () {
-          if (!Object.getPrototypeOf(this)) { return 'Instance of PlainJavaScriptObject';}
-          return ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").dart.dsendRepl(this, "$methodName", arguments);
-        }
-        ''';
+    final send = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
+        .callInstanceMethodJsExpression(methodName);
     final remote = await jsCallFunctionOn(receiver, send, positionalArgs);
     return remote;
   }
diff --git a/dwds/lib/src/debugging/instance.dart b/dwds/lib/src/debugging/instance.dart
@@ -653,7 +653,8 @@ class InstanceHelper extends Domain {
     // We do this in in awkward way because we want the names and types, but we
     // can't return things by value or some Dart objects will come back as
     // values that we need to be RemoteObject, e.g. a List of int.
-    final expression = _jsRuntimeFunctionCall('getRecordTypeFields(this)');
+    final expression = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
+        .getRecordTypeFieldsJsExpression();
 
     final result = await inspector.jsCallFunctionOn(record, expression, []);
     final fieldNameElements =
@@ -887,11 +888,3 @@ class InstanceHelper extends Domain {
     }
   }
 }
-
-String _jsRuntimeFunctionCall(String expression) => '''
-  function() {
-    const sdk = ${globalToolConfiguration.loadStrategy.loadModuleSnippet}('dart_sdk');
-    const dart = sdk.dart;
-    return dart.$expression;
-  }
-''';
diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 24.3.0
+version: 24.4.0-wip
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
   service protocol.
diff --git a/dwds/test/instances/common/record_type_inspection_common.dart b/dwds/test/instances/common/record_type_inspection_common.dart
@@ -64,6 +64,7 @@ void runTests({
           verboseCompiler: debug,
           experiments: ['records', 'patterns'],
           canaryFeatures: canaryFeatures,
+          moduleFormat: provider.ddcModuleFormat,
         ),
       );
       service = context.debugConnection.vmService;
diff --git a/dwds/test/instances/record_type_inspection_amd_canary_test.dart b/dwds/test/instances/record_type_inspection_amd_canary_test.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, 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.
 
@@ -7,6 +7,7 @@
 @Timeout(Duration(minutes: 2))
 library;
 
+import 'package:dwds/expression_compiler.dart';
 import 'package:test/test.dart';
 import 'package:test_common/test_sdk_configuration.dart';
 
@@ -22,6 +23,7 @@ void main() {
     final provider = TestSdkConfigurationProvider(
       verbose: debug,
       canaryFeatures: canaryFeatures,
+      ddcModuleFormat: ModuleFormat.amd,
     );
     tearDownAll(provider.dispose);
 
diff --git a/dwds/test/instances/record_type_inspection_amd_test.dart b/dwds/test/instances/record_type_inspection_amd_test.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, 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.
 
@@ -7,6 +7,7 @@
 @Timeout(Duration(minutes: 2))
 library;
 
+import 'package:dwds/expression_compiler.dart';
 import 'package:test/test.dart';
 import 'package:test_common/test_sdk_configuration.dart';
 
@@ -22,6 +23,7 @@ void main() {
     final provider = TestSdkConfigurationProvider(
       verbose: debug,
       canaryFeatures: canaryFeatures,
+      ddcModuleFormat: ModuleFormat.amd,
     );
     tearDownAll(provider.dispose);
 
diff --git a/dwds/test/instances/record_type_inspection_ddc_library_bundle_test.dart b/dwds/test/instances/record_type_inspection_ddc_library_bundle_test.dart
@@ -0,0 +1,37 @@
+// 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.
+
+@Tags(['daily'])
+@TestOn('vm')
+@Timeout(Duration(minutes: 2))
+library;
+
+import 'package:dwds/expression_compiler.dart';
+import 'package:test/test.dart';
+import 'package:test_common/test_sdk_configuration.dart';
+
+import '../fixtures/context.dart';
+import 'common/record_type_inspection_common.dart';
+
+void main() {
+  // Enable verbose logging for debugging.
+  final debug = false;
+  final canaryFeatures = true;
+  final compilationMode = CompilationMode.frontendServer;
+
+  group('canary: $canaryFeatures |', () {
+    final provider = TestSdkConfigurationProvider(
+      verbose: debug,
+      canaryFeatures: canaryFeatures,
+      ddcModuleFormat: ModuleFormat.ddc,
+    );
+    tearDownAll(provider.dispose);
+    runTests(
+      provider: provider,
+      compilationMode: compilationMode,
+      canaryFeatures: canaryFeatures,
+      debug: debug,
+    );
+  });
+}
diff --git a/example/web/main.dart b/example/web/main.dart
@@ -5,6 +5,8 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:developer';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 void main() {
diff --git a/fixtures/_experimentSound/web/main.dart b/fixtures/_experimentSound/web/main.dart
@@ -4,6 +4,8 @@
 
 import 'dart:async';
 import 'dart:core';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 void main() {
diff --git a/fixtures/_testCircular2Sound/web/main.dart b/fixtures/_testCircular2Sound/web/main.dart
@@ -4,6 +4,8 @@
 
 import 'dart:async';
 import 'dart:core';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 import 'package:_test_circular1_sound/library1.dart';
diff --git a/fixtures/_testHotRestart2Sound/web/main.dart b/fixtures/_testHotRestart2Sound/web/main.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:core';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 import 'package:_test_hot_restart1/library1.dart';
diff --git a/fixtures/_testPackageSound/web/main.dart b/fixtures/_testPackageSound/web/main.dart
@@ -6,6 +6,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:core';
 import 'dart:developer';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 import 'package:_test_package_sound/test_library.dart';
diff --git a/fixtures/_testSound/example/append_body/main.dart b/fixtures/_testSound/example/append_body/main.dart
@@ -4,6 +4,8 @@
 
 import 'dart:async';
 import 'dart:developer';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 void main() {
diff --git a/fixtures/_testSound/example/hello_world/main.dart b/fixtures/_testSound/example/hello_world/main.dart
@@ -6,7 +6,11 @@ import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:developer';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:js';
 
 import 'package:intl/intl.dart';
diff --git a/fixtures/_webdevSoundSmoke/web/main.dart b/fixtures/_webdevSoundSmoke/web/main.dart
@@ -5,6 +5,8 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:developer';
+// TODO: https://github.com/dart-lang/webdev/issues/2508
+// ignore: deprecated_member_use
 import 'dart:html';
 
 void main() {
