[native_assets_cli] Cleanup JSON: assetsForLinking

Author: dcharkes

pkgs/code_assets/doc/schema/shared/shared_definitions.generated.schema.json

@@ -36,15 +36,6 @@
         },
         {
           "properties": {
-            "assetsForLinking": {
-              "type": "object",
-              "additionalProperties": {
-                "type": "array",
-                "items": {
-                  "$ref": "shared_definitions.schema.json#/definitions/Asset"
-                }
-              }
-            },
             "assets_for_build": {
               "type": "array",
               "items": {

pkgs/code_assets/test/data/build_output_macos.json

@@ -50,20 +50,6 @@
       "type": "code_assets/code"
     }
   ],
-  "assetsForLinking": {
-    "package_with_linker": [
-      {
-        "encoding": {
-          "file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
-          "id": "package:native_add/src/native_add_bindings_generated.dart",
-          "link_mode": {
-            "type": "static"
-          }
-        },
-        "type": "code_assets/code"
-      }
-    ]
-  },
   "assets_for_build": [
     {
       "encoding": {

pkgs/code_assets/test/schema/schema_test.dart

@@ -122,7 +122,6 @@ FieldsFunction _codeFields(AllTestData allTestData) {
           for (final (field, expect) in codeAssetFields)
             for (final path in [
               ['assets_for_build'],
-              ['assetsForLinking', 'package_with_linker'],
               ['assets_for_linking', 'package_with_linker'],
             ])
               ([...path, 0, 'encoding', ...field], expect),

pkgs/data_assets/doc/schema/shared/shared_definitions.generated.schema.json

@@ -36,15 +36,6 @@
         },
         {
           "properties": {
-            "assetsForLinking": {
-              "type": "object",
-              "additionalProperties": {
-                "type": "array",
-                "items": {
-                  "$ref": "shared_definitions.schema.json#/definitions/Asset"
-                }
-              }
-            },
             "assets_for_build": {
               "type": "array",
               "items": {

pkgs/data_assets/test/data/build_output.json

@@ -18,26 +18,6 @@
       "type": "data_assets/data"
     }
   ],
-  "assetsForLinking": {
-    "package_with_linker": [
-      {
-        "encoding": {
-          "file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_0.json",
-          "name": "assets/data_0.json",
-          "package": "simple_link"
-        },
-        "type": "data_assets/data"
-      },
-      {
-        "encoding": {
-          "file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/0s5bKi/simple_link/assets/data_1.json",
-          "name": "assets/data_1.json",
-          "package": "simple_link"
-        },
-        "type": "data_assets/data"
-      }
-    ]
-  },
   "assets_for_build": [
     {
       "encoding": {

pkgs/data_assets/test/schema/schema_test.dart

@@ -54,7 +54,6 @@ List<(List<Object>, void Function(ValidationResults result))> _dataFields({
       for (final field in _dataAssetFields)
         for (final path in [
           ['assets_for_build'],
-          ['assetsForLinking', 'package_with_linker'],
           ['assets_for_linking', 'package_with_linker'],
         ])
           ([...path, 0, 'encoding', field], expectRequiredFieldMissing),

pkgs/hooks/doc/schema/hook/shared_definitions.schema.json

@@ -5,11 +5,6 @@
     "BuildInput": {},
     "BuildOutput": {
       "$ref": "../shared/shared_definitions.schema.json#/definitions/BuildOutput",
-      "properties": {
-        "assets_for_linking": {
-          "$comment": "Older SDKs will only read 'assetsForLinking', so it must be emitted as well."
-        }
-      },
       "unevaluatedProperties": false
     },
     "HookInput": {},

pkgs/hooks/doc/schema/sdk/shared_definitions.schema.json

@@ -6,16 +6,7 @@
       "$ref": "../shared/shared_definitions.schema.json#/definitions/BuildInput",
       "unevaluatedProperties": false
     },
-    "BuildOutput": {
-      "properties": {
-        "assetsForLinking": {
-          "deprecated": true
-        },
-        "assets_for_linking": {
-          "$comment": "Older hooks will still emit 'assetsForLinking', so it must be read."
-        }
-      }
-    },
+    "BuildOutput": {},
     "HookInput": {},
     "HookOutput": {},
     "LinkInput": {

pkgs/hooks/doc/schema/shared/shared_definitions.schema.json

@@ -94,15 +94,6 @@
     "BuildOutput": {
       "type": "object",
       "properties": {
-        "assetsForLinking": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "array",
-            "items": {
-              "$ref": "#/definitions/Asset"
-            }
-          }
-        },
         "assets_for_build": {
           "type": "array",
           "items": {

pkgs/hooks/test/data/build_output.json

@@ -14,23 +14,6 @@
       "type": "some_other_asset_type"
     }
   ],
-  "assetsForLinking": {
-    "package_with_linker": [
-      {
-        "encoding": {
-          "a_key": "some_value"
-        },
-        "type": "some_asset_type"
-      },
-      {
-        "encoding": {
-          "key": "foo",
-          "value": "bar"
-        },
-        "type": "hooks/metadata"
-      }
-    ]
-  },
   "assets_for_build": [
     {
       "encoding": {

pkgs/hooks/test/schema/helpers.dart

@@ -316,7 +316,6 @@ FieldsReturn _hookFields({
       (['metadata'], expectOptionalFieldMissing),
       for (final path in [
         ['assets_for_build'],
-        ['assetsForLinking', 'package_with_linker'],
         ['assets_for_linking', 'package_with_linker'],
       ]) ...[
         ([...path], expectOptionalFieldMissing),
@@ -330,7 +329,6 @@ FieldsReturn _hookFields({
     if (inputOrOutput == InputOrOutput.output || hook == Hook.link) ['assets'],
     if (inputOrOutput == InputOrOutput.output && hook == Hook.build) ...[
       ['assets_for_build'],
-      ['assetsForLinking', 'package_with_linker'],
       ['assets_for_linking', 'package_with_linker'],
     ],
   ]) ...[

pkgs/hooks/test/schema/schema_test.dart

@@ -42,7 +42,6 @@ _metadataAssetFields({
     if (inputOrOutput == InputOrOutput.input && hook == Hook.link) ['assets'],
     if (inputOrOutput == InputOrOutput.output && hook == Hook.build) ...[
       ['assets_for_build'],
-      ['assetsForLinking', 'package_with_linker'],
       ['assets_for_linking', 'package_with_linker'],
     ],
   ]) ...[

pkgs/hooks/tool/generate_schemas.dart

@@ -34,15 +34,6 @@ void generateSharedDefinitions() {
   };
   const buildOutputAssetOverride = {
     'properties': {
-      'assetsForLinking': {
-        'type': 'object',
-        'additionalProperties': {
-          'type': 'array',
-          'items': {
-            r'$ref': 'shared_definitions.schema.json#/definitions/Asset',
-          },
-        },
-      },
       'assets_for_linking': {
         'type': 'object',
         'additionalProperties': {

pkgs/hooks/tool/generate_syntax.dart

@@ -35,7 +35,6 @@ void main(List<String> args) {
             'Macos': 'MacOS',
             'prefer-dynamic': 'preferDynamicOld',
             'prefer-static': 'preferStaticOld',
-            'assetsForLinking': 'assetsForLinkingOld',
             'CodeAssetsCodeAsset': 'NativeCodeAssetNew',
             'DataAssetsDataAsset': 'DataAssetNew',
           },

pkgs/native_assets_cli/lib/src/config.dart

@@ -441,8 +441,7 @@ class BuildOutput extends HookOutput {
   /// specified in the key, which can decide if they are bundled or not.
   Map<String, List<EncodedAsset>> get _encodedAssetsForLinking => {
     for (final MapEntry(:key, :value)
-        in (_syntax.assetsForLinking ?? _syntax.assetsForLinkingOld ?? {})
-            .entries)
+        in (_syntax.assetsForLinking ?? {}).entries)
       key: _parseAssets(value),
   };
 
@@ -619,7 +618,6 @@ extension type EncodedAssetBuildOutputBuilder._(BuildOutputBuilder _output) {
           syntax.Asset.fromJson(asset.toJson()),
         );
         _syntax.assetsForLinking = assetsForLinking;
-        _syntax.assetsForLinkingOld = assetsForLinking;
     }
   }
 
@@ -657,14 +655,12 @@ extension type EncodedAssetBuildOutputBuilder._(BuildOutputBuilder _output) {
         _syntax.assetsForBuild = list;
       case ToLinkHook():
         final linkInPackage = routing.packageName;
-        final assetsForLinking =
-            _syntax.assetsForLinking ?? _syntax.assetsForLinkingOld ?? {};
+        final assetsForLinking = _syntax.assetsForLinking ?? {};
         final list = assetsForLinking[linkInPackage] ??= [];
         for (final asset in assets) {
           list.add(syntax.Asset.fromJson(asset.toJson()));
         }
         _syntax.assetsForLinking = assetsForLinking;
-        _syntax.assetsForLinkingOld = assetsForLinking;
     }
   }
 

pkgs/native_assets_cli/lib/src/hooks/syntax.g.dart

@@ -233,12 +233,10 @@ class BuildOutput extends HookOutput {
     required super.assets,
     required List<Asset>? assetsForBuild,
     required Map<String, List<Asset>>? assetsForLinking,
-    required Map<String, List<Asset>>? assetsForLinkingOld,
     required super.dependencies,
     required JsonObject? metadata,
     required super.timestamp,
   }) : super() {
-    this.assetsForLinkingOld = assetsForLinkingOld;
     this.assetsForBuild = assetsForBuild;
     this.assetsForLinking = assetsForLinking;
     this.metadata = metadata;
@@ -248,66 +246,16 @@ class BuildOutput extends HookOutput {
   /// Setup all fields for [BuildOutput] that are not in
   /// [HookOutput].
   void setup({
-    required Map<String, List<Asset>>? assetsForLinkingOld,
     required List<Asset>? assetsForBuild,
     required Map<String, List<Asset>>? assetsForLinking,
     required JsonObject? metadata,
   }) {
-    this.assetsForLinkingOld = assetsForLinkingOld;
     this.assetsForBuild = assetsForBuild;
     this.assetsForLinking = assetsForLinking;
     this.metadata = metadata;
     json.sortOnKey();
   }
 
-  Map<String, List<Asset>>? get assetsForLinkingOld {
-    final jsonValue = _reader.optionalMap('assetsForLinking');
-    if (jsonValue == null) {
-      return null;
-    }
-    final result = <String, List<Asset>>{};
-    for (final MapEntry(:key, :value) in jsonValue.entries) {
-      result[key] = [
-        for (final (index, item) in (value as List<Object?>).indexed)
-          Asset.fromJson(
-            item as Map<String, Object?>,
-            path: [...path, key, index],
-          ),
-      ];
-    }
-    return result;
-  }
-
-  set assetsForLinkingOld(Map<String, List<Asset>>? value) {
-    if (value == null) {
-      json.remove('assetsForLinking');
-    } else {
-      json['assetsForLinking'] = {
-        for (final MapEntry(:key, :value) in value.entries)
-          key: [for (final item in value) item.json],
-      };
-    }
-    json.sortOnKey();
-  }
-
-  List<String> _validateAssetsForLinkingOld() {
-    final mapErrors = _reader.validateOptionalMap('assetsForLinking');
-    if (mapErrors.isNotEmpty) {
-      return mapErrors;
-    }
-    final jsonValue = _reader.optionalMap('assetsForLinking');
-    if (jsonValue == null) {
-      return [];
-    }
-    final result = <String>[];
-    for (final list in assetsForLinkingOld!.values) {
-      for (final element in list) {
-        result.addAll(element.validate());
-      }
-    }
-    return result;
-  }
-
   List<Asset>? get assetsForBuild {
     final jsonValue = _reader.optionalList('assets_for_build');
     if (jsonValue == null) return null;
@@ -413,7 +361,6 @@ class BuildOutput extends HookOutput {
   @override
   List<String> validate() => [
     ...super.validate(),
-    ..._validateAssetsForLinkingOld(),
     ..._validateAssetsForBuild(),
     ..._validateAssetsForLinking(),
     ..._validateMetadata(),

pkgs/native_assets_cli/lib/src/validation.dart

@@ -138,7 +138,7 @@ ValidationErrors _validateAssetsForLinking(
   if (!input.config.linkingEnabled) {
     if (output.assets.encodedAssetsForLinking.isNotEmpty) {
       const error =
-          'BuildOutput.assetsForLinking is not empty while '
+          'BuildOutput.assets_for_linking is not empty while '
           'BuildInput.config.linkingEnabled is false';
       errors.add(error);
     }

pkgs/native_assets_cli/test/build_output_test.dart

@@ -85,15 +85,6 @@ void main() {
           'type': 'my-asset-type',
         },
       ],
-      'assetsForLinking': {
-        'package:linker1': [
-          {
-            'encoding': {'a-1': 'v-1'},
-            'type': 'my-asset-type',
-          },
-        ],
-        'package:linker2': <Object?>[],
-      },
       'assets_for_linking': {
         'package:linker1': [
           {