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.

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

fix(yaml): fix merge (<<) type handling in parse() #5185

Merged
merged 1 commit into from
Jun 28, 2024
Merged

fix(yaml): fix merge (<<) type handling in parse() #5185

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
2 changes: 1 addition & 1 deletion yaml/_loader/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ function mergeMappings(
);
}

for (const key in Object.keys(source)) {
for (const key of Object.keys(source)) {
if (!hasOwn(destination, key)) {
Object.defineProperty(destination, key, {
value: source[key],
Expand Down
17 changes: 17 additions & 0 deletions yaml/parse_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,3 +448,20 @@ Deno.test("parse() throws with invalid strings", () => {
'expected valid JSON character at line 1, column 3:\n "\b"\n ^',
);
});

Deno.test("parse() handles merge (<<) types", () => {
assertEquals(
parse(`<<: { a: 1, b: 2 }
c: 3`),
{ a: 1, b: 2, c: 3 },
);

assertThrows(
() =>
// number can't be used as merge value
parse(`<<: 1
c: 3`),
YamlError,
"cannot merge mappings; the provided source object is unacceptable at line 1, column 6:\n <<: 1\n ^",
);
});