Merge commit 'f50689da650c8218301819c4f31703d9a658033b'

* commit 'f50689da650c8218301819c4f31703d9a658033b':
  3.0.1
  Update eslint
  3.0.0
  Follow-up to d9d31aa
  Update machine runner to v15. (refs balderdashy/sails#4264)

# Conflicts:
#	package.json

Author: andrii-liashenko

.eslintrc

@@ -2,31 +2,70 @@
   //   ╔═╗╔═╗╦  ╦╔╗╔╔╦╗┬─┐┌─┐
   //   ║╣ ╚═╗║  ║║║║ ║ ├┬┘│
   //  o╚═╝╚═╝╩═╝╩╝╚╝ ╩ ┴└─└─┘
-  // A set of basic conventions designed to complement the .jshintrc file.
+  // A set of basic conventions (similar to .jshintrc) for use within any
+  // arbitrary JavaScript / Node.js package -- inside or outside Sails.js.
   // For the master copy of this file, see the `.eslintrc` template file in
   // the `sails-generate` package (https://www.npmjs.com/package/sails-generate.)
+  // Designed for ESLint v4.
+  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  // For more information about any of the rules below, check out the relevant
+  // reference page on eslint.org.  For example, to get details on "no-sequences",
+  // you would visit `http://eslint.org/docs/rules/no-sequences`.  If you're unsure
+  // or could use some advice, come by https://sailsjs.com/support.
+  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
   "env": {
-    "node": true,
-    "mocha": true
+    "node": true
   },
+
+  "parserOptions": {
+    "ecmaVersion": 5
+    // ^^This can be changed to `8` if this package doesn't need to support <= Node v6.
+  },
+
+  "globals": {
+    "Promise": true
+    // ^^Available since Node v4
+  },
+
   "rules": {
-    "callback-return":              [2, ["callback", "cb", "next", "done", "proceed"]],
-    "camelcase":                    [2, {"properties": "always"}],
-    "comma-style":                  [2, "last"],
-    "curly":                        [2],
-    "eqeqeq":                       [1, "smart"],
-    "eol-last":                     [2],
-    "handle-callback-err":          [2],
-    "indent":                       [2, 2, {"SwitchCase": 1}],
-    "linebreak-style":              [2, "unix"],
-    "no-mixed-spaces-and-tabs":     [2, "smart-tabs"],
-    "no-return-assign":             [2, "always"],
-    "no-sequences":                 [2],
-    "no-trailing-spaces":           [2],
-    "no-undef":                     [2],
-    "no-unexpected-multiline":      [1],
-    "no-unused-vars":               [2],
-    "one-var":                      [2, "never"],
-    "semi":                         [1, "always"]
+    "callback-return":              ["error", ["done", "proceed", "next", "onwards", "callback", "cb"]],
+    "camelcase":                    ["warn", {"properties": "always"}],
+    "comma-style":                  ["warn", "last"],
+    "curly":                        ["error"],
+    "eqeqeq":                       ["error", "always"],
+    "eol-last":                     ["warn"],
+    "handle-callback-err":          ["error"],
+    "indent":                       ["warn", 2, {
+      "SwitchCase": 1,
+      "MemberExpression": "off",
+      "FunctionDeclaration": {"body":1, "parameters": "off"},
+      "FunctionExpression": {"body":1, "parameters": "off"},
+      "CallExpression": {"arguments":"off"},
+      "ArrayExpression": 1,
+      "ObjectExpression": 1,
+      "ignoredNodes": ["ConditionalExpression"]
+    }],
+    "linebreak-style":              ["error", "unix"],
+    "no-dupe-keys":                 ["error"],
+    "no-duplicate-case":            ["error"],
+    "no-extra-semi":                ["warn"],
+    "no-labels":                    ["error"],
+    "no-mixed-spaces-and-tabs":     ["error", "smart-tabs"],
+    "no-redeclare":                 ["warn"],
+    "no-return-assign":             ["error", "always"],
+    "no-sequences":                 ["error"],
+    "no-trailing-spaces":           ["warn"],
+    "no-undef":                     ["error"],
+    "no-unexpected-multiline":      ["warn"],
+    "no-unreachable":               ["warn"],
+    "no-unused-vars":               ["warn", {"caughtErrors":"all", "caughtErrorsIgnorePattern": "^unused($|[A-Z].*$)"}],
+    "no-use-before-define":         ["error", {"functions":false}],
+    "one-var":                      ["warn", "never"],
+    "quotes":                       ["warn", "single", {"avoidEscape":false, "allowTemplateLiterals":true}],
+    "semi":                         ["error", "always"],
+    "semi-spacing":                 ["warn", {"before":false, "after":true}],
+    "semi-style":                   ["warn", "last"]
   }
+
 }

