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

Don't use isClassPrivateMethod because it isn't supported in <7.2.0 #9121

Merged
merged 1 commit into from
Dec 4, 2018
Merged

Don't use isClassPrivateMethod because it isn't supported in <7.2.0 #9121

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/babel-helper-create-class-features-plugin/src/features.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ export function verifyUsedFeatures(path, file) {
);
}

if (path.isClassPrivateMethod()) {
// NOTE: We can't use path.isPrivateMethod() because it isn't supported in <7.2.0
if (path.isPrivate() && path.isMethod()) {
if (!hasFeature(file, FEATURES.privateMethods)) {
throw path.buildCodeFrameError("Class private methods are not enabled.");
}
Expand Down
31 changes: 17 additions & 14 deletions packages/babel-helper-create-class-features-plugin/src/fields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export function buildPrivateNamesMap(props) {
privateNamesMap.set(name, {
id: prop.scope.generateUidIdentifier(name),
static: !!prop.node.static,
method: prop.isClassPrivateMethod(),
methodId: prop.isClassPrivateMethod()
method: prop.isMethod(),
danez marked this conversation as resolved.
Show resolved Hide resolved
methodId: prop.isMethod()
? prop.scope.generateUidIdentifier(name)
: undefined,
});
Expand Down Expand Up @@ -321,34 +321,37 @@ export function buildFieldsInitNodes(

for (const prop of props) {
const isStatic = prop.node.static;
const isPrivateField = prop.isClassPrivateProperty();
const isPrivateMethod = prop.isClassPrivateMethod();
const isInstance = !isStatic;
const isPrivate = prop.isPrivate();
const isPublic = !isPrivate;
const isField = prop.isProperty();
const isMethod = !isField;

switch (true) {
case isStatic && isPrivateField && loose:
case isStatic && isPrivate && isField && loose:
staticNodes.push(
buildPrivateFieldInitLoose(t.cloneNode(ref), prop, privateNamesMap),
);
break;
case isStatic && isPrivateField && !loose:
case isStatic && isPrivate && isField && !loose:
staticNodes.push(
buildPrivateStaticFieldInitSpec(prop, privateNamesMap),
);
break;
case isStatic && !isPrivateField && loose:
case isStatic && isPublic && isField && loose:
staticNodes.push(buildPublicFieldInitLoose(t.cloneNode(ref), prop));
break;
case isStatic && !isPrivateField && !loose:
case isStatic && isPublic && isField && !loose:
staticNodes.push(
buildPublicFieldInitSpec(t.cloneNode(ref), prop, state),
);
break;
case !isStatic && isPrivateField && loose:
case isInstance && isPrivate && isField && loose:
instanceNodes.push(
buildPrivateFieldInitLoose(t.thisExpression(), prop, privateNamesMap),
);
break;
case !isStatic && isPrivateField && !loose:
case isInstance && isPrivate && isField && !loose:
instanceNodes.push(
buildPrivateInstanceFieldInitSpec(
t.thisExpression(),
Expand All @@ -357,7 +360,7 @@ export function buildFieldsInitNodes(
),
);
break;
case !isStatic && isPrivateMethod && loose:
case isInstance && isPrivate && isMethod && loose:
instanceNodes.push(
buildPrivateMethodInitLoose(
t.thisExpression(),
Expand All @@ -369,7 +372,7 @@ export function buildFieldsInitNodes(
buildPrivateInstanceMethodDeclaration(prop, privateNamesMap),
);
break;
case !isStatic && isPrivateMethod && !loose:
case isInstance && isPrivate && isMethod && !loose:
instanceNodes.push(
buildPrivateInstanceMethodInitSpec(
t.thisExpression(),
Expand All @@ -381,10 +384,10 @@ export function buildFieldsInitNodes(
buildPrivateInstanceMethodDeclaration(prop, privateNamesMap),
);
break;
case !isStatic && !isPrivateField && loose:
case isInstance && isPublic && isField && loose:
instanceNodes.push(buildPublicFieldInitLoose(t.thisExpression(), prop));
break;
case !isStatic && !isPrivateField && !loose:
case isInstance && isPublic && isField && !loose:
instanceNodes.push(
buildPublicFieldInitSpec(t.thisExpression(), prop, state),
);
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-helper-create-class-features-plugin/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export function createClassFeaturePlugin({
privateNames.add(name);
}

if (path.isProperty() || path.isClassPrivateMethod()) {
if (path.isProperty() || path.isPrivate()) {
danez marked this conversation as resolved.
Show resolved Hide resolved
props.push(path);
} else if (path.isClassMethod({ kind: "constructor" })) {
constructor = path;
Expand Down