Skip to content

Serialize and deserialize support for Map type. #41

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

Merged
volovyks merged 1 commit into from
Dec 1, 2021
Merged

Serialize and deserialize support for Map type. #41

Show file tree
Hide file tree
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
18 changes: 18 additions & 0 deletions borsh-ts/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,14 @@ function serializeField(
}
break;
}
case "map": {
writer.writeU32(value.size);
value.forEach((val, key) => {
serializeField(schema, fieldName, key, fieldType.key, writer);
serializeField(schema, fieldName, val, fieldType.value, writer);
});
break;
}
default:
throw new BorshError(`FieldType ${fieldType} unrecognized`);
}
Expand Down Expand Up @@ -384,6 +392,16 @@ function deserializeField(

return undefined;
}
if (fieldType.kind === "map") {
let map = new Map();
const length = reader.readU32();
for (let i = 0; i < length; i++) {
const key = deserializeField(schema, fieldName, fieldType.key, reader);
const val = deserializeField(schema, fieldName, fieldType.value, reader);
map.set(key, val);
}
return map
}

return deserializeStruct(schema, fieldType, reader);
} catch (error) {
Expand Down
21 changes: 21 additions & 0 deletions borsh-ts/test/serialize.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,24 @@ test('serialize with custom writer/reader', async () => {
const newValue = borsh.deserialize(schema, Test, buf, ExtendedReader);
expect(newValue.x).toEqual(new Date(time));
});

test('serialize map', async () => {
let map = new Map();
for (let i = 0; i < 10; i++) {
map.set(new BN(i * 10), "some string " + i.toString());
}
const value = new Test({ x: map });
const schema = new Map([[ Test, {
kind: 'struct',
fields: [
['x', { kind: 'map', key: 'u64', value: 'string' }],
],
}]]);

const buf = borsh.serialize(schema, value);
const deserialized = borsh.deserialize(schema, Test, buf);
expect(deserialized.x.size).toEqual(10);
deserialized.x.forEach((value, key) => {
expect(value).toEqual("some string " + (key.toNumber() / 10).toString());
});
});
18 changes: 18 additions & 0 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,14 @@ function serializeField(schema, fieldName, value, fieldType, writer) {
}
break;
}
case "map": {
writer.writeU32(value.size);
value.forEach((val, key) => {
serializeField(schema, fieldName, key, fieldType.key, writer);
serializeField(schema, fieldName, val, fieldType.value, writer);
});
break;
}
default:
throw new BorshError(`FieldType ${fieldType} unrecognized`);
}
Expand Down Expand Up @@ -371,6 +379,16 @@ function deserializeField(schema, fieldName, fieldType, reader) {
}
return undefined;
}
if (fieldType.kind === "map") {
let map = new Map();
const length = reader.readU32();
for (let i = 0; i < length; i++) {
const key = deserializeField(schema, fieldName, fieldType.key, reader);
const val = deserializeField(schema, fieldName, fieldType.value, reader);
map.set(key, val);
}
return map;
}
return deserializeStruct(schema, fieldType, reader);
}
catch (error) {
Expand Down