[+] Technical - Add babel (#217)

.babelrc

@@ -0,0 +1,12 @@
+{
+  "presets": ["env"],
+  "plugins": [
+    [
+      "transform-runtime",
+      {
+        "polyfill": false,
+        "regenerator": true
+      }
+    ]
+  ]
+}

.gitignore

@@ -25,3 +25,6 @@ build/Release
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+
+# Build
+dist

.npmignore

@@ -0,0 +1 @@
+src

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change Log
 
 ## [Unreleased]
+### Added
+- Technical - Add babel.
 
 ## RELEASE 2.16.9 - 2018-11-08
 ### Changed

bin/.eslintrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  'rules': {
+      'no-console': 0
+  }
+};

bin/deploy.js

@@ -0,0 +1,46 @@
+'use strict';
+const moment = require('moment');
+const fs = require('fs');
+const simpleGit = require('simple-git')();
+const semver = require('semver');
+
+const BRANCH_MASTER = 'master';
+const BRANCH_DEVEL = 'devel';
+
+let numberToIncrement = 'patch';
+if (process.argv && process.argv[3]) {
+  const option = process.argv[3].replace('--', '');
+  if (['major', 'minor', 'patch'].indexOf(option) !== -1) {
+    numberToIncrement = option;
+  }
+}
+
+// VERSION
+const versionFile = fs.readFileSync('package.json').toString().split('\n');
+let version = versionFile[3].match(/\w*"version": "(.*)",/)[1];
+version = semver.inc(version, numberToIncrement);
+versionFile[3] = '  "version": "' + version + '",';
+fs.writeFileSync('package.json', versionFile.join('\n'));
+
+// CHANGELOG
+const data = fs.readFileSync('CHANGELOG.md').toString().split('\n');
+const today = moment().format('YYYY-MM-DD');
+
+data.splice(3, 0, '\n## RELEASE ' + version + ' - ' + today);
+const text = data.join('\n');
+
+simpleGit
+  .checkout(BRANCH_DEVEL)
+  .then(function() { console.log('Starting pull on ' + BRANCH_DEVEL + '...'); })
+  .pull(function(error) { if (error) { console.log(error); } })
+  .then(function() { console.log(BRANCH_DEVEL + ' pull done.'); })
+  .then(function() { fs.writeFileSync('CHANGELOG.md', text); })
+  .add(['CHANGELOG.md', 'package.json'])
+  .commit('Release ' + version)
+  .push()
+  .checkout(BRANCH_MASTER)
+  .then(function() { console.log('Starting pull on ' + BRANCH_MASTER + '...'); })
+  .pull(function(error) { if (error) { console.log(error); } })
+  .then(function() { console.log(BRANCH_MASTER + ' pull done.'); })
+  .mergeFromTo(BRANCH_DEVEL, BRANCH_MASTER)
+  .push();

package.json

@@ -21,8 +21,9 @@
     "type": "git",
     "url": "git://github.com/ForestAdmin/forest-express-sequelize.git"
   },
-  "main": "index.js",
+  "main": "dist/index.js",
   "dependencies": {
+    "babel-runtime": "6.26.0",
     "bluebird": "2.9.25",
     "forest-express": "2.15.4",
     "http-errors": "1.6.1",
@@ -31,22 +32,33 @@
     "moment-timezone": "0.5.14"
   },
   "devDependencies": {
+    "babel-cli": "6.26.0",
+    "babel-core": "6.26.0",
+    "babel-plugin-transform-runtime": "6.23.0",
+    "babel-preset-env": "1.6.1",
     "chai": "2.3.0",
     "eslint": "4.1.1",
-    "git-hooks": "1.1.9",
     "gulp": "3.9.1",
     "mocha": "2.2.5",
     "mysql": "2.13.0",
     "nsp": "2.8.1",
+    "onchange": "4.0.0",
     "pg": "6.3.1",
+    "pre-commit": "1.2.2",
     "semver": "5.4.1",
     "sequelize": "3.29.0",
     "sequelize-fixtures": "0.6.0",
     "simple-git": "1.65.0"
   },
   "scripts": {
+    "build": "./node_modules/babel-cli/bin/babel.js src --out-dir dist && echo '\n\\033[0;34m[+] \\033[0;32mBuild done\\033[0m'",
+    "build:watch": "onchange 'src/**/*.js' -i -- yarn build",
+    "deploy": "yarn build && node ./bin/deploy.js",
     "test": "./node_modules/mocha/bin/mocha test/**",
-    "lint": "./node_modules/eslint/bin/eslint.js services/ adapters/ utils/",
-    "detect-vulnerabilities": "./node_modules/nsp/bin/nsp check --output summary"
-  }
+    "detect-vulnerabilities": "./node_modules/nsp/bin/nsp check --output summary",
+    "lint": "./node_modules/eslint/bin/eslint.js src"
+  },
+  "pre-commit": [
+    "lint"
+  ]
 }

index.js → src/index.js

@@ -28,7 +28,7 @@ exports.init = function(opts) {
   };
 
   exports.getLianaVersion = function () {
-    var lianaVersion = require('./package.json').version.match(REGEX_VERSION);
+    var lianaVersion = require('../package.json').version.match(REGEX_VERSION);
     if (lianaVersion && lianaVersion[0]) {
       return lianaVersion[0];
     }

test/index.js

@@ -7,7 +7,7 @@ var _ = require('lodash');
 var Sequelize = require('sequelize');
 var sequelizeFixtures = require('sequelize-fixtures');
 var Interface = require('forest-express');
-var SchemaAdapter = require('../adapters/sequelize');
+var SchemaAdapter = require('../src/adapters/sequelize');
 
 var databaseOptions = {
   logging: false,
@@ -22,14 +22,14 @@ var sequelizeMySQL = new Sequelize(
   'mysql://forest:secret@localhost:8999/forest-express-sequelize-test',
   databaseOptions);
 
-var PieStatGetter = require('../services/pie-stat-getter');
-var LineStatGetter = require('../services/line-stat-getter');
-var ResourcesGetter = require('../services/resources-getter');
-var ResourceGetter = require('../services/resource-getter');
-var ResourceCreator = require('../services/resource-creator');
-var ResourceRemover = require('../services/resource-remover');
-var HasManyGetter = require('../services/has-many-getter');
-var HasManyDissociator = require('../services/has-many-dissociator');
+var PieStatGetter = require('../src/services/pie-stat-getter');
+var LineStatGetter = require('../src/services/line-stat-getter');
+var ResourcesGetter = require('../src/services/resources-getter');
+var ResourceGetter = require('../src/services/resource-getter');
+var ResourceCreator = require('../src/services/resource-creator');
+var ResourceRemover = require('../src/services/resource-remover');
+var HasManyGetter = require('../src/services/has-many-getter');
+var HasManyDissociator = require('../src/services/has-many-dissociator');
 
 [sequelizePostgres, sequelizeMySQL].forEach(function (sequelize) {
   var models = {};

test/services/apimap-field-builder.js

@@ -5,7 +5,7 @@
 var expect = require('chai').expect;
 var _ = require('lodash');
 var Sequelize = require('sequelize');
-var ApimapFieldBuilder = require('../../services/apimap-field-builder');
+var ApimapFieldBuilder = require('../../src/services/apimap-field-builder');
 
 var databaseOptions = {
   logging: false,