From 0c8fdc381d122229277b0c42a0f4fb34ff5ce6f6 Mon Sep 17 00:00:00 2001
From: Bo Lingen <lingenbw@gmail.com>
Date: Thu, 8 Jun 2017 15:58:37 -0500
Subject: [PATCH] Backport array & object pattern fixes to 6.x (#5770)

* Backport array & object pattern fixes to 6.x

Original PRs merged to 7.0 as #5722 and #5762

* fix lint error
---
 packages/babel-types/src/definitions/core.js  |  2 +-
 .../babel-types/src/definitions/es2015.js     |  2 +-
 packages/babel-types/test/validators.js       | 24 +++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/babel-types/src/definitions/core.js b/packages/babel-types/src/definitions/core.js
index e7b7a272e0..9b45860834 100644
--- a/packages/babel-types/src/definitions/core.js
+++ b/packages/babel-types/src/definitions/core.js
@@ -526,7 +526,7 @@ defineType("ObjectProperty", {
       }
     },
     value: {
-      validate: assertNodeType("Expression")
+      validate: assertNodeType("Expression", "Pattern", "RestElement")
     },
     shorthand: {
       validate: assertValueType("boolean"),
diff --git a/packages/babel-types/src/definitions/es2015.js b/packages/babel-types/src/definitions/es2015.js
index f0231478d3..5a610b4e81 100644
--- a/packages/babel-types/src/definitions/es2015.js
+++ b/packages/babel-types/src/definitions/es2015.js
@@ -29,7 +29,7 @@ defineType("ArrayPattern", {
   aliases: ["Pattern", "LVal"],
   fields: {
     elements: {
-      validate: chain(assertValueType("array"), assertEach(assertNodeType("Expression")))
+      validate: chain(assertValueType("array"), assertEach(assertNodeType("Identifier", "Pattern", "RestElement")))
     },
     decorators: {
       validate: chain(assertValueType("array"), assertEach(assertNodeType("Decorator")))
diff --git a/packages/babel-types/test/validators.js b/packages/babel-types/test/validators.js
index ccc83f665b..8ad737b00b 100644
--- a/packages/babel-types/test/validators.js
+++ b/packages/babel-types/test/validators.js
@@ -31,4 +31,28 @@ suite("validators", function () {
       assert(t.isValidIdentifier("await") === false);
     });
   });
+
+  suite("patterns", function () {
+    it("allows nested pattern structures", function () {
+      const pattern = t.objectPattern([
+        t.objectProperty(
+          t.identifier("a"),
+          t.objectPattern([
+            t.objectProperty(
+              t.identifier("b"),
+              t.stringLiteral("foo")
+            ),
+            t.objectProperty(
+              t.identifier("c"),
+              t.arrayPattern([
+                t.identifier("value"),
+              ])
+            ),
+          ])
+        ),
+      ]);
+
+      assert(t.isNodesEquivalent(pattern, pattern) === true);
+    });
+  });
 });