-
Notifications
You must be signed in to change notification settings - Fork 50
fix: Firebase plugin fixes #4
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,82 +1,44 @@ | ||
// class PropertyMap { | ||
// final Set<String>? keys; | ||
// final bool optional; | ||
|
||
// PropertyMap({this.keys, this.optional = false}); | ||
// } | ||
|
||
class PropertyMapper { | ||
final Set<String> sourceKeys; | ||
final String targetKey; | ||
final dynamic Function(dynamic)? fromJson; | ||
|
||
const PropertyMapper(this.sourceKeys, {this.fromJson}); | ||
const PropertyMapper(this.targetKey, {this.fromJson}); | ||
} | ||
|
||
dynamic recurseMapper( | ||
dynamic value, Map<String, PropertyMapper> propertiesMapper) { | ||
dynamic recurseMapper(dynamic value, Map<String, PropertyMapper> mappings) { | ||
if (value is List) { | ||
return value.map((value) => recurseMapper(value, propertiesMapper)); | ||
return value.map((value) => recurseMapper(value, mappings)); | ||
} else if (value is Map<String, dynamic>) { | ||
return mapProperties(value, mappings); | ||
} else if (value is Map) { | ||
value.map( | ||
(key, value) => MapEntry(key, recurseMapper(value, propertiesMapper))); | ||
return value | ||
.map((key, value) => MapEntry(key, recurseMapper(value, mappings))); | ||
} else { | ||
return value; | ||
} | ||
} | ||
|
||
dynamic Function(String targetKey, | ||
{bool? optional, dynamic Function(dynamic)? fromJson}) | ||
propertyMapper(Map<String, dynamic>? properties, | ||
Map<String, PropertyMapper> propertiesMapper) { | ||
return (String targetKey, | ||
{bool? optional, dynamic Function(dynamic)? fromJson}) { | ||
final propertyMapper = propertiesMapper[targetKey]; | ||
if (properties != null) { | ||
for (final sourceKey in (propertyMapper != null | ||
? propertyMapper.sourceKeys | ||
: {targetKey})) { | ||
final value = properties[sourceKey]; | ||
if (value != null) { | ||
return fromJson == null | ||
? (propertyMapper?.fromJson == null | ||
? value | ||
: propertyMapper?.fromJson!(value)) | ||
: fromJson(value); | ||
} | ||
} | ||
} | ||
if (optional == null || optional == false) { | ||
throw Exception( | ||
"Missing properties: ${propertyMapper == null ? targetKey : propertyMapper.sourceKeys.join(',')}"); | ||
} else { | ||
return null; | ||
} | ||
}; | ||
} | ||
Map<String, Object?> mapProperties( | ||
Map<String, dynamic>? properties, Map<String, PropertyMapper> mappings) { | ||
final Map<String, Object?> output = {}; | ||
|
||
// Map<String, dynamic> mapProperties( | ||
// Map<String, dynamic> properties, Map<String, PropertyMap> mapper) { | ||
// final Map<String, dynamic> output = {}; | ||
// final Set<String> missing = {}; | ||
if (properties == null) { | ||
return {}; | ||
} | ||
|
||
// for (final entry in mapper.entries) { | ||
// var found = false; | ||
// for (final sourceKey in entry.value.keys ?? {entry.key}) { | ||
// final value = properties[sourceKey]; | ||
// if (value != null) { | ||
// output[entry.key] = value; | ||
// found = true; | ||
// break; | ||
// } | ||
// } | ||
// if (!found && !entry.value.optional) { | ||
// missing.add(entry.value.keys?.first ?? entry.key); | ||
// } | ||
// } | ||
for (final entry in properties.entries) { | ||
final sourceKey = entry.key; | ||
final sourceValue = properties[sourceKey]; | ||
if (mappings.containsKey(sourceKey)) { | ||
final mapping = mappings[sourceKey]!; | ||
|
||
// if (missing.isNotEmpty) { | ||
// throw Exception("Missing properties: ${missing.join(',')}"); | ||
// } | ||
output[mapping.targetKey] = (mapping.fromJson != null) | ||
? mapping.fromJson!(sourceValue) | ||
: sourceValue; | ||
} else { | ||
output[sourceKey] = sourceValue; | ||
} | ||
} | ||
|
||
// return output; | ||
// } | ||
return output; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.