Skip to content

Commit

Permalink
[native_assets_builder] Format with tall style (#1992)
Browse files Browse the repository at this point in the history
  • Loading branch information
dcharkes authored Feb 14, 2025
1 parent f2ad223 commit 5bbc747
Show file tree
Hide file tree
Showing 105 changed files with 1,725 additions and 1,892 deletions.
45 changes: 22 additions & 23 deletions pkgs/native_assets_builder/lib/src/build_runner/build_planner.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,17 @@ class NativeAssetsBuildPlanner {
required FileSystem fileSystem,
}) async {
final workingDirectory = packageConfigUri.resolve('../');
final result = await Process.run(
dartExecutable.toFilePath(),
[
'pub',
'deps',
'--json',
],
workingDirectory: workingDirectory.toFilePath(),
final result = await Process.run(dartExecutable.toFilePath(), [
'pub',
'deps',
'--json',
], workingDirectory: workingDirectory.toFilePath());
final packageGraph = PackageGraph.fromPubDepsJsonString(
result.stdout as String,
);
final packageGraphFromRunPackage = packageGraph.subGraph(
packageLayout.runPackageName,
);
final packageGraph =
PackageGraph.fromPubDepsJsonString(result.stdout as String);
final packageGraphFromRunPackage =
packageGraph.subGraph(packageLayout.runPackageName);
return NativeAssetsBuildPlanner._(
packageGraph: packageGraphFromRunPackage,
dartExecutable: dartExecutable,
Expand All @@ -70,10 +68,9 @@ class NativeAssetsBuildPlanner {
// everyone has migrated. (Probably once we stop backwards compatibility of
// the protocol version pre 1.2.0 on some future version.)
Future<List<Package>> packagesWithHook(Hook hook) async => switch (hook) {
Hook.build => _packagesWithBuildHook ??=
await _runPackagesWithHook(hook),
Hook.link => _packagesWithLinkHook ??= await _runPackagesWithHook(hook),
};
Hook.build => _packagesWithBuildHook ??= await _runPackagesWithHook(hook),
Hook.link => _packagesWithLinkHook ??= await _runPackagesWithHook(hook),
};

List<Package>? _packagesWithBuildHook;
List<Package>? _packagesWithLinkHook;
Expand Down Expand Up @@ -111,15 +108,15 @@ class NativeAssetsBuildPlanner {
if (_buildHookPlan != null) return _buildHookPlan;
final packagesWithNativeAssets = await packagesWithHook(Hook.build);
final packageMap = {
for (final package in packagesWithNativeAssets) package.name: package
for (final package in packagesWithNativeAssets) package.name: package,
};
final packagesToBuild = packageMap.keys.toSet();
final stronglyConnectedComponents = packageGraph.computeStrongComponents();
final result = <Package>[];
for (final stronglyConnectedComponent in stronglyConnectedComponents) {
final stronglyConnectedComponentWithNativeAssets = [
for (final packageName in stronglyConnectedComponent)
if (packagesToBuild.contains(packageName)) packageName
if (packagesToBuild.contains(packageName)) packageName,
];
if (stronglyConnectedComponentWithNativeAssets.length > 1) {
logger.severe(
Expand All @@ -129,7 +126,8 @@ class NativeAssetsBuildPlanner {
return null;
} else if (stronglyConnectedComponentWithNativeAssets.length == 1) {
result.add(
packageMap[stronglyConnectedComponentWithNativeAssets.single]!);
packageMap[stronglyConnectedComponentWithNativeAssets.single]!,
);
}
}
_buildHookPlan = result;
Expand Down Expand Up @@ -157,9 +155,10 @@ class PackageGraph {
for (final package in packages) {
final package_ = package as Map<dynamic, dynamic>;
final name = package_['name'] as String;
final dependencies = (package_['dependencies'] as List<dynamic>)
.whereType<String>()
.toList();
final dependencies =
(package_['dependencies'] as List<dynamic>)
.whereType<String>()
.toList();
result[name] = dependencies;
}
return PackageGraph(result);
Expand Down Expand Up @@ -188,7 +187,7 @@ class PackageGraph {
vertex: [
for (final neighbor in map[vertex]!)
if (subgraphVertices.contains(neighbor)) neighbor,
]
],
});
}

Expand Down
Loading

0 comments on commit 5bbc747

Please sign in to comment.