Merge branch 'yj-dev-2566' into yj-2573

Author: jyameo

.github/workflows/dcm.yml

@@ -19,7 +19,7 @@ jobs:
           wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
           echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
           sudo apt-get update
-          sudo apt-get install dcm=1.16.2-1 # To avoid errors add `-1` (build number) to the version
+          sudo apt-get install dcm=1.26.0-1 # To avoid errors add `-1` (build number) to the version
           sudo chmod +x /usr/bin/dcm
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94

dwds/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 24.3.3-wip
 
+- Added support for some debugging APIs with the DDC library bundle format. - [#2563](https://github.com/dart-lang/webdev/issues/2563),[#2566](https://github.com/dart-lang/webdev/issues/2566)
+- Update `DCM` version to `1.26.0-1`
+
 ## 24.3.2
 
 - Bump `package:dds` to `>=4.2.5 <6.0.0`.

dwds/lib/src/debugging/dart_runtime_debugger.dart

@@ -18,11 +18,8 @@ class DartRuntimeDebugger {
   String _generateJsExpression(
     String ddcExpression,
     String libraryBundleExpression,
-  ) {
-    return _useLibraryBundleExpression
-        ? libraryBundleExpression
-        : ddcExpression;
-  }
+  ) =>
+      _useLibraryBundleExpression ? libraryBundleExpression : ddcExpression;
 
   /// Wraps a JS function call with SDK loader logic.
   String _wrapWithSdkLoader(String args, String functionCall) {
@@ -200,14 +197,38 @@ class DartRuntimeDebugger {
     );
   }
 
-  String getVariableJsExpression(
-    String libraryName,
-    String url,
-    String variable,
+  /// Generates a JS expression to invoke a Dart extension method.
+  String invokeExtensionJsExpression(String methodName, String encodedJson) {
+    return _generateJsExpression(
+      "${_loadStrategy.loadModuleSnippet}('dart_sdk').developer.invokeExtension('$methodName', JSON.stringify($encodedJson));",
+      "dartDevEmbedder.debugger.invokeExtension('$methodName', JSON.stringify($encodedJson));",
+    );
+  }
+
+  /// Generates a JS expression for calling a library method.
+  String callLibraryMethodJsExpression(
+    String libraryUri,
+    String methodName,
   ) {
+    final findLibraryExpression = '''
+     (function() {
+       const sdk = ${_loadStrategy.loadModuleSnippet}('dart_sdk');
+       const dart = sdk.dart;
+       const library = dart.getLibrary('$libraryUri');
+       if (!library) throw 'cannot find library for $libraryUri';
+       return library;
+     })();
+     ''';
+
+    // `callLibraryMethod` expects an array of arguments. Chrome DevTools spreads
+    // arguments individually when calling functions. This code reconstructs the
+    // expected argument array.
     return _generateJsExpression(
-      "${_loadStrategy.loadModuleSnippet}('dart_sdk').dart.getModuleLibraries('$libraryName')['$url']['$variable'];",
-      'dartDevEmbedder.dart.getModuleLibraries("$libraryName")["$url"]["$variable"]',
+      findLibraryExpression,
+      _wrapWithBundleLoader(
+        '',
+        'callLibraryMethod("$libraryUri", "$methodName", Array.from(arguments))',
+      ),
     );
   }
 }

dwds/lib/src/debugging/inspector.dart

@@ -14,6 +14,7 @@ import 'package:dwds/src/debugging/instance.dart';
 import 'package:dwds/src/debugging/libraries.dart';
 import 'package:dwds/src/debugging/location.dart';
 import 'package:dwds/src/debugging/remote_debugger.dart';
+import 'package:dwds/src/loaders/ddc_library_bundle.dart';
 import 'package:dwds/src/readers/asset_reader.dart';
 import 'package:dwds/src/utilities/conversions.dart';
 import 'package:dwds/src/utilities/dart_uri.dart';
@@ -301,11 +302,17 @@ class AppInspector implements AppInspectorInterface {
     String selector,
     List<RemoteObject> arguments,
   ) {
-    return _evaluateInLibrary(
-      library,
-      'function () { return this.$selector.apply(this, arguments);}',
-      arguments,
-    );
+    return globalToolConfiguration.loadStrategy is DdcLibraryBundleStrategy
+        ? _evaluateLibraryMethodWithDdcLibraryBundle(
+            library,
+            selector,
+            arguments,
+          )
+        : _evaluateInLibrary(
+            library,
+            'function () { return this.$selector.apply(this, arguments); }',
+            arguments,
+          );
   }
 
   /// Evaluate [expression] by calling Chrome's Runtime.evaluate.
@@ -340,19 +347,31 @@ class AppInspector implements AppInspectorInterface {
     if (libraryUri == null) {
       throwInvalidParam('invoke', 'library uri is null');
     }
-    final findLibrary = '''
-      (function() {
-        const sdk = ${globalToolConfiguration.loadStrategy.loadModuleSnippet}('dart_sdk');
-        const dart = sdk.dart;
-        const library = dart.getLibrary('$libraryUri');
-        if (!library) throw 'cannot find library for $libraryUri';
-        return library;
-      })();
-      ''';
-    final remoteLibrary = await jsEvaluate(findLibrary);
+    final findLibraryJsExpression = globalToolConfiguration
+        .loadStrategy.dartRuntimeDebugger
+        .callLibraryMethodJsExpression(libraryUri, jsFunction);
+
+    final remoteLibrary = await jsEvaluate(findLibraryJsExpression);
     return jsCallFunctionOn(remoteLibrary, jsFunction, arguments);
   }
 
+  /// Evaluates the specified top-level method [methodName] within [library]
+  /// using the Dart Development Compiler (DDC) library bundle strategy with
+  /// the given [arguments].
+  Future<RemoteObject> _evaluateLibraryMethodWithDdcLibraryBundle(
+    Library library,
+    String methodName,
+    List<RemoteObject> arguments,
+  ) {
+    final libraryUri = library.uri;
+    if (libraryUri == null) {
+      throwInvalidParam('invoke', 'library uri is null');
+    }
+    final expression = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
+        .callLibraryMethodJsExpression(libraryUri, methodName);
+    return _jsCallFunction(expression, arguments);
+  }
+
   /// Call [function] with objects referred by [argumentIds] as arguments.
   @override
   Future<RemoteObject> callFunction(

dwds/lib/src/services/chrome_proxy_service.dart

@@ -518,10 +518,8 @@ class ChromeProxyService implements VmServiceInterface {
         v is String ? v : jsonEncode(v),
       ),
     );
-    final expression = '''
-${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
-    "$method", JSON.stringify(${jsonEncode(stringArgs)}));
-''';
+    final expression = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
+        .invokeExtensionJsExpression(method, jsonEncode(stringArgs));
     final result = await inspector.jsEvaluate(expression, awaitPromise: true);
     final decodedResponse =
         jsonDecode(result.value as String) as Map<String, dynamic>;

dwds/test/chrome_proxy_service_amd_test.dart

@@ -0,0 +1,40 @@
+// Copyright (c) 2025, 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.
+
+@TestOn('vm')
+@Tags(['daily'])
+@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 'common/chrome_proxy_service_common.dart';
+import 'fixtures/context.dart';
+
+void main() {
+  // Enable verbose logging for debugging.
+  final debug = false;
+  final canaryFeatures = false;
+  final moduleFormat = ModuleFormat.amd;
+  final compilationMode = CompilationMode.buildDaemon;
+
+  group('canary: $canaryFeatures |', () {
+    final provider = TestSdkConfigurationProvider(
+      verbose: debug,
+      canaryFeatures: canaryFeatures,
+      ddcModuleFormat: moduleFormat,
+    );
+    tearDownAll(provider.dispose);
+
+    runTests(
+      provider: provider,
+      moduleFormat: moduleFormat,
+      compilationMode: compilationMode,
+      canaryFeatures: canaryFeatures,
+      debug: debug,
+    );
+  });
+}

dwds/test/chrome_proxy_service_ddc_library_bundle_test.dart

@@ -0,0 +1,40 @@
+// Copyright (c) 2025, 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.
+
+@TestOn('vm')
+@Tags(['daily'])
+@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 'common/chrome_proxy_service_common.dart';
+import 'fixtures/context.dart';
+
+void main() {
+  // Enable verbose logging for debugging.
+  final debug = false;
+  final canaryFeatures = true;
+  final moduleFormat = ModuleFormat.ddc;
+  final compilationMode = CompilationMode.frontendServer;
+
+  group('canary: $canaryFeatures |', () {
+    final provider = TestSdkConfigurationProvider(
+      verbose: debug,
+      canaryFeatures: canaryFeatures,
+      ddcModuleFormat: moduleFormat,
+    );
+    tearDownAll(provider.dispose);
+
+    runTests(
+      provider: provider,
+      moduleFormat: moduleFormat,
+      compilationMode: compilationMode,
+      canaryFeatures: canaryFeatures,
+      debug: debug,
+    );
+  });
+}