Class transform clean up (#90)

* Moved all `class` tests to a folder * Fixed specifiers definition (`id` -> `local`) * bumped Jest * yarned it * specified the new objectCurlySpacing print option * updated README (yarn)
reactjs · Nov 29, 2016 · 393bb0c · 393bb0c
1 parent d0b9a63
commit 393bb0c
Show file tree

Hide file tree

Showing 43 changed files with 3,905 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,8 @@ APIs.
   * `git clone https://github.com/reactjs/react-codemod.git` or download a zip file
     from `https://github.com/reactjs/react-codemod/archive/master.zip`
   * Run `npm install` in the react-codemod directory
+    * Alternatively, run [`yarn`](https://yarnpkg.com/) to install in the
+      react-codemod directory for a reliable dependency resolution
   * `jscodeshift -t <codemod-script> <path>`
   * Use the `-d` option for a dry-run and use `-p` to print the output
     for comparison

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "babel-jest": "^15.0.0",
     "eslint": "^2.13.1",
     "fbjs-scripts": "^0.7.1",
-    "jest": "^15.1.1"
+    "jest": "^17.0.3"
   },
   "jest": {
     "globals": {

diff --git a/...__testfixtures__/class-anonymous.input.js → ...fixtures__/class/class-anonymous.input.js b/...__testfixtures__/class-anonymous.input.js → ...fixtures__/class/class-anonymous.input.js
diff --git a/..._testfixtures__/class-anonymous.output.js → ...ixtures__/class/class-anonymous.output.js b/..._testfixtures__/class-anonymous.output.js → ...ixtures__/class/class-anonymous.output.js
diff --git a/..._testfixtures__/class-anonymous2.input.js → ...ixtures__/class/class-anonymous2.input.js b/..._testfixtures__/class-anonymous2.input.js → ...ixtures__/class/class-anonymous2.input.js
diff --git a/...testfixtures__/class-anonymous2.output.js → ...xtures__/class/class-anonymous2.output.js b/...testfixtures__/class-anonymous2.output.js → ...xtures__/class/class-anonymous2.output.js
diff --git a/...rms/__testfixtures__/class-flow1.input.js → ...testfixtures__/class/class-flow1.input.js b/...rms/__testfixtures__/class-flow1.input.js → ...testfixtures__/class/class-flow1.input.js
diff --git a/...ms/__testfixtures__/class-flow1.output.js → ...estfixtures__/class/class-flow1.output.js b/...ms/__testfixtures__/class-flow1.output.js → ...estfixtures__/class/class-flow1.output.js
diff --git a/...rms/__testfixtures__/class-flow2.input.js → ...testfixtures__/class/class-flow2.input.js b/...rms/__testfixtures__/class-flow2.input.js → ...testfixtures__/class/class-flow2.input.js
diff --git a/...ms/__testfixtures__/class-flow2.output.js → ...estfixtures__/class/class-flow2.output.js b/...ms/__testfixtures__/class-flow2.output.js → ...estfixtures__/class/class-flow2.output.js
diff --git a/...rms/__testfixtures__/class-flow3.input.js → ...testfixtures__/class/class-flow3.input.js b/...rms/__testfixtures__/class-flow3.input.js → ...testfixtures__/class/class-flow3.input.js
diff --git a/...ms/__testfixtures__/class-flow3.output.js → ...estfixtures__/class/class-flow3.output.js b/...ms/__testfixtures__/class-flow3.output.js → ...estfixtures__/class/class-flow3.output.js
diff --git a/...rms/__testfixtures__/class-flow4.input.js → ...testfixtures__/class/class-flow4.input.js b/...rms/__testfixtures__/class-flow4.input.js → ...testfixtures__/class/class-flow4.input.js
diff --git a/...ms/__testfixtures__/class-flow4.output.js → ...estfixtures__/class/class-flow4.output.js b/...ms/__testfixtures__/class-flow4.output.js → ...estfixtures__/class/class-flow4.output.js
diff --git a/...rms/__testfixtures__/class-flow5.input.js → ...testfixtures__/class/class-flow5.input.js b/...rms/__testfixtures__/class-flow5.input.js → ...testfixtures__/class/class-flow5.input.js
diff --git a/...ms/__testfixtures__/class-flow5.output.js → ...estfixtures__/class/class-flow5.output.js b/...ms/__testfixtures__/class-flow5.output.js → ...estfixtures__/class/class-flow5.output.js
diff --git a/...rms/__testfixtures__/class-flow6.input.js → ...testfixtures__/class/class-flow6.input.js b/...rms/__testfixtures__/class-flow6.input.js → ...testfixtures__/class/class-flow6.input.js
diff --git a/...ms/__testfixtures__/class-flow6.output.js → ...estfixtures__/class/class-flow6.output.js b/...ms/__testfixtures__/class-flow6.output.js → ...estfixtures__/class/class-flow6.output.js
diff --git a/...rms/__testfixtures__/class-flow7.input.js → ...testfixtures__/class/class-flow7.input.js b/...rms/__testfixtures__/class-flow7.input.js → ...testfixtures__/class/class-flow7.input.js
diff --git a/...ms/__testfixtures__/class-flow7.output.js → ...estfixtures__/class/class-flow7.output.js b/...ms/__testfixtures__/class-flow7.output.js → ...estfixtures__/class/class-flow7.output.js
diff --git a/...stfixtures__/class-initial-state.input.js → ...ures__/class/class-initial-state.input.js b/...stfixtures__/class-initial-state.input.js → ...ures__/class/class-initial-state.input.js
diff --git a/...tfixtures__/class-initial-state.output.js → ...res__/class/class-initial-state.output.js b/...tfixtures__/class-initial-state.output.js → ...res__/class/class-initial-state.output.js
diff --git a/...tfixtures__/class-property-field.input.js → ...res__/class/class-property-field.input.js b/...tfixtures__/class-property-field.input.js → ...res__/class/class-property-field.input.js
diff --git a/...fixtures__/class-property-field.output.js → ...es__/class/class-property-field.output.js b/...fixtures__/class-property-field.output.js → ...es__/class/class-property-field.output.js
diff --git a/...testfixtures__/class-pure-mixin1.input.js → ...xtures__/class/class-pure-mixin1.input.js b/...testfixtures__/class-pure-mixin1.input.js → ...xtures__/class/class-pure-mixin1.input.js
diff --git a/...estfixtures__/class-pure-mixin1.output.js → ...tures__/class/class-pure-mixin1.output.js b/...estfixtures__/class-pure-mixin1.output.js → ...tures__/class/class-pure-mixin1.output.js
diff --git a/...testfixtures__/class-pure-mixin2.input.js → ...xtures__/class/class-pure-mixin2.input.js b/...testfixtures__/class-pure-mixin2.input.js → ...xtures__/class/class-pure-mixin2.input.js
diff --git a/...estfixtures__/class-pure-mixin2.output.js → ...tures__/class/class-pure-mixin2.output.js b/...estfixtures__/class-pure-mixin2.output.js → ...tures__/class/class-pure-mixin2.output.js
diff --git a/...testfixtures__/class-pure-mixin3.input.js → ...xtures__/class/class-pure-mixin3.input.js b/...testfixtures__/class-pure-mixin3.input.js → ...xtures__/class/class-pure-mixin3.input.js
diff --git a/...estfixtures__/class-pure-mixin3.output.js → ...tures__/class/class-pure-mixin3.output.js b/...estfixtures__/class-pure-mixin3.output.js → ...tures__/class/class-pure-mixin3.output.js
diff --git a/...testfixtures__/class-pure-mixin4.input.js → ...xtures__/class/class-pure-mixin4.input.js b/...testfixtures__/class-pure-mixin4.input.js → ...xtures__/class/class-pure-mixin4.input.js
diff --git a/...estfixtures__/class-pure-mixin4.output.js → ...tures__/class/class-pure-mixin4.output.js b/...estfixtures__/class-pure-mixin4.output.js → ...tures__/class/class-pure-mixin4.output.js
diff --git a/...rms/__testfixtures__/class-test2.input.js → ...testfixtures__/class/class-test2.input.js b/...rms/__testfixtures__/class-test2.input.js → ...testfixtures__/class/class-test2.input.js
diff --git a/...ms/__testfixtures__/class-test2.output.js → ...estfixtures__/class/class-test2.output.js b/...ms/__testfixtures__/class-test2.output.js → ...estfixtures__/class/class-test2.output.js
diff --git a/...testfixtures__/class-top-comment.input.js → ...xtures__/class/class-top-comment.input.js b/...testfixtures__/class-top-comment.input.js → ...xtures__/class/class-top-comment.input.js
diff --git a/...estfixtures__/class-top-comment.output.js → ...tures__/class/class-top-comment.output.js b/...estfixtures__/class-top-comment.output.js → ...tures__/class/class-top-comment.output.js
diff --git a/transforms/__testfixtures__/class.input.js → ...rms/__testfixtures__/class/class.input.js b/transforms/__testfixtures__/class.input.js → ...rms/__testfixtures__/class/class.input.js
diff --git a/transforms/__testfixtures__/class.output.js → ...ms/__testfixtures__/class/class.output.js b/transforms/__testfixtures__/class.output.js → ...ms/__testfixtures__/class/class.output.js
diff --git a/...tfixtures__/export-default-class.input.js → ...res__/class/export-default-class.input.js b/...tfixtures__/export-default-class.input.js → ...res__/class/export-default-class.input.js
diff --git a/...fixtures__/export-default-class.output.js → ...es__/class/export-default-class.output.js b/...fixtures__/export-default-class.output.js → ...es__/class/export-default-class.output.js
diff --git a/transforms/__tests__/class-test.js b/transforms/__tests__/class-test.js
@@ -19,34 +19,34 @@ const pureMixinAlternativeOption = {
 
 const enableFlowOption = {flow: true};
 
-defineTest(__dirname, 'class');
-defineTest(__dirname, 'class', enableFlowOption, 'class-anonymous');
-defineTest(__dirname, 'class', enableFlowOption, 'class-anonymous2');
-defineTest(__dirname, 'class', pureMixinAlternativeOption, 'class-test2');
-defineTest(__dirname, 'class', enableFlowOption, 'export-default-class');
-defineTest(__dirname, 'class', pureMixinAlternativeOption, 'class-pure-mixin1');
+defineTest(__dirname, 'class', null, 'class/class');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-anonymous');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-anonymous2');
+defineTest(__dirname, 'class', pureMixinAlternativeOption, 'class/class-test2');
+defineTest(__dirname, 'class', enableFlowOption, 'class/export-default-class');
+defineTest(__dirname, 'class', pureMixinAlternativeOption, 'class/class-pure-mixin1');
 defineTest(__dirname, 'class', {
   ...enableFlowOption,
   'pure-component': true,
-}, 'class-pure-mixin2');
-defineTest(__dirname, 'class', null, 'class-pure-mixin3');
+}, 'class/class-pure-mixin2');
+defineTest(__dirname, 'class', null, 'class/class-pure-mixin3');
 defineTest(__dirname, 'class', {
   ...pureMixinAlternativeOption,
   ...enableFlowOption,
-}, 'class-pure-mixin4');
+}, 'class/class-pure-mixin4');
 defineTest(__dirname, 'class', {
   ...pureMixinAlternativeOption,
   ...enableFlowOption,
-}, 'class-top-comment');
-defineTest(__dirname, 'class', enableFlowOption, 'class-initial-state');
-defineTest(__dirname, 'class', enableFlowOption, 'class-property-field');
-defineTest(__dirname, 'class', enableFlowOption, 'class-flow1');
-defineTest(__dirname, 'class', enableFlowOption, 'class-flow2');
-defineTest(__dirname, 'class', enableFlowOption, 'class-flow3');
-defineTest(__dirname, 'class', enableFlowOption, 'class-flow4');
-defineTest(__dirname, 'class', enableFlowOption, 'class-flow5');
-defineTest(__dirname, 'class', enableFlowOption, 'class-flow6');
+}, 'class/class-top-comment');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-initial-state');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-property-field');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-flow1');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-flow2');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-flow3');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-flow4');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-flow5');
+defineTest(__dirname, 'class', enableFlowOption, 'class/class-flow6');
 defineTest(__dirname, 'class', {
   ...enableFlowOption,
   'remove-runtime-proptypes': true,
-}, 'class-flow7');
+}, 'class/class-flow7');
diff --git a/transforms/class.js b/transforms/class.js
@@ -22,6 +22,8 @@ module.exports = (file, api, options) => {
       trailingComma: true,
       flowObjectCommas: true,
       arrowParensAlways: true,
+      arrayBracketSpacing: false,
+      objectCurlySpacing: false,
     };
 
   const root = j(file.source);
@@ -396,7 +398,7 @@ module.exports = (file, api, options) => {
       importStatement.forEach(path => {
         result = {
           path,
-          binding: path.value.specifiers[0].id.name,
+          binding: path.value.specifiers[0].local.name,
           type: 'import',
         };
       });
@@ -1020,7 +1022,7 @@ module.exports = (file, api, options) => {
     // Ignore import bindings
     .filter(identifierPath => !(
       path.value.type === 'ImportDeclaration' &&
-      path.value.specifiers.some(specifier => specifier.id === identifierPath.value)
+      path.value.specifiers.some(specifier => specifier.local === identifierPath.value)
     ))
     // Ignore properties in MemberExpressions
     .filter(identifierPath => {