Adding support for Build Daemon + Frontend Server with expression eval.

dwds/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 27.2.0
+
+- Add support for Frontend Server + Build Daemon configuration with hot reload via `FrontendServerBuildDaemonStrategyProvider`.
+- Expose `DaemonExpressionCompiler` for handling expression compile directly via `build_daemon`.
+
 ## 27.1.2
 
 - Bump the min sdk to 3.13.0-107.0.dev.

dwds/lib/dwds.dart

@@ -25,6 +25,7 @@ export 'src/loaders/build_runner_strategy_provider.dart'
 export 'src/loaders/ddc.dart' show DdcStrategy;
 export 'src/loaders/frontend_server_strategy_provider.dart'
     show
+        FrontendServerBuildDaemonStrategyProvider,
         FrontendServerDdcLibraryBundleStrategyProvider,
         FrontendServerDdcStrategyProvider,
         FrontendServerRequireStrategyProvider;
@@ -42,6 +43,8 @@ export 'src/readers/proxy_server_asset_reader.dart' show ProxyServerAssetReader;
 export 'src/servers/devtools.dart';
 export 'src/services/chrome/chrome_debug_exception.dart'
     show ChromeDebugException;
+export 'src/services/daemon_expression_compiler.dart'
+    show DaemonExpressionCompiler;
 export 'src/services/expression_compiler.dart'
     show
         CompilerOptions,

dwds/lib/src/debugging/location.dart

@@ -194,6 +194,8 @@ class Locations {
     return _sourceToLocation[serverPath] ?? {};
   }
 
+  Iterable<String> keys() => _sourceToLocation.keys;
+
   /// Returns all [Location] data for a provided JS server path.
   Future<Set<Location>> locationsForUrl(String url) async {
     if (url.isEmpty) return {};
@@ -345,7 +347,13 @@ class Locations {
         '/${stripLeadingSlashes(modulePath)}',
       );
 
-      if (sourceMapContents == null) return result;
+      if (sourceMapContents == null) {
+        _logger.warning(
+          'Failed to load source map for module $module at path '
+          '$sourceMapPath',
+        );
+        return result;
+      }
 
       final runtimeScriptId = await _modules.getRuntimeScriptIdForModule(
         _entrypoint,
@@ -373,11 +381,9 @@ class Locations {
         }
       }
       for (final location in result) {
+        final serverPath = location.dartLocation.uri.serverPath;
         _sourceToLocation
-            .putIfAbsent(
-              location.dartLocation.uri.serverPath,
-              () => <Location>{},
-            )
+            .putIfAbsent(serverPath, () => <Location>{})
             .add(location);
       }
       return _moduleToLocations[module] = result;
@@ -395,15 +401,43 @@ class Locations {
   }) {
     final index = entry.sourceUrlId;
     if (index == null) return null;
-    // Source map URLS are relative to the script. They may have platform
-    // separators or they may use URL semantics. To be sure, we split and
-    // re-join them.
-    // This works on Windows because path treats both / and \ as separators.
-    // It will fail if the path has both separators in it.
-    final relativeSegments = p.split(sourceUrls[index]);
-    final path = p.url.normalize(
-      p.url.joinAll([scriptLocation, ...relativeSegments]),
-    );
+    final sourceUrl = sourceUrls[index];
+    String path;
+    if (Uri.tryParse(sourceUrl)?.isAbsolute == true) {
+      path = sourceUrl;
+    } else {
+      // Source map URLS are relative to the script. They may have platform
+      // separators or they may use URL semantics. To be sure, we split and
+      // re-join them.
+      // This works on Windows because path treats both / and \ as separators.
+      // It will fail if the path has both separators in it.
+      final relativeSegments = p.split(sourceUrl);
+      path = p.url.normalize(
+        p.url.joinAll([scriptLocation, ...relativeSegments]),
+      );
+
+      // Frontend Server emits source maps paths relative relative to the
+      // generated JS. If this is for a 'package:build' source, it may be in
+      // `.dart_tool/build/generated`, and relative path resolution might
+      // traverse beyond the package directory. We detect this and reconstruct
+      // the correct `org-dartlang-app:///` URI.
+      //
+      // For example:
+      // scriptLocation: `/packages/my_package/subdir/main.ddc.js`
+      // relativePath in source map: `../../../lib/src/library.dart`
+      //
+      // Joined path:
+      // Before: `/lib/src/library.dart` (loses `my_package`)
+      // After:  `org-dartlang-app:///packages/my_package/src/library.dart`
+      if (scriptLocation.startsWith('/packages/') &&
+          !path.startsWith('/packages/')) {
+        final packageDir = scriptLocation.split('/').take(3).join('/');
+        final relativePath = path.startsWith('/lib/')
+            ? path.substring('/lib/'.length)
+            : path.substring('/'.length);
+        path = 'org-dartlang-app://$packageDir/$relativePath';
+      }
+    }
 
     try {
       final dartUri = DartUri(path, _root);

dwds/lib/src/debugging/metadata/provider.dart

@@ -264,8 +264,10 @@ class MetadataProvider {
   }
 
   void _addMetadata(ModuleMetadata metadata) {
-    final modulePath = stripLeadingSlashes(metadata.moduleUri);
-    final sourceMapPath = stripLeadingSlashes(metadata.sourceMapUri);
+    final modulePath = stripLeadingSlashes(metadata.moduleUri)
+        .replaceAll('\\', '/');
+    final sourceMapPath = stripLeadingSlashes(metadata.sourceMapUri)
+        .replaceAll('\\', '/');
     final moduleName = metadata.name;
 
     _moduleToSourceMap[moduleName] = sourceMapPath;
@@ -274,18 +276,20 @@ class MetadataProvider {
 
     final moduleLibraries = <String>{};
     for (final library in metadata.libraries.values) {
-      if (library.importUri.startsWith('file:/')) {
-        throw AbsoluteImportUriException(library.importUri);
+      final importUri = library.importUri.replaceAll('\\', '/');
+      if (importUri.startsWith('file:/')) {
+        throw AbsoluteImportUriException(importUri);
       }
-      moduleLibraries.add(library.importUri);
-      _libraries.add(library.importUri);
-      _scripts[library.importUri] = [];
+      moduleLibraries.add(importUri);
+      _libraries.add(importUri);
+      _scripts[importUri] = [];
 
-      _scriptToModule[library.importUri] = moduleName;
+      _scriptToModule[importUri] = moduleName;
       for (final path in library.partUris) {
+        final normalizedPath = path.replaceAll('\\', '/');
         // Parts in metadata are relative to the library Uri directory.
-        final partPath = p.url.join(p.dirname(library.importUri), path);
-        _scripts[library.importUri]!.add(partPath);
+        final partPath = p.url.join(p.url.dirname(importUri), normalizedPath);
+        _scripts[importUri]!.add(partPath);
         _scriptToModule[partPath] = moduleName;
       }
     }