[native assets] Graduate to preview

This PR enables native assets on the main and dev channel by default,
and make native assets available on the beta channel.

This PR removes the flag from invocations.

The helper packages (`package:hooks` and `package:code_assets`) will
stay 0.x for now, until the SDK constraint can be bumped to a beta
release and we're happy with the Dart API.

`dart build` is also made available as preview (without a flag on
the main, dev, and beta channels). We're still finalizing the spec for
this command. (#60730)

`dart test` will need dart-lang/test#2501.
This means users will need to update their `package:test` dependency.

This PR refactors the way that invalid `package_config.json`s are
handled: they are now loaded in the dartdev commands and handled there.

Bug: #50565
Project: https://github.com/orgs/dart-lang/projects/99/

Change-Id: I7db9ff6d7196750cab9379a4605c6bbf89a974d7
Cq-Include-Trybots: luci.dart.try:pkg-linux-debug-try,pkg-linux-release-arm64-try,pkg-linux-release-try,pkg-mac-release-arm64-try,pkg-win-release-arm64-try,pkg-mac-release-try,pkg-win-release-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429920
Commit-Queue: Daco Harkes <[email protected]>
Reviewed-by: Martin Kustermann <[email protected]>

Author: dcharkes

DEPS

@@ -143,7 +143,7 @@ vars = {
   "shelf_rev": "082d3ac2d13a98700d8148e8fad8f3e12a6fd0e1",
   "sync_http_rev": "dc54465f07d9652875deeade643256dafa2fbc6c",
   "tar_rev": "5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a",
-  "test_rev": "5ffcb36fd6c82843f25ed96585a4b9e96022e7f9",
+  "test_rev": "42a6d333d96b4b0964d356b9a29ca47ccdb43691",
   "tools_rev": "36f5c9f9989e06e79323499914c50e78ab1a6621",
   "vector_math_rev": "13f185f7e97d559e003f5ac79201da12f9a01049",
   "web_rev": "f1becf07db9faa56559d2844c3c6d430dc9b37de",

pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart

@@ -159,10 +159,10 @@ enum ExperimentalFlag {
 
   nativeAssets(
       name: 'native-assets',
-      isEnabledByDefault: false,
+      isEnabledByDefault: true,
       isExpired: false,
-      experimentEnabledVersion: defaultLanguageVersion,
-      experimentReleasedVersion: defaultLanguageVersion),
+      experimentEnabledVersion: const Version(3, 9),
+      experimentReleasedVersion: const Version(3, 9)),
 
   nonNullable(
       name: 'non-nullable',

pkg/analyzer/lib/src/dart/analysis/experiments.g.dart

@@ -428,8 +428,8 @@ class ExperimentalFeatures {
     isExpired: IsExpired.native_assets,
     documentation: 'Compile and bundle native assets.',
     experimentalReleaseVersion: null,
-    releaseVersion: null,
-    channels: ["main", "dev"],
+    releaseVersion: Version.parse('3.9.0'),
+    channels: ["main", "dev", "beta"],
   );
 
   static final non_nullable = ExperimentalFeature(
@@ -690,7 +690,7 @@ class IsEnabledByDefault {
   static const bool named_arguments_anywhere = true;
 
   /// Default state of the experiment "native-assets"
-  static const bool native_assets = false;
+  static const bool native_assets = true;
 
   /// Default state of the experiment "non-nullable"
   static const bool non_nullable = true;

pkg/analyzer/test/src/dart/analysis/analysis_context_collection_test.dart

@@ -412,6 +412,7 @@ analysisOptions
       inference-using-bounds
       inline-class
       named-arguments-anywhere
+      native-assets
       non-nullable
       nonfunction-type-aliases
       null-aware-elements
@@ -491,6 +492,7 @@ analysisOptions
       inference-using-bounds
       inline-class
       named-arguments-anywhere
+      native-assets
       non-nullable
       nonfunction-type-aliases
       null-aware-elements

pkg/dartdev/lib/src/commands/build.dart

@@ -120,6 +120,10 @@ class BuildCommand extends DartdevCommand {
       return 128;
     }
 
+    stdout.writeln('''The `dart build` command is in preview at the moment.
+See documentation on https://dart.dev/interop/c-interop#native-assets.
+''');
+
     final outputDir = Directory.fromUri(outputUri);
     if (await outputDir.exists()) {
       stdout.writeln('Deleting output directory: ${outputUri.toFilePath()}.');
@@ -128,17 +132,23 @@ class BuildCommand extends DartdevCommand {
     await outputDir.create(recursive: true);
 
     stdout.writeln('Building native assets.');
-    final packageConfig = await DartNativeAssetsBuilder.ensurePackageConfig(
+    final packageConfigUri = await DartNativeAssetsBuilder.ensurePackageConfig(
       sourceUri,
     );
+    final packageConfig =
+        await DartNativeAssetsBuilder.loadPackageConfig(packageConfigUri!);
+    if (packageConfig == null) {
+      return compileErrorExitCode;
+    }
     final runPackageName = await DartNativeAssetsBuilder.findRootPackageName(
       sourceUri,
     );
     final pubspecUri =
-        await DartNativeAssetsBuilder.findWorkspacePubspec(packageConfig);
+        await DartNativeAssetsBuilder.findWorkspacePubspec(packageConfigUri);
     final builder = DartNativeAssetsBuilder(
       pubspecUri: pubspecUri,
-      packageConfigUri: packageConfig!,
+      packageConfigUri: packageConfigUri,
+      packageConfig: packageConfig,
       runPackageName: runPackageName!,
       verbose: verbose,
     );
@@ -163,7 +173,7 @@ class BuildCommand extends DartdevCommand {
         verbose: verbose,
         verbosity: args.option('verbosity')!,
         defines: [],
-        packages: packageConfig.toFilePath(),
+        packages: packageConfigUri.toFilePath(),
         targetOS: targetOS == null ? null : OS.fromString(targetOS),
         enableExperiment: args.enabledExperiments.join(','),
         tempDir: tempDir,

pkg/dartdev/lib/src/commands/compile.dart

@@ -610,19 +610,25 @@ Remove debugging information from the output and save it separately to the speci
       }
     }
 
-    final packageConfig = await DartNativeAssetsBuilder.ensurePackageConfig(
+    final packageConfigUri = await DartNativeAssetsBuilder.ensurePackageConfig(
       Directory.current.uri,
     );
-    if (packageConfig != null) {
+    if (packageConfigUri != null) {
+      final packageConfig =
+          await DartNativeAssetsBuilder.loadPackageConfig(packageConfigUri);
+      if (packageConfig == null) {
+        return compileErrorExitCode;
+      }
       final runPackageName = await DartNativeAssetsBuilder.findRootPackageName(
         Directory.current.uri,
       );
       if (runPackageName != null) {
-        final pubspecUri =
-            await DartNativeAssetsBuilder.findWorkspacePubspec(packageConfig);
+        final pubspecUri = await DartNativeAssetsBuilder.findWorkspacePubspec(
+            packageConfigUri);
         final builder = DartNativeAssetsBuilder(
             pubspecUri: pubspecUri,
-            packageConfigUri: packageConfig,
+            packageConfigUri: packageConfigUri,
+            packageConfig: packageConfig,
             runPackageName: runPackageName,
             verbose: verbose,
             target: target);

pkg/dartdev/lib/src/commands/run.dart

@@ -6,6 +6,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:args/args.dart';
+import 'package:dartdev/src/commands/compile.dart';
 import 'package:front_end/src/api_prototype/compiler_options.dart'
     show Verbosity;
 import 'package:frontend_server/resident_frontend_server_utils.dart'
@@ -391,20 +392,26 @@ class RunCommand extends DartdevCommand {
     }
 
     String? nativeAssets;
-    final packageConfig = await DartNativeAssetsBuilder.ensurePackageConfig(
+    final packageConfigUri = await DartNativeAssetsBuilder.ensurePackageConfig(
       Directory.current.uri,
     );
-    if (packageConfig != null) {
+    if (packageConfigUri != null) {
+      final packageConfig =
+          await DartNativeAssetsBuilder.loadPackageConfig(packageConfigUri);
+      if (packageConfig == null) {
+        return compileErrorExitCode;
+      }
       final runPackageName = getPackageForCommand(mainCommand) ??
           await DartNativeAssetsBuilder.findRootPackageName(
             Directory.current.uri,
           );
       if (runPackageName != null) {
-        final pubspecUri =
-            await DartNativeAssetsBuilder.findWorkspacePubspec(packageConfig);
+        final pubspecUri = await DartNativeAssetsBuilder.findWorkspacePubspec(
+            packageConfigUri);
         final builder = DartNativeAssetsBuilder(
           pubspecUri: pubspecUri,
-          packageConfigUri: packageConfig,
+          packageConfigUri: packageConfigUri,
+          packageConfig: packageConfig,
           runPackageName: runPackageName,
           verbose: verbose,
         );

pkg/dartdev/lib/src/commands/test.dart

@@ -47,19 +47,25 @@ Run "${runner!.executableName} help" to see global options.''');
     final args = argResults!;
 
     String? nativeAssets;
-    final packageConfig = await DartNativeAssetsBuilder.ensurePackageConfig(
+    final packageConfigUri = await DartNativeAssetsBuilder.ensurePackageConfig(
       Directory.current.uri,
     );
-    if (packageConfig != null) {
+    if (packageConfigUri != null) {
+      final packageConfig =
+          await DartNativeAssetsBuilder.loadPackageConfig(packageConfigUri);
+      if (packageConfig == null) {
+        return DartdevCommand.errorExitCode;
+      }
       final runPackageName = await DartNativeAssetsBuilder.findRootPackageName(
         Directory.current.uri,
       );
       if (runPackageName != null) {
-        final pubspecUri =
-            await DartNativeAssetsBuilder.findWorkspacePubspec(packageConfig);
+        final pubspecUri = await DartNativeAssetsBuilder.findWorkspacePubspec(
+            packageConfigUri);
         final builder = DartNativeAssetsBuilder(
           pubspecUri: pubspecUri,
-          packageConfigUri: packageConfig,
+          packageConfigUri: packageConfigUri,
+          packageConfig: packageConfig,
           runPackageName: runPackageName,
           verbose: verbose,
         );
@@ -78,7 +84,7 @@ Run "${runner!.executableName} help" to see global options.''');
           // package:test to explicitly provide the native_assets.yaml path
           // instead of copying to the workspace .dart_tool.
           final expectedPackageTestLocation =
-              packageConfig.resolve('native_assets.yaml');
+              packageConfigUri.resolve('native_assets.yaml');
           if (expectedPackageTestLocation != assetsYamlFileUri) {
             await File.fromUri(assetsYamlFileUri)
                 .copy(expectedPackageTestLocation.toFilePath());

pkg/dartdev/lib/src/experiments.dart

@@ -98,7 +98,9 @@ List<String> parseVmEnabledExperiments(List<String> vmArgs) {
 
 bool nativeAssetsEnabled(List<String> vmEnabledExperiments) =>
     vmEnabledExperiments
-        .contains(ExperimentalFeatures.native_assets.enableString);
+        .contains(ExperimentalFeatures.native_assets.enableString) ||
+    (_availableOnCurrentChannel(ExperimentalFeatures.native_assets.channels) &&
+        ExperimentalFeatures.native_assets.isEnabledByDefault);
 
 bool recordUseEnabled(List<String> vmEnabledExperiments) =>
     vmEnabledExperiments.contains(ExperimentalFeatures.record_use.enableString);

pkg/dartdev/lib/src/native_assets.dart

@@ -22,6 +22,7 @@ import 'core.dart';
 class DartNativeAssetsBuilder {
   final Uri? pubspecUri;
   final Uri packageConfigUri;
+  final package_config.PackageConfig packageConfig;
   final String runPackageName;
   final bool verbose;
 
@@ -30,7 +31,7 @@ class DartNativeAssetsBuilder {
   late final Future<PackageLayout> _packageLayout = () async {
     return PackageLayout.fromPackageConfig(
       _fileSystem,
-      await package_config.loadPackageConfigUri(packageConfigUri),
+      packageConfig,
       packageConfigUri,
       runPackageName,
     );
@@ -65,6 +66,7 @@ class DartNativeAssetsBuilder {
   DartNativeAssetsBuilder({
     this.pubspecUri,
     required this.packageConfigUri,
+    required this.packageConfig,
     required this.runPackageName,
     required this.verbose,
     Target? target,
@@ -112,27 +114,14 @@ class DartNativeAssetsBuilder {
   }
 
   Future<bool> warnOnNativeAssets() async {
-    try {
-      final builder = await _nativeAssetsBuildRunner;
-      final packageNames = await builder.packagesWithBuildHooks();
-      if (packageNames.isEmpty) return false;
-      log.stderr(
-        'Package(s) $packageNames require the native assets feature to be enabled. '
-        'Enable native assets with `--enable-experiment=native-assets`.',
-      );
-      return true;
-    } on FormatException catch (e) {
-      // This can be thrown if the package_config.json is malformed or has
-      // duplicate entries.
-      log.stderr(
-        'Error encountered while parsing '
-        '${packageConfigUri.toFilePath()}: ${e.message}.',
-      );
-      // If the package config cannot be read, don't fail here. The dartdev
-      // command invoking this function can fail if it requires to have a valid
-      // package config.
-      return false;
-    }
+    final builder = await _nativeAssetsBuildRunner;
+    final packageNames = await builder.packagesWithBuildHooks();
+    if (packageNames.isEmpty) return false;
+    log.stderr(
+      'Package(s) $packageNames require the native assets feature to be enabled. '
+      'Enable native assets with `--enable-experiment=native-assets`.',
+    );
+    return true;
   }
 
   late final _extensions = [
@@ -245,6 +234,24 @@ class DartNativeAssetsBuilder {
     return packageConfig;
   }
 
+  /// Tries to load the package config.
+  ///
+  /// Returns null and writes to stderr if the package config is malformed.
+  static Future<package_config.PackageConfig?> loadPackageConfig(
+      Uri packageConfigUri) async {
+    try {
+      return await package_config.loadPackageConfigUri(packageConfigUri);
+    } on FormatException catch (e) {
+      // This can be thrown if the package_config.json is malformed or has
+      // duplicate entries.
+      log.stderr(
+        'Error encountered while parsing '
+        '${packageConfigUri.toFilePath()}: ${e.message}.',
+      );
+      return null;
+    }
+  }
+
   /// Finds the package config uri.
   ///
   /// Returns `null` if no package config can be found.

pkg/dartdev/test/native_assets/build_test.dart

@@ -49,7 +49,6 @@ void main([List<String> args = const []]) async {
           final bool expectCrossOSFailure = targetOS == crossOS;
           final result = await runDart(
             arguments: [
-              '--enable-experiment=native-assets',
               if (fromDartdevSource) dartDevEntryScriptUri.toFilePath(),
               'build',
               if (targetOS != null) ...[
@@ -115,7 +114,6 @@ void main(List<String> args) {
 ''');
       final result = await runDart(
         arguments: [
-          '--enable-experiment=native-assets',
           'build',
           'bin/dart_app.dart',
         ],
@@ -137,7 +135,6 @@ void main(List<String> args) {
     await nativeAssetsTest('native_add_duplicate', (dartAppUri) async {
       final result = await runDart(
         arguments: [
-          '--enable-experiment=native-assets',
           'build',
           'bin/native_add_duplicate.dart',
         ],
@@ -159,7 +156,6 @@ void main(List<String> args) {
     await nativeAssetsTest('drop_dylib_link', (dartAppUri) async {
       await runDart(
         arguments: [
-          '--enable-experiment=native-assets',
           'build',
           'bin/drop_dylib_link.dart',
         ],
@@ -190,7 +186,6 @@ void main(List<String> args) {
     await nativeAssetsTest('add_asset_link', (dartAppUri) async {
       final result = await runDart(
         arguments: [
-          '--enable-experiment=native-assets',
           'build',
           'bin/add_asset_link.dart',
         ],
@@ -219,7 +214,6 @@ void main(List<String> args) {
     await nativeAssetsTest('dart_app', (dartAppUri) async {
       final result = await runDart(
         arguments: [
-          '--enable-experiment=native-assets',
           if (fromDartdevSource) dartDevEntryScriptUri.toFilePath(),
           'build',
           'bin/dart_app.dart',
@@ -252,7 +246,7 @@ void main(List<String> args) {
 
         await runDart(
           arguments: [
-            '--enable-experiment=native-assets,record-use',
+            '--enable-experiment=record-use',
             'build',
             'bin/$filename.dart',
           ],
@@ -295,7 +289,6 @@ void main(List<String> args) {
       await nativeAssetsTest('native_dynamic_linking', (packageUri) async {
         await runDart(
           arguments: [
-            '--enable-experiment=native-assets',
             'build',
             'bin/native_dynamic_linking.dart',
           ],
@@ -337,7 +330,6 @@ void main(List<String> args) {
             (packageUri) async {
           await runDart(
             arguments: [
-              '--enable-experiment=native-assets',
               'build',
               'bin/user_defines.dart',
             ],