Skip to content
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

modifies Struct#elements() to return all field values #754

Merged
merged 2 commits into from
Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/dom/Struct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,7 @@ export class Struct extends Value(
}

elements(): Value[] {
desaikd marked this conversation as resolved.
Show resolved Hide resolved
let singleValueFields = Object.create(null);
for (const [fieldName, values] of this.allFields()) {
singleValueFields[fieldName] = values[values.length - 1];
}
return Object.values(singleValueFields);
return Object.values(this._fields).flat() as Value[];
desaikd marked this conversation as resolved.
Show resolved Hide resolved
}

[Symbol.iterator](): IterableIterator<[string, Value]> {
Expand Down
10 changes: 6 additions & 4 deletions test/dom/dom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -544,11 +544,13 @@ describe("DOM", () => {
assert.isTrue(s1.getAll("name", "middle")![1].equals("Bob"));
assert.equal(2, s1.getAll("name", "middle")!.length);

// elements returns values for given Struct where for a fieldname it only contains the last value
// instead of an array of all values
assert.equal(41, s.elements()[0]);
// elements returns values for given Struct where for a fieldname returns all its values
assert.equal(55, s.elements()[0]);
assert.isFalse(Array.isArray(s.elements()[0]));
assert.equal("Jessie", s1.elements()[0]["first"]);
assert.equal("John", s1.elements()[0]["first"]);
desaikd marked this conversation as resolved.
Show resolved Hide resolved
assert.equal("Jessie", s1.elements()[1]["first"]);
assert.equal(41, +s1.elements()[2]);
assert.equal(3, s1.elements().length);

// Iteration
for (let [fieldName, value] of s) {
Expand Down