Plumbing flags required for running tests with the DDC module system.

dwds/CHANGELOG.md

@@ -2,6 +2,7 @@
 - Restructure `LoadStrategy` to provide build settings. - [#2270](https://github.com/dart-lang/webdev/pull/2270)
 - Add `FrontendServerLegacyStrategyProvider` and update bootstrap generation logic for `LegacyStrategy` - [#2285](https://github.com/dart-lang/webdev/pull/2285)
 - Tolerate failures to detect a dart execution context. - [#2286](https://github.com/dart-lang/webdev/pull/2286)
+- Enabling tests that run with the DDC module system and exposing `utilities/ddc_names.dart` - [#2295](https://github.com/dart-lang/webdev/pull/2295)
 
 ## 22.1.0
 - Update `package:vm_service` constraint to `^13.0.0`. - [#2265](https://github.com/dart-lang/webdev/pull/2265)

dwds/lib/dart_web_debug_service.dart

@@ -65,6 +65,7 @@ class Dwds {
     required Stream<BuildResult> buildResults,
     required ConnectionProvider chromeConnection,
     required ToolConfiguration toolConfiguration,
+    Future? completeBeforeHandlingConnections,
   }) async {
     globalToolConfiguration = toolConfiguration;
     final debugSettings = toolConfiguration.debugSettings;
@@ -128,6 +129,7 @@ class Dwds {
       injected,
       debugSettings.spawnDds,
       debugSettings.launchDevToolsInNewWindow,
+      completeBeforeHandlingConnections,
     );
 
     return Dwds._(

dwds/lib/expression_compiler.dart

@@ -7,4 +7,5 @@ export 'src/services/expression_compiler.dart'
         ExpressionCompilationResult,
         ExpressionCompiler,
         CompilerOptions,
+        ModuleFormat,
         ModuleInfo;

dwds/lib/src/handlers/dev_handler.dart

@@ -67,6 +67,7 @@ class DevHandler {
   final bool _useSseForInjectedClient;
   final bool _spawnDds;
   final bool _launchDevToolsInNewWindow;
+  final Future? _completeBeforeHandlingConnections;
   final ExpressionCompiler? _expressionCompiler;
   final DwdsInjector _injected;
 
@@ -91,6 +92,7 @@ class DevHandler {
     this._injected,
     this._spawnDds,
     this._launchDevToolsInNewWindow,
+    this._completeBeforeHandlingConnections,
   ) {
     _subs.add(buildResults.listen(_emitBuildResults));
     _listen();
@@ -494,6 +496,7 @@ class DevHandler {
               : WebSocketSocketHandler();
           _sseHandlers[uri.path] = handler;
           final injectedConnections = handler.connections;
+          await _completeBeforeHandlingConnections;
           while (await injectedConnections.hasNext) {
             _handleConnection(await injectedConnections.next);
           }

dwds/lib/src/loaders/legacy.dart

@@ -181,7 +181,11 @@ class LegacyStrategy extends LoadStrategy {
     return '''
 $_baseUrlScript
 var scripts = ${const JsonEncoder.withIndent(" ").convert(scripts)};
-window.\$dartLoader.loadScripts(scripts);
+window.\$dartLoader.loadConfig.loadScriptFn = function(loader) {
+  loader.addScriptsToQueue(scripts, null);
+  loader.loadEnqueuedModules();
+};
+window.\$dartLoader.loader.nextAttempt();
 ''';
   }
 

dwds/lib/src/services/chrome_proxy_service.dart

@@ -187,7 +187,7 @@ class ChromeProxyService implements VmServiceInterface {
         'with sound null safety: $soundNullSafety');
 
     final compilerOptions = CompilerOptions(
-      moduleFormat: moduleFormat,
+      moduleFormat: ModuleFormat.values.byName(moduleFormat),
       soundNullSafety: soundNullSafety,
       canaryFeatures: canaryFeatures,
       experiments: experiments,

dwds/lib/src/services/expression_compiler.dart

@@ -4,7 +4,7 @@
 
 /// Options passed to DDC and the expression compiler.
 class CompilerOptions {
-  final String moduleFormat;
+  final ModuleFormat moduleFormat;
   final bool soundNullSafety;
   final bool canaryFeatures;
   final List<String> experiments;
@@ -17,6 +17,9 @@ class CompilerOptions {
   });
 }
 
+// Indicates the module system DDC is targeting.
+enum ModuleFormat { amd, ddc, es6 }
+
 /// Result of compilation of dart expression to JavaScript
 class ExpressionCompilationResult {
   final bool isError;

dwds/lib/src/services/expression_compiler_service.dart

@@ -89,7 +89,7 @@ class _Compiler {
       '--asset-server-port',
       '$port',
       '--module-format',
-      compilerOptions.moduleFormat,
+      compilerOptions.moduleFormat.name,
       if (verbose) '--verbose',
       compilerOptions.soundNullSafety
           ? '--sound-null-safety'

dwds/lib/utilities.dart

@@ -0,0 +1,5 @@
+// Copyright (c) 2023, 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.
+
+export 'src/utilities/ddc_names.dart';

dwds/test/evaluate_common.dart

@@ -71,6 +71,7 @@ void testAll({
         await context.setUp(
           testSettings: TestSettings(
             compilationMode: compilationMode,
+            moduleFormat: provider.ddcModuleFormat,
             enableExpressionEvaluation: true,
             useDebuggerModuleNames: useDebuggerModuleNames,
             verboseCompiler: debug,
@@ -821,6 +822,7 @@ void testAll({
       await context.setUp(
         testSettings: TestSettings(
           compilationMode: compilationMode,
+          moduleFormat: provider.ddcModuleFormat,
           enableExpressionEvaluation: false,
           verboseCompiler: debug,
         ),

dwds/test/fixtures/context.dart

@@ -2,22 +2,24 @@
 // 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.
 
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:build_daemon/client.dart';
 import 'package:build_daemon/data/build_status.dart';
 import 'package:build_daemon/data/build_target.dart';
 import 'package:dwds/asset_reader.dart';
-import 'package:dwds/expression_compiler.dart';
 import 'package:dwds/src/connections/app_connection.dart';
 import 'package:dwds/src/connections/debug_connection.dart';
 import 'package:dwds/src/debugging/webkit_debugger.dart';
 import 'package:dwds/src/loaders/build_runner_require.dart';
+import 'package:dwds/src/loaders/frontend_server_legacy.dart';
 import 'package:dwds/src/loaders/frontend_server_require.dart';
-import 'package:dwds/src/loaders/require.dart';
+import 'package:dwds/src/loaders/strategy.dart';
 import 'package:dwds/src/readers/proxy_server_asset_reader.dart';
 import 'package:dwds/src/services/chrome_proxy_service.dart';
+import 'package:dwds/src/services/expression_compiler.dart';
 import 'package:dwds/src/services/expression_compiler_service.dart';
 import 'package:dwds/src/utilities/dart_uri.dart';
 import 'package:dwds/src/utilities/server.dart';
@@ -204,7 +206,7 @@ class TestContext {
       ExpressionCompiler? expressionCompiler;
       AssetReader assetReader;
       Stream<BuildResults> buildResults;
-      RequireStrategy requireStrategy;
+      LoadStrategy loadStrategy;
       String basePath = '';
       String filePathToServe = project.filePathToServe;
 
@@ -268,7 +270,7 @@ class TestContext {
               expressionCompiler = ddcService;
             }
 
-            requireStrategy = BuildRunnerRequireStrategyProvider(
+            loadStrategy = BuildRunnerRequireStrategyProvider(
               assetHandler,
               testSettings.reloadConfiguration,
               assetReader,
@@ -301,6 +303,7 @@ class TestContext {
               nullSafety: project.nullSafety,
               experiments: buildSettings.experiments,
               canaryFeatures: buildSettings.canaryFeatures,
+              moduleFormat: testSettings.moduleFormat,
             );
 
             _webRunner = ResidentWebRunner(
@@ -332,14 +335,24 @@ class TestContext {
             basePath = webRunner.devFS.assetServer.basePath;
             assetReader = webRunner.devFS.assetServer;
             _assetHandler = webRunner.devFS.assetServer.handleRequest;
-            requireStrategy = FrontendServerRequireStrategyProvider(
-              testSettings.reloadConfiguration,
-              assetReader,
-              packageUriMapper,
-              () async => {},
-              buildSettings,
-            ).strategy;
-
+            loadStrategy = switch (testSettings.moduleFormat) {
+              ModuleFormat.amd => FrontendServerRequireStrategyProvider(
+                  testSettings.reloadConfiguration,
+                  assetReader,
+                  packageUriMapper,
+                  () async => {},
+                  buildSettings,
+                ).strategy,
+              ModuleFormat.ddc => FrontendServerLegacyStrategyProvider(
+                  testSettings.reloadConfiguration,
+                  assetReader,
+                  packageUriMapper,
+                  () async => {},
+                  buildSettings,
+                ).strategy,
+              _ => throw Exception(
+                  'Unsupported DDC module format ${testSettings.moduleFormat.name}.')
+            };
             buildResults = const Stream<BuildResults>.empty();
           }
           break;
@@ -380,6 +393,10 @@ class TestContext {
           ),
         );
       }
+
+      // The debugger tab must be enabled and connected before certain
+      // listeners in DWDS run.
+      final tabConnectionCompleter = Completer();
       final connection = ChromeConnection('localhost', debugPort);
 
       _testServer = await TestServer.start(
@@ -389,11 +406,12 @@ class TestContext {
         port: port,
         assetHandler: assetHandler,
         assetReader: assetReader,
-        strategy: requireStrategy,
+        strategy: loadStrategy,
         target: project.directoryToServe,
         buildResults: buildResults,
         chromeConnection: () async => connection,
         autoRun: testSettings.autoRun,
+        completeBeforeHandlingConnections: tabConnectionCompleter.future,
       );
 
       _appUrl = basePath.isEmpty
@@ -406,7 +424,9 @@ class TestContext {
         if (tab != null) {
           _tabConnection = await tab.connect();
           await tabConnection.runtime.enable();
-          await tabConnection.debugger.enable();
+          await tabConnection.debugger
+              .enable()
+              .then((_) => tabConnectionCompleter.complete());
         } else {
           throw StateError('Unable to connect to tab.');
         }

dwds/test/fixtures/server.dart

@@ -9,7 +9,7 @@ import 'package:dwds/asset_reader.dart';
 import 'package:dwds/dart_web_debug_service.dart';
 import 'package:dwds/data/build_result.dart';
 import 'package:dwds/src/config/tool_configuration.dart';
-import 'package:dwds/src/loaders/require.dart';
+import 'package:dwds/src/loaders/strategy.dart';
 import 'package:dwds/src/utilities/server.dart';
 import 'package:logging/logging.dart';
 import 'package:shelf/shelf.dart';
@@ -62,12 +62,13 @@ class TestServer {
     required AppMetadata appMetadata,
     required Handler assetHandler,
     required AssetReader assetReader,
-    required RequireStrategy strategy,
+    required LoadStrategy strategy,
     required String target,
     required Stream<daemon.BuildResults> buildResults,
     required Future<ChromeConnection> Function() chromeConnection,
     required bool autoRun,
     int? port,
+    Future? completeBeforeHandlingConnections,
   }) async {
     var pipeline = const Pipeline();
 
@@ -100,6 +101,7 @@ class TestServer {
       buildResults: filteredBuildResults,
       chromeConnection: chromeConnection,
       toolConfiguration: toolConfiguration,
+      completeBeforeHandlingConnections: completeBeforeHandlingConnections,
     );
 
     final server = await startHttpServer('localhost', port: port);

dwds/test/fixtures/utilities.dart

@@ -242,6 +242,7 @@ class TestSettings {
 
   // Build settings.
   final CompilationMode compilationMode;
+  final ModuleFormat moduleFormat;
   final bool canaryFeatures;
   final bool isFlutterApp;
   final List<String> experiments;
@@ -255,6 +256,7 @@ class TestSettings {
     this.verboseCompiler = false,
     this.launchChrome = true,
     this.compilationMode = CompilationMode.buildDaemon,
+    this.moduleFormat = ModuleFormat.amd,
     this.canaryFeatures = false,
     this.isFlutterApp = false,
     this.experiments = const <String>[],
@@ -296,8 +298,8 @@ class TestCompilerOptions extends CompilerOptions {
     required NullSafety nullSafety,
     required super.canaryFeatures,
     required List<String> experiments,
+    super.moduleFormat = ModuleFormat.amd,
   }) : super(
-          moduleFormat: 'amd',
           soundNullSafety: nullSafety == NullSafety.sound,
           experiments: const <String>[],
         );

dwds/test/frontend_server_ddc_evaluate_sound_test.dart

@@ -0,0 +1,53 @@
+// Copyright (c) 2023, 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: 5))
+
+import 'dart:io';
+
+import 'package:dwds/expression_compiler.dart';
+import 'package:test/test.dart';
+import 'package:test_common/test_sdk_configuration.dart';
+
+import 'evaluate_common.dart';
+import 'fixtures/context.dart';
+import 'fixtures/project.dart';
+
+void main() async {
+  // Enable verbose logging for debugging.
+  final debug = false;
+
+  final provider = TestSdkConfigurationProvider(
+    verbose: debug,
+    ddcModuleFormat: ModuleFormat.ddc,
+  );
+  tearDownAll(provider.dispose);
+
+  for (var useDebuggerModuleNames in [false, true]) {
+    group('Debugger module names: $useDebuggerModuleNames |', () {
+      final nullSafety = NullSafety.sound;
+      group('${nullSafety.name} null safety | DDC module system |', () {
+        for (var indexBaseMode in IndexBaseMode.values) {
+          group(
+            'with ${indexBaseMode.name} |',
+            () {
+              testAll(
+                provider: provider,
+                compilationMode: CompilationMode.frontendServer,
+                indexBaseMode: indexBaseMode,
+                nullSafety: nullSafety,
+                useDebuggerModuleNames: useDebuggerModuleNames,
+                debug: debug,
+              );
+            },
+            // https://github.com/dart-lang/sdk/issues/49277
+            skip: indexBaseMode == IndexBaseMode.base && Platform.isWindows,
+          );
+        }
+      });
+    });
+  }
+}