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

Avoid reusing AST nodes #4309

Closed
wants to merge 2 commits into from
Closed

Avoid reusing AST nodes #4309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ddcfa6
Add `@babel/helper-check-duplicate-nodes`
eoin May 7, 2023
973027a
Clone reused nodes
eoin May 10, 2023
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"dependencies": {
"@babel/core": "^7.18.6",
"@babel/generator": "^7.18.6",
"@babel/helper-check-duplicate-nodes": "^7.18.6",
"@babel/parser": "^7.18.6",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
"@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
Expand Down
8 changes: 6 additions & 2 deletions packages/babel-plugin-relay/__tests__/transformerWithOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

const BabelPluginRelay = require('../BabelPluginRelay');
const babel = require('@babel/core');
const checkDuplicatedNodes =
require('@babel/helper-check-duplicate-nodes').default;
const prettier = require('prettier');

function transformerWithOptions(
Expand All @@ -23,14 +25,16 @@ function transformerWithOptions(
const previousEnv = process.env.BABEL_ENV;
try {
process.env.BABEL_ENV = environment;
const code = babel.transform(text, {
const {code, ast} = babel.transformSync(text, {
compact: false,
cwd: '/',
filename: filename || providedFileName || 'test.js',
highlightCode: false,
parserOpts: {plugins: ['jsx']},
plugins: [[BabelPluginRelay, options]],
}).code;
ast: true,
});
checkDuplicatedNodes(ast);
return prettier.format(code, {
bracketSameLine: true,
bracketSpacing: false,
Expand Down
29 changes: 18 additions & 11 deletions packages/babel-plugin-relay/compileGraphQLTag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ function createNode(

const id = topScope.generateUidIdentifier(definitionName);

const expHash = t.MemberExpression(id, t.Identifier('hash'));
const expHash = t.MemberExpression(t.cloneNode(id), t.Identifier('hash'));
const expWarn = warnNeedsRebuild(t, definitionName, options.buildCommand);
const expWarnIfOutdated = t.LogicalExpression(
'&&',
expHash,
t.cloneNode(expHash),
t.LogicalExpression(
'&&',
t.BinaryExpression('!==', expHash, t.StringLiteral(hash)),
Expand All @@ -145,34 +145,41 @@ function createNode(
const program = path.findParent(parent => parent.isProgram());
program.unshiftContainer('body', importDeclaration);

const expAssignAndCheck = t.SequenceExpression([expWarnIfOutdated, id]);
const expAssignAndCheck = t.SequenceExpression([
expWarnIfOutdated,
t.cloneNode(id),
]);

let expAssign;
if (options.isDevVariable != null) {
expAssign = t.ConditionalExpression(
t.Identifier(options.isDevVariable),
expAssignAndCheck,
id,
t.cloneNode(id),
);
} else if (options.isDevelopment) {
expAssign = expAssignAndCheck;
} else {
expAssign = id;
expAssign = t.cloneNode(id);
}

path.replaceWith(expAssign);
} else {
topScope.push({id});
topScope.push({id: t.cloneNode(id)});

const requireGraphQLModule = t.CallExpression(t.Identifier('require'), [
t.StringLiteral(requiredPath),
]);

const expAssignProd = t.AssignmentExpression('=', id, requireGraphQLModule);
const expAssignProd = t.AssignmentExpression(
'=',
t.cloneNode(id),
requireGraphQLModule,
);
const expAssignAndCheck = t.SequenceExpression([
expAssignProd,
expWarnIfOutdated,
id,
t.cloneNode(id),
]);

let expAssign;
Expand All @@ -191,9 +198,9 @@ function createNode(
const expVoid0 = t.UnaryExpression('void', t.NumericLiteral(0));
path.replaceWith(
t.ConditionalExpression(
t.BinaryExpression('!==', id, expVoid0),
id,
expAssign,
t.BinaryExpression('!==', t.cloneNode(id), expVoid0),
t.cloneNode(id),
t.cloneNode(expAssign),
),
);
}
Expand Down
7 changes: 7 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@
dependencies:
"@babel/types" "^7.18.6"

"@babel/helper-check-duplicate-nodes@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/helper-check-duplicate-nodes/-/helper-check-duplicate-nodes-7.18.6.tgz#776dcf6834a9ea1162530069000218bc44e1c11e"
integrity sha512-gQkMniJ8+GfcRk98xGNlBXSEuWOJpEb7weoHDJpw4xxQrikPRvO1INlqbCM6LynKYKVZ/suN869xudV5DzAkzQ==
dependencies:
"@babel/types" "^7.18.6"

"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.18.9":
version "7.18.9"
resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
Expand Down