npm run-script lint runs clean

Moved test files with ES6 syntax or that test corresponding files in
lib/es6 into test/unit/es6.

Added a minimal .eslintrc to the directories for conditionally
included ES6 source files.

Author: mikesamuel

lib/SqlString.js

@@ -14,7 +14,7 @@ var CHARS_ESCAPE_MAP    = {
   '\''   : '\\\'',
   '\\'   : '\\\\'
 };
-var ONE_ID_PATTERN = '^`(?:[^`]|``)+`$'  // TODO(mikesamuel): Should allow ``?
+var ONE_ID_PATTERN = '^`(?:[^`]|``)+`$'; // TODO(mikesamuel): Should allow ``?
 // One or more Identifiers separated by dots.
 var QUALIFIED_ID_REGEXP = new RegExp(
   '^' + ONE_ID_PATTERN + '(?:[.]' + ONE_ID_PATTERN + ')*$');

lib/Template.js

@@ -1,5 +1,7 @@
+/* eslint no-unused-vars: "off" */
+
 try {
-  module.exports = require('./es6/Template')
+  module.exports = require('./es6/Template');
 } catch (ignored) {
   // ES6 code failed to load.
   //
@@ -13,14 +15,14 @@ try {
   // calledAsTemplateTagQuick unless that function has
   // returned true.
 
-  module.exports = function (staticStrings) {
+  module.exports = function (sqlStrings) {
     // This might be reached if client code is transpiled down to
     // ES5 but this module is not.
     throw new Error('ES6 features not supported');
   };
   /**
-   * @param {*} firstArg
-   * @param {number} nArgs
+   * @param {*} firstArg The first argument to the function call.
+   * @param {number} nArgs The number of arguments pass to the function call.
    *
    * @return {boolean} always false in ES<6 compatibility mode.
    */

lib/es6/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "parserOptions": { "ecmaVersion": 6 }
+}

lib/es6/Template.js

@@ -4,8 +4,7 @@ const SqlString = require('../SqlString');
 const {
   calledAsTemplateTagQuick,
   memoizedTagFunction,
-  trimCommonWhitespaceFromLines,
-  TypedString
+  trimCommonWhitespaceFromLines
 } = require('template-tag-common');
 const { makeLexer } = require('./Lexer');
 

test/unit/es6/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "parserOptions": { "ecmaVersion": 6 }
+}

test/unit/es6-Lexer.js renamed to test/unit/es6/Lexer.js

@@ -2,7 +2,7 @@
 
 var assert    = require('assert');
 var test      = require('utest');
-var Lexer     = require('../../lib/es6/Lexer');
+var Lexer     = require('../../../lib/es6/Lexer');
 
 function tokens (...chunks) {
   const lexer = Lexer.makeLexer();

test/unit/es6-Template.js renamed to test/unit/es6/Template.js

@@ -1,7 +1,7 @@
 // This file uses es6 features and is loaded conditionally.
 
 var assert    = require('assert');
-var SqlString = require('../../');
+var SqlString = require('../../../');
 var test      = require('utest');
 
 var sql = SqlString.sql;
@@ -44,7 +44,7 @@ test('template tag', {
     runTagTest(
       'SELECT "\x1f8p\xbe\\\'OlI\xb3\xe3\\Z\x0cg(\x95\x7f"',
       () =>
-        sql`SELECT "${Buffer.from("1f3870be274f6c49b3e31a0c6728957f","hex")}"`
+        sql`SELECT "${Buffer.from('1f3870be274f6c49b3e31a0c6728957f','hex')}"`
     );
   },
   'null': function () {
@@ -61,7 +61,7 @@ test('template tag', {
         sql`SELECT ${undefined}`
     );
   },
-  'undefined': function () {
+  'negative zero': function () {
     runTagTest(
       'SELECT (1 / 0)',
       () =>

test/unit/test-Lexer.js

@@ -1,12 +1,10 @@
-var assert    = require('assert');
 var process   = require('process');
-var test      = require('utest');
 
 // If we're on a Node runtime that should support ES6, run the ES6 tests.
 var nodeVersion = process.env.npm_config_node_version;
 if (/^[0-5][.]/.test(nodeVersion || '')) {
   // The major version is a single digit in [0, 5].
   console.info('Skipping ES6 tests for node_version %s', nodeVersion);
 } else {
-  require('./es6-Lexer')
+  require('./es6/Lexer');
 }

test/unit/test-SqlString.js

@@ -362,15 +362,15 @@ test('SqlString.identifier', {
 
   'toSqlString returns escaped id': function() {
     assert.equal(
-      SqlString.identifier("Hello, World!").toSqlString(),
-      "`Hello, World!`");
+      SqlString.identifier('Hello, World!').toSqlString(),
+      '`Hello, World!`');
   },
 
   'backticks escaped': function() {
-    assert.equal(SqlString.identifier("I`m").toSqlString(), "`I``m`");
+    assert.equal(SqlString.identifier('I`m').toSqlString(), '`I``m`');
   },
 
   'escape() does not re-escape': function() {
-    assert.equal(SqlString.escape(SqlString.identifier("I`m")), "`I``m`");
+    assert.equal(SqlString.escape(SqlString.identifier('I`m')), '`I``m`');
   }
 });

test/unit/test-Template.js

@@ -9,7 +9,7 @@ if (/^[0-5][.]/.test(nodeVersion || '')) {
   // The major version is a single digit in [0, 5].
   console.info('Skipping ES6 tests for node_version %s', nodeVersion);
 } else {
-  require('./es6-Template')
+  require('./es6/Template');
 }
 
 var sql = SqlString.sql;
@@ -26,4 +26,4 @@ test('sql.calledAsTemplateTagQuick', {
   'string array first': function () {
     assert.equal(sql.calledAsTemplateTagQuick([''], 2), false);
   }
-})
+});