Skip to content

[native_assets_cli] Hide CodeAsset.type and DataAsset.type #2140

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.

Sign up for GitHub

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
Mar 28, 2025
Merged

[native_assets_cli] Hide CodeAsset.type and DataAsset.type #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,7 @@ class NativeAssetsBuildRunner {
)?.forEach((key, value) => metadata[key] = value);

final inputBuilder = BuildInputBuilder();
inputBuilder.config.setupShared(
buildAssetTypes: [for (final e in extensions) ...e.buildAssetTypes],
);

for (final e in extensions) {
e.setupBuildInput(inputBuilder);
}
Expand Down Expand Up @@ -199,9 +197,6 @@ class NativeAssetsBuildRunner {
var hookResult = HookResult(encodedAssets: buildResult.encodedAssets);
for (final package in buildPlan) {
final inputBuilder = LinkInputBuilder();
inputBuilder.config.setupShared(
buildAssetTypes: [for (final e in extensions) ...e.buildAssetTypes],
);
for (final e in extensions) {
e.setupLinkInput(inputBuilder);
}
Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_assets_builder/test/build_runner/build_dependencies_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void main() async {
logger,
dartExecutable,
capturedLogs: logMessages,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
expect(
logMessages.join('\n'),
Expand Down
4 changes: 2 additions & 2 deletions pkgs/native_assets_builder/test/build_runner/build_runner_asset_id_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void main() async {
packageUri,
createCapturingLogger(logMessages, level: Level.SEVERE),
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
);
final fullLog = logMessages.join('\n');
expect(result, isNull);
Expand Down Expand Up @@ -52,7 +52,7 @@ void main() async {
packageUri,
logger,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
);
expect(result, isNotNull);
}
Expand Down
16 changes: 8 additions & 8 deletions pkgs/native_assets_builder/test/build_runner/build_runner_caching_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void main() async {
logger,
dartExecutable,
capturedLogs: logMessages,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
expect(
logMessages.join('\n'),
Expand All @@ -52,7 +52,7 @@ void main() async {
logger,
dartExecutable,
capturedLogs: logMessages,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
final hookUri = packageUri.resolve('hook/build.dart');
expect(
Expand Down Expand Up @@ -97,7 +97,7 @@ void main() async {
packageUri,
logger,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
await expectSymbols(
asset: CodeAsset.fromEncoded(result.encodedAssets.single),
Expand All @@ -117,7 +117,7 @@ void main() async {
packageUri,
logger,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;

final cUri = packageUri.resolve('src/').resolve('native_add.c');
Expand Down Expand Up @@ -153,7 +153,7 @@ void main() async {
packageUri,
logger,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
{
final compiledHook =
Expand Down Expand Up @@ -183,7 +183,7 @@ void main() async {
packageUri,
logger,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;

final hookUri = packageUri.resolve('hook/build.dart');
Expand Down Expand Up @@ -217,7 +217,7 @@ void main() async {
packageUri,
logger,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
hookEnvironment:
modifiedEnvKey == 'PATH'
? null
Expand Down Expand Up @@ -255,7 +255,7 @@ void main() async {
packageUri,
logger,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
expect(logMessages.join('\n'), contains('hook.dill'));
expect(
Expand Down
8 changes: 4 additions & 4 deletions pkgs/native_assets_builder/test/build_runner/build_runner_failure_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void main() async {
packageUri,
logger,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
expect(result.encodedAssets.length, 1);
await expectSymbols(
Expand All @@ -50,7 +50,7 @@ void main() async {
packageUri,
createCapturingLogger(logMessages, level: Level.SEVERE),
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
);
final fullLog = logMessages.join('\n');
expect(result, isNull);
Expand Down Expand Up @@ -80,7 +80,7 @@ void main() async {
packageUri,
logger,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
expect(result.encodedAssets.length, 1);
await expectSymbols(
Expand Down Expand Up @@ -111,7 +111,7 @@ void main() async {
logger,
capturedLogs: logMessages,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
);
Matcher stringContainsBuildHookCompilation(String packageName) =>
stringContainsInOrder([
Expand Down
4 changes: 2 additions & 2 deletions pkgs/native_assets_builder/test/build_runner/build_runner_non_root_package_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void main() async {
dartExecutable,
capturedLogs: logMessages,
runPackageName: 'some_dev_dep',
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
expect(result.encodedAssets, isEmpty);
expect(result.dependencies, isEmpty);
Expand All @@ -43,7 +43,7 @@ void main() async {
dartExecutable,
capturedLogs: logMessages,
runPackageName: 'native_add',
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
expect(result.encodedAssets, isNotEmpty);
expect(
Expand Down
4 changes: 2 additions & 2 deletions pkgs/native_assets_builder/test/build_runner/build_runner_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void main() async {
logger,
dartExecutable,
capturedLogs: logMessages,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
expect(
logMessages.join('\n'),
Expand Down Expand Up @@ -74,7 +74,7 @@ void main() async {
logger,
dartExecutable,
capturedLogs: logMessages,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;
expect(
false,
Expand Down
6 changes: 3 additions & 3 deletions pkgs/native_assets_builder/test/build_runner/conflicting_dylib_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void main() async {
packageUri,
createCapturingLogger(logMessages, level: Level.SEVERE),
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
);
final fullLog = logMessages.join('\n');
expect(result, isNull);
Expand All @@ -49,15 +49,15 @@ void main() async {
logger,
linkingEnabled: true,
dartExecutable,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
))!;

final linkResult = await link(
packageUri,
logger,
dartExecutable,
buildResult: buildResult,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
);
// Application validation error due to conflicting dylib name.
expect(linkResult, isNull);
Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_assets_builder/test/build_runner/fail_on_os_sdk_version_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void main() async {
packageUri,
createCapturingLogger(logMessages, level: Level.SEVERE),
dartExecutable,
buildAssetTypes: [CodeAsset.type, DataAsset.type],
buildAssetTypes: [BuildAssetType.code, BuildAssetType.data],
);
final fullLog = logMessages.join('\n');
if (hook == 'build') {
Expand Down
30 changes: 17 additions & 13 deletions pkgs/native_assets_builder/test/build_runner/helpers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Future<BuildResult?> buildDataAssets(
logger,
dartExecutable,
capturedLogs: capturedLogs,
buildAssetTypes: [DataAsset.type],
buildAssetTypes: [BuildAssetType.data],
runPackageName: runPackageName,
linkingEnabled: linkingEnabled,
);
Expand All @@ -53,10 +53,12 @@ Future<BuildResult?> buildCodeAssets(
logger,
dartExecutable,
capturedLogs: capturedLogs,
buildAssetTypes: [CodeAsset.type],
buildAssetTypes: [BuildAssetType.code],
runPackageName: runPackageName,
);

enum BuildAssetType { code, data }

Future<BuildResult?> build(
Uri packageUri,
Logger logger,
Expand All @@ -71,7 +73,7 @@ Future<BuildResult?> build(
int? targetAndroidNdkApi,
Target? target,
bool linkingEnabled = false,
required List<String> buildAssetTypes,
required List<BuildAssetType> buildAssetTypes,
Map<String, String>? hookEnvironment,
}) async {
final targetOS = target?.os ?? OS.current;
Expand All @@ -91,7 +93,7 @@ Future<BuildResult?> build(
packageLayout: packageLayout,
).build(
extensions: [
if (buildAssetTypes.contains(CodeAsset.type))
if (buildAssetTypes.contains(BuildAssetType.code))
CodeAssetExtension(
targetArchitecture: target?.architecture ?? Architecture.current,
targetOS: targetOS,
Expand All @@ -115,7 +117,8 @@ Future<BuildResult?> build(
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
: null,
),
if (buildAssetTypes.contains(DataAsset.type)) DataAssetsExtension(),
if (buildAssetTypes.contains(BuildAssetType.data))
DataAssetsExtension(),
],
linkingEnabled: linkingEnabled,
);
Expand Down Expand Up @@ -147,7 +150,7 @@ Future<LinkResult?> link(
int? targetMacOSVersion,
int? targetAndroidNdkApi,
Target? target,
required List<String> buildAssetTypes,
required List<BuildAssetType> buildAssetTypes,
}) async {
final targetOS = target?.os ?? OS.current;
final runPackageName_ =
Expand All @@ -165,7 +168,7 @@ Future<LinkResult?> link(
packageLayout: packageLayout,
).link(
extensions: [
if (buildAssetTypes.contains(CodeAsset.type))
if (buildAssetTypes.contains(BuildAssetType.code))
CodeAssetExtension(
targetArchitecture: target?.architecture ?? Architecture.current,
targetOS: target?.os ?? OS.current,
Expand All @@ -189,7 +192,8 @@ Future<LinkResult?> link(
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
: null,
),
if (buildAssetTypes.contains(DataAsset.type)) DataAssetsExtension(),
if (buildAssetTypes.contains(BuildAssetType.data))
DataAssetsExtension(),
],
buildResult: buildResult,
resourceIdentifiers: resourceIdentifiers,
Expand Down Expand Up @@ -218,7 +222,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
int? targetAndroidNdkApi,
Target? target,
Uri? resourceIdentifiers,
required List<String> buildAssetTypes,
required List<BuildAssetType> buildAssetTypes,
}) async => await runWithLog(capturedLogs, () async {
final runPackageName_ =
runPackageName ?? packageUri.pathSegments.lastWhere((e) => e.isNotEmpty);
Expand All @@ -236,7 +240,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
final targetOS = target?.os ?? OS.current;
final buildResult = await buildRunner.build(
extensions: [
if (buildAssetTypes.contains(CodeAsset.type))
if (buildAssetTypes.contains(BuildAssetType.code))
CodeAssetExtension(
targetArchitecture: target?.architecture ?? Architecture.current,
targetOS: target?.os ?? OS.current,
Expand All @@ -260,7 +264,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
: null,
),
if (buildAssetTypes.contains(DataAsset.type)) DataAssetsExtension(),
if (buildAssetTypes.contains(BuildAssetType.data)) DataAssetsExtension(),
],
linkingEnabled: true,
);
Expand All @@ -277,7 +281,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(

final linkResult = await buildRunner.link(
extensions: [
if (buildAssetTypes.contains(CodeAsset.type))
if (buildAssetTypes.contains(BuildAssetType.code))
CodeAssetExtension(
targetArchitecture: target?.architecture ?? Architecture.current,
targetOS: target?.os ?? OS.current,
Expand All @@ -301,7 +305,7 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
: null,
),
if (buildAssetTypes.contains(DataAsset.type)) DataAssetsExtension(),
if (buildAssetTypes.contains(BuildAssetType.data)) DataAssetsExtension(),
],
buildResult: buildResult,
resourceIdentifiers: resourceIdentifiers,
Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_assets_builder/test/build_runner/link_caching_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void main() async {
logger,
dartExecutable,
buildResult: buildResult,
buildAssetTypes: [DataAsset.type],
buildAssetTypes: [BuildAssetType.data],
capturedLogs: logMessages,
))!;
}
Expand Down
Loading