upgrading to latest prettier

nfriedly · nfriedly · commit 5d23b964aefc · 2017-04-27T11:42:07.000-04:00
diff --git a/examples/static/audio-video-deprecated/media-element-audio-stream.js b/examples/static/audio-video-deprecated/media-element-audio-stream.js
@@ -70,8 +70,8 @@ function MediaElementAudioStream(element, options) {
 
   var AudioContext = window.AudioContext || window.webkitAudioContext;
   // cache the source node & context since it's not possible to recreate it later
-  var context = element.context = element.context || new AudioContext();
-  var audioInput = element.node = element.node || context.createMediaElementSource(element);
+  var context = (element.context = element.context || new AudioContext());
+  var audioInput = (element.node = element.node || context.createMediaElementSource(element));
   var scriptProcessor = context.createScriptProcessor(options.bufferSize, inputChannels, outputChannels);
 
   scriptProcessor.onaudioprocess = processAudio;
diff --git a/examples/stt-token.js b/examples/stt-token.js
@@ -4,7 +4,7 @@ var express = require('express');
 var router = express.Router(); // eslint-disable-line new-cap
 var watson = require('watson-developer-cloud');
 var vcapServices = require('vcap_services');
-var extend = extend = require('util')._extend;
+var extend = (extend = require('util')._extend);
 
 // set up an endpoint to serve speech-to-text auth tokens
 
diff --git a/examples/tts-token.js b/examples/tts-token.js
@@ -4,7 +4,7 @@ var express = require('express');
 var router = express.Router(); // eslint-disable-line new-cap
 var watson = require('watson-developer-cloud');
 var vcapServices = require('vcap_services');
-var extend = extend = require('util')._extend;
+var extend = (extend = require('util')._extend);
 
 // another endpoint for the text to speech service
 
diff --git a/speech-to-text/file-player.js b/speech-to-text/file-player.js
@@ -9,7 +9,7 @@ var getContentTypeFromHeader = require('./content-type');
  * @constructor
  */
 function UrlPlayer(url) {
-  var audio = this.audio = new Audio();
+  var audio = (this.audio = new Audio());
   audio.src = url;
   audio.play();
   /**
@@ -28,7 +28,7 @@ function UrlPlayer(url) {
  * @constructor
  */
 function FilePlayer(file, contentType) {
-  var audio = this.audio = new Audio();
+  var audio = (this.audio = new Audio());
   if (audio.canPlayType(contentType)) {
     audio.src = URL.createObjectURL(new Blob([file], { type: contentType }));
     audio.play();
diff --git a/speech-to-text/format-stream.js b/speech-to-text/format-stream.js
@@ -34,7 +34,7 @@ function FormatStream(opts) {
 util.inherits(FormatStream, Transform);
 
 var reHesitation = /%HESITATION ?/g; // http://www.ibm.com/watson/developercloud/doc/speech-to-text/output.shtml#hesitation - D_ is handled below
-var reRepeatedCharacter = /([a-z])\1{2,}/ig; // detect the same character repeated three or more times and remove it
+var reRepeatedCharacter = /([a-z])\1{2,}/gi; // detect the same character repeated three or more times and remove it
 var reDUnderscoreWords = /D_[^\s]+/g; // replace D_(anything)
 
 /**
@@ -121,43 +121,34 @@ FormatStream.prototype.formatString = function(str, isInterim) {
 FormatStream.prototype.formatResult = function formatResult(data) {
   data = clone(data);
   if (Array.isArray(data.results)) {
-    data.results.forEach(
-      function(result, i) {
-        // if there are multiple interim results (as produced by the speaker stream),
-        // treat the text as final in all but the last result
-        var textFinal = result.final || i !== data.results.length - 1;
-
-        result.alternatives = result.alternatives.map(
-          function(alt) {
-            alt.transcript = this.formatString(alt.transcript, !textFinal);
-            if (alt.timestamps) {
-              alt.timestamps = alt.timestamps
-                .map(
-                  function(ts, j, arr) {
-                    // timestamps is an array of arrays, each sub-array is in the form ["word", startTime, endTime]'
-                    ts[0] = this.clean(ts[0]);
-                    if (j === 0) {
-                      ts[0] = this.capitalize(ts[0]);
-                    }
-
-                    if (j === arr.length - 1 && textFinal) {
-                      ts[0] = this.period(ts[0]);
-                    }
-                    return ts;
-                  },
-                  this
-                )
-                .filter(function(ts) {
-                  return ts[0]; // remove any timestamps without a word (due to cleaning out junk words)
-                });
-            }
-            return alt;
-          },
-          this
-        );
-      },
-      this
-    );
+    data.results.forEach(function(result, i) {
+      // if there are multiple interim results (as produced by the speaker stream),
+      // treat the text as final in all but the last result
+      var textFinal = result.final || i !== data.results.length - 1;
+
+      result.alternatives = result.alternatives.map(function(alt) {
+        alt.transcript = this.formatString(alt.transcript, !textFinal);
+        if (alt.timestamps) {
+          alt.timestamps = alt.timestamps
+            .map(function(ts, j, arr) {
+              // timestamps is an array of arrays, each sub-array is in the form ["word", startTime, endTime]'
+              ts[0] = this.clean(ts[0]);
+              if (j === 0) {
+                ts[0] = this.capitalize(ts[0]);
+              }
+
+              if (j === arr.length - 1 && textFinal) {
+                ts[0] = this.period(ts[0]);
+              }
+              return ts;
+            }, this)
+            .filter(function(ts) {
+              return ts[0]; // remove any timestamps without a word (due to cleaning out junk words)
+            });
+        }
+        return alt;
+      }, this);
+    }, this);
   }
   return data;
 };
diff --git a/speech-to-text/no-timestamps.js b/speech-to-text/no-timestamps.js
@@ -8,7 +8,7 @@
 module.exports = function noTimestamps(data) {
   return data.results.some(function(result) {
     var alt = result.alternatives && result.alternatives[0];
-    return !!(alt && (alt.transcript.trim() && !alt.timestamps || !alt.timestamps.length));
+    return !!(alt && ((alt.transcript.trim() && !alt.timestamps) || !alt.timestamps.length));
   });
 };
 
diff --git a/speech-to-text/recognize-file.js b/speech-to-text/recognize-file.js
@@ -82,7 +82,7 @@ module.exports = function recognizeFile(options) {
     options.smart_formatting = options.format;
   }
 
-  var realtime = options.realtime || typeof options.realtime === 'undefined' && options.play;
+  var realtime = options.realtime || (typeof options.realtime === 'undefined' && options.play);
 
   // the timing stream requires timestamps to work, so enable them automatically
   if (realtime) {
@@ -168,9 +168,11 @@ module.exports = function recognizeFile(options) {
         //   3. re-pipe the source streams
 
         var sources = streams.filter(function(s) {
-          return s._readableState &&
+          return (
+            s._readableState &&
             s._readableState.pipes &&
-            (s._readableState.pipes === stream || Array.isArray(s._readableState.pipes) && s._readableState.pipes.indexOf(stream) !== -1);
+            (s._readableState.pipes === stream || (Array.isArray(s._readableState.pipes) && s._readableState.pipes.indexOf(stream) !== -1))
+          );
         });
 
         stream.emit('error', err);
diff --git a/speech-to-text/recognize-stream.js b/speech-to-text/recognize-stream.js
@@ -159,7 +159,7 @@ RecognizeStream.prototype.initialize = function() {
 
   // node params: requestUrl, protocols, origin, headers, extraRequestOptions
   // browser params: requestUrl, protocols (all others ignored)
-  var socket = this.socket = new W3CWebSocket(url, null, null, options.headers, null);
+  var socket = (this.socket = new W3CWebSocket(url, null, null, options.headers, null));
 
   // when the input stops, let the service know that we're done
   self.on('finish', self.finish.bind(self));
diff --git a/speech-to-text/result-stream.js b/speech-to-text/result-stream.js
@@ -39,14 +39,11 @@ ResultStream.prototype._transform = function(data, encoding, next) {
   // when speaker_labels is enabled, some messages won't have a results array
   if (Array.isArray(data.results)) {
     // usually there is exactly 1 result, but there can be 0 in some circumstances, and potentially more in future iterations
-    data.results.forEach(
-      function(result) {
-        var cloned = clone(result);
-        cloned.index = data.result_index;
-        this.push(cloned);
-      },
-      this
-    );
+    data.results.forEach(function(result) {
+      var cloned = clone(result);
+      cloned.index = data.result_index;
+      this.push(cloned);
+    }, this);
   } else {
     this.push(data);
   }
diff --git a/speech-to-text/speaker-stream.js b/speech-to-text/speaker-stream.js
@@ -169,26 +169,23 @@ SpeakerStream.prototype.buildMessage = function() {
   });
 
   // group the words together into utterances by speaker
-  var utterances = words.reduce(
-    function(arr, word) {
-      var utterance = arr[arr.length - 1];
-      // any time the speaker changes or the (original) result changes, create a new utterance
-      if (!utterance || utterance.speaker !== word.speaker || utterance.result !== word.result) {
-        utterance = {
-          speaker: word.speaker,
-          timestamps: [word.timestamp],
-          result: word.result
-        };
-        // and add it to the list
-        arr.push(utterance);
-      } else {
-        // otherwise just append the current word to the current result
-        utterance.timestamps.push(word.timestamp);
-      }
-      return arr;
-    },
-    []
-  );
+  var utterances = words.reduce(function(arr, word) {
+    var utterance = arr[arr.length - 1];
+    // any time the speaker changes or the (original) result changes, create a new utterance
+    if (!utterance || utterance.speaker !== word.speaker || utterance.result !== word.result) {
+      utterance = {
+        speaker: word.speaker,
+        timestamps: [word.timestamp],
+        result: word.result
+      };
+      // and add it to the list
+      arr.push(utterance);
+    } else {
+      // otherwise just append the current word to the current result
+      utterance.timestamps.push(word.timestamp);
+    }
+    return arr;
+  }, []);
 
   // create new results
   var results = utterances.map(function(utterance, i) {
@@ -207,11 +204,12 @@ SpeakerStream.prototype.buildMessage = function() {
     result.speaker = utterance.speaker;
     // overwrite the transcript and timestamps on the first alternative
     var alt = result.alternatives[0];
-    alt.transcript = utterance.timestamps
-      .map(function(ts) {
-        return ts[WORD];
-      })
-      .join(' ') + ' ';
+    alt.transcript =
+      utterance.timestamps
+        .map(function(ts) {
+          return ts[WORD];
+        })
+        .join(' ') + ' ';
     alt.timestamps = utterance.timestamps;
     // overwrite the final value
     result.final = final;
@@ -266,12 +264,9 @@ SpeakerStream.prototype.handleResults = function(data) {
     .filter(function(result) {
       return result.final;
     })
-    .forEach(
-      function(result) {
-        this.results.push(result);
-      },
-      this
-    );
+    .forEach(function(result) {
+      this.results.push(result);
+    }, this);
 };
 
 // sorts by start time and then end time
@@ -350,18 +345,16 @@ SpeakerStream.prototype._flush = function(done) {
     .map(function(r) {
       return r.alternatives[0].timestamps;
     })
-    .reduce(
-      function(a, b) {
-        return a.concat(b);
-      },
-      []
-    );
+    .reduce(function(a, b) {
+      return a.concat(b);
+    }, []);
   if (timestamps.length !== this.speaker_labels.length) {
     var msg;
     if (timestamps.length && !this.speaker_labels.length) {
       msg = 'No speaker_labels found. SpeakerStream requires speaker_labels to be enabled.';
     } else {
-      msg = 'Mismatch between number of word timestamps (' +
+      msg =
+        'Mismatch between number of word timestamps (' +
         timestamps.length +
         ') and number of speaker_labels (' +
         this.speaker_labels.length +
diff --git a/speech-to-text/timing-stream.js b/speech-to-text/timing-stream.js
@@ -60,12 +60,9 @@ TimingStream.prototype._transform = function(msg, encoding, next) {
   }
 
   if (objectMode || hasTranscript) {
-    this.timeout = setTimeout(
-      function() {
-        next(null, msg);
-      },
-      delayMs
-    );
+    this.timeout = setTimeout(function() {
+      next(null, msg);
+    }, delayMs);
   } else {
     return next();
   }
diff --git a/speech-to-text/webaudio-l16-stream.js b/speech-to-text/webaudio-l16-stream.js
@@ -151,7 +151,7 @@ WebAudioL16Stream.prototype.floatTo16BitPCM = function(input) {
   var output = new DataView(new ArrayBuffer(input.length * 2)); // length is in bytes (8-bit), so *2 to get 16-bit length
   for (var i = 0; i < input.length; i++) {
     var multiplier = input[i] < 0 ? 0x8000 : 0x7fff; // 16-bit signed range is -32768 to 32767
-    output.setInt16(i * 2, input[i] * multiplier | 0, true); // index, value, little edian
+    output.setInt16(i * 2, (input[i] * multiplier) | 0, true); // index, value, little edian
   }
   return Buffer.from(output.buffer);
 };
diff --git a/speech-to-text/writable-element-stream.js b/speech-to-text/writable-element-stream.js
@@ -57,17 +57,14 @@ WritableElementStream.prototype.writeString = function writeString(text, encodin
 
 WritableElementStream.prototype.writeObject = function writeObject(data, encoding, next) {
   if (Array.isArray(data.results)) {
-    data.results.forEach(
-      function(result) {
-        if (result.final) {
-          this.finalizedText += result.alternatives[0].transcript;
-          this.el[this.prop] = this.finalizedText;
-        } else {
-          this.el[this.prop] = this.finalizedText + result.alternatives[0].transcript;
-        }
-      },
-      this
-    );
+    data.results.forEach(function(result) {
+      if (result.final) {
+        this.finalizedText += result.alternatives[0].transcript;
+        this.el[this.prop] = this.finalizedText;
+      } else {
+        this.el[this.prop] = this.finalizedText + result.alternatives[0].transcript;
+      }
+    }, this);
   }
   next();
 };
diff --git a/test/end-to-end-spec.js b/test/end-to-end-spec.js
@@ -36,7 +36,7 @@ describe('WatsonSpeech.SpeechToText end-to-end', function() {
   // firefox can automatically approve getUserMedia, but not playback audio, so offline only
   // ...except on travis ci, where it gets NO_DEVICES_FOUND
   // chrome can do both, so it gets tested on and offline
-  (offline && !travis || chrome ? it : xit)('should transcribe mic input', function(done) {
+  ((offline && !travis) || chrome ? it : xit)('should transcribe mic input', function(done) {
     getConfig()
       .then(function(cfg) {
         var stt = SpeechToText.recognizeMicrophone(cfg);
diff --git a/test/resources/offline_test_server.js b/test/resources/offline_test_server.js
diff --git a/test/speaker-stream-spec.js b/test/speaker-stream-spec.js
diff --git a/test/timing-stream-spec.js b/test/timing-stream-spec.js
