Upgrade to es6 (GoogleCloudPlatform#85)

* First draft of ES6 upgrade

* Fix nits

* Get tests passing + fix more stuff

* Upgrade package.json engine to 4.3.2

Author: Ace Nassri

1-hello-world/app.js

@@ -13,23 +13,23 @@
 
 'use strict';
 
-var express = require('express');
+const express = require('express');
 
-var app = express();
+const app = express();
 
 // [START hello_world]
 // Say hello!
-app.get('/', function (req, res) {
+app.get('/', (req, res) => {
   res.status(200).send('Hello, world!');
 });
 // [END hello_world]
 
 if (module === require.main) {
   // [START server]
   // Start the server
-  var server = app.listen(process.env.PORT || 8080, function () {
-    var port = server.address().port;
-    console.log('App listening on port %s', port);
+  const server = app.listen(process.env.PORT || 8080, () => {
+    const port = server.address().port;
+    console.log(`App listening on port ${port}`);
   });
   // [END server]
 }

1-hello-world/package.json

@@ -45,6 +45,6 @@
     "supertest": "^2.0.0"
   },
   "engines": {
-    "node": ">=0.12.7"
+    "node": ">=4.3.2"
   }
 }

1-hello-world/test/app.test.js

@@ -13,22 +13,22 @@
 
 'use strict';
 
-var assert = require('assert');
-var config = require('./config');
-var utils = require('nodejs-repo-tools');
+const assert = require(`assert`);
+const config = require(`./config`);
+const utils = require(`nodejs-repo-tools`);
 
-describe('app.js', function () {
+describe(`app.js`, () => {
   if (!process.env.E2E_TESTS) {
-    it('should run', function (done) {
+    it(`should run`, (done) => {
       utils.testLocalApp(config, done);
     });
   }
 
-  it('should create an express app', function (done) {
+  it(`should create an express app`, (done) => {
     utils.getRequest(config)
-      .get('/')
+      .get(`/`)
       .expect(200)
-      .expect(function (response) {
+      .expect((response) => {
         assert.equal(response.text, config.msg);
       })
       .end(done);

1-hello-world/test/config.js

@@ -13,12 +13,12 @@
 
 'use strict';
 
-var path = require('path');
+const path = require(`path`);
 
 module.exports = {
-  test: '1-hello-world',
+  test: `1-hello-world`,
   cwd: path.resolve(path.join(__dirname, '../')),
-  cmd: 'node',
-  args: ['app.js'],
-  msg: 'Hello, world!'
+  cmd: `node`,
+  args: [`app.js`],
+  msg: `Hello, world!`
 };

1-hello-world/test/index.js

@@ -13,15 +13,14 @@
 
 'use strict';
 
-var config = require('./config');
-var utils = require('nodejs-repo-tools');
+const config = require(`./config`);
+const utils = require(`nodejs-repo-tools`);
 
-describe(config.test + '/', function () {
+describe(`${config.test}/`, () => {
   if (!process.env.E2E_TESTS) {
-    it('should install dependencies', function (done) {
-      this.timeout(120 * 1000); // Allow 2 minutes to test installation
+    it(`should install dependencies`, (done) => {
       utils.testInstallation(config, done);
-    });
+    }).timeout(120 * 1000);
   }
-  require('./app.test');
+  require(`./app.test`);
 });

2-structured-data/app.js

@@ -13,11 +13,11 @@
 
 'use strict';
 
-var path = require('path');
-var express = require('express');
-var config = require('./config');
+const path = require('path');
+const express = require('express');
+const config = require('./config');
 
-var app = express();
+const app = express();
 
 app.disable('etag');
 app.set('views', path.join(__dirname, 'views'));
@@ -29,17 +29,17 @@ app.use('/books', require('./books/crud'));
 app.use('/api/books', require('./books/api'));
 
 // Redirect root to /books
-app.get('/', function (req, res) {
+app.get('/', (req, res) => {
   res.redirect('/books');
 });
 
 // Basic 404 handler
-app.use(function (req, res) {
+app.use((req, res) => {
   res.status(404).send('Not Found');
 });
 
 // Basic error handler
-app.use(function (err, req, res, next) {
+app.use((err, req, res, next) => {
   /* jshint unused:false */
   console.error(err);
   // If our routes specified a specific response, then send that. Otherwise,
@@ -49,9 +49,9 @@ app.use(function (err, req, res, next) {
 
 if (module === require.main) {
   // Start the server
-  var server = app.listen(config.get('PORT'), function () {
-    var port = server.address().port;
-    console.log('App listening on port %s', port);
+  const server = app.listen(config.get('PORT'), () => {
+    const port = server.address().port;
+    console.log(`App listening on port ${port}`);
   });
 }
 

2-structured-data/books/api.js

@@ -13,15 +13,15 @@
 
 'use strict';
 
-var express = require('express');
-var bodyParser = require('body-parser');
-var config = require('../config');
+const express = require('express');
+const bodyParser = require('body-parser');
+const config = require('../config');
 
 function getModel () {
-  return require('./model-' + config.get('DATA_BACKEND'));
+  return require(`./model-${config.get('DATA_BACKEND')}`);
 }
 
-var router = express.Router();
+const router = express.Router();
 
 // Automatically parse request body as JSON
 router.use(bodyParser.json());
@@ -31,10 +31,11 @@ router.use(bodyParser.json());
  *
  * Retrieve a page of books (up to ten at a time).
  */
-router.get('/', function list (req, res, next) {
-  getModel().list(10, req.query.pageToken, function (err, entities, cursor) {
+router.get('/', (req, res, next) => {
+  getModel().list(10, req.query.pageToken, (err, entities, cursor) => {
     if (err) {
-      return next(err);
+      next(err);
+      return;
     }
     res.json({
       items: entities,
@@ -48,10 +49,11 @@ router.get('/', function list (req, res, next) {
  *
  * Create a new book.
  */
-router.post('/', function insert (req, res, next) {
-  getModel().create(req.body, function (err, entity) {
+router.post('/', (req, res, next) => {
+  getModel().create(req.body, (err, entity) => {
     if (err) {
-      return next(err);
+      next(err);
+      return;
     }
     res.json(entity);
   });
@@ -62,10 +64,11 @@ router.post('/', function insert (req, res, next) {
  *
  * Retrieve a book.
  */
-router.get('/:book', function get (req, res, next) {
-  getModel().read(req.params.book, function (err, entity) {
+router.get('/:book', (req, res, next) => {
+  getModel().read(req.params.book, (err, entity) => {
     if (err) {
-      return next(err);
+      next(err);
+      return;
     }
     res.json(entity);
   });
@@ -76,10 +79,11 @@ router.get('/:book', function get (req, res, next) {
  *
  * Update a book.
  */
-router.put('/:book', function update (req, res, next) {
-  getModel().update(req.params.book, req.body, function (err, entity) {
+router.put('/:book', (req, res, next) => {
+  getModel().update(req.params.book, req.body, (err, entity) => {
     if (err) {
-      return next(err);
+      next(err);
+      return;
     }
     res.json(entity);
   });
@@ -90,10 +94,11 @@ router.put('/:book', function update (req, res, next) {
  *
  * Delete a book.
  */
-router.delete('/:book', function _delete (req, res, next) {
-  getModel().delete(req.params.book, function (err) {
+router.delete('/:book', (req, res, next) => {
+  getModel().delete(req.params.book, (err) => {
     if (err) {
-      return next(err);
+      next(err);
+      return;
     }
     res.status(200).send('OK');
   });
@@ -102,7 +107,7 @@ router.delete('/:book', function _delete (req, res, next) {
 /**
  * Errors on "/api/books/*" routes.
  */
-router.use(function handleRpcError (err, req, res, next) {
+router.use((err, req, res, next) => {
   // Format error and forward to generic error handler for logging and
   // responding to the request
   err.response = {