@speleotica/frcsdata 4.0.0 → 4.0.1

package/parseFrcsTripSummaryFile.js

@@ -1,22 +1,16 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = parseFrcsTripSummaryFile;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _asyncIterator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncIterator"));
-
 var _unitized = require("@speleotica/unitized");
-
+function _asyncIterator(iterable) { var method, async, sync, retry = 2; for ("undefined" != typeof Symbol && (async = Symbol.asyncIterator, sync = Symbol.iterator); retry--;) { if (async && null != (method = iterable[async])) return method.call(iterable); if (sync && null != (method = iterable[sync])) return new AsyncFromSyncIterator(method.call(iterable)); async = "@@asyncIterator", sync = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
+function AsyncFromSyncIterator(s) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var done = r.done; return Promise.resolve(r.value).then(function (value) { return { value: value, done: done }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(s) { this.s = s, this.n = s.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, "return": function _return(value) { var ret = this.s["return"]; return void 0 === ret ? Promise.resolve({ value: value, done: !0 }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments)); }, "throw": function _throw(value) { var thr = this.s["return"]; return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(s); }
 var tripSummaryRegex = /^\s*(\d+)\s+(\d{1,2})\/(\s\d|\d\d)\/(\d{2,4})\s+(\d+(?:\.\d*)?)\s+(\d+)\s+(\S.*)EXCLUDED:\s+(\d+(?:\.\d*)?)\s+(\d+)/;
 /**
  * Parses data from a STAT_sum.txt file.  Here is an excerpt of the format:
@@ -32,149 +26,115 @@ var tripSummaryRegex = /^\s*(\d+)\s+(\d{1,2})\/(\s\d|\d\d)\/(\d{2,4})\s+(\d+(?:\
                                  B6-B18       B17 SIDE     B19-B38      B32 SIDE
                                  BS1-BS5      C1-C18       </pre>
  */
-
 function parseFrcsTripSummaryFile(_x, _x2) {
   return _parseFrcsTripSummaryFile.apply(this, arguments);
 }
-
 function _parseFrcsTripSummaryFile() {
-  _parseFrcsTripSummaryFile = (0, _asyncToGenerator2["default"])(
-  /*#__PURE__*/
-  _regenerator["default"].mark(function _callee(file, lines) {
-    var errors, tripSummaries, tripStartLine, lineNumber, team, shots, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, line, match, tripNumber, tripIndex, year, date, totalLength, numShots, name, excludedLength, numExcludedShots, _team, _shots, trimmed;
-
+  _parseFrcsTripSummaryFile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(file, lines) {
+    var errors, tripSummaries, tripStartLine, lineNumber, team, shots, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, line, match, tripNumber, tripIndex, year, date, totalLength, numShots, name, excludedLength, numExcludedShots, _team, _shots, trimmed;
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            errors = [];
-            tripSummaries = [];
-            tripStartLine = -2;
-            lineNumber = 0;
-            team = [];
-            shots = [];
-            _iteratorNormalCompletion = true;
-            _didIteratorError = false;
-            _context.prev = 8;
-            _iterator = (0, _asyncIterator2["default"])(lines);
-
-          case 10:
-            _context.next = 12;
-            return _iterator.next();
-
-          case 12:
-            _step = _context.sent;
-            _iteratorNormalCompletion = _step.done;
-            _context.next = 16;
-            return _step.value;
-
-          case 16:
-            _value = _context.sent;
-
-            if (_iteratorNormalCompletion) {
-              _context.next = 41;
-              break;
-            }
-
-            line = _value;
-            lineNumber++;
-            match = tripSummaryRegex.exec(line);
-
-            if (!match) {
-              _context.next = 37;
-              break;
-            }
-
-            tripStartLine = lineNumber;
-            tripNumber = parseInt(match[1]);
-            tripIndex = tripNumber - 1;
-            year = parseInt(match[4]);
-            if (year < 1000) year += 1900;
-            date = new Date(year, parseInt(match[2]) - 1, parseInt(match[3]));
-            totalLength = _unitized.Unitize.feet(parseFloat(match[5]));
-            numShots = parseInt(match[6]);
-            name = match[7].trim();
-            excludedLength = _unitized.Unitize.feet(parseFloat(match[8]));
-            numExcludedShots = parseInt(match[9]);
-            team = [];
-            shots = [];
-            tripSummaries[tripIndex] = {
-              tripNumber: tripNumber,
-              tripIndex: tripIndex,
-              date: date,
-              totalLength: totalLength,
-              numShots: numShots,
-              name: name,
-              excludedLength: excludedLength,
-              numExcludedShots: numExcludedShots,
-              team: team,
-              shots: shots
-            };
-            return _context.abrupt("continue", 38);
-
-          case 37:
-            if (lineNumber === tripStartLine + 1) {
-              (_team = team).push.apply(_team, (0, _toConsumableArray2["default"])(line.trim().split(/\s\s+|\t+/g)));
-            } else {
-              trimmed = line.trim();
-              if (trimmed) (_shots = shots).push.apply(_shots, (0, _toConsumableArray2["default"])(trimmed.split(/\s\s+|\t+/)));
-            }
-
-          case 38:
-            _iteratorNormalCompletion = true;
-            _context.next = 10;
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          errors = [];
+          tripSummaries = [];
+          tripStartLine = -2;
+          lineNumber = 0;
+          team = [];
+          shots = [];
+          _iteratorAbruptCompletion = false;
+          _didIteratorError = false;
+          _context.prev = 8;
+          _iterator = _asyncIterator(lines);
+        case 10:
+          _context.next = 12;
+          return _iterator.next();
+        case 12:
+          if (!(_iteratorAbruptCompletion = !(_step = _context.sent).done)) {
+            _context.next = 36;
             break;
-
-          case 41:
+          }
+          line = _step.value;
+          lineNumber++;
+          match = tripSummaryRegex.exec(line);
+          if (!match) {
+            _context.next = 32;
+            break;
+          }
+          tripStartLine = lineNumber;
+          tripNumber = parseInt(match[1]);
+          tripIndex = tripNumber - 1;
+          year = parseInt(match[4]);
+          if (year < 1000) year += 1900;
+          date = new Date(year, parseInt(match[2]) - 1, parseInt(match[3]));
+          totalLength = _unitized.Unitize.feet(parseFloat(match[5]));
+          numShots = parseInt(match[6]);
+          name = match[7].trim();
+          excludedLength = _unitized.Unitize.feet(parseFloat(match[8]));
+          numExcludedShots = parseInt(match[9]);
+          team = [];
+          shots = [];
+          tripSummaries[tripIndex] = {
+            tripNumber: tripNumber,
+            tripIndex: tripIndex,
+            date: date,
+            totalLength: totalLength,
+            numShots: numShots,
+            name: name,
+            excludedLength: excludedLength,
+            numExcludedShots: numExcludedShots,
+            team: team,
+            shots: shots
+          };
+          return _context.abrupt("continue", 33);
+        case 32:
+          if (lineNumber === tripStartLine + 1) {
+            (_team = team).push.apply(_team, (0, _toConsumableArray2["default"])(line.trim().split(/\s\s+|\t+/g)));
+          } else {
+            trimmed = line.trim();
+            if (trimmed) (_shots = shots).push.apply(_shots, (0, _toConsumableArray2["default"])(trimmed.split(/\s\s+|\t+/)));
+          }
+        case 33:
+          _iteratorAbruptCompletion = false;
+          _context.next = 10;
+          break;
+        case 36:
+          _context.next = 42;
+          break;
+        case 38:
+          _context.prev = 38;
+          _context.t0 = _context["catch"](8);
+          _didIteratorError = true;
+          _iteratorError = _context.t0;
+        case 42:
+          _context.prev = 42;
+          _context.prev = 43;
+          if (!(_iteratorAbruptCompletion && _iterator["return"] != null)) {
             _context.next = 47;
             break;
-
-          case 43:
-            _context.prev = 43;
-            _context.t0 = _context["catch"](8);
-            _didIteratorError = true;
-            _iteratorError = _context.t0;
-
-          case 47:
-            _context.prev = 47;
-            _context.prev = 48;
-
-            if (!(!_iteratorNormalCompletion && _iterator["return"] != null)) {
-              _context.next = 52;
-              break;
-            }
-
-            _context.next = 52;
-            return _iterator["return"]();
-
-          case 52:
-            _context.prev = 52;
-
-            if (!_didIteratorError) {
-              _context.next = 55;
-              break;
-            }
-
-            throw _iteratorError;
-
-          case 55:
-            return _context.finish(52);
-
-          case 56:
-            return _context.finish(47);
-
-          case 57:
-            return _context.abrupt("return", {
-              errors: errors,
-              tripSummaries: tripSummaries
-            });
-
-          case 58:
-          case "end":
-            return _context.stop();
-        }
+          }
+          _context.next = 47;
+          return _iterator["return"]();
+        case 47:
+          _context.prev = 47;
+          if (!_didIteratorError) {
+            _context.next = 50;
+            break;
+          }
+          throw _iteratorError;
+        case 50:
+          return _context.finish(47);
+        case 51:
+          return _context.finish(42);
+        case 52:
+          return _context.abrupt("return", {
+            errors: errors,
+            tripSummaries: tripSummaries
+          });
+        case 53:
+        case "end":
+          return _context.stop();
       }
-    }, _callee, null, [[8, 43, 47, 57], [48,, 52, 56]]);
+    }, _callee, null, [[8, 38, 42, 52], [43,, 47, 51]]);
   }));
   return _parseFrcsTripSummaryFile.apply(this, arguments);
 }

