feat(babel): upgrade babel 7 (#10)

BREAKING CHANGE: Maybe require Babel 7>=

.babelrc

@@ -1,8 +1,5 @@
 {
   "presets": [
-    "es2015"
-  ],
-  "plugins": [
-    "add-module-exports"
+    "@babel/preset-env"
   ]
-}
+}

package.json

@@ -22,7 +22,8 @@
     "build": "babel src --out-dir lib --source-maps",
     "watch": "babel src --out-dir lib --watch --source-maps",
     "prepublish": "npm run --if-present build",
-    "test": "mocha"
+    "test": "mocha",
+    "updateSnapshot": "UPDATE_SNAPSHOT=1 mocha"
   },
   "keywords": [
     "babel",
@@ -31,19 +32,13 @@
     "testing",
     "coc"
   ],
-  "directories": {
-    "build": "NODE_ENV=production babel src --out-dir lib --source-maps",
-    "watch": "babel src --out-dir lib --watch --source-maps",
-    "prepublish": "npm run --if-present build",
-    "test": "mocha --compilers js:babel-register"
-  },
   "devDependencies": {
-    "babel-cli": "^6.18.0",
-    "babel-core": "^6.18.2",
-    "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-register": "^6.18.0",
-    "mocha": "^3.1.2"
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/register": "^7.0.0",
+    "babel-plugin-add-module-exports": "^1.0.0",
+    "mocha": "^5.2.0"
   },
   "dependencies": {
     "doctrine": "^2.0.0",

test/babel-plugin-jsdoc-to-assert-test.js

@@ -1,30 +1,37 @@
 const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
-import {transformFileSync} from 'babel-core';
+import { transformFileSync } from '@babel/core';
 
 function normalize(str) {
-    return str.replace(/^\s+|\s+$/, '').replace(/\r?\n/g, '\n');
+  return str.replace(/^\s+|\s+$/, '').replace(/\r?\n/g, '\n');
 }
 
 describe('JSDoc plugin', () => {
-    const fixturesDir = path.join(__dirname, 'fixtures');
-    fs.readdirSync(fixturesDir).map((caseName) => {
-        it(`should generate assertions for ${caseName.replace(/-/g, ' ')}`, () => {
-            const fixtureDir = path.join(fixturesDir, caseName);
-            let actualPath = path.join(fixtureDir, 'actual.js');
-            const actual = transformFileSync(actualPath).code;
+  const fixturesDir = path.join(__dirname, 'fixtures');
+  fs.readdirSync(fixturesDir).map((caseName) => {
+    it(`should generate assertions for ${caseName.replace(/-/g, ' ')}`, function() {
+      const fixtureDir = path.join(fixturesDir, caseName);
+      let actualPath = path.join(fixtureDir, 'actual.js');
+      const actual = transformFileSync(actualPath).code;
 
-            if (path.sep === '\\') {
-                // Specific case of windows, transformFileSync return code with '/'
-                actualPath = actualPath.replace(/\\/g, '/');
-            }
+      if (path.sep === '\\') {
+        // Specific case of windows, transformFileSync return code with '/'
+        actualPath = actualPath.replace(/\\/g, '/');
+      }
 
-            const expected = fs.readFileSync(
-                path.join(fixtureDir, 'expected.js')
-            ).toString().replace(/%FIXTURE_PATH%/g, actualPath);
+      const expectedPath = path.join(fixtureDir, 'expected.js');
+      const expected = fs.readFileSync(
+        expectedPath
+      ).toString().replace(/%FIXTURE_PATH%/g, actualPath);
 
-            assert.equal(normalize(actual), normalize(expected));
-        });
+      // UPDATE_SNAPSHOT=1 npm test で呼び出したときはスナップショットを更新
+      if (process.env.UPDATE_SNAPSHOT) {
+        fs.writeFileSync(expectedPath, actual);
+        this.skip(); // スキップ
+        return;
+      }
+      assert.equal(normalize(actual), normalize(expected));
     });
-});
+  });
+});

test/fixtures/ArrowFunctionExpression/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/AssertOption/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/ClassMethod/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/ClassMethod/expected.js

@@ -7,4 +7,5 @@ class X {
     console.assert(typeof x === "number");
     console.assert(typeof y === "string");
   }
+
 }

