Skip to content

Clean up private name transformation #4

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

Merged
merged 3 commits into from
Jul 5, 2018
Merged

Clean up private name transformation #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ce239f
Clean up private name initializer code
Jul 2, 2018
dd7c993
Clean up private field class transformation.
Jul 3, 2018
74986a6
Fix private name transformation clash with constructor overload list
Jul 3, 2018
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
140 changes: 74 additions & 66 deletions src/compiler/transformers/esnext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace ts {
* Maps private names to the generated name of the WeakMap.
*/
interface PrivateNameEnvironment {
[name: string]: { weakMapName: Identifier, initializer: Expression | undefined }
[name: string]: Identifier
}
let privateNameEnvironmentStack: PrivateNameEnvironment[] = [];
let privateNameEnvironmentIndex = -1;
Expand Down Expand Up @@ -116,8 +116,9 @@ namespace ts {
case SyntaxKind.PropertyAccessExpression:
return visitPropertyAccessExpression(node as PropertyAccessExpression);
case SyntaxKind.ClassDeclaration:
return visitClassDeclaration(node as ClassDeclaration);
case SyntaxKind.ClassExpression:
return visitClassLikeDeclaration(node as ClassLikeDeclaration);
return visitClassExpression(node as ClassExpression);
default:
return visitEachChild(node, visitor, context);
}
Expand All @@ -128,19 +129,13 @@ namespace ts {
}

function addPrivateNameToEnvironment(name: Identifier,
initializer?: Expression,
environment: PrivateNameEnvironment = currentPrivateNameEnvironment()) {
const nameString = getTextOfIdentifierOrLiteral(name);
if (nameString in environment) {
if (initializer) {
environment[nameString].initializer = initializer;
}
return environment[nameString].weakMapName;
return environment[nameString];
}
const weakMapName = createFileLevelUniqueName('_' + nameString.substring(1));
environment[nameString] = {
weakMapName, initializer
};
environment[nameString] = weakMapName;
return weakMapName;
}

Expand All @@ -165,15 +160,45 @@ namespace ts {
return visitEachChild(node, visitor, context);
}

function visitClassLikeDeclaration(node: ClassLikeDeclaration): Node[] {
function visitClassDeclaration(node: ClassDeclaration) {
startPrivateNameEnvironment();
node = visitEachChild(node, visitor, context);
node = updateClassDeclaration(
node,
node.decorators,
node.modifiers,
node.name,
node.typeParameters,
node.heritageClauses,
transformClassMembers(node.members)
);
return [...endPrivateNameEnvironment(), node];
}

function visitClassExpression(node: ClassExpression) {
startPrivateNameEnvironment();
node = visitEachChild(node, visitor, context);
node = updateClassExpression(
node,
node.modifiers,
node.name,
node.typeParameters,
node.heritageClauses,
transformClassMembers(node.members)
);
return [...endPrivateNameEnvironment(), node];
}

function startPrivateNameEnvironment() {
// Create private name environment.
privateNameEnvironmentStack[++privateNameEnvironmentIndex] = {};
// Visit children.
node = visitEachChild(node, visitor, context);
// Create WeakMaps for private properties.
return currentPrivateNameEnvironment();
}

function endPrivateNameEnvironment(): Statement[] {
const privateNameEnvironment = currentPrivateNameEnvironment();
const weakMapDeclarations = Object.keys(privateNameEnvironment).map(name => {
const { weakMapName } = privateNameEnvironment[name];
const weakMapName = privateNameEnvironment[name];
return createVariableStatement(
/* modifiers */ undefined,
[createVariableDeclaration(weakMapName,
Expand All @@ -185,69 +210,52 @@ namespace ts {
))]
);
});
// Destroy private name environment.
delete privateNameEnvironmentStack[privateNameEnvironmentIndex--];
return weakMapDeclarations;
}

function transformClassMembers(members: ReadonlyArray<ClassElement>): ClassElement[] {
// Rewrite constructor with private name initializers.
const privateNameEnvironment = currentPrivateNameEnvironment();
// Initialize private properties.
const initializerStatements = Object.keys(privateNameEnvironment).map(name => {
return createStatement(
createCall(
createPropertyAccess(privateNameEnvironment[name].weakMapName, 'set'),
createPropertyAccess(privateNameEnvironment[name], 'set'),
/* typeArguments */ undefined,
[createThis(), privateNameEnvironment[name].initializer || createVoidZero()]
[createThis(), createVoidZero()]
)
);
});
let members = [...node.members];
let ctor = find(members, (member) => isConstructorDeclaration(member));
if (!ctor) {
// Create constructor with private field initializers.
ctor = createConstructor(
/* decorators */ undefined,
/* modifiers */ undefined,
/* parameters */ [],
createBlock(initializerStatements)
);
members.unshift(ctor);
} else {
// Update existing constructor to add private field initializers.
members = members.map(member => {
if (isConstructorDeclaration(member)) {
let statements = member.body ?
[...initializerStatements, ...member.body.statements] :
initializerStatements;
const ctor = find(
members,
(member) => isConstructorDeclaration(member) && !!member.body
) as ConstructorDeclaration | undefined;
if (ctor) {
const body = updateBlock(ctor.body!, [...initializerStatements, ...ctor.body!.statements]);
return members.map(member => {
if (member === ctor) {
return updateConstructor(
member,
member.decorators,
member.modifiers,
member.parameters,
createBlock(statements, member.body ? member.body.multiLine : undefined)
ctor,
ctor.decorators,
ctor.modifiers,
ctor.parameters,
body
);
}
return member;
})
}

// Update class members.
if (isClassDeclaration(node)) {
node = updateClassDeclaration(
node,
node.decorators,
node.modifiers,
node.name,
node.typeParameters,
node.heritageClauses,
members
);
} else if (isClassExpression(node)) {
node = updateClassExpression(
node,
node.modifiers,
node.name,
node.typeParameters,
node.heritageClauses,
members
);
});
}
// Destroy private name environment.
delete privateNameEnvironmentStack[privateNameEnvironmentIndex--];
return [ ...weakMapDeclarations, node ];
return [
createConstructor(
/* decorators */ undefined,
/* modifiers */ undefined,
/* parameters */ [],
createBlock(initializerStatements)
),
...members
];
}

function visitAwaitExpression(node: AwaitExpression): Expression {
Expand Down