Remove asset type

dart-lang · Nov 30, 2023 · 217a340 · 217a340
1 parent cd92f28
commit 217a340
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 31 deletions.
diff --git a/pkgs/native_assets_cli/example/native_add_library/build.dart b/pkgs/native_assets_cli/example/native_add_library/build.dart
@@ -39,7 +39,6 @@ void main(List<String> args) async {
       target: buildConfig.target,
       path: AssetAbsolutePath(
           buildConfig.packageRoot.resolve('data_asset_build.json')),
-      type: AssetType.data,
     ),
   );
 

diff --git a/pkgs/native_assets_cli/example/native_add_library/link.dart b/pkgs/native_assets_cli/example/native_add_library/link.dart
@@ -22,7 +22,6 @@ void main(List<String> args) async {
       path: AssetAbsolutePath(
         buildConfig.packageRoot.resolve('data_asset_link.json'),
       ),
-      type: AssetType.data,
     ),
   );
 
@@ -38,5 +37,5 @@ class MyResourceShaker {
     List<Asset> assets,
     ResourceIdentifiers? resourceIdentifiers,
   ) =>
-      assets.where((asset) => asset.type != AssetType.data).toList();
+      assets.where((asset) => !asset.id.endsWith('.json')).toList();
 }
diff --git a/pkgs/native_assets_cli/lib/src/model/asset.dart b/pkgs/native_assets_cli/lib/src/model/asset.dart
@@ -195,7 +195,6 @@ class Asset {
   final String id;
   final Target target;
   final AssetPath path;
-  final AssetType type;
 
   /// The step at which the asset should be output. For example, if you want an
   /// asset to be output after `build.dart`, choose [BuildStep]. If you want it
@@ -207,7 +206,6 @@ class Asset {
     required this.linkMode,
     required this.target,
     required this.path,
-    required this.type,
     this.step = const BuildStep(),
   });
 
@@ -216,7 +214,6 @@ class Asset {
         path: AssetPath.fromYaml(as<YamlMap>(yamlMap[_pathKey])),
         target: Target.fromString(as<String>(yamlMap[_targetKey])),
         linkMode: LinkMode.fromName(as<String>(yamlMap[_linkModeKey])),
-        type: AssetType.fromName(as<String>(yamlMap[_typeKey])),
       );
 
   static List<Asset> listFromYamlString(String yaml) {
@@ -240,14 +237,12 @@ class Asset {
     String? id,
     Target? target,
     AssetPath? path,
-    AssetType? type,
   }) =>
       Asset(
         id: id ?? this.id,
         linkMode: linkMode ?? this.linkMode,
         target: target ?? this.target,
         path: path ?? this.path,
-        type: type ?? this.type,
       );
 
   @override
@@ -258,19 +253,17 @@ class Asset {
     return other.id == id &&
         other.linkMode == linkMode &&
         other.target == target &&
-        other.path == path &&
-        other.type == type;
+        other.path == path;
   }
 
   @override
-  int get hashCode => Object.hash(id, linkMode, target, path, type);
+  int get hashCode => Object.hash(id, linkMode, target, path);
 
   Map<String, Object> toYaml() => {
         _idKey: id,
         _linkModeKey: linkMode.name,
         _pathKey: path.toYaml(),
         _targetKey: target.toString(),
-        _typeKey: type.name,
       };
 
   Map<String, List<String>> toDartConst() => {
@@ -283,22 +276,13 @@ class Asset {
   static const _linkModeKey = 'link_mode';
   static const _pathKey = 'path';
   static const _targetKey = 'target';
-  static const _typeKey = 'type';
 
   Future<bool> exists() => path.exists();
 
   @override
   String toString() => 'Asset(${toYaml()})';
 }
 
-enum AssetType {
-  code,
-  data;
-
-  static AssetType fromName(String name) =>
-      AssetType.values.firstWhere((element) => element.name == name);
-}
-
 extension AssetIterable on Iterable<Asset> {
   List<Object> toYaml() => [for (final item in this) item.toYaml()];
 

diff --git a/pkgs/native_assets_cli/test/model/asset_test.dart b/pkgs/native_assets_cli/test/model/asset_test.dart
@@ -18,49 +18,42 @@ void main() {
       path: AssetAbsolutePath(fooUri),
       target: Target.androidX64,
       linkMode: LinkMode.dynamic,
-      type: AssetType.code,
     ),
     Asset(
       id: 'foo2',
       path: AssetRelativePath(foo2Uri),
       target: Target.androidX64,
       linkMode: LinkMode.dynamic,
-      type: AssetType.code,
     ),
     Asset(
       id: 'foo3',
       path: AssetSystemPath(foo3Uri),
       target: Target.androidX64,
       linkMode: LinkMode.dynamic,
-      type: AssetType.code,
     ),
     Asset(
       id: 'foo4',
       path: AssetInExecutable(),
       target: Target.androidX64,
       linkMode: LinkMode.dynamic,
-      type: AssetType.code,
     ),
     Asset(
       id: 'foo5',
       path: AssetInProcess(),
       target: Target.androidX64,
       linkMode: LinkMode.dynamic,
-      type: AssetType.code,
     ),
     Asset(
       id: 'bar',
       path: AssetAbsolutePath(barUri),
       target: Target.linuxArm64,
       linkMode: LinkMode.static,
-      type: AssetType.code,
     ),
     Asset(
       id: 'bla',
       path: AssetAbsolutePath(blaUri),
       target: Target.windowsX64,
       linkMode: LinkMode.dynamic,
-      type: AssetType.code,
     ),
   ];
 

diff --git a/pkgs/native_assets_cli/test/model/build_output_test.dart b/pkgs/native_assets_cli/test/model/build_output_test.dart
@@ -26,14 +26,12 @@ void main() {
         path: AssetAbsolutePath(Uri(path: 'path/to/libfoo.so')),
         target: Target.androidX64,
         linkMode: LinkMode.dynamic,
-        type: AssetType.code,
       ),
       Asset(
         id: 'foo2',
         path: AssetRelativePath(Uri(path: 'path/to/libfoo2.so')),
         target: Target.androidX64,
         linkMode: LinkMode.dynamic,
-        type: AssetType.code,
       ),
     ],
     dependencies: Dependencies([

diff --git a/pkgs/native_toolchain_c/lib/src/cbuilder/cbuilder.dart b/pkgs/native_toolchain_c/lib/src/cbuilder/cbuilder.dart
@@ -260,7 +260,6 @@ class CBuilder implements Builder {
           linkMode: linkMode,
           target: target,
           path: AssetAbsolutePath(libUri),
-          type: AssetType.code,
         ));
       }
     }