Skip to content

no private name environment stack #6

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

Closed
wants to merge 1 commit into from
Closed

no private name environment stack #6

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 14 additions & 32 deletions src/compiler/transformers/esnext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ namespace ts {
initializer?: Expression;
};
}
const privateNameEnvironmentStack: PrivateNameEnvironment[] = [];
let privateNameEnvironmentIndex = -1;

let privateNameEnvironment: PrivateNameEnvironment = {};

return chainBundle(transformSourceFile);

Expand Down Expand Up @@ -125,29 +125,23 @@ namespace ts {
}
}

function currentPrivateNameEnvironment() {
return privateNameEnvironmentStack[privateNameEnvironmentIndex];
}

function addPrivateName(name: PrivateName, initializer?: Expression) {
const environment = currentPrivateNameEnvironment();
const nameString = name.escapedText as string;
if (nameString in environment) {
if (nameString in privateNameEnvironment) {
throw new Error("Redeclaring private name " + nameString + ".");
}
const weakMap = createFileLevelUniqueName("_" + nameString.substring(1));
environment[nameString] = {
privateNameEnvironment[nameString] = {
weakMap,
initializer
};
return weakMap;
}

function accessPrivateName(name: PrivateName) {
const environment = currentPrivateNameEnvironment();
const nameString = name.escapedText as string;
if (nameString in environment) {
return environment[nameString].weakMap;
if (nameString in privateNameEnvironment) {
return privateNameEnvironment[nameString].weakMap;
}
// Undeclared private name.
return undefined;
Expand Down Expand Up @@ -183,11 +177,12 @@ namespace ts {
}

function visitClassDeclaration(node: ClassDeclaration) {
startPrivateNameEnvironment();
const savedPrivateNameEnvironment = privateNameEnvironment;
privateNameEnvironment = {};
node = visitEachChild(node, visitorCollectPrivateNames, context);
node = visitEachChild(node, visitor, context);
const statements = createPrivateNameWeakMapDeclarations(
currentPrivateNameEnvironment()
privateNameEnvironment
);
if (statements.length) {
node = updateClassDeclaration(
Expand All @@ -201,16 +196,17 @@ namespace ts {
);
}
statements.unshift(node);
endPrivateNameEnvironment();
privateNameEnvironment = savedPrivateNameEnvironment;
return statements;
}

function visitClassExpression(node: ClassExpression) {
startPrivateNameEnvironment();
const savedPrivateNameEnvironment = privateNameEnvironment;
privateNameEnvironment = {};
node = visitEachChild(node, visitorCollectPrivateNames, context);
node = visitEachChild(node, visitor, context);
const expressions = createPrivateNameWeakMapAssignments(
currentPrivateNameEnvironment()
privateNameEnvironment
);
if (expressions.length) {
node = updateClassExpression(
Expand All @@ -223,23 +219,10 @@ namespace ts {
);
}
expressions.push(node);
endPrivateNameEnvironment();
privateNameEnvironment = savedPrivateNameEnvironment;
return expressions.length > 1 ? createCommaList(expressions) : expressions[0];
}

function startPrivateNameEnvironment() {
// Create private name environment.
privateNameEnvironmentStack[++privateNameEnvironmentIndex] = {};
return currentPrivateNameEnvironment();
}

function endPrivateNameEnvironment(): PrivateNameEnvironment {
const privateNameEnvironment = currentPrivateNameEnvironment();
// Destroy private name environment.
delete privateNameEnvironmentStack[privateNameEnvironmentIndex--];
return privateNameEnvironment;
}

function createPrivateNameWeakMapDeclarations(environment: PrivateNameEnvironment): Statement[] {
return Object.keys(environment).map(name => {
const privateName = environment[name];
Expand Down Expand Up @@ -270,7 +253,6 @@ namespace ts {

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 => {
const privateName = privateNameEnvironment[name];
Expand Down