Pass the script uri for expression compilation; add test for expression compilation in parts.

Author: jensjoha

dwds/lib/src/debugging/modules.dart

@@ -22,6 +22,14 @@ class Modules {
 
   // The Dart server path to library import uri
   final _sourceToLibrary = <String, Uri>{};
+
+  // The Dart server path to library/part import uri
+  final _sourceToLibraryOrPart = <String, Uri>{};
+
+  // Library import uri to list of script (parts) dart server path for the
+  // library.
+  final _scriptsForLibrary = <Uri, List<String>>{};
+
   var _moduleMemoizer = AsyncMemoizer<void>();
 
   final Map<String, String> _libraryToModule = {};
@@ -45,7 +53,18 @@ class Modules {
       assert(_entrypoint == entrypoint);
       for (final library in modifiedModuleReport.modifiedLibraries) {
         final libraryServerPath = _getLibraryServerPath(library);
-        _sourceToLibrary.remove(libraryServerPath);
+        final libraryUri = _sourceToLibrary.remove(libraryServerPath);
+        _sourceToLibraryOrPart.remove(libraryServerPath);
+        if (libraryUri != null) {
+          final scriptServerPaths = _scriptsForLibrary[libraryUri];
+          if (scriptServerPaths != null) {
+            for(final scriptServerPath in scriptServerPaths) {
+              _sourceToLibraryOrPart.remove(scriptServerPath);
+              _sourceToLibrary.remove(scriptServerPath);
+            }
+            _scriptsForLibrary.remove(libraryUri);
+          }
+        }
         _sourceToModule.remove(libraryServerPath);
         _libraryToModule.remove(library);
       }
@@ -57,6 +76,8 @@ class Modules {
     }
     _entrypoint = entrypoint;
     _sourceToLibrary.clear();
+    _sourceToLibraryOrPart.clear();
+    _scriptsForLibrary.clear();
     _sourceToModule.clear();
     _libraryToModule.clear();
     _moduleToSources.clear();
@@ -81,6 +102,13 @@ class Modules {
     return _sourceToLibrary[serverPath];
   }
 
+  /// Returns the importUri of the library or part for the provided Dart server
+  /// path.
+  Future<Uri?> libraryOrPartForSource(String serverPath) async {
+    await _moduleMemoizer.runOnce(_initializeMapping);
+    return _sourceToLibraryOrPart[serverPath];
+  }
+
   Future<String?> moduleForLibrary(String libraryUri) async {
     await _moduleMemoizer.runOnce(_initializeMapping);
     return _libraryToModule[libraryUri];
@@ -106,7 +134,8 @@ class Modules {
           ? library
           : DartUri(library, _root).serverPath;
 
-  /// Initializes [_sourceToModule], [_moduleToSources], and [_sourceToLibrary].
+  /// Initializes [_sourceToModule], [_moduleToSources], [_sourceToLibrary] and
+  /// [_sourceToLibraryOrPart].
   ///
   /// If [modifiedModuleReport] is not null, only updates the maps for the
   /// modified libraries in the report.
@@ -126,6 +155,7 @@ class Modules {
         // it, so it's okay to only process the modified libraries.
         continue;
       }
+      final libraryUri = Uri.parse(library);
       final scripts = libraryToScripts[library]!;
       final libraryServerPath = _getLibraryServerPath(library);
 
@@ -134,15 +164,17 @@ class Modules {
 
         _sourceToModule[libraryServerPath] = module;
         _moduleToSources.putIfAbsent(module, () => {}).add(libraryServerPath);
-        _sourceToLibrary[libraryServerPath] = Uri.parse(library);
+        _sourceToLibrary[libraryServerPath] = libraryUri;
+        _sourceToLibraryOrPart[libraryServerPath] = libraryUri;
         _libraryToModule[library] = module;
 
         for (final script in scripts) {
           final scriptServerPath = _getLibraryServerPath(script);
-
           _sourceToModule[scriptServerPath] = module;
           _moduleToSources[module]!.add(scriptServerPath);
-          _sourceToLibrary[scriptServerPath] = Uri.parse(library);
+          _sourceToLibrary[scriptServerPath] = libraryUri;
+          _sourceToLibraryOrPart[scriptServerPath] = Uri.parse(script);
+          (_scriptsForLibrary[libraryUri] ??= []).add(scriptServerPath);
         }
       } else {
         _logger.warning('No module found for library $library');

dwds/lib/src/services/expression_compiler.dart

@@ -63,6 +63,7 @@ abstract class ExpressionCompiler {
   Future<ExpressionCompilationResult> compileExpressionToJs(
     String isolateId,
     String libraryUri,
+    String scriptUri,
     int line,
     int column,
     Map<String, String> jsModules,

dwds/lib/src/services/expression_compiler_service.dart

@@ -144,6 +144,7 @@ class _Compiler {
 
   Future<ExpressionCompilationResult> compileExpressionToJs(
     String libraryUri,
+    String scriptUri,
     int line,
     int column,
     Map<String, String> jsModules,
@@ -171,6 +172,7 @@ class _Compiler {
       'jsModules': jsModules,
       'jsScope': jsFrameValues,
       'libraryUri': libraryUri,
+      'scriptUri': scriptUri,
       'moduleName': moduleName,
     });
 
@@ -241,6 +243,7 @@ class ExpressionCompilerService implements ExpressionCompiler {
   Future<ExpressionCompilationResult> compileExpressionToJs(
     String isolateId,
     String libraryUri,
+    String scriptUri,
     int line,
     int column,
     Map<String, String> jsModules,
@@ -249,6 +252,7 @@ class ExpressionCompilerService implements ExpressionCompiler {
     String expression,
   ) async => (await _compiler.future).compileExpressionToJs(
     libraryUri,
+    scriptUri,
     line,
     column,
     jsModules,

dwds/lib/src/services/expression_evaluator.dart

@@ -125,6 +125,9 @@ class ExpressionEvaluator {
     final compilationResult = await _compiler.compileExpressionToJs(
       isolateId,
       libraryUri.toString(),
+      // Evaluating at "the library level" (and passing line 0 column 0) we'll
+      // also just pass the library uri as the script uri.
+      libraryUri.toString(),
       0,
       0,
       {},
@@ -280,6 +283,7 @@ class ExpressionEvaluator {
     final dartLocation = locationMap.dartLocation;
     final dartSourcePath = dartLocation.uri.serverPath;
     final libraryUri = await _modules.libraryForSource(dartSourcePath);
+    final scriptUri = await _modules.libraryOrPartForSource(dartSourcePath);
     if (libraryUri == null) {
       return createError(
         EvaluationErrorKind.internal,
@@ -298,6 +302,7 @@ class ExpressionEvaluator {
     _logger.finest(
       'Evaluating "$expression" at $module, '
       '$libraryUri:${dartLocation.line}:${dartLocation.column} '
+      'or rather $scriptUri:${dartLocation.line}:${dartLocation.column} '
       'with scope: $scope',
     );
 
@@ -317,6 +322,7 @@ class ExpressionEvaluator {
     final compilationResult = await _compiler.compileExpressionToJs(
       isolateId,
       libraryUri.toString(),
+      scriptUri.toString(),
       dartLocation.line,
       dartLocation.column,
       {},

dwds/test/build_daemon_parts_evaluate_test.dart

@@ -0,0 +1,27 @@
+// 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')
+@Timeout(Duration(minutes: 2))
+library;
+
+import 'package:test/test.dart';
+import 'package:test_common/test_sdk_configuration.dart';
+
+import 'evaluate_parts_common.dart';
+import 'fixtures/context.dart';
+
+void main() async {
+  // Enable verbose logging for debugging.
+  const debug = false;
+
+  final provider = TestSdkConfigurationProvider(verbose: debug);
+  tearDownAll(provider.dispose);
+
+  testAll(
+    provider: provider,
+    compilationMode: CompilationMode.buildDaemon,
+    debug: debug,
+  );
+}