[dwds] Sync state with sdk/g3 and restore static analysis for fixtures (#2824)

jyameo · web-flow · commit d33d27044f21 · 2026-04-23T20:00:22.000Z
Synced changes from the Dart SDK ([CL 494660](https://dart-review.googlesource.com/c/sdk/+/494660)) to bring DWDS up to parity with the state of the sdk/g3 workspace. This will ensure the changes made are not overwritten when syncing the webdev repo with the sdk or in follow up roll into g3. **Key Changes:** - Narrowed the static analysis exclusion from the entire test/integration/fixtures/ folder to only the specific files that depend on package:build_daemon. This restores lint coverage for the rest of the fixtures folder while ensuring that files dependent on build_daemon don't break the SDK environment where the package isn't supported. - Restored static analysis for files under lib/data/ and resolved active lint warnings across them. - Added `dwds/lib/src/utilities/test_path_utils.dart` which to used to resolve CI failures in sdk environment. - Convert `packageConfigPath` constructor parameter to use a super parameter in `ddc.dart`, `ddc_library_bundle.dart` and `require.dart` to resolve the `use_super_parameters` lint warning in the sdk. Related to dart-lang/sdk#62102, dart-lang/sdk#62100, dart-lang/sdk#62101, dart-lang/sdk#62103
diff --git a/dwds/OWNERS b/dwds/OWNERS
@@ -0,0 +1,3 @@
+set noparent
+# Dart Development Infrastructure Team
+file:/tools/OWNERS_DEV_INFRA
diff --git a/dwds/analysis_options.yaml b/dwds/analysis_options.yaml
@@ -3,8 +3,11 @@ include: package:dart_flutter_team_lints/analysis_options.yaml
 analyzer:
   exclude:
     # Ignore generated files
-    - "lib/data/*"
     - "lib/src/handlers/injected_client_js.dart"
+    # Ignore integration fixtures to avoid analysis errors from "package:build_daemon".
+    - "test/integration/fixtures/context.dart"
+    - "test/integration/fixtures/server.dart"
+    - "test/integration/fixtures/utilities.dart"
 
 linter:
   rules:
diff --git a/dwds/lib/data/debug_event.dart b/dwds/lib/data/debug_event.dart
@@ -77,7 +77,7 @@ class BatchedDebugEvents {
 bool _listEquals<T>(List<T>? a, List<T>? b) {
   if (a == null) return b == null;
   if (b == null || a.length != b.length) return false;
-  for (int i = 0; i < a.length; i++) {
+  for (var i = 0; i < a.length; i++) {
     if (a[i] != b[i]) return false;
   }
   return true;
diff --git a/dwds/lib/data/extension_request.dart b/dwds/lib/data/extension_request.dart
@@ -49,7 +49,8 @@ class ExtensionRequest {
 
   @override
   String toString() =>
-      'ExtensionRequest { id=$id, command=$command, commandParams=$commandParams }';
+      'ExtensionRequest { id=$id, command=$command, '
+      'commandParams=$commandParams }';
 
   @override
   bool operator ==(Object other) =>
@@ -111,7 +112,8 @@ class ExtensionResponse {
 
   @override
   String toString() =>
-      'ExtensionResponse { id=$id, success=$success, result=$result, error=$error }';
+      'ExtensionResponse { id=$id, success=$success, '
+      'result=$result, error=$error }';
 
   @override
   bool operator ==(Object other) =>
@@ -195,7 +197,7 @@ class BatchedEvents {
       identical(this, other) ||
       other is BatchedEvents &&
           runtimeType == other.runtimeType &&
-          const ListEquality().equals(events, other.events);
+          const ListEquality<ExtensionEvent>().equals(events, other.events);
 
   @override
   int get hashCode => Object.hashAll(events);
diff --git a/dwds/lib/data/hot_reload_request.dart b/dwds/lib/data/hot_reload_request.dart
@@ -2,8 +2,6 @@
 // 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.
 
-library hot_reload_request;
-
 /// A request to hot reload the application.
 class HotReloadRequest {
   /// A unique identifier for this request.
diff --git a/dwds/lib/data/hot_reload_response.dart b/dwds/lib/data/hot_reload_response.dart
@@ -2,8 +2,6 @@
 // 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.
 
-library hot_reload_response;
-
 /// A response to a hot reload request.
 class HotReloadResponse {
   /// The unique identifier matching the request.
@@ -50,5 +48,6 @@ class HotReloadResponse {
 
   @override
   String toString() =>
-      'HotReloadResponse(id: $id, success: $success, errorMessage: $errorMessage)';
+      'HotReloadResponse(id: $id, success: $success, '
+      'errorMessage: $errorMessage)';
 }
diff --git a/dwds/lib/data/hot_restart_request.dart b/dwds/lib/data/hot_restart_request.dart
@@ -2,8 +2,6 @@
 // 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.
 
-library hot_restart_request;
-
 /// A request to hot restart the application.
 class HotRestartRequest {
   /// A unique identifier for this request.
diff --git a/dwds/lib/data/utils.dart b/dwds/lib/data/utils.dart
@@ -23,7 +23,8 @@ Map<String, dynamic> listToMap(List<dynamic> list, {String? type}) {
 
   if ((list.length - startIndex).isOdd) {
     throw FormatException(
-      'Expected an even number of elements${type != null ? " after $type" : ""}',
+      'Expected an even number of elements'
+      '${type != null ? " after $type" : ""}',
       list,
     );
   }
diff --git a/dwds/lib/src/loaders/ddc.dart b/dwds/lib/src/loaders/ddc.dart
@@ -146,8 +146,8 @@ class DdcStrategy extends LoadStrategy {
     AssetReader assetReader,
     this._buildSettings,
     this._g3RelativePath, {
-    String? packageConfigPath,
-  }) : super(assetReader, packageConfigPath: packageConfigPath);
+    super.packageConfigPath,
+  }) : super(assetReader);
 
   @override
   Handler get handler => (request) async {
diff --git a/dwds/lib/src/loaders/ddc_library_bundle.dart b/dwds/lib/src/loaders/ddc_library_bundle.dart
@@ -146,10 +146,10 @@ class DdcLibraryBundleStrategy extends LoadStrategy {
     AssetReader assetReader,
     this._buildSettings,
     this._g3RelativePath, {
-    String? packageConfigPath,
+    super.packageConfigPath,
     this.reloadedSourcesUri,
     this.injectScriptLoad = true,
-  }) : super(assetReader, packageConfigPath: packageConfigPath);
+  }) : super(assetReader);
 
   @override
   Handler get handler => (request) async {
diff --git a/dwds/lib/src/loaders/require.dart b/dwds/lib/src/loaders/require.dart
@@ -139,8 +139,8 @@ class RequireStrategy extends LoadStrategy {
     this._moduleInfoForProvider,
     AssetReader assetReader,
     this._buildSettings, {
-    String? packageConfigPath,
-  }) : super(assetReader, packageConfigPath: packageConfigPath);
+    super.packageConfigPath,
+  }) : super(assetReader);
 
   @override
   Handler get handler => (request) async {
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
@@ -1,5 +1,5 @@
 name: dwds
-# Every time this changes you need to run `dart run build_runner build`.
+# Every time this changes you need to run `dart run tool/build.dart`.
 version: 27.1.1-wip
 
 description: >-
diff --git a/dwds/test/build/build_script_test.dart b/dwds/test/build/build_script_test.dart
@@ -10,11 +10,13 @@ import 'package:dwds/src/handlers/injected_client_js.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'test_path_utils.dart';
+
 void main() {
   group('Committed file integrity tests', () {
-    test('injected_client_js.dart is in sync with web/client.dart', () {
+    test('injected_client_js.dart is in sync with web/client.dart', () async {
       final clientDartString = File(
-        'web/client.dart',
+        await dwdsPath('web/client.dart'),
       ).readAsStringSync().replaceAll('\r\n', '\n');
       final expectedHash = sha256
           .convert(utf8.encode(clientDartString))
@@ -37,11 +39,17 @@ void main() {
 
   group('Build script tests', () {
     setUpAll(() async {
-      // Use Platform.executable to ensure we use the same Dart SDK
-      final result = await Process.run(Platform.executable, [
+      // Use Platform.executable to ensure the same Dart SDK is used. Only
+      // resolve the absolute path if it's a local/relative path. Global
+      // system commands (no path separators) are passed as-is.
+      final executable = Platform.executable;
+      final resolvedExecutable = executable.contains(p.separator)
+          ? File(executable).absolute.path
+          : executable;
+      final result = await Process.run(resolvedExecutable, [
         'run',
         'tool/build.dart',
-      ]);
+      ], workingDirectory: await dwdsPackageRoot);
 
       expect(
         result.exitCode,
@@ -50,38 +58,48 @@ void main() {
       );
     });
 
-    test('generates client.js', () {
-      final clientJsFile = File(p.join('lib', 'src', 'injected', 'client.js'));
+    test('generates client.js', () async {
+      final clientJsFile = File(
+        await dwdsPath(p.join('lib', 'src', 'injected', 'client.js')),
+      );
       expect(clientJsFile.existsSync(), isTrue);
       expect(clientJsFile.lengthSync(), greaterThan(0));
     });
 
-    test('generates version.dart', () {
-      final versionFile = File(p.join('lib', 'src', 'version.dart'));
+    test('generates version.dart', () async {
+      final versionFile = File(
+        await dwdsPath(p.join('lib', 'src', 'version.dart')),
+      );
       expect(versionFile.existsSync(), isTrue);
       expect(
         versionFile.readAsStringSync(),
         contains('const packageVersion ='),
       );
     });
 
-    test('generates injected_client_js.dart', () {
+    test('generates injected_client_js.dart', () async {
       final injectedFile = File(
-        p.join('lib', 'src', 'handlers', 'injected_client_js.dart'),
+        await dwdsPath(
+          p.join('lib', 'src', 'handlers', 'injected_client_js.dart'),
+        ),
       );
       expect(injectedFile.existsSync(), isTrue);
       expect(injectedFile.lengthSync(), greaterThan(0));
     });
 
-    test('injected_client_js.dart matches client.js content', () {
-      final clientJsFile = File(p.join('lib', 'src', 'injected', 'client.js'));
+    test('injected_client_js.dart matches client.js content', () async {
+      final clientJsFile = File(
+        await dwdsPath(p.join('lib', 'src', 'injected', 'client.js')),
+      );
       final actualClientJs = clientJsFile.readAsStringSync().replaceAll(
         '\r\n',
         '\n',
       );
 
       final injectedFile = File(
-        p.join('lib', 'src', 'handlers', 'injected_client_js.dart'),
+        await dwdsPath(
+          p.join('lib', 'src', 'handlers', 'injected_client_js.dart'),
+        ),
       );
       final injectedContent = injectedFile.readAsStringSync();
 
diff --git a/dwds/test/build/ensure_version_test.dart b/dwds/test/build/ensure_version_test.dart
@@ -12,9 +12,12 @@ import 'package:pub_semver/pub_semver.dart';
 import 'package:test/test.dart';
 import 'package:yaml/yaml.dart';
 
+import 'test_path_utils.dart';
+
 void main() {
-  test('dwds lib/src/version.dart matches the pubspec version', () {
-    final pubspec = loadYaml(File('pubspec.yaml').readAsStringSync()) as Map;
+  test('dwds lib/src/version.dart matches the pubspec version', () async {
+    final pubspecPath = await dwdsPath('pubspec.yaml');
+    final pubspec = loadYaml(File(pubspecPath).readAsStringSync()) as Map;
     expect(
       Version.parse(packageVersion),
       Version.parse(pubspec['version'] as String),
diff --git a/dwds/test/build/min_sdk_test.dart b/dwds/test/build/min_sdk_test.dart
diff --git a/dwds/test/build/test_path_utils.dart b/dwds/test/build/test_path_utils.dart
@@ -0,0 +1,25 @@
+// Copyright (c) 2026, 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.
+
+import 'dart:isolate';
+import 'package:path/path.dart' as p;
+
+/// Returns the path to the `dwds` package root directory.
+Future<String> get dwdsPackageRoot async {
+  final uri = await Isolate.resolvePackageUri(
+    Uri.parse('package:dwds/dwds.dart'),
+  );
+  if (uri == null) {
+    throw StateError('Could not resolve package:dwds');
+  }
+  // uri is file:///.../pkg/dwds/lib/dwds.dart
+  // We need to go up 2 levels to get to pkg/dwds
+  return p.dirname(p.dirname(uri.toFilePath()));
+}
+
+/// Returns the absolute path to a file or directory relative to the `dwds`
+/// package root.
+Future<String> dwdsPath(String pathFromDwds) async {
+  return p.normalize(p.join(await dwdsPackageRoot, pathFromDwds));
+}
diff --git a/dwds/test/integration/fixtures/context.dart b/dwds/test/integration/fixtures/context.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.
 
+// @skip_package_deps_validation
+
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
diff --git a/dwds/test/integration/fixtures/server.dart b/dwds/test/integration/fixtures/server.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.
 
+// @skip_package_deps_validation
+
 import 'dart:io';
 
 import 'package:build_daemon/data/build_status.dart' as daemon;
diff --git a/dwds/test/integration/fixtures/utilities.dart b/dwds/test/integration/fixtures/utilities.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.
 
+// @skip_package_deps_validation
+
 import 'dart:io';
 
 import 'package:build_daemon/client.dart';
diff --git a/dwds_test_common/LICENSE b/dwds_test_common/LICENSE
@@ -0,0 +1,27 @@
+Copyright 2026, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/dwds_test_common/OWNERS b/dwds_test_common/OWNERS
@@ -0,0 +1,3 @@
+set noparent
+# Dart Development Infrastructure Team
+file:/tools/OWNERS_DEV_INFRA

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+set noparent`
	`2`	`+# Dart Development Infrastructure Team`
	`3`	`+file:/tools/OWNERS_DEV_INFRA`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class BatchedDebugEvents {`
`77`	`77`	`bool _listEquals<T>(List<T>? a, List<T>? b) {`
`78`	`78`	`if (a == null) return b == null;`
`79`	`79`	`if (b == null \|\| a.length != b.length) return false;`
`80`		`- for (int i = 0; i < a.length; i++) {`
	`80`	`+ for (var i = 0; i < a.length; i++) {`
`81`	`81`	`if (a[i] != b[i]) return false;`
`82`	`82`	`}`
`83`	`83`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ Map<String, dynamic> listToMap(List<dynamic> list, {String? type}) {`
`23`	`23`
`24`	`24`	`if ((list.length - startIndex).isOdd) {`
`25`	`25`	`throw FormatException(`
`26`		`- 'Expected an even number of elements${type != null ? " after $type" : ""}',`
	`26`	`+ 'Expected an even number of elements'`
	`27`	`+ '${type != null ? " after $type" : ""}',`
`27`	`28`	`list,`
`28`	`29`	`);`
`29`	`30`	`}`