From 35c49dbef736793cf8c69d5671a68b05246c5b50 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Sat, 7 Mar 2015 01:25:44 +1100
Subject: [PATCH] merge validation transformers

---
 src/babel/transformation/transformers/index.js      |  5 ++---
 .../validation.js}                                  | 10 ++++++++--
 .../transformers/validation/setters.js              | 13 -------------
 3 files changed, 10 insertions(+), 18 deletions(-)
 rename src/babel/transformation/transformers/{validation/no-for-in-of-assignment.js => internal/validation.js} (60%)
 delete mode 100644 src/babel/transformation/transformers/validation/setters.js

diff --git a/src/babel/transformation/transformers/index.js b/src/babel/transformation/transformers/index.js
index 66e2f396b4..67dd56f30c 100644
--- a/src/babel/transformation/transformers/index.js
+++ b/src/babel/transformation/transformers/index.js
@@ -1,9 +1,8 @@
 export default {
   strict:                                  require("./other/strict"),
 
-  "validation.undeclaredVariableCheck":    require("./validation/undeclared-variable-check"),
-  "validation.noForInOfAssignment":        require("./validation/no-for-in-of-assignment"),
-  "validation.setters":                    require("./validation/setters"),
+  _validation:                             require("./internal/validation"),
+
   "validation.react":                      require("./validation/react"),
 
   // this goes at the start so we only transform the original user code
diff --git a/src/babel/transformation/transformers/validation/no-for-in-of-assignment.js b/src/babel/transformation/transformers/internal/validation.js
similarity index 60%
rename from src/babel/transformation/transformers/validation/no-for-in-of-assignment.js
rename to src/babel/transformation/transformers/internal/validation.js
index 57c0855af9..9dff3a64f4 100644
--- a/src/babel/transformation/transformers/validation/no-for-in-of-assignment.js
+++ b/src/babel/transformation/transformers/internal/validation.js
@@ -1,8 +1,6 @@
 import * as messages from "../../../messages";
 import t from "../../../types";
 
-export { isFor as check } from "../../../types";
-
 export function ForOfStatement(node, parent, scope, file) {
   var left = node.left;
   if (t.isVariableDeclaration(left)) {
@@ -12,3 +10,11 @@ export function ForOfStatement(node, parent, scope, file) {
 }
 
 export { ForOfStatement as ForInStatement };
+
+export function Property(node, parent, scope, file) {
+  if (node.kind === "set" && node.value.params.length !== 1) {
+    throw file.errorWithNode(node.value, messages.get("settersInvalidParamLength"));
+  }
+}
+
+export { Property as MethodDefinition };
diff --git a/src/babel/transformation/transformers/validation/setters.js b/src/babel/transformation/transformers/validation/setters.js
deleted file mode 100644
index a7aebb0f61..0000000000
--- a/src/babel/transformation/transformers/validation/setters.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as messages from "../../../messages";
-
-export function check(node) {
-  return node.kind === "set";
-}
-
-export function Property(node, parent, scope, file) {
-  if (node.kind === "set" && node.value.params.length !== 1) {
-    throw file.errorWithNode(node.value, messages.get("settersInvalidParamLength"));
-  }
-}
-
-export { Property as MethodDefinition };