test/fixtures/Default-Option-Generator/.babelrc

@@ -1,6 +1,5 @@
 {
   "plugins": [
     "../../../src/"
-    // use spec generator
   ]
-}
+}

test/fixtures/ExportDefaultFunctionDeclaration/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/ExportDefaultFunctionDestructuring/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/ExportDefaultFunctionDestructuring/expected.js

@@ -1,6 +1,8 @@
 /**
  * @param {string} key
  */
-export default function fn({ key }) {
+export default function fn({
+  key
+}) {
   console.assert(typeof key === "string");
 }

test/fixtures/ExportFunctionDeclaration/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/FunctionDeclaration/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/FunctionExpression/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/FunctionExpression/expected.js

@@ -4,7 +4,6 @@ const obj = {
    */
   log: function (message) {
     console.assert(typeof message === "string");
-
     console.log(message);
   }
 };

test/fixtures/NOT_SUPPORT_Type_Object/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/NOT_SUPPORT_Type_Object/expected.js

@@ -3,4 +3,4 @@ const obj = {
    * @type {string}
    */
   value: "s"
-};
+};

test/fixtures/NoTypeOption/.babelrc

@@ -9,4 +9,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/ObjectMethod/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/ObjectMethod/expected.js

@@ -7,4 +7,5 @@ var object = {
     console.assert(typeof x === "number");
     console.assert(typeof y === "string");
   }
-};
+
+};

test/fixtures/ObjectMethodB/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/ObjectMethodB/expected.js

@@ -18,4 +18,5 @@ const cli = {
       return typeof item === "string";
     }));
   }
+
 };

test/fixtures/ObjectMethod_with_es2015/.babelrc

@@ -1,6 +1,6 @@
 {
   "presets": [
-    "es2015"
+    "@babel/preset-env"
   ],
   "plugins": [
     [
@@ -10,4 +10,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/SpecGenerator-param/.babelrc

@@ -8,4 +8,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/SpecGenerator-type/.babelrc

@@ -9,4 +9,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/SpecGenerator-type/expected.js

@@ -5,8 +5,9 @@ const value = "s";
 /**
  * @type {string[]}
  */
+
 console.assert(typeof value === "string", 'Expected type: @type {string} value\nActual value:', value, '\nFailure assertion: typeof value === "string"');
 const array = ["s"];
 console.assert(Array.isArray(array) && array.every(function (item) {
   return typeof item === "string";
-}), 'Expected type: @type {Array.<string>} array\nActual value:', array, '\nFailure assertion: Array.isArray(array) && array.every(function(item){ return (typeof item === "string"); })');
+}), 'Expected type: @type {Array.<string>} array\nActual value:', array, '\nFailure assertion: Array.isArray(array) && array.every(function(item){ return (typeof item === "string"); })');

test/fixtures/TypeCustomObject/.babelrc

@@ -8,4 +8,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/TypeExportExpression/.babelrc

@@ -8,4 +8,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/TypeExportExpression/expected.js

@@ -1,4 +1,4 @@
 /*
  * @type {string}
  */
-export const ItemType = 'ItemType';
+export const ItemType = 'ItemType';

test/fixtures/TypeString/.babelrc

@@ -8,4 +8,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/TypeThisAssignMent/.babelrc

@@ -8,4 +8,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/TypeThisAssignMent/expected.js

@@ -6,4 +6,5 @@ class A {
     this.value = "s";
     console.assert(typeof this.value === "string");
   }
+
 }

test/fixtures/TypeVariableAssignMent/.babelrc

@@ -8,4 +8,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/TypeVariableAssignMent/expected.js

@@ -2,5 +2,6 @@ var value;
 /**
  * @type {string}
  */
+
 value = "s";
 console.assert(typeof value === "string");

test/fixtures/VariableDeclaration/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/multiple-comments/.babelrc

@@ -7,4 +7,4 @@
       }
     ]
   ]
-}
+}

test/fixtures/multiple-comments/expected.js

@@ -2,6 +2,7 @@
  * @typedef {Object} O
  * @property {number} x - this is a param.
  */
+
 /**
  * @param {number} param - this is a param.
  * @param {string} b - this is a param.

test/mocha.opts

@@ -1 +1 @@
---compilers js:babel-register
+--require @babel/register