diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 8f9e4eaa6..07f7c7543 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -2,6 +2,7 @@ - Replace deprecated JS code `this.__proto__` with `Object.getPrototypeOf(this)`. - [#2500](https://github.com/dart-lang/webdev/pull/2500) - Migrate injected client code to `package:web`. - [#2491](https://github.com/dart-lang/webdev/pull/2491) +- Removed unsound null safety options from classes ModuleMetadata, MetadataProvider & Metadata_test. - [#2427](https://github.com/dart-lang/webdev/issues/2427) ## 24.1.0 diff --git a/dwds/lib/src/debugging/metadata/module_metadata.dart b/dwds/lib/src/debugging/metadata/module_metadata.dart index ce186df28..2a83d1a27 100644 --- a/dwds/lib/src/debugging/metadata/module_metadata.dart +++ b/dwds/lib/src/debugging/metadata/module_metadata.dart @@ -114,18 +114,13 @@ class ModuleMetadata { /// Module uri final String moduleUri; - /// True if the module corresponding to this metadata was compiled with sound - /// null safety enabled. - final bool soundNullSafety; - final Map libraries = {}; ModuleMetadata( this.name, this.closureName, this.sourceMapUri, - this.moduleUri, - this.soundNullSafety, { + this.moduleUri, { String? ver, }) { version = ver ?? ModuleMetadataVersion.current.version; @@ -151,8 +146,7 @@ class ModuleMetadata { name = _readRequiredField(json, 'name'), closureName = _readRequiredField(json, 'closureName'), sourceMapUri = _readRequiredField(json, 'sourceMapUri'), - moduleUri = _readRequiredField(json, 'moduleUri'), - soundNullSafety = _readOptionalField(json, 'soundNullSafety') ?? false { + moduleUri = _readRequiredField(json, 'moduleUri') { if (!ModuleMetadataVersion.current.isCompatibleWith(version) && !ModuleMetadataVersion.previous.isCompatibleWith(version)) { throw Exception('Unsupported metadata version $version. ' @@ -174,7 +168,6 @@ class ModuleMetadata { 'sourceMapUri': sourceMapUri, 'moduleUri': moduleUri, 'libraries': [for (final lib in libraries.values) lib.toJson()], - 'soundNullSafety': soundNullSafety, }; } } diff --git a/dwds/lib/src/debugging/metadata/provider.dart b/dwds/lib/src/debugging/metadata/provider.dart index 41541659f..570defb9e 100644 --- a/dwds/lib/src/debugging/metadata/provider.dart +++ b/dwds/lib/src/debugging/metadata/provider.dart @@ -15,7 +15,6 @@ class MetadataProvider { final AssetReader _assetReader; final _logger = Logger('MetadataProvider'); final String entrypoint; - bool _soundNullSafety; final List _libraries = []; final Map _scriptToModule = {}; final Map _moduleToSourceMap = {}; @@ -65,15 +64,14 @@ class MetadataProvider { 'dart:ui', ]; - MetadataProvider(this.entrypoint, this._assetReader) - : _soundNullSafety = false; + MetadataProvider(this.entrypoint, this._assetReader); /// A sound null safety mode for the whole app. /// /// All libraries have to agree on null safety mode. Future get soundNullSafety async { await _initialize(); - return _soundNullSafety; + return true; } /// A list of all libraries in the Dart application. @@ -178,8 +176,6 @@ class MetadataProvider { Future _initialize() async { await _metadataMemoizer.runOnce(() async { - var hasSoundNullSafety = true; - var hasUnsoundNullSafety = true; // The merged metadata resides next to the entrypoint. // Assume that .bootstrap.js has .ddc_merged_metadata if (entrypoint.endsWith('.bootstrap.js')) { @@ -199,8 +195,6 @@ class MetadataProvider { final metadata = ModuleMetadata.fromJson(moduleJson as Map); _addMetadata(metadata); - hasUnsoundNullSafety &= !metadata.soundNullSafety; - hasSoundNullSafety &= metadata.soundNullSafety; _logger .fine('Loaded debug metadata for module: ${metadata.name}'); } catch (e) { @@ -208,13 +202,7 @@ class MetadataProvider { rethrow; } } - if (!hasSoundNullSafety && !hasUnsoundNullSafety) { - throw Exception('Metadata contains modules with mixed null safety'); - } - _soundNullSafety = hasSoundNullSafety; } - _logger.info('Loaded debug metadata ' - '(${_soundNullSafety ? "sound" : "weak"} null safety)'); } }); } diff --git a/dwds/test/metadata_test.dart b/dwds/test/metadata_test.dart index 046e635e7..aa320d116 100644 --- a/dwds/test/metadata_test.dart +++ b/dwds/test/metadata_test.dart @@ -69,7 +69,7 @@ void main() { await provider.libraries, contains('org-dartlang-app:///web/main.dart'), ); - expect(await provider.soundNullSafety, false); + expect(await provider.soundNullSafety, true); }); test('throws on metadata with absolute import uris', () async { @@ -114,6 +114,5 @@ void main() { expect(parts.length, 1); expect(parts[0], 'org-dartlang-app:///web/main.dart'); } - expect(metadata.soundNullSafety, false); }); }