Destructuring consistency fixes (#1417)
- Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
This commit is contained in:
Anthony Van de Gejuchte
committed by
Alex Lam S.L
Alex Lam S.L
parent
85c1cba760
commit
07734b000a
@@ -80,4 +80,306 @@ describe("Arrow functions", function() {
|
||||
assert.throws(test(tests[i]), error);
|
||||
}
|
||||
});
|
||||
|
||||
it("Should parse a function containing default assignment correctly", function() {
|
||||
var ast = uglify.parse("var a = (a = 123) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// First argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_DefaultAssign);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].left instanceof uglify.AST_SymbolFunarg);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].operator, "=");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].right instanceof uglify.AST_Number);
|
||||
|
||||
ast = uglify.parse("var a = (a = a) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// First argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_DefaultAssign);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].left instanceof uglify.AST_SymbolFunarg);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].operator, "=");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].right instanceof uglify.AST_SymbolRef);
|
||||
});
|
||||
|
||||
it("Should parse a function containing default assignments in destructuring correctly", function() {
|
||||
var ast = uglify.parse("var a = ([a = 123]) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// First argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_DefaultAssign);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].left instanceof uglify.AST_SymbolFunarg);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].operator, "=");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].right instanceof uglify.AST_Number);
|
||||
|
||||
|
||||
ast = uglify.parse("var a = ({a = 123}) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// First argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectKeyVal);
|
||||
|
||||
// First object element in first argument
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_DefaultAssign);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.left instanceof uglify.AST_SymbolFunarg);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].value.operator, "=");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.right instanceof uglify.AST_Number);
|
||||
|
||||
|
||||
ast = uglify.parse("var a = ({a: a = 123}) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// First argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
|
||||
|
||||
// Content destructuring of first argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectProperty);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_DefaultAssign);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.left instanceof uglify.AST_SymbolFunarg);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].value.operator, "=");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.right instanceof uglify.AST_Number);
|
||||
});
|
||||
|
||||
it("Should parse a function containing default assignments in complex destructuring correctly", function() {
|
||||
var ast = uglify.parse("var a = ([a, [b = 123]]) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// Check first argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 2);
|
||||
|
||||
// Check whole destructuring structure of first argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].is_array, true);
|
||||
|
||||
// Check content of second destructuring element (which is the nested destructuring pattern)
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0] instanceof uglify.AST_DefaultAssign);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].left instanceof uglify.AST_SymbolFunarg);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].operator, "=");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].right instanceof uglify.AST_Number);
|
||||
|
||||
|
||||
ast = uglify.parse("var a = ([a, {b: c = 123}]) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// Check first argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 2);
|
||||
|
||||
// Check whole destructuring structure of first argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].is_array, false);
|
||||
|
||||
// Check content of second destructuring element (which is the nested destructuring pattern)
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0] instanceof uglify.AST_ObjectKeyVal);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].key, "b");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].value instanceof uglify.AST_DefaultAssign);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].value.left instanceof uglify.AST_SymbolFunarg);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].value.operator, "=");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].value.right instanceof uglify.AST_Number);
|
||||
|
||||
|
||||
ast = uglify.parse("var a = ({a, b: {b = 123}}) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// Check first argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 2);
|
||||
|
||||
// First argument, property 1
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectKeyVal);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_SymbolFunarg);
|
||||
|
||||
// First argument, property 2
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_ObjectKeyVal);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].key, "b");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1].value instanceof uglify.AST_Destructuring);
|
||||
|
||||
// Check content of nested destructuring
|
||||
var content = ast.body[0].definitions[0].value.argnames[0].names[1].value
|
||||
assert.strictEqual(content.is_array, false);
|
||||
assert.strictEqual(content.names.length, 1);
|
||||
assert(content.names[0] instanceof uglify.AST_ObjectKeyVal);
|
||||
|
||||
// Content of first property in nested destructuring
|
||||
assert.strictEqual(content.names[0].key, "b");
|
||||
assert(content.names[0].value instanceof uglify.AST_DefaultAssign);
|
||||
assert(content.names[0].value.left instanceof uglify.AST_SymbolFunarg);
|
||||
assert.strictEqual(content.names[0].value.operator, "=");
|
||||
assert(content.names[0].value.right instanceof uglify.AST_Number);
|
||||
|
||||
|
||||
ast = uglify.parse("var a = ({a: {b = 123}}) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// Check first argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
|
||||
|
||||
// Check whole destructuring structure of first argument
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectKeyVal);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_Destructuring);
|
||||
|
||||
// Check content of nested destructuring
|
||||
content = ast.body[0].definitions[0].value.argnames[0].names[0].value
|
||||
assert.strictEqual(content.is_array, false);
|
||||
assert.strictEqual(content.names.length, 1);
|
||||
assert(content.names[0] instanceof uglify.AST_ObjectKeyVal);
|
||||
|
||||
// Check first property of nested destructuring
|
||||
assert.strictEqual(content.names[0].key, "b");
|
||||
assert(content.names[0].value instanceof uglify.AST_DefaultAssign);
|
||||
assert(content.names[0].value.left instanceof uglify.AST_SymbolFunarg);
|
||||
assert.strictEqual(content.names[0].value.operator, "=");
|
||||
assert(content.names[0].value.right instanceof uglify.AST_Number);
|
||||
});
|
||||
|
||||
it("Should parse spread correctly", function() {
|
||||
var ast = uglify.parse("var a = (a, b, ...c) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 3);
|
||||
|
||||
// Check parameters
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[1] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[2] instanceof uglify.AST_Expansion);
|
||||
assert(ast.body[0].definitions[0].value.argnames[2].expression instanceof uglify.AST_SymbolFunarg);
|
||||
|
||||
|
||||
ast = uglify.parse("var a = ([a, b, ...c]) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// Check first parameter
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
|
||||
|
||||
// Check content first parameter
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[2] instanceof uglify.AST_Expansion);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[2].expression instanceof uglify.AST_SymbolFunarg);
|
||||
|
||||
|
||||
ast = uglify.parse("var a = ([a, b, [c, ...d]]) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// Check first parameter
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
|
||||
|
||||
// Check content outer destructuring array
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[2] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[2].is_array, true);
|
||||
|
||||
// Check content nested destructuring array
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[2].names.length, 2);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[2].names[0] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[2].names[1] instanceof uglify.AST_Expansion);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[2].names[1].expression instanceof uglify.AST_SymbolFunarg);
|
||||
|
||||
|
||||
ast = uglify.parse("var a = ({a: [b, ...c]}) => {}");
|
||||
assert(ast.body[0] instanceof uglify.AST_Var);
|
||||
assert.strictEqual(ast.body[0].definitions.length, 1);
|
||||
assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
|
||||
assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
|
||||
assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
|
||||
|
||||
// Check first parameter
|
||||
assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
|
||||
|
||||
// Check outer destructuring object
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectKeyVal);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_Destructuring);
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].value.is_array, true);
|
||||
|
||||
// Check content nested destructuring array
|
||||
assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].value.names.length, 2);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.names[0] instanceof uglify.AST_SymbolFunarg);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.names[1] instanceof uglify.AST_Expansion);
|
||||
assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.names[1].expression instanceof uglify.AST_SymbolFunarg);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user