@@ -165,6 +165,7 @@ class BuildInputSyntax extends HookInputSyntax {
165165 }
166166
167167 set _assets (Map <String , List <AssetSyntax >>? value) {
168+ _checkArgumentMapKeys (value);
168169 if (value == null ) {
169170 json.remove ('assets' );
170171 } else {
@@ -292,6 +293,7 @@ class BuildOutputSyntax extends HookOutputSyntax {
292293 }
293294
294295 set assetsForLinking (Map <String , List <AssetSyntax >>? value) {
296+ _checkArgumentMapKeys (value);
295297 if (value == null ) {
296298 json.remove ('assets_for_linking' );
297299 } else {
@@ -1102,24 +1104,47 @@ class JsonReader {
11021104 return result;
11031105 }
11041106
1105- Map <String , T > map$ <T extends Object ?>(String key) =>
1106- _castMap <T >(get <Map <String , Object ?>>(key), key);
1107+ Map <String , T > map$ <T extends Object ?>(String key, {RegExp ? keyPattern}) {
1108+ final map = get <Map <String , Object ?>>(key);
1109+ final keyErrors = _validateMapKeys (map, key, keyPattern: keyPattern);
1110+ if (keyErrors.isNotEmpty) {
1111+ throw FormatException (keyErrors.join ('\n ' ));
1112+ }
1113+ return _castMap <T >(map, key);
1114+ }
11071115
1108- List <String > validateMap <T extends Object ?>(String key) {
1116+ List <String > validateMap <T extends Object ?>(
1117+ String key, {
1118+ RegExp ? keyPattern,
1119+ }) {
11091120 final mapErrors = validate <Map <String , Object ?>>(key);
11101121 if (mapErrors.isNotEmpty) {
11111122 return mapErrors;
11121123 }
1113- return _validateMapElements <T >(get <Map <String , Object ?>>(key), key);
1124+ final map = get <Map <String , Object ?>>(key);
1125+ return [
1126+ ..._validateMapKeys (map, key, keyPattern: keyPattern),
1127+ ..._validateMapElements <T >(map, key),
1128+ ];
11141129 }
11151130
1116- Map <String , T >? optionalMap <T extends Object ?>(String key) =>
1117- switch (get <Map <String , Object ?>?>(key)) {
1118- null => null ,
1119- final m => _castMap <T >(m, key),
1120- };
1131+ Map <String , T >? optionalMap <T extends Object ?>(
1132+ String key, {
1133+ RegExp ? keyPattern,
1134+ }) {
1135+ final map = get <Map <String , Object ?>?>(key);
1136+ if (map == null ) return null ;
1137+ final keyErrors = _validateMapKeys (map, key, keyPattern: keyPattern);
1138+ if (keyErrors.isNotEmpty) {
1139+ throw FormatException (keyErrors.join ('\n ' ));
1140+ }
1141+ return _castMap <T >(map, key);
1142+ }
11211143
1122- List <String > validateOptionalMap <T extends Object ?>(String key) {
1144+ List <String > validateOptionalMap <T extends Object ?>(
1145+ String key, {
1146+ RegExp ? keyPattern,
1147+ }) {
11231148 final mapErrors = validate <Map <String , Object ?>?>(key);
11241149 if (mapErrors.isNotEmpty) {
11251150 return mapErrors;
@@ -1128,7 +1153,10 @@ class JsonReader {
11281153 if (map == null ) {
11291154 return [];
11301155 }
1131- return _validateMapElements <T >(map, key);
1156+ return [
1157+ ..._validateMapKeys (map, key, keyPattern: keyPattern),
1158+ ..._validateMapElements <T >(map, key),
1159+ ];
11321160 }
11331161
11341162 /// [Map.cast] but with [FormatException] s.
@@ -1144,6 +1172,23 @@ class JsonReader {
11441172 return map_.cast ();
11451173 }
11461174
1175+ List <String > _validateMapKeys (
1176+ Map <String , Object ?> map_,
1177+ String parentKey, {
1178+ required RegExp ? keyPattern,
1179+ }) {
1180+ if (keyPattern == null ) return [];
1181+ final result = < String > [];
1182+ for (final key in map_.keys) {
1183+ if (! keyPattern.hasMatch (key)) {
1184+ result.add (
1185+ keyErrorString (key, pattern: keyPattern, pathExtension: [parentKey]),
1186+ );
1187+ }
1188+ }
1189+ return result;
1190+ }
1191+
11471192 List <String > _validateMapElements <T extends Object ?>(
11481193 Map <String , Object ?> map_,
11491194 String parentKey,
@@ -1248,6 +1293,16 @@ class JsonReader {
12481293 ' Expected a $expectedType $satisfying .' ;
12491294 }
12501295
1296+ String keyErrorString (
1297+ String key, {
1298+ required RegExp pattern,
1299+ List <Object > pathExtension = const [],
1300+ }) {
1301+ final pathString = _jsonPathToString (pathExtension);
1302+ return "Unexpected key '$key ' in '$pathString '."
1303+ ' Expected a key satisfying ${pattern .pattern }.' ;
1304+ }
1305+
12511306 /// Traverses a JSON path, returns `null` if the path cannot be traversed.
12521307 Object ? tryTraverse (List <String > path) {
12531308 Object ? json = this .json;
@@ -1286,3 +1341,16 @@ extension<K extends Comparable<K>, V extends Object?> on Map<K, V> {
12861341 addAll (result);
12871342 }
12881343}
1344+
1345+ void _checkArgumentMapKeys (Map <String , Object ?>? map, {RegExp ? keyPattern}) {
1346+ if (map == null ) return ;
1347+ for (final key in map.keys) {
1348+ if (keyPattern != null && ! keyPattern.hasMatch (key)) {
1349+ throw ArgumentError .value (
1350+ map,
1351+ "Unexpected key '$key '."
1352+ ' Expected a key satisfying ${keyPattern .pattern }.' ,
1353+ );
1354+ }
1355+ }
1356+ }
0 commit comments