Implement: ES6 modules

.gitignore

@@ -1,4 +1,5 @@
 .env
 client/favicons
 client/public
+dist/
 node_modules/

package.json

@@ -2,10 +2,11 @@
   "name": "theatrebase",
   "version": "0.0.0",
   "description": "A database-driven site that provides listings for theatrical productions, playtexts and associated data.",
-  "main": "app.js",
+  "main": "server/app-dev.js",
   "scripts": {
-    "start": "nodemon app",
-    "test": "find spec -name '*.spec.js' | xargs mocha -R spec"
+    "start": "nodemon server/app-dev.js",
+    "test": "find spec -name '*.spec.js' | xargs mocha -R spec",
+    "pretest": "babel server --out-dir dist --ignore app-dev.js"
   },
   "author": "https://github.com/andygout",
   "license": "MS-RSL",
@@ -27,6 +28,10 @@
     "serve-favicon": "^2.2.0"
   },
   "devDependencies": {
+    "babel-cli": "^6.22.2",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.22.0",
+    "babel-register": "^6.22.0",
     "chai": "^3.5.0",
     "mocha": "^3.2.0",
     "node-mocks-http": "^1.5.4",

server/.babelrc

@@ -0,0 +1,6 @@
+{
+	"plugins": [
+		"add-module-exports",
+		"transform-es2015-modules-commonjs"
+	]
+}

server/app-dev.js

@@ -0,0 +1,2 @@
+require('babel-register');
+require('./app');

app.js → server/app.js

@@ -1,19 +1,18 @@
-require('dotenv').config();
-
-const bodyParser = require('body-parser');
-const exphbs = require('express-handlebars');
-const express = require('express');
-const Handlebars = require('handlebars');
-const favicon = require('serve-favicon');
-const flash = require('connect-flash');
-const http = require('http');
-const logger = require('morgan');
-const path = require('path');
-const sassMiddleware = require('node-sass-middleware');
-const session = require('express-session');
-
-const handlebarsHelpers = require('./server/lib/handlebars-helpers');
-const router = require('./server/routes');
+import _ from './dotenv';
+import bodyParser from 'body-parser';
+import exphbs from 'express-handlebars';
+import express from 'express';
+import Handlebars from 'handlebars';
+import favicon from 'serve-favicon';
+import flash from 'connect-flash';
+import http from 'http';
+import logger from 'morgan';
+import path from 'path';
+import sassMiddleware from 'node-sass-middleware';
+import session from 'express-session';
+
+import * as handlebarsHelpers from './lib/handlebars-helpers';
+import router from './routes';
 
 const app = express();
 
@@ -29,7 +28,7 @@ app.use(bodyParser.json());
 
 app.use(bodyParser.urlencoded({ extended: true }));
 
-app.use(favicon(path.join(__dirname, 'client', 'favicons', 'favicon.ico')));
+app.use(favicon(path.join(__dirname, '../', 'client', 'favicons', 'favicon.ico')));
 
 app.use(logger('dev'));
 
@@ -39,14 +38,14 @@ app.use(flash());
 
 app.use(
 	sassMiddleware({
-		src: path.join(__dirname, 'client', 'stylesheets'),
-		dest: path.join(__dirname, 'client', 'public'),
+		src: path.join(__dirname, '../', 'client', 'stylesheets'),
+		dest: path.join(__dirname, '../', 'client', 'public'),
 		prefix: '/stylesheets',
 		debug: true
 	})
 );
 
-app.use(express.static(path.join(__dirname, 'client', 'public')));
+app.use(express.static(path.join(__dirname, '../', 'client', 'public')));
 
 app.use('/', router);
 

server/controllers/index.js

@@ -1,2 +1,7 @@
-exports.productions = require('./productions');
-exports.theatres = require('./theatres');
+import * as productions from './productions';
+import * as theatres from './theatres';
+
+export {
+	productions,
+	theatres
+};

server/controllers/productions.js

@@ -1,9 +1,9 @@
-const Production = require('../models/production');
-const getAlert = require('../lib/alert').get;
-const getPageData = require('../lib/get-page-data');
-const handleModelResponse = require('../lib/handle-model-response');
+import Production from '../models/production';
+import { getAlert } from '../lib/alert';
+import getPageData from '../lib/get-page-data';
+import handleModelResponse from '../lib/handle-model-response';
 
-exports.new = (req, res, next) => {
+function newRoute (req, res, next) {
 
 	const production = new Production();
 
@@ -13,7 +13,7 @@ exports.new = (req, res, next) => {
 
 };
 
-exports.create = (req, res, next) => {
+function createRoute (req, res, next) {
 
 	const production = new Production(req.body);
 
@@ -29,7 +29,7 @@ exports.create = (req, res, next) => {
 
 };
 
-exports.edit = (req, res, next) => {
+function editRoute (req, res, next) {
 
 	const production = new Production(req.params);
 
@@ -45,7 +45,7 @@ exports.edit = (req, res, next) => {
 
 };
 
-exports.update = (req, res, next) => {
+function updateRoute (req, res, next) {
 
 	const production = new Production(req.body);
 
@@ -61,7 +61,7 @@ exports.update = (req, res, next) => {
 
 };
 
-exports.delete = (req, res, next) => {
+function deleteRoute (req, res, next) {
 
 	const production = new Production(req.body);
 
@@ -77,7 +77,7 @@ exports.delete = (req, res, next) => {
 
 };
 
-exports.show = (req, res, next) => {
+function showRoute (req, res, next) {
 
 	const production = new Production(req.params);
 
@@ -93,7 +93,7 @@ exports.show = (req, res, next) => {
 
 };
 
-exports.list = (req, res, next) => {
+function listRoute (req, res, next) {
 
 	return Production.list()
 		.then(productions => {
@@ -106,3 +106,13 @@ exports.list = (req, res, next) => {
 		.catch(err => next(err));
 
 };
+
+export {
+	newRoute,
+	createRoute,
+	editRoute,
+	updateRoute,
+	deleteRoute,
+	showRoute,
+	listRoute
+};

server/controllers/theatres.js

@@ -1,9 +1,9 @@
-const Theatre = require('../models/theatre');
-const getAlert = require('../lib/alert').get;
-const getPageData = require('../lib/get-page-data');
-const handleModelResponse = require('../lib/handle-model-response');
+import Theatre from '../models/theatre';
+import { getAlert } from '../lib/alert';
+import getPageData from '../lib/get-page-data';
+import handleModelResponse from '../lib/handle-model-response';
 
-exports.edit = (req, res, next) => {
+function editRoute (req, res, next) {
 
 	const theatre = new Theatre(req.params);
 
@@ -19,7 +19,7 @@ exports.edit = (req, res, next) => {
 
 };
 
-exports.update = (req, res, next) => {
+function updateRoute (req, res, next) {
 
 	const theatre = new Theatre(req.body);
 
@@ -35,7 +35,7 @@ exports.update = (req, res, next) => {
 
 };
 
-exports.delete = (req, res, next) => {
+function deleteRoute (req, res, next) {
 
 	const theatre = new Theatre(req.body);
 
@@ -51,7 +51,7 @@ exports.delete = (req, res, next) => {
 
 };
 
-exports.show = (req, res, next) => {
+function showRoute (req, res, next) {
 
 	const theatre = new Theatre(req.params);
 
@@ -67,7 +67,7 @@ exports.show = (req, res, next) => {
 
 };
 
-exports.list = (req, res, next) => {
+function listRoute (req, res, next) {
 
 	return Theatre.list()
 		.then(theatres => {
@@ -82,3 +82,11 @@ exports.list = (req, res, next) => {
 		.catch(err => next(err));
 
 };
+
+export {
+	editRoute,
+	updateRoute,
+	deleteRoute,
+	showRoute,
+	listRoute
+};

database/pool.js → server/database/pool.js

@@ -1,9 +1,9 @@
-const pg = require('pg');
+import pg from 'pg';
 
 const config = {
 	database: process.env.DEV_DATABASE_NAME
 };
 
 const pool = new pg.Pool(config);
 
-module.exports = pool;
+export default pool;

database/query.js → server/database/query.js

@@ -1,6 +1,6 @@
-const pool = require('./pool');
+import pool from './pool';
 
-module.exports = function (queryData) {
+export default function (queryData) {
 
 	return new Promise(function (resolve, reject) {
 

server/dotenv.js

@@ -0,0 +1,3 @@
+import dotenv from 'dotenv';
+
+dotenv.config({ silent: true });

server/lib/alert.js

@@ -1,8 +1,14 @@
-exports.set = (req, pageData) => {
+function setAlert (req, pageData) {
 
 	req.flash('text', pageData.alertText);
 	req.flash('type', pageData.alertType);
 
 };
 
-exports.get = req => ({ text: req.flash('text'), type: req.flash('type') });
+function getAlert (req) {
+
+	return { text: req.flash('text'), type: req.flash('type') };
+
+};
+
+export { setAlert, getAlert };

server/lib/constants.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 
 	STRING_MIN_LENGTH: 1,
 	STRING_MAX_LENGTH: 255

server/lib/get-page-data.js

@@ -1,4 +1,4 @@
-const modelNamingPropMap = require('./model-naming-prop-map');
+import modelNamingPropMap from './model-naming-prop-map';
 
 const getModelName = instance => instance.constructor.name.toLowerCase();
 
@@ -43,7 +43,7 @@ const getAlertText = (model, instance, action) => {
 
 const getAlertType = instance => instance.hasError ? 'error' : 'success';
 
-module.exports = function (instance, action) {
+export default function (instance, action) {
 
 	const model = getModelName(instance);
 

server/lib/handle-model-response.js

@@ -1,14 +1,14 @@
-const alert = require('./alert');
+import { getAlert, setAlert } from './alert';
 
-module.exports = function (req, res, data) {
+export default function (req, res, data) {
 
 	const page = data.page;
 
-	alert.set(req, page);
+	setAlert(req, page);
 
 	data[page.modelName].hasError ?
 		(page.action === 'create' || page.action === 'update') ?
-			res.render(`${page.modelRoute}/form`, Object.assign(data, { alert: alert.get(req) })) :
+			res.render(`${page.modelRoute}/form`, Object.assign(data, { alert: getAlert(req) })) :
 			res.redirect(page.instanceRoute)
 		:
 		res.redirect(page.action !== 'delete' ? page.instanceRoute : '/');

server/lib/handlebars-helpers/capitalise.js

@@ -1,4 +1,4 @@
-module.exports = function (string) {
+export default function (string) {
 
 	return string.charAt(0).toUpperCase() + string.substring(1);
 

server/lib/handlebars-helpers/date-format-now.js

@@ -1,6 +1,6 @@
-const dateFormat = require('dateformat');
+import dateFormat from 'dateformat';
 
-module.exports = function(format) {
+export default function(format) {
 
 	return dateFormat(new Date(), format);
 

server/lib/handlebars-helpers/index.js

@@ -1,11 +1,17 @@
-module.exports = {
-
-	capitalise: require('./capitalise'),
-	dateFormatNow: require('./date-format-now'),
-	instanceNamingValue: require('./instance-naming-value'),
-	instanceRoute: require('./instance-route'),
-	model: require('./model'),
-	modelLowerCase: require('./model-lower-case'),
-	upperCase: require('./upper-case')
+import capitalise from './capitalise';
+import dateFormatNow from './date-format-now';
+import instanceNamingValue from './instance-naming-value';
+import instanceRoute from './instance-route';
+import model from './model';
+import modelLowerCase from './model-lower-case';
+import upperCase from './upper-case';
 
+export {
+	capitalise,
+	dateFormatNow,
+	instanceNamingValue,
+	instanceRoute,
+	model,
+	modelLowerCase,
+	upperCase
 };

server/lib/handlebars-helpers/instance-naming-value.js

@@ -1,6 +1,6 @@
-const modelNamingPropMap = require('../model-naming-prop-map');
+import modelNamingPropMap from '../model-naming-prop-map';
 
-module.exports = function (instance) {
+export default function (instance) {
 
 	const model = instance.constructor.name.toLowerCase();
 

server/lib/handlebars-helpers/instance-route.js

@@ -1,4 +1,4 @@
-module.exports = function (instance) {
+export default function (instance) {
 
 	return `/${instance.constructor.name.toLowerCase()}s/${instance.id}`;