mirror of
https://github.com/morluto/rea.git
synced 2026-11-20 13:45:30 +00:00
fix(javascript): preserve object sibling reads across safe iterator close (#12587)
* fix(javascript): preserve sibling array reads under object bindings * fix(javascript): require coercible nested object pattern receivers
This commit is contained in:
1 parent
2b4442c0e9
commit
2ff20ce32e
3 files changed
+91
-10
No files matched your search
@@ -2038,13 +2038,67 @@ it.each([
|
||||
"candidate",
|
||||
],
|
||||
[
|
||||
"second nested iterator comes after first close",
|
||||
"second nested iterator after a harmless close",
|
||||
'const box={first:[0],items:["one"]};const {first:[used],items:[selected]}=box;box.items[0]="later";',
|
||||
["items", "0"],
|
||||
"resolved",
|
||||
],
|
||||
[
|
||||
"second nested iterator below a different own-data object path",
|
||||
'const box={left:{first:[0]},right:{items:["one"]}};const {left:{first:[used]},right:{items:[selected]}}=box;box.right.items[0]="later";',
|
||||
["right", "items", "0"],
|
||||
"resolved",
|
||||
],
|
||||
[
|
||||
"second nested iterator before a later return hook",
|
||||
'const box={first:[0],items:["one"]};const {first:[used],items:[selected]}=box;Object.getPrototypeOf([].values()).return=()=>({});box.items[0]="later";',
|
||||
["items", "0"],
|
||||
"resolved",
|
||||
],
|
||||
[
|
||||
"second nested iterator after an inherited return hook",
|
||||
'const box={first:[0],items:["one"]};Object.prototype.return=()=>({});const {first:[used],items:[selected]}=box;box.items[0]="later";',
|
||||
["items", "0"],
|
||||
"candidate",
|
||||
],
|
||||
[
|
||||
"second nested iterator after an effectful first default",
|
||||
'const box={first:[undefined],items:["one"]};const {first:[used=(box.items[0]="default")],items:[selected]}=box;box.items[0]="later";',
|
||||
["items", "0"],
|
||||
"candidate",
|
||||
],
|
||||
[
|
||||
"second nested iterator after an intervening getter",
|
||||
'const box={first:[0],get between(){this.items[0]="getter";},items:["one"]};const {first:[used],between,items:[selected]}=box;box.items[0]="later";',
|
||||
["items", "0"],
|
||||
"candidate",
|
||||
],
|
||||
...[
|
||||
["null", "null", "candidate"],
|
||||
["void", "void 0", "candidate"],
|
||||
["unproved", "unknown()", "candidate"],
|
||||
["object", "{}", "resolved"],
|
||||
["array", "[]", "resolved"],
|
||||
["zero", "0", "resolved"],
|
||||
["false", "false", "resolved"],
|
||||
["empty string", '""', "resolved"],
|
||||
].map(
|
||||
([label, receiver, resolution]) =>
|
||||
[
|
||||
`second nested iterator after an empty pattern with receiver ${label}`,
|
||||
`const box={first:[0],middle:${receiver},items:["one"]};const {first:[used],middle:{},items:[selected]}=box;box.items[0]="later";`,
|
||||
["items", "0"],
|
||||
resolution,
|
||||
] as const,
|
||||
),
|
||||
[
|
||||
"second nested iterator after a prior assignment target",
|
||||
'const box={first:[0],items:["one"]};let used,selected;({first:[used],items:[selected]}=box);box.items[0]="later";',
|
||||
["items", "0"],
|
||||
"candidate",
|
||||
],
|
||||
] as const)(
|
||||
"owns a single native iterator below an object for %s",
|
||||
"owns native iterators below an object for %s",
|
||||
(_name, code, path, resolution) => {
|
||||
const graph = graphForJavaScript(code);
|
||||
const selected = graph.nodes.find(
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
semanticWriteSiteReadsFirst,
|
||||
semanticWriteSiteTarget,
|
||||
semanticWriteTargets,
|
||||
staticJavaScriptTruthiness,
|
||||
unwrapJavaScriptExpression,
|
||||
} from "./javascriptAstValues.js";
|
||||
import {
|
||||
@@ -139,6 +140,13 @@ const collectMember = (
|
||||
);
|
||||
};
|
||||
|
||||
/** An empty object pattern still applies RequireObjectCoercible to its input. */
|
||||
const isKnownCoercibleReceiver = (node: t.Node | undefined): boolean =>
|
||||
node !== undefined &&
|
||||
((t.isLiteral(node) && !t.isNullLiteral(node)) ||
|
||||
t.isObjectMethod(node) ||
|
||||
staticJavaScriptTruthiness(node) === true);
|
||||
|
||||
const collectDestructuring = (
|
||||
root: t.Node,
|
||||
initializer: t.Node | null | undefined,
|
||||
@@ -202,10 +210,14 @@ const collectDestructuring = (
|
||||
? unwrapJavaScriptExpression(occurrence.left).node
|
||||
: occurrence;
|
||||
if (t.isObjectPattern(pattern)) {
|
||||
// A nested pattern needs a proved object even if it has no children.
|
||||
// Later siblings require the nested receiver check to complete.
|
||||
if (
|
||||
ownSlot !== sourcePresence?.read ||
|
||||
(rootArray && !t.isObjectExpression(selected))
|
||||
(pattern !== root &&
|
||||
!t.isObjectExpression(selected) &&
|
||||
(rootArray ||
|
||||
pattern.properties.length !== 0 ||
|
||||
!isKnownCoercibleReceiver(selected)))
|
||||
)
|
||||
ownSlot = undefined;
|
||||
for (const property of pattern.properties.toReversed()) {
|
||||
@@ -248,7 +260,6 @@ const collectDestructuring = (
|
||||
if (ownSlot !== undefined)
|
||||
pending.push(
|
||||
parentRead !== undefined &&
|
||||
rootArray &&
|
||||
semanticArrayPatternCanResumeAfterClose(
|
||||
pattern,
|
||||
state.parentsByNode.get(root),
|
||||
|
||||
@@ -37,6 +37,12 @@ const arrayPrototypeAliasSource = `
|
||||
pairs[0][0] = "later";
|
||||
`;
|
||||
|
||||
const abruptObjectPatternSource = `
|
||||
const box = { first: [0], empty: null, sibling: ["before"] };
|
||||
const { first: [used], empty: {}, sibling: [unreachedSibling] } = box;
|
||||
box.sibling[0] = "later";
|
||||
`;
|
||||
|
||||
const expectedDependencies = [
|
||||
["declared", ["a"]],
|
||||
["a", ["a"]],
|
||||
@@ -49,6 +55,8 @@ const expectedDependencies = [
|
||||
["projected", ["items", "0"]],
|
||||
["arrayObject", ["0", "mode"]],
|
||||
["nestedElement", ["items", "0"]],
|
||||
["siblingObjectElement", ["sibling", "0"]],
|
||||
["unreachedSibling", ["sibling", "0"], "candidate"],
|
||||
["innerElement", ["0", "0"]],
|
||||
["siblingInnerElement", ["1", "0"]],
|
||||
["spreadElement", ["1"]],
|
||||
@@ -72,6 +80,8 @@ const tracedBindings = [
|
||||
"projected",
|
||||
"arrayObject",
|
||||
"nestedElement",
|
||||
"siblingObjectElement",
|
||||
"unreachedSibling",
|
||||
"innerElement",
|
||||
"siblingInnerElement",
|
||||
"spreadElement",
|
||||
@@ -123,9 +133,10 @@ cliTest(
|
||||
const nestedArray = [{ mode: "read-time" }];
|
||||
const [{ mode: arrayObject }] = nestedArray;
|
||||
nestedArray[0].mode = "later";
|
||||
const nestedSource = { items: ["nested"] };
|
||||
const { items: [nestedElement] } = nestedSource;
|
||||
const nestedSource = { items: ["nested"], empty: 0, sibling: ["sibling"] };
|
||||
const { items: [nestedElement], empty: {}, sibling: [siblingObjectElement] } = nestedSource;
|
||||
nestedSource.items[0] = "later";
|
||||
nestedSource.sibling[0] = "later";
|
||||
const nestedPairs = [["read-time"], ["sibling"]];
|
||||
const [[innerElement], [siblingInnerElement]] = nestedPairs;
|
||||
nestedPairs[0][0] = "later";
|
||||
@@ -149,6 +160,10 @@ cliTest(
|
||||
join(root, "array-prototype-alias.js"),
|
||||
arrayPrototypeAliasSource,
|
||||
);
|
||||
await writeFile(
|
||||
join(root, "abrupt-object-pattern.js"),
|
||||
abruptObjectPatternSource,
|
||||
);
|
||||
const output = await cli.run({
|
||||
arguments: ["analyze-javascript-application", root, "--json"],
|
||||
});
|
||||
@@ -215,9 +230,10 @@ cliTest(
|
||||
},
|
||||
};
|
||||
if (
|
||||
name === "selected" ||
|
||||
name === "afterClose" ||
|
||||
name === "aliasedPrototypeElement"
|
||||
expectedDependencies.some(
|
||||
([binding, , resolution]) =>
|
||||
binding === name && resolution === "candidate",
|
||||
)
|
||||
)
|
||||
expect(trace.json).not.toMatchObject(relation);
|
||||
else expect(trace.json).toMatchObject(relation);
|
||||
|
||||
Reference in new issue
Block a user