bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-28 06:03:40 +00:00
Code Issues Releases Wiki Activity

Make Record <-> Map idempotent

Browse Source 
Should we get in a situation where we _think_ an object has been
jsonified, but hasn't been, we need to correctly deal with the object
received to create our target.
This commit is contained in:
Matt Gibson
2022-11-17 14:04:07 -05:00
parent 3e4817b2b1
commit 05353b63d4
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/common/src/misc/utils.ts
View File

@@ -438,7 +438,13 @@ export class Utils {
* @returns
*/
static mapToRecord<K extends string | number, V>(map: Map<K, V>): Record<string, V> {
return map == null ? null : Object.fromEntries(map);
if (map == null) {
return null;
}
if (!(map instanceof Map)) {
return map;
}
return Object.fromEntries(map);
}
/**
@@ -452,7 +458,10 @@ export class Utils {
static recordToMap<K extends string | number, V>(record: Record<K, V>): Map<K, V> {
if (record == null) {
return null;
} else if (record instanceof Map) {
return record;
}
const entries = Object.entries(record);
if (entries.length === 0) {
return new Map();