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.

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

Handle member expressions in array patterns #2760

Merged
merged 3 commits into from
Mar 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/ast/nodes/ExportDefaultDeclaration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export default class ExportDefaultDeclaration extends NodeBase {
scope: ModuleScope;
type: NodeType.tExportDefaultDeclaration;
variable: ExportDefaultVariable;

private declarationName: string;

include(includeAllChildrenRecursively: boolean) {
Expand Down
5 changes: 4 additions & 1 deletion src/ast/nodes/MemberExpression.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import Identifier from './Identifier';
import Literal from './Literal';
import * as NodeType from './NodeType';
import { ExpressionNode, Node, NodeBase } from './shared/Node';
import { PatternNode } from './shared/Pattern';

function getResolvablePropertyKey(memberExpression: MemberExpression): string | null {
return memberExpression.computed
Expand Down Expand Up @@ -72,7 +73,7 @@ export function isMemberExpression(node: Node): node is MemberExpression {
return node.type === NodeType.MemberExpression;
}

export default class MemberExpression extends NodeBase implements DeoptimizableEntity {
export default class MemberExpression extends NodeBase implements DeoptimizableEntity, PatternNode {
computed: boolean;
object: ExpressionNode;
property: ExpressionNode;
Expand All @@ -84,6 +85,8 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE
private expressionsToBeDeoptimized: DeoptimizableEntity[];
private replacement: string | null;

addExportedVariables(): void {}

bind() {
if (this.bound) return;
this.bound = true;
Expand Down
3 changes: 3 additions & 0 deletions test/form/samples/pattern-member-expressions/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
description: 'handles member expressions in patterns (#2750)'
};
23 changes: 23 additions & 0 deletions test/form/samples/pattern-member-expressions/_expected/amd.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
define(function () { 'use strict';

const array = [false];
const obj1 = {value: false};
const obj2 = {value: false};

([array[0]] = [true]);
({a: obj1.value} = {a: true});
({[globalVar1]: obj2[globalVar2]} = {[globalVar3]: true});

if (array[0]) {
console.log('retained');
}

if (obj1.value) {
console.log('retained');
}

if (obj2.value) {
console.log('retained');
}

});
21 changes: 21 additions & 0 deletions test/form/samples/pattern-member-expressions/_expected/cjs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
'use strict';

const array = [false];
const obj1 = {value: false};
const obj2 = {value: false};

([array[0]] = [true]);
({a: obj1.value} = {a: true});
({[globalVar1]: obj2[globalVar2]} = {[globalVar3]: true});

if (array[0]) {
console.log('retained');
}

if (obj1.value) {
console.log('retained');
}

if (obj2.value) {
console.log('retained');
}
19 changes: 19 additions & 0 deletions test/form/samples/pattern-member-expressions/_expected/es.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
const array = [false];
const obj1 = {value: false};
const obj2 = {value: false};

([array[0]] = [true]);
({a: obj1.value} = {a: true});
({[globalVar1]: obj2[globalVar2]} = {[globalVar3]: true});

if (array[0]) {
console.log('retained');
}

if (obj1.value) {
console.log('retained');
}

if (obj2.value) {
console.log('retained');
}
24 changes: 24 additions & 0 deletions test/form/samples/pattern-member-expressions/_expected/iife.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
(function () {
'use strict';

const array = [false];
const obj1 = {value: false};
const obj2 = {value: false};

([array[0]] = [true]);
({a: obj1.value} = {a: true});
({[globalVar1]: obj2[globalVar2]} = {[globalVar3]: true});

if (array[0]) {
console.log('retained');
}

if (obj1.value) {
console.log('retained');
}

if (obj2.value) {
console.log('retained');
}

}());
28 changes: 28 additions & 0 deletions test/form/samples/pattern-member-expressions/_expected/system.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
System.register([], function (exports, module) {
'use strict';
return {
execute: function () {

const array = [false];
const obj1 = {value: false};
const obj2 = {value: false};

([array[0]] = [true]);
({a: obj1.value} = {a: true});
({[globalVar1]: obj2[globalVar2]} = {[globalVar3]: true});

if (array[0]) {
console.log('retained');
}

if (obj1.value) {
console.log('retained');
}

if (obj2.value) {
console.log('retained');
}

}
};
});
26 changes: 26 additions & 0 deletions test/form/samples/pattern-member-expressions/_expected/umd.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
(function (factory) {
typeof define === 'function' && define.amd ? define(factory) :
factory();
}(function () { 'use strict';

const array = [false];
const obj1 = {value: false};
const obj2 = {value: false};

([array[0]] = [true]);
({a: obj1.value} = {a: true});
({[globalVar1]: obj2[globalVar2]} = {[globalVar3]: true});

if (array[0]) {
console.log('retained');
}

if (obj1.value) {
console.log('retained');
}

if (obj2.value) {
console.log('retained');
}

}));
19 changes: 19 additions & 0 deletions test/form/samples/pattern-member-expressions/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
const array = [false];
const obj1 = {value: false};
const obj2 = {value: false};

([array[0]] = [true]);
({a: obj1.value} = {a: true});
({[globalVar1]: obj2[globalVar2]} = {[globalVar3]: true});

if (array[0]) {
console.log('retained');
}

if (obj1.value) {
console.log('retained');
}

if (obj2.value) {
console.log('retained');
}