Merge pull request #19 from mccauli/change_babel_version

change babel version
mccauli · Sep 16, 2019 · bee4e2c · bee4e2c
2 parents 34f43aa + 2366630
commit bee4e2c
Show file tree

Hide file tree

Showing 19 changed files with 1,639 additions and 1,483 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["@babel/preset-env"]
+  "presets": ["env"]
 }
diff --git a/dist/converters/index.js b/dist/converters/index.js
@@ -1,30 +1,7 @@
-"use strict";
+'use strict';
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-var Joi = require('joi-browser');
-
-var parse = require('../parsers');
-
-var transform = require('../transformers');
-
-var srt = require('./srt');
-
-var vtt = require('./vtt');
-
-var _require = require('../shared/constants'),
-    PARAM_SCHEMA = _require.PARAM_SCHEMA;
-
-function generateOutputData(_x, _x2) {
-  return _generateOutputData.apply(this, arguments);
-}
-
-function _generateOutputData() {
-  _generateOutputData = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee(jsonData, outputExtension) {
+var generateOutputData = function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(jsonData, outputExtension) {
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -34,32 +11,29 @@ function _generateOutputData() {
             break;
 
           case 3:
-            return _context.abrupt("return", srt(jsonData));
+            return _context.abrupt('return', srt(jsonData));
 
           case 4:
-            return _context.abrupt("return", vtt(jsonData));
+            return _context.abrupt('return', vtt(jsonData));
 
           case 5:
-            throw Error("File type ".concat(outputExtension, " is not supported. Supported output file types include:\n") + 'srt');
+            throw Error('File type ' + outputExtension + ' is not supported. Supported output file types include:\n' + 'srt');
 
           case 6:
-          case "end":
+          case 'end':
             return _context.stop();
         }
       }
-    }, _callee);
+    }, _callee, this);
   }));
-  return _generateOutputData.apply(this, arguments);
-}
 
-function convert(_x3, _x4, _x5, _x6) {
-  return _convert.apply(this, arguments);
-}
+  return function generateOutputData(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
 
-function _convert() {
-  _convert = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee2(subtitleText, inputExtension, outputExtension, options) {
+var convert = function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(subtitleText, inputExtension, outputExtension, options) {
     var _Joi$validate, validationError, data, transformedData;
 
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -68,9 +42,8 @@ function _convert() {
           case 0:
             if (!options) {
               options = {};
-            } // validate input options
-
-
+            }
+            // validate input options
             _Joi$validate = Joi.validate({
               subtitleText: subtitleText,
               inputExtension: inputExtension,
@@ -97,21 +70,35 @@ function _convert() {
 
           case 10:
             transformedData = _context2.sent;
-            return _context2.abrupt("return", generateOutputData(transformedData, outputExtension));
+            return _context2.abrupt('return', generateOutputData(transformedData, outputExtension));
 
           case 14:
             _context2.prev = 14;
-            _context2.t0 = _context2["catch"](4);
+            _context2.t0 = _context2['catch'](4);
             throw Error(_context2.t0);
 
           case 17:
-          case "end":
+          case 'end':
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[4, 14]]);
+    }, _callee2, this, [[4, 14]]);
   }));
-  return _convert.apply(this, arguments);
-}
+
+  return function convert(_x3, _x4, _x5, _x6) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+
+var Joi = require('joi-browser');
+var parse = require('../parsers');
+var transform = require('../transformers');
+var srt = require('./srt');
+var vtt = require('./vtt');
+
+var _require = require('../shared/constants'),
+    PARAM_SCHEMA = _require.PARAM_SCHEMA;
 
 module.exports = convert;
diff --git a/dist/converters/srt.js b/dist/converters/srt.js
@@ -1,8 +1,29 @@
-"use strict";
+'use strict';
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+var srt = function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(subtitleJSON) {
+    var formattedJSON;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            formattedJSON = format(subtitleJSON);
+            return _context.abrupt('return', toSrt(formattedJSON));
 
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+          case 2:
+          case 'end':
+            return _context.stop();
+        }
+      }
+    }, _callee, this);
+  }));
+
+  return function srt(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
 
 var _require = require('subtitles-parser'),
     toSrt = _require.toSrt;
@@ -21,30 +42,4 @@ function format(subtitleJSON) {
   });
 }
 
