Skip to content

Discussion - Cast or map from Yaml* types to have generics #1295

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

Closed
wants to merge 1 commit into from
Closed

Discussion - Cast or map from Yaml* types to have generics #1295

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
31 changes: 24 additions & 7 deletions build_config/lib/src/parse.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ const _builderConfigDefaultOptions = const [

BuildConfig parseFromYaml(
String packageName, Iterable<String> dependencies, String configYaml) =>
parseFromMap(packageName, dependencies,
loadYaml(configYaml) as Map<String, dynamic> ?? {});
parseFromMap(packageName, dependencies, _loadMap(configYaml));

BuildConfig parseFromMap(String packageName,
Iterable<String> packageDependencies, Map<String, dynamic> config) {
Expand All @@ -87,7 +86,7 @@ BuildConfig parseFromMap(String packageName,
final postProcessBuilderDefinitions =
<String, PostProcessBuilderDefinition>{};

final targetConfigs = config['targets'] as Map<String, Map> ?? {};
final targetConfigs = config['targets'] as Map<String, dynamic> ?? {};
for (var targetName in targetConfigs.keys) {
var targetConfig = _readMapOrThrow(
targetConfigs, targetName, _targetOptions, 'target `$targetName`');
Expand Down Expand Up @@ -125,7 +124,7 @@ BuildConfig parseFromMap(String packageName,
);
}

final builderConfigs = config['builders'] as Map<String, Map> ?? {};
final builderConfigs = config['builders'] as Map<String, dynamic> ?? {};
for (var builderName in builderConfigs.keys) {
final builderConfig = _readMapOrThrow(builderConfigs, builderName,
_builderDefinitionOptions, 'builder `$builderName`',
Expand Down Expand Up @@ -193,7 +192,7 @@ BuildConfig parseFromMap(String packageName,
}

final postProcessBuilderConfigs =
config['post_process_builders'] as Map<String, Map> ?? {};
config['post_process_builders'] as Map<String, dynamic> ?? {};
for (var builderName in postProcessBuilderConfigs.keys) {
final builderConfig = _readMapOrThrow(
postProcessBuilderConfigs,
Expand Down Expand Up @@ -251,11 +250,12 @@ Map<String, List<String>> _readBuildExtensions(Map<String, dynamic> options) {
if (value == null) {
throw new ArgumentError('Missing configuration for build_extensions');
}
if (value is! Map<String, List<String>>) {
if (value is! Map) {
throw new ArgumentError('Invalid value for build_extensions, '
'got `$value` but expected a Map');
}
return value as Map<String, List<String>>;
return (value as Map).map((key, value) => new MapEntry<String, List<String>>(
'$key', (value as List).cast<String>()));
}

Map<String, dynamic> _readMapOrThrow(Map<String, dynamic> options,
Expand Down Expand Up @@ -430,3 +430,20 @@ BuilderOptions _readBuilderOptions(
}
return null;
}

Map<String, dynamic> _loadMap(String encoded) {
var parsed = loadYaml(encoded);
if (parsed == null) return {};
return _actualDartType(parsed as YamlNode) as Map<String, dynamic>;
}

dynamic _actualDartType(YamlNode yamlNode) {
if (yamlNode is YamlScalar) return yamlNode.value;
// YamlList can already be safely treated as a List
if (yamlNode is YamlList) return yamlNode;
if (yamlNode is YamlMap) {
return yamlNode.map((key, value) => new MapEntry<String, dynamic>(
'$key', (value is YamlNode) ? _actualDartType(value) : value));
}
throw 'Unhandled noe type ${yamlNode.runtimeType}';
}