tornado-packages/ethers.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added deep convertion to Result for toObject and toArray (#4681).

Browse Source
This commit is contained in:
Richard Moore 2024-04-09 20:02:29 -04:00
parent 12772e9498
commit 03bfe2a4f7
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src.ts/abi/coders/abstract-coder.ts
View File

@ -130,27 +130,33 @@ export class Result extends Array<any> {
} }
/** /**
* Returns the Result as a normal Array. * Returns the Result as a normal Array. If %%deep%%, any children
* which are Result objects are also converted to a normal Array.
* *
* This will throw if there are any outstanding deferred * This will throw if there are any outstanding deferred
* errors. * errors.
*/ */
toArray(): Array<any> { toArray(deep?: boolean): Array<any> {
const result: Array<any> = [ ]; const result: Array<any> = [ ];
this.forEach((item, index) => { this.forEach((item, index) => {
if (item instanceof Error) { throwError(`index ${ index }`, item); } if (item instanceof Error) { throwError(`index ${ index }`, item); }
if (deep && item instanceof Result) {
item = item.toArray(deep);
}
result.push(item); result.push(item);
}); });
return result; return result;
} }
/** /**
* Returns the Result as an Object with each name-value pair. * Returns the Result as an Object with each name-value pair. If
* %%deep%%, any children which are Result objects are also
* converted to an Object.
* *
* This will throw if any value is unnamed, or if there are * This will throw if any value is unnamed, or if there are
* any outstanding deferred errors. * any outstanding deferred errors.
*/ */
toObject(): Record<string, any> { toObject(deep?: boolean): Record<string, any> {
return this.#names.reduce((accum, name, index) => { return this.#names.reduce((accum, name, index) => {
assert(name != null, "value at index ${ index } unnamed", "UNSUPPORTED_OPERATION", { assert(name != null, "value at index ${ index } unnamed", "UNSUPPORTED_OPERATION", {
operation: "toObject()" operation: "toObject()"
@ -158,7 +164,11 @@ export class Result extends Array<any> {
// Add values for names that don't conflict // Add values for names that don't conflict
if (!(name in accum)) { if (!(name in accum)) {
accum[name] = this.getValue(name); let child = this.getValue(name);
if (deep && child instanceof Result) {
child = child.toObject(deep);
}
accum[name] = child;
} }
return accum; return accum;