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

Jump to bottom

fix: Duplicate declaration in transformed for...of #14564

Merged
merged 4 commits into from May 19, 2022
Merged

fix: Duplicate declaration in transformed for...of #14564

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d4bbcb
fix: Duplicate declaration in transformed for...of
liuxingbaoyu May 19, 2022
e68b866
fix
liuxingbaoyu May 19, 2022
86f7931
review
liuxingbaoyu May 19, 2022
bfe2ccd
add type annotations
liuxingbaoyu May 19, 2022
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
72 changes: 26 additions & 46 deletions packages/babel-plugin-transform-for-of/src/index.ts
View file
Open in desktop
Expand Up @@ -9,6 +9,24 @@ export interface Options {
loose?: boolean;
}

function buildLoopBody(path, declar, newBody?) {
liuxingbaoyu marked this conversation as resolved.
Show resolved Hide resolved
let block;
const bodyPath = path.get("body");
const body = newBody ?? bodyPath.node;
if (
t.isBlockStatement(body) &&
Object.keys(path.getBindingIdentifiers()).some(id =>
bodyPath.scope.hasOwnBinding(id),
)
) {
block = t.blockStatement([declar, body]);
} else {
block = t.toBlock(body);
block.body.unshift(declar);
}
return block;
}

export default declare((api, options: Options) => {
api.assertVersion(7);

Expand Down Expand Up @@ -90,20 +108,6 @@ export default declare((api, options: Options) => {
);
}

let blockBody;
const body = path.get("body");
if (
body.isBlockStatement() &&
Object.keys(path.getBindingIdentifiers()).some(id =>
body.scope.hasOwnBinding(id),
)
) {
blockBody = t.blockStatement([assignment, body.node]);
} else {
blockBody = t.toBlock(body.node);
blockBody.body.unshift(assignment);
}

path.replaceWith(
t.forStatement(
t.variableDeclaration("let", inits),
Expand All @@ -113,7 +117,7 @@ export default declare((api, options: Options) => {
t.memberExpression(t.cloneNode(array), t.identifier("length")),
),
t.updateExpression("++", t.cloneNode(i)),
blockBody,
buildLoopBody(path, assignment),
),
);
},
Expand Down Expand Up @@ -174,29 +178,19 @@ export default declare((api, options: Options) => {
true,
);

if (
t.isBlockStatement(loop.body) &&
Object.keys(path.getBindingIdentifiers()).some(id =>
path.get("body").scope.hasOwnBinding(id),
)
) {
loop.body = t.blockStatement([loop.body]);
} else {
loop.body = t.toBlock(loop.body);
}

let declar;
const left = node.left;
if (t.isVariableDeclaration(left)) {
left.declarations[0].init = iterationValue;
loop.body.body.unshift(left);
declar = left;
} else {
loop.body.body.unshift(
t.expressionStatement(
t.assignmentExpression("=", left, iterationValue),
),
declar = t.expressionStatement(
t.assignmentExpression("=", left, iterationValue),
);
}

loop.body = buildLoopBody(path, declar, loop.body);

return loop;
}

Expand Down Expand Up @@ -242,20 +236,6 @@ export default declare((api, options: Options) => {
);
}

let blockBody;
const body = path.get("body");
if (
body.isBlockStatement() &&
Object.keys(path.getBindingIdentifiers()).some(id =>
body.scope.hasOwnBinding(id),
)
) {
blockBody = t.blockStatement([declar, body.node]);
} else {
blockBody = t.toBlock(body.node);
blockBody.body.unshift(declar);
}

const nodes = builder.build({
CREATE_ITERATOR_HELPER: state.addHelper(builder.helper),
ITERATOR_HELPER: scope.generateUidIdentifier("iterator"),
Expand All @@ -264,7 +244,7 @@ export default declare((api, options: Options) => {
: null,
STEP_KEY: t.identifier(stepKey),
OBJECT: node.right,
BODY: blockBody,
BODY: buildLoopBody(path, declar),
});
const container = builder.getContainer(nodes);

Expand Down