Skip to content

[hooks] Stop leaking MetadataAsset #2357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/code_assets/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ environment:

dependencies:
collection: ^1.19.1
hooks: ^0.19.4
hooks: ^0.19.5

dev_dependencies:
custom_lint: ^0.7.5
Expand Down
2 changes: 1 addition & 1 deletion pkgs/data_assets/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ environment:
sdk: '>=3.9.0-21.0.dev <4.0.0'

dependencies:
hooks: ^0.19.4
hooks: ^0.19.5

dev_dependencies:
custom_lint: ^0.7.5
Expand Down
4 changes: 4 additions & 0 deletions pkgs/hooks/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.19.5

* Stop leaking unexported symbols.

## 0.19.4

* Add doc comments to all public members.
Expand Down
34 changes: 20 additions & 14 deletions pkgs/hooks/lib/src/config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ final class BuildInputMetadata {
BuildInputMetadata._(this._input);

/// The metadata emitted by the build hook of package [packageName].
PackageMetadata operator [](String packageName) => PackageMetadata(
PackageMetadata operator [](String packageName) => PackageMetadata._(
(_input.assets.encodedAssets[packageName] ?? [])
.where((e) => e.isMetadataAsset)
.map((e) => e.asMetadataAsset)
Expand All @@ -238,8 +238,7 @@ final class BuildInputMetadata {

/// The metadata from a specific package, available in [BuildInput.metadata].
final class PackageMetadata {
/// Creates a [PackageMetadata] from the given metadata.
PackageMetadata(this._metadata);
PackageMetadata._(this._metadata);

final List<MetadataAsset> _metadata;

Expand All @@ -258,7 +257,7 @@ final class BuildInputAssets {
Map<String, List<EncodedAsset>> get encodedAssets => {
for (final MapEntry(:key, :value)
in (_input._syntaxBuildInput.assets ?? {}).entries)
key: _parseAssets(value),
key: EncodedAssetSyntax._fromSyntax(value),
};

/// The encoded assets from the direct dependency [packageName].
Expand Down Expand Up @@ -334,7 +333,7 @@ final class BuildConfigBuilder extends HookConfigBuilder {
final class LinkInput extends HookInput {
List<EncodedAsset> get _encodedAssets {
final assets = _syntaxLinkInput.assets;
return _parseAssets(assets);
return EncodedAssetSyntax._fromSyntax(assets);
}

/// The file containing recorded usages, if any.
Expand Down Expand Up @@ -407,12 +406,18 @@ final class LinkConfigBuilder extends HookConfigBuilder {
LinkConfigBuilder._(super.builder) : super._();
}

List<EncodedAsset> _parseAssets(List<AssetSyntax>? assets) => assets == null
? []
: [
for (final asset in assets)
EncodedAsset.fromJson(asset.json, asset.path),
];
/// Extension methods for [EncodedAsset] to convert to and from the syntax
/// model.
extension EncodedAssetSyntax on List<EncodedAsset> {
static List<EncodedAsset> _fromSyntax(List<AssetSyntax>? assets) {
if (assets == null) {
return [];
}
return [
for (final asset in assets) EncodedAsset.fromJson(asset.json, asset.path),
];
}
}

/// The output from a `hook/build.dart` or `hook/link.dart`.
///
Expand Down Expand Up @@ -442,7 +447,8 @@ sealed class HookOutput {
List<Uri> get dependencies => _syntax.dependencies ?? [];

/// The assets produced by this build.
List<EncodedAsset> get _encodedAssets => _parseAssets(_syntax.assets);
List<EncodedAsset> get _encodedAssets =>
EncodedAssetSyntax._fromSyntax(_syntax.assets);

HookOutputSyntax get _syntax;

Expand Down Expand Up @@ -513,11 +519,11 @@ final class BuildOutput extends HookOutput implements BuildOutputMaybeFailure {
Map<String, List<EncodedAsset>> get _encodedAssetsForLinking => {
for (final MapEntry(:key, :value)
in (_syntax.assetsForLinking ?? {}).entries)
key: _parseAssets(value),
key: EncodedAssetSyntax._fromSyntax(value),
};

List<EncodedAsset> get _encodedAssetsForBuild =>
_parseAssets(_syntax.assetsForBuild ?? []);
EncodedAssetSyntax._fromSyntax(_syntax.assetsForBuild ?? []);

@override
final BuildOutputSyntax _syntax;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/hooks/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: >-
A library that contains a Dart API for the JSON-based protocol for
`hook/build.dart` and `hook/link.dart`.

version: 0.19.4
version: 0.19.5

repository: https://github.com/dart-lang/native/tree/main/pkgs/hooks

Expand All @@ -29,7 +29,7 @@ dependencies:

dev_dependencies:
args: ^2.6.0
code_assets: any # Used for running tests with real asset types.
code_assets: ^0.19.4 # Used for running tests with real asset types.
custom_lint: ^0.7.5
dart_flutter_team_lints: ^3.5.1
data_assets: any # Used for running tests with real asset types.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/hooks_runner/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
crypto: ^3.0.6
file: ^7.0.1
graphs: ^2.3.2
hooks: ^0.19.4
hooks: ^0.19.5
logging: ^1.3.0
meta: ^1.16.0
package_config: ^2.1.0
Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_toolchain_c/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ environment:
dependencies:
code_assets: ^0.19.4
glob: ^2.1.1
hooks: ^0.19.4
hooks: ^0.19.5
logging: ^1.3.0
meta: ^1.16.0
pub_semver: ^2.2.0
Expand Down
Loading