-function srt(_x) {
-  return _srt.apply(this, arguments);
-}
-
-function _srt() {
-  _srt = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee(subtitleJSON) {
-    var formattedJSON;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            formattedJSON = format(subtitleJSON);
-            return _context.abrupt("return", toSrt(formattedJSON));
-
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _srt.apply(this, arguments);
-}
-
 module.exports = srt;
diff --git a/dist/converters/vtt.js b/dist/converters/vtt.js
@@ -1,8 +1,29 @@
-"use strict";
+'use strict';
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+var vtt = function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(subtitleJSON) {
+    var formattedJSON;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            formattedJSON = format(subtitleJSON);
+            return _context.abrupt('return', compile(formattedJSON));
 
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+          case 2:
+          case 'end':
+            return _context.stop();
+        }
+      }
+    }, _callee, this);
+  }));
+
+  return function vtt(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
 
 var _require = require('node-webvtt'),
     compile = _require.compile;
@@ -15,7 +36,7 @@ function format(subtitleJSON) {
     valid: true,
     cues: subtitleJSON.body.map(function (line) {
       var styles = line.styles ? Object.keys(line.styles).map(function (key) {
-        return "".concat(key, ":").concat(line.styles[key]);
+        return key + ':' + line.styles[key];
       }).join(' ') : '';
       return {
         identifier: line.id,
@@ -28,30 +49,4 @@ function format(subtitleJSON) {
   };
 }
 
-function vtt(_x) {
-  return _vtt.apply(this, arguments);
-}
-
-function _vtt() {
-  _vtt = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee(subtitleJSON) {
-    var formattedJSON;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            formattedJSON = format(subtitleJSON);
-            return _context.abrupt("return", compile(formattedJSON));
-
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _vtt.apply(this, arguments);
-}
-
 module.exports = vtt;
diff --git a/dist/index.js b/dist/index.js
@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 var convert = require('./converters');
 

diff --git a/dist/parsers/dfxp.js b/dist/parsers/dfxp.js
@@ -1,16 +1,51 @@
-"use strict";
+'use strict';
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+var dfxp = function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(subtitleText, options) {
+    var subtitleJSON, _Joi$validate, error, value;
+
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return parseXml(subtitleText);
 
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+          case 2:
+            subtitleJSON = _context.sent;
+            _Joi$validate = Joi.validate(standardize(subtitleJSON, options), SUBTITLE_SCHEMA), error = _Joi$validate.error, value = _Joi$validate.value;
+
+            if (!error) {
+              _context.next = 6;
+              break;
+            }
+
+            throw Error(error);
+
+          case 6:
+            return _context.abrupt('return', value);
+
+          case 7:
+          case 'end':
+            return _context.stop();
+        }
+      }
+    }, _callee, this);
+  }));
+
+  return function dfxp(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
 
 var util = require('util');
 
 var _require = require('xml2js'),
     parseString = _require.parseString;
 
 var Joi = require('joi-browser');
-
 var R = require('ramda');
 
 var _require2 = require('../shared/constants'),
@@ -26,6 +61,7 @@ var parseXml = util.promisify(parseString);
 function standardize(subtitleJSON, options) {
   var removeTextFormatting = options.removeTextFormatting,
       timecodeOverlapLimiter = options.timecodeOverlapLimiter;
+
   var prevLine = '';
   var global = R.path(['tt', '$'], subtitleJSON);
   var body = R.path(['tt', 'body', '0', 'div', '0', 'p'], subtitleJSON);
@@ -53,45 +89,4 @@ function standardize(subtitleJSON, options) {
   };
 }
 
-function dfxp(_x, _x2) {
-  return _dfxp.apply(this, arguments);
-}
-
-function _dfxp() {
-  _dfxp = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee(subtitleText, options) {
-    var subtitleJSON, _Joi$validate, error, value;
-
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return parseXml(subtitleText);
-
-          case 2:
-            subtitleJSON = _context.sent;
-            _Joi$validate = Joi.validate(standardize(subtitleJSON, options), SUBTITLE_SCHEMA), error = _Joi$validate.error, value = _Joi$validate.value;
-
-            if (!error) {
-              _context.next = 6;
-              break;
-            }
-
-            throw Error(error);
-
-          case 6:
-            return _context.abrupt("return", value);
-
-          case 7:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _dfxp.apply(this, arguments);
-}
-
 module.exports = dfxp;