package/string/index.js

@@ -1,58 +1,41 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseFrcsTripSummaryFile = exports.parseFrcsPlotFile = exports.parseFrcsSurveyFile = void 0;
-
+exports.parseFrcsTripSummaryFile = exports.parseFrcsSurveyFile = exports.parseFrcsPlotFile = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _wrapAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapAsyncGenerator"));
-
 var _awaitAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/awaitAsyncGenerator"));
-
-var _asyncIterator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncIterator"));
-
 var _asyncGeneratorDelegate2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncGeneratorDelegate"));
-
 var _parseFrcsSurveyFile2 = _interopRequireDefault(require("../parseFrcsSurveyFile"));
-
 var _parseFrcsPlotFile2 = _interopRequireDefault(require("../parseFrcsPlotFile"));
-
 var _parseFrcsTripSummaryFile2 = _interopRequireDefault(require("../parseFrcsTripSummaryFile"));
-
+function _asyncIterator(iterable) { var method, async, sync, retry = 2; for ("undefined" != typeof Symbol && (async = Symbol.asyncIterator, sync = Symbol.iterator); retry--;) { if (async && null != (method = iterable[async])) return method.call(iterable); if (sync && null != (method = iterable[sync])) return new AsyncFromSyncIterator(method.call(iterable)); async = "@@asyncIterator", sync = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
+function AsyncFromSyncIterator(s) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var done = r.done; return Promise.resolve(r.value).then(function (value) { return { value: value, done: done }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(s) { this.s = s, this.n = s.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, "return": function _return(value) { var ret = this.s["return"]; return void 0 === ret ? Promise.resolve({ value: value, done: !0 }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments)); }, "throw": function _throw(value) { var thr = this.s["return"]; return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(s); }
 function linesOf(_x) {
   return _linesOf.apply(this, arguments);
 }
-
 function _linesOf() {
-  _linesOf = (0, _wrapAsyncGenerator2["default"])(
-  /*#__PURE__*/
-  _regenerator["default"].mark(function _callee(s) {
+  _linesOf = (0, _wrapAsyncGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(s) {
     return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            return _context.delegateYield((0, _asyncGeneratorDelegate2["default"])((0, _asyncIterator2["default"])(s.split(/\r\n?|\n/gm)), _awaitAsyncGenerator2["default"]), "t0", 1);
-
-          case 1:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.delegateYield((0, _asyncGeneratorDelegate2["default"])(_asyncIterator(s.split(/\r\n?|\n/gm)), _awaitAsyncGenerator2["default"]), "t0", 1);
+        case 1:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));
   return _linesOf.apply(this, arguments);
 }
-
 var convert = function convert(fn) {
   return function (file, str) {
     return fn(file, linesOf(str));
   };
 };
-
 var parseFrcsSurveyFile = convert(_parseFrcsSurveyFile2["default"]);
 exports.parseFrcsSurveyFile = parseFrcsSurveyFile;
 var parseFrcsPlotFile = convert(_parseFrcsPlotFile2["default"]);