.gitignore

@@ -17,6 +17,7 @@
 node_modules
 npm-debug.log
 .node_history
+package-lock.json
 
 ############################
 # editor & OS files

helpers/validate-connection.js

@@ -7,7 +7,7 @@ module.exports = require('machine').build({
   description: 'Check if this looks like a valid MySQL connection instance.',
 
 
-  cacheable: true,
+  sideEffects: 'cacheable',
 
 
   sync: true,

machines/.gitkeep

@@ -37,8 +37,8 @@ module.exports = {
       extendedDescription: 'Until it is committed, rolled back, or times out, subsequent queries run on this connection will be transactional.  They will not have any true effect on the database until the transaction is committed, and will not affect queries made on other connections.',
       outputVariableName: 'report',
       outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
-      // example: {
+      outputExample: '==='
+      // outputExample: {
       //   meta: '==='
       // }
     },
@@ -49,8 +49,8 @@ module.exports = {
       extendedDescription: 'Usually, this means the connection to the database was lost due to a logic error or timing issue in userland code.  In production, this can mean that the database became overwhelemed or was shut off while some business logic was in progress.',
       outputVariableName: 'report',
       outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
-      // example: {
+      outputExample: '==='
+      // outputExample: {
       //   meta: '==='
       // }
     }
@@ -66,7 +66,7 @@ module.exports = {
     Pack.sendNativeQuery({
       connection: inputs.connection,
       nativeQuery: 'BEGIN'
-    }).exec({
+    }).switch({
       error: function error(err) {
         return exits.error(err);
       },

machines/begin-transaction.js

@@ -40,8 +40,8 @@ module.exports = {
       extendedDescription: 'Subsequent queries on this connection will no longer be transactional unless a new transaction is begun.',
       outputVariableName: 'report',
       outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
-      // example: {
+      outputExample: '==='
+      // outputExample: {
       //   meta: '==='
       // }
     },
@@ -52,8 +52,8 @@ module.exports = {
       extendedDescription: 'Usually, this means the connection to the database was lost due to a logic error or timing issue in userland code.  In production, this can mean that the database became overwhelemed or was shut off while some business logic was in progress.',
       outputVariableName: 'report',
       outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
-      // example: {
+      outputExample: '==='
+      // outputExample: {
       //   meta: '==='
       // }
     }
@@ -69,7 +69,7 @@ module.exports = {
     Pack.sendNativeQuery({
       connection: inputs.connection,
       nativeQuery: 'COMMIT'
-    }).exec({
+    }).switch({
       error: function error(err) {
         return exits.error(err);
       },

machines/commit-transaction.js

@@ -13,7 +13,7 @@ module.exports = {
   description: 'Compile a Waterline statement to a native query for MySQL.',
 
 
-  cacheable: true,
+  sideEffects: 'cacheable',
 
 
   sync: true,
@@ -46,7 +46,7 @@ module.exports = {
       description: 'The provided Waterline statement was compiled successfully.',
       outputVariableName: 'report',
       outputDescription: 'The `nativeQuery` property is the compiled native query for the database.  The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
+      outputExample: '==='
       // example: {
       //   nativeQuery: 'SELECT * FROM foo',
       //   valuesToEscape: ['foo']
@@ -58,7 +58,7 @@ module.exports = {
       description: 'The provided Waterline statement could not be compiled due to malformed syntax.',
       outputVariableName: 'report',
       outputDescription: 'The `error` property is a JavaScript error instance explaining that (or preferably even _why_) the Waterline syntax is not valid.  The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
+      outputExample: '==='
       // example: {
       //   error: '===',
       //   meta: '==='
@@ -70,7 +70,7 @@ module.exports = {
       extendedDescription: 'If even one clause of the Waterline statement is not supported by the MySQL driver, the compilation of the entire statement _always fails_.',
       outputVariableName: 'report',
       outputDescription: 'The `error` property is a JavaScript error instance explaining that (or preferably even _why_) the Waterline statement is not supported.  The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
+      outputExample: '==='
       // example: {
       //   error: '===',
       //   meta: '==='

machines/compile-statement.js

@@ -24,9 +24,6 @@ module.exports = {
   '(e.g. a PoolCluster from felixge\'s `mysql` package).',
 
 
-  cacheable: false,
-
-
   sync: true,
 
 
@@ -82,7 +79,7 @@ module.exports = {
         'basis; and it may also vary based on the configuration passed into the `meta` input.',
       outputVariableName: 'report',
       outputDescription: 'The `manager` property is a manager instance that will be passed into `getConnection()`. The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
+      outputExample: '==='
       // example: {
       //   manager: '===',
       //   meta: '==='
@@ -93,7 +90,7 @@ module.exports = {
       description: 'The provided connection string is not valid for MySQL.',
       outputVariableName: 'report',
       outputDescription: 'The `error` property is a JavaScript Error instance explaining that (and preferably "why") the provided connection string is invalid.  The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
+      outputExample: '==='
       // example: {
       //   error: '===',
       //   meta: '==='
@@ -119,8 +116,8 @@ module.exports = {
         'any errors related to bad credentials, connectivity, etc. will not be caught until `getConnection()` is called.',
       outputVariableName: 'report',
       outputDescription: 'The `error` property is a JavaScript Error instance with more information and a stack trace.  The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
-      // example: {
+      outputExample: '==='
+      // outputExample: {
       //   error: '===',
       //   meta: '==='
       // }

machines/create-manager.js

@@ -33,7 +33,7 @@ module.exports = {
       description: 'The specified manager and all of its active connections were successfully destroyed.',
       outputVariableName: 'report',
       outputDescription: 'The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
+      outputExample: '==='
       // example: {
       //   meta: '==='
       // }
@@ -48,7 +48,7 @@ module.exports = {
         'server(s) became overwhelemed or were shut off while some business logic was in progress.',
       outputVariableName: 'report',
       outputDescription: 'The `error` property is a JavaScript Error instance with more information and a stack trace.  The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
+      outputExample: '==='
       // example: {
       //   error: '===',
       //   meta: '==='

machines/destroy-manager.js

@@ -39,7 +39,7 @@ module.exports = {
       extendedDescription: 'This connection should be eventually released.  Otherwise, it may time out.  It is not a good idea to rely on database connections timing out-- be sure to release this connection when finished with it!',
       outputVariableName: 'report',
       outputDescription: 'The `connection` property is an active connection to the database.  The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
+      outputExample: '==='
       // example: {
       //   connection: '===',
       //   meta: '==='
@@ -57,7 +57,7 @@ module.exports = {
       ' + any other miscellaneous connection error',
       outputVariableName: 'report',
       outputDescription: 'The `error` property is a JavaScript Error instance explaining that a connection could not be made.  The `meta` property is reserved for custom driver-specific extensions.',
-      example: '==='
+      outputExample: '==='
       // example: {
       //   error: '===',
       //   meta: '==='