Skip to content

Commit

Permalink
Implement assumptions defined in the babel/rfcs#5 RFC
Browse files Browse the repository at this point in the history
- `mutableTemplateObject` and `ignoreToPrimitiveHint` (#12408)
- `setClassMethods` (#12407)
- `setComputedProperties` (#12490)
- `ignoreFunctionLength` (#12491)
- `noDocumentAll` (#12481)
- `iterableIsArray` and `arrayLikeIsIterable` (#12489)
- `pureGetters` (#12504)
- `skipForOfIteratorClosing` (#12496)
- `objectRestNoSymbols`, `setSpreadProperties` and `pureGetters` (#12505)
- `noNewArrows` (#12613, #12793)
- `setPublicClassFields` and `privateFieldsAsProperties` (#12497)
- `constantReexports` and `enumerableModuleMeta` (#12618)
- `constantSuper`, `superIsCallableConstructor` and `noClassCalls` (#12726)

Co-authored-by: Justin Ridgewell <justin@ridgewell.name>
Co-authored-by: Hu谩ng J霉nli脿ng <JLHwung@users.noreply.github.com>
  • Loading branch information
3 people committed Feb 21, 2021
1 parent 7965c15 commit 6ef7b51
Show file tree
Hide file tree
Showing 586 changed files with 5,744 additions and 198 deletions.
18 changes: 18 additions & 0 deletions packages/babel-core/src/config/validation/options.js
Expand Up @@ -332,8 +332,26 @@ type EnvPath = $ReadOnly<{
export type NestingPath = RootPath | OverridesPath | EnvPath;

export const assumptionsNames = new Set<string>([
"arrayLikeIsIterable",
"constantReexports",
"constantSuper",
"enumerableModuleMeta",
"ignoreFunctionLength",
"ignoreToPrimitiveHint",
"iterableIsArray",
"mutableTemplateObject",
"noClassCalls",
"noDocumentAll",
"noNewArrows",
"objectRestNoSymbols",
"privateFieldsAsProperties",
"pureGetters",
"setClassMethods",
"setComputedProperties",
"setPublicClassFields",
"setSpreadProperties",
"skipForOfIteratorClosing",
"superIsCallableConstructor",
]);

function getSource(loc: NestingPath): OptionsSource {
Expand Down
95 changes: 65 additions & 30 deletions packages/babel-helper-create-class-features-plugin/src/fields.js
Expand Up @@ -35,11 +35,16 @@ export function buildPrivateNamesMap(props) {
return privateNamesMap;
}

export function buildPrivateNamesNodes(privateNamesMap, loose, state) {
export function buildPrivateNamesNodes(
privateNamesMap,
privateFieldsAsProperties,
state,
) {
const initNodes = [];

for (const [name, value] of privateNamesMap) {
// In loose mode, both static and instance fields are transpiled using a
// When the privateFieldsAsProperties assumption is enabled,
// both static and instance fields are transpiled using a
// secret non-enumerable property. Hence, we also need to generate that
// key (using the classPrivateFieldLooseKey helper).
// In spec mode, only instance fields need a "private name" initializer
Expand All @@ -48,7 +53,7 @@ export function buildPrivateNamesNodes(privateNamesMap, loose, state) {
const { static: isStatic, method: isMethod, getId, setId } = value;
const isAccessor = getId || setId;
const id = t.cloneNode(value.id);
if (loose) {
if (privateFieldsAsProperties) {
initNodes.push(
template.statement.ast`
var ${id} = ${state.addHelper("classPrivateFieldLooseKey")}("${name}")
Expand Down Expand Up @@ -149,13 +154,13 @@ const privateInVisitor = privateNameVisitorFactory({
if (operator !== "in") return;
if (!path.get("left").isPrivateName()) return;

const { loose, privateNamesMap, redeclared } = this;
const { privateFieldsAsProperties, privateNamesMap, redeclared } = this;
const { name } = left.id;

if (!privateNamesMap.has(name)) return;
if (redeclared && redeclared.includes(name)) return;

if (loose) {
if (privateFieldsAsProperties) {
const { id } = privateNamesMap.get(name);
path.replaceWith(template.expression.ast`
Object.prototype.hasOwnProperty.call(${right}, ${t.cloneNode(id)})
Expand Down Expand Up @@ -373,13 +378,15 @@ export function transformPrivateNamesUsage(
ref,
path,
privateNamesMap,
loose,
{ privateFieldsAsProperties },
state,
) {
if (!privateNamesMap.size) return;

const body = path.get("body");
const handler = loose ? privateNameHandlerLoose : privateNameHandlerSpec;
const handler = privateFieldsAsProperties
? privateNameHandlerLoose
: privateNameHandlerSpec;

memberExpressionToFunctions(body, privateNameVisitor, {
privateNamesMap,
Expand All @@ -391,7 +398,7 @@ export function transformPrivateNamesUsage(
privateNamesMap,
classRef: ref,
file: state,
loose,
privateFieldsAsProperties,
});
}

Expand Down Expand Up @@ -573,7 +580,11 @@ function buildPrivateStaticMethodInitLoose(ref, prop, state, privateNamesMap) {
`;
}

function buildPrivateMethodDeclaration(prop, privateNamesMap, loose = false) {
function buildPrivateMethodDeclaration(
prop,
privateNamesMap,
privateFieldsAsProperties = false,
) {
const privateName = privateNamesMap.get(prop.node.key.id.name);
const {
id,
Expand Down Expand Up @@ -613,7 +624,7 @@ function buildPrivateMethodDeclaration(prop, privateNamesMap, loose = false) {
t.variableDeclarator(setId, methodValue),
]);
}
if (isStatic && !loose) {
if (isStatic && !privateFieldsAsProperties) {
return t.variableDeclaration("var", [
t.variableDeclarator(
t.cloneNode(id),
Expand All @@ -637,12 +648,12 @@ const thisContextVisitor = traverse.visitors.merge([
environmentVisitor,
]);

function replaceThisContext(path, ref, superRef, file, loose) {
function replaceThisContext(path, ref, superRef, file, constantSuper) {
const state = { classRef: ref, needsClassRef: false };

const replacer = new ReplaceSupers({
methodPath: path,
isLoose: loose,
constantSuper,
superRef,
file,
refToPreserve: ref,
Expand All @@ -666,7 +677,9 @@ export function buildFieldsInitNodes(
props,
privateNamesMap,
state,
loose,
setPublicClassFields,
privateFieldsAsProperties,
constantSuper,
) {
const staticNodes = [];
const instanceNodes = [];
Expand All @@ -683,39 +696,45 @@ export function buildFieldsInitNodes(
const isMethod = !isField;

if (isStatic || (isMethod && isPrivate)) {
const replaced = replaceThisContext(prop, ref, superRef, state, loose);
const replaced = replaceThisContext(
prop,
ref,
superRef,
state,
constantSuper,
);
needsClassRef = needsClassRef || replaced;
}

switch (true) {
case isStatic && isPrivate && isField && loose:
case isStatic && isPrivate && isField && privateFieldsAsProperties:
needsClassRef = true;
staticNodes.push(
buildPrivateFieldInitLoose(t.cloneNode(ref), prop, privateNamesMap),
);
break;
case isStatic && isPrivate && isField && !loose:
case isStatic && isPrivate && isField && !privateFieldsAsProperties:
needsClassRef = true;
staticNodes.push(
buildPrivateStaticFieldInitSpec(prop, privateNamesMap),
);
break;
case isStatic && isPublic && isField && loose:
case isStatic && isPublic && isField && setPublicClassFields:
needsClassRef = true;
staticNodes.push(buildPublicFieldInitLoose(t.cloneNode(ref), prop));
break;
case isStatic && isPublic && isField && !loose:
case isStatic && isPublic && isField && !setPublicClassFields:
needsClassRef = true;
staticNodes.push(
buildPublicFieldInitSpec(t.cloneNode(ref), prop, state),
);
break;
case isInstance && isPrivate && isField && loose:
case isInstance && isPrivate && isField && privateFieldsAsProperties:
instanceNodes.push(
buildPrivateFieldInitLoose(t.thisExpression(), prop, privateNamesMap),
);
break;
case isInstance && isPrivate && isField && !loose:
case isInstance && isPrivate && isField && !privateFieldsAsProperties:
instanceNodes.push(
buildPrivateInstanceFieldInitSpec(
t.thisExpression(),
Expand All @@ -724,7 +743,7 @@ export function buildFieldsInitNodes(
),
);
break;
case isInstance && isPrivate && isMethod && loose:
case isInstance && isPrivate && isMethod && privateFieldsAsProperties:
instanceNodes.unshift(
buildPrivateMethodInitLoose(
t.thisExpression(),
Expand All @@ -733,10 +752,14 @@ export function buildFieldsInitNodes(
),
);
staticNodes.push(
buildPrivateMethodDeclaration(prop, privateNamesMap, loose),
buildPrivateMethodDeclaration(
prop,
privateNamesMap,
privateFieldsAsProperties,
),
);
break;
case isInstance && isPrivate && isMethod && !loose:
case isInstance && isPrivate && isMethod && !privateFieldsAsProperties:
instanceNodes.unshift(
buildPrivateInstanceMethodInitSpec(
t.thisExpression(),
Expand All @@ -745,19 +768,27 @@ export function buildFieldsInitNodes(
),
);
staticNodes.push(
buildPrivateMethodDeclaration(prop, privateNamesMap, loose),
buildPrivateMethodDeclaration(
prop,
privateNamesMap,
privateFieldsAsProperties,
),
);
break;
case isStatic && isPrivate && isMethod && !loose:
case isStatic && isPrivate && isMethod && !privateFieldsAsProperties:
needsClassRef = true;
staticNodes.push(
buildPrivateStaticFieldInitSpec(prop, privateNamesMap),
);
staticNodes.unshift(
buildPrivateMethodDeclaration(prop, privateNamesMap, loose),
buildPrivateMethodDeclaration(
prop,
privateNamesMap,
privateFieldsAsProperties,
),
);
break;
case isStatic && isPrivate && isMethod && loose:
case isStatic && isPrivate && isMethod && privateFieldsAsProperties:
needsClassRef = true;
staticNodes.push(
buildPrivateStaticMethodInitLoose(
Expand All @@ -768,13 +799,17 @@ export function buildFieldsInitNodes(
),
);
staticNodes.unshift(
buildPrivateMethodDeclaration(prop, privateNamesMap, loose),
buildPrivateMethodDeclaration(
prop,
privateNamesMap,
privateFieldsAsProperties,
),
);
break;
case isInstance && isPublic && isField && loose:
case isInstance && isPublic && isField && setPublicClassFields:
instanceNodes.push(buildPublicFieldInitLoose(t.thisExpression(), prop));
break;
case isInstance && isPublic && isField && !loose:
case isInstance && isPublic && isField && !setPublicClassFields:
instanceNodes.push(
buildPublicFieldInitSpec(t.thisExpression(), prop, state),
);
Expand Down
45 changes: 42 additions & 3 deletions packages/babel-helper-create-class-features-plugin/src/index.js
Expand Up @@ -36,7 +36,38 @@ export function createClassFeaturePlugin({
feature,
loose,
manipulateOptions,
// TODO(Babel 8): Remove the default falue
api = { assumption: () => {} },
}) {
const setPublicClassFields = api.assumption("setPublicClassFields");
const privateFieldsAsProperties = api.assumption("privateFieldsAsProperties");
const constantSuper = api.assumption("constantSuper");

if (loose) {
const explicit = [];

if (setPublicClassFields !== undefined) {
explicit.push(`"setPublicClassFields"`);
}
if (privateFieldsAsProperties !== undefined) {
explicit.push(`"privateFieldsAsProperties"`);
}
if (explicit.length !== 0) {
console.warn(
`[${name}]: You are using the "loose: true" option and you are` +
` explicitly setting a value for the ${explicit.join(" and ")}` +
` assumption${explicit.length > 1 ? "s" : ""}. The "loose" option` +
` can cause incompatibilities with the other class features` +
` plugins, so it's recommended that you replace it with the` +
` following top-level option:\n` +
`\t"assumptions": {\n` +
`\t\t"setPublicClassFields": true,\n` +
`\t\t"privateFieldsAsProperties": true\n` +
`\t}`,
);
}
}

return {
name,
manipulateOptions,
Expand Down Expand Up @@ -151,11 +182,17 @@ export function createClassFeaturePlugin({
const privateNamesMap = buildPrivateNamesMap(props);
const privateNamesNodes = buildPrivateNamesNodes(
privateNamesMap,
loose,
privateFieldsAsProperties ?? loose,
state,
);

transformPrivateNamesUsage(ref, path, privateNamesMap, loose, state);
transformPrivateNamesUsage(
ref,
path,
privateNamesMap,
{ privateFieldsAsProperties: privateFieldsAsProperties ?? loose },
state,
);

let keysNodes, staticNodes, instanceNodes, wrapClass;

Expand All @@ -175,7 +212,9 @@ export function createClassFeaturePlugin({
props,
privateNamesMap,
state,
loose,
setPublicClassFields ?? loose,
privateFieldsAsProperties ?? loose,
constantSuper ?? loose,
));
}

Expand Down
@@ -0,0 +1,3 @@
class A {
foo;
}
@@ -0,0 +1,9 @@
{
"validateLogs": true,
"plugins": [
["proposal-class-properties", { "loose": true }]
],
"assumptions": {
"setPublicClassFields": true
}
}
@@ -0,0 +1,6 @@
class A {
constructor() {
this.foo = void 0;
}

}
@@ -0,0 +1,5 @@
[proposal-class-properties]: You are using the "loose: true" option and you are explicitly setting a value for the "setPublicClassFields" assumption. The "loose" option can cause incompatibilities with the other class features plugins, so it's recommended that you replace it with the following top-level option:
"assumptions": {
"setPublicClassFields": true,
"privateFieldsAsProperties": true
}

0 comments on commit 6ef7b51

Please sign in to comment.