@jbrowse/plugin-legacy-jbrowse 1.4.4 → 1.5.3

package/dist/plugin-legacy-jbrowse.esm.js

@@ -4,16 +4,93 @@ import ConnectionType from '@jbrowse/core/pluggableElementTypes/ConnectionType';
 import Plugin from '@jbrowse/core/Plugin';
 import { ConfigurationSchema, readConfObject, ConfigurationReference } from '@jbrowse/core/configuration';
 import { BaseAdapter, BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
-import BaseResult, { LocStringResult } from '@jbrowse/core/TextSearch/BaseResults';
-import { isElectron, objectHash, getSession, checkAbortSignal } from '@jbrowse/core/util';
+import BaseResult from '@jbrowse/core/TextSearch/BaseResults';
+import crc32 from 'buffer-crc32';
+import { generateUnsupportedTrackConf, guessAdapter, UNSUPPORTED, UNKNOWN, generateUnknownTrackConf, guessTrackType, getFileName } from '@jbrowse/core/util/tracks';
+import { objectHash, getSession, checkAbortSignal } from '@jbrowse/core/util';
 import { baseConnectionConfig, BaseConnectionModelFactory } from '@jbrowse/core/pluggableElementTypes/models';
 import { types } from 'mobx-state-tree';
-import { openLocation, openUrl } from '@jbrowse/core/util/io';
+import { openLocation } from '@jbrowse/core/util/io';
 import getValue from 'get-value';
 import setValue from 'set-value';
-import { generateUnsupportedTrackConf, guessAdapter, UNSUPPORTED, UNKNOWN, generateUnknownTrackConf, guessTrackType } from '@jbrowse/core/util/tracks';
 import NCListStore from '@gmod/nclist';
 import { ObservableCreate } from '@jbrowse/core/util/rxjs';
+import { RemoteFile } from 'generic-filehandle';
+
+function _asyncIterator(iterable) {
+  var method,
+      async,
+      sync,
+      retry = 2;
+
+  if (typeof Symbol !== "undefined") {
+    async = Symbol.asyncIterator;
+    sync = Symbol.iterator;
+  }
+
+  while (retry--) {
+    if (async && (method = iterable[async]) != null) {
+      return method.call(iterable);
+    }
+
+    if (sync && (method = iterable[sync]) != null) {
+      return new AsyncFromSyncIterator(method.call(iterable));
+    }
+
+    async = "@@asyncIterator";
+    sync = "@@iterator";
+  }
+
+  throw new TypeError("Object is not async iterable");
+}
+
+function AsyncFromSyncIterator(s) {
+  AsyncFromSyncIterator = function (s) {
+    this.s = s;
+    this.n = s.next;
+  };
+
+  AsyncFromSyncIterator.prototype = {
+    s: null,
+    n: null,
+    next: function () {
+      return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments));
+    },
+    return: function (value) {
+      var ret = this.s.return;
+
+      if (ret === undefined) {
+        return Promise.resolve({
+          value: value,
+          done: true
+        });
+      }
+
+      return AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments));
+    },
+    throw: function (value) {
+      var thr = this.s.return;
+      if (thr === undefined) return Promise.reject(value);
+      return AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments));
+    }
+  };
+
+  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 new AsyncFromSyncIterator(s);
+}
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -69,20 +146,6 @@ function _typeof(obj) {
   return _typeof(obj);
 }
 
-function _asyncIterator(iterable) {
-  var method;
-
-  if (typeof Symbol !== "undefined") {
-    if (Symbol.asyncIterator) method = iterable[Symbol.asyncIterator];
-    if (method == null && Symbol.iterator) method = iterable[Symbol.iterator];
-  }
-
-  if (method == null) method = iterable["@@asyncIterator"];
-  if (method == null) method = iterable["@@iterator"];
-  if (method == null) throw new TypeError("Object is not async iterable");
-  return method.call(iterable);
-}
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -211,6 +274,8 @@ function _assertThisInitialized(self) {
 function _possibleConstructorReturn(self, call) {
   if (call && (typeof call === "object" || typeof call === "function")) {
     return call;
+  } else if (call !== void 0) {
+    throw new TypeError("Derived constructors may only return object or undefined");
   }
 
   return _assertThisInitialized(self);
@@ -314,7 +379,8 @@ var ncListAdapterConfigSchema = /*#__PURE__*/ConfigurationSchema('NCListAdapter'
   rootUrlTemplate: {
     type: 'fileLocation',
     defaultValue: {
-      uri: '/path/to/my/{refseq}/trackData.json'
+      uri: '/path/to/my/{refseq}/trackData.json',
+      locationType: 'UriLocation'
     }
   },
   refNames: {
@@ -423,11 +489,9 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
 
 
     var IteratorPrototype = {};
-
-    IteratorPrototype[iteratorSymbol] = function () {
+    define(IteratorPrototype, iteratorSymbol, function () {
       return this;
-    };
-
+    });
     var getProto = Object.getPrototypeOf;
     var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
 
@@ -438,8 +502,9 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
     }
 
     var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
-    GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
-    GeneratorFunctionPrototype.constructor = GeneratorFunction;
+    GeneratorFunction.prototype = GeneratorFunctionPrototype;
+    define(Gp, "constructor", GeneratorFunctionPrototype);
+    define(GeneratorFunctionPrototype, "constructor", GeneratorFunction);
     GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"); // Helper for defining the .next, .throw, and .return methods of the
     // Iterator interface in terms of a single ._invoke method.
 
@@ -544,11 +609,9 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
     }
 
     defineIteratorMethods(AsyncIterator.prototype);
-
-    AsyncIterator.prototype[asyncIteratorSymbol] = function () {
+    define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
       return this;
-    };
-
+    });
     exports.AsyncIterator = AsyncIterator; // Note that simple async functions are implemented on top of
     // AsyncIterator objects; they just return a Promise for the value of
     // the final result produced by the iterator.
@@ -725,13 +788,12 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
     // object to not be returned from this call. This ensures that doesn't happen.
     // See https://github.com/facebook/regenerator/issues/274 for more details.
 
-    Gp[iteratorSymbol] = function () {
+    define(Gp, iteratorSymbol, function () {
       return this;
-    };
-
-    Gp.toString = function () {
+    });
+    define(Gp, "toString", function () {
       return "[object Generator]";
-    };
+    });
 
     function pushTryEntry(locs) {
       var entry = {
@@ -1043,86 +1105,28 @@ var runtime_1 = /*#__PURE__*/createCommonjsModule(function (module) {
   } catch (accidentalStrictMode) {
     // This module should not be running in strict mode, so the above
     // assignment should always work unless something is misconfigured. Just
-    // in case runtime.js accidentally runs in strict mode, we can escape
+    // in case runtime.js accidentally runs in strict mode, in modern engines
+    // we can explicitly access globalThis. In older engines we can escape
     // strict mode using a global Function call. This could conceivably fail
     // if a Content Security Policy forbids using Function, but in that case
     // the proper solution is to fix the accidental strict mode problem. If
     // you've misconfigured your bundler to force strict mode and applied a
     // CSP to forbid Function, and you're not willing to fix either of those
     // problems, please detail your unique predicament in a GitHub issue.
-    Function("r", "regeneratorRuntime = r")(runtime);
+    if (typeof globalThis === "object") {
+      globalThis.regeneratorRuntime = runtime;
+    } else {
+      Function("r", "regeneratorRuntime = r")(runtime);
+    }
   }
 });
 
-var crc32Table = '00000000 77073096 EE0E612C 990951BA 076DC419 706AF48F E963A535 9E6495A3 0EDB8832 79DCB8A4 E0D5E91E 97D2D988 09B64C2B 7EB17CBD E7B82D07 90BF1D91 1DB71064 6AB020F2 F3B97148 84BE41DE 1ADAD47D 6DDDE4EB F4D4B551 83D385C7 136C9856 646BA8C0 FD62F97A 8A65C9EC 14015C4F 63066CD9 FA0F3D63 8D080DF5 3B6E20C8 4C69105E D56041E4 A2677172 3C03E4D1 4B04D447 D20D85FD A50AB56B 35B5A8FA 42B2986C DBBBC9D6 ACBCF940 32D86CE3 45DF5C75 DCD60DCF ABD13D59 26D930AC 51DE003A C8D75180 BFD06116 21B4F4B5 56B3C423 CFBA9599 B8BDA50F 2802B89E 5F058808 C60CD9B2 B10BE924 2F6F7C87 58684C11 C1611DAB B6662D3D 76DC4190 01DB7106 98D220BC EFD5102A 71B18589 06B6B51F 9FBFE4A5 E8B8D433 7807C9A2 0F00F934 9609A88E E10E9818 7F6A0DBB 086D3D2D 91646C97 E6635C01 6B6B51F4 1C6C6162 856530D8 F262004E 6C0695ED 1B01A57B 8208F4C1 F50FC457 65B0D9C6 12B7E950 8BBEB8EA FCB9887C 62DD1DDF 15DA2D49 8CD37CF3 FBD44C65 4DB26158 3AB551CE A3BC0074 D4BB30E2 4ADFA541 3DD895D7 A4D1C46D D3D6F4FB 4369E96A 346ED9FC AD678846 DA60B8D0 44042D73 33031DE5 AA0A4C5F DD0D7CC9 5005713C 270241AA BE0B1010 C90C2086 5768B525 206F85B3 B966D409 CE61E49F 5EDEF90E 29D9C998 B0D09822 C7D7A8B4 59B33D17 2EB40D81 B7BD5C3B C0BA6CAD EDB88320 9ABFB3B6 03B6E20C 74B1D29A EAD54739 9DD277AF 04DB2615 73DC1683 E3630B12 94643B84 0D6D6A3E 7A6A5AA8 E40ECF0B 9309FF9D 0A00AE27 7D079EB1 F00F9344 8708A3D2 1E01F268 6906C2FE F762575D 806567CB 196C3671 6E6B06E7 FED41B76 89D32BE0 10DA7A5A 67DD4ACC F9B9DF6F 8EBEEFF9 17B7BE43 60B08ED5 D6D6A3E8 A1D1937E 38D8C2C4 4FDFF252 D1BB67F1 A6BC5767 3FB506DD 48B2364B D80D2BDA AF0A1B4C 36034AF6 41047A60 DF60EFC3 A867DF55 316E8EEF 4669BE79 CB61B38C BC66831A 256FD2A0 5268E236 CC0C7795 BB0B4703 220216B9 5505262F C5BA3BBE B2BD0B28 2BB45A92 5CB36A04 C2D7FFA7 B5D0CF31 2CD99E8B 5BDEAE1D 9B64C2B0 EC63F226 756AA39C 026D930A 9C0906A9 EB0E363F 72076785 05005713 95BF4A82 E2B87A14 7BB12BAE 0CB61B38 92D28E9B E5D5BE0D 7CDCEFB7 0BDBDF21 86D3D2D4 F1D4E242 68DDB3F8 1FDA836E 81BE16CD F6B9265B 6FB077E1 18B74777 88085AE6 FF0F6A70 66063BCA 11010B5C 8F659EFF F862AE69 616BFFD3 166CCF45 A00AE278 D70DD2EE 4E048354 3903B3C2 A7672661 D06016F7 4969474D 3E6E77DB AED16A4A D9D65ADC 40DF0B66 37D83BF0 A9BCAE53 DEBB9EC5 47B2CF7F 30B5FFE9 BDBDF21C CABAC28A 53B39330 24B4A3A6 BAD03605 CDD70693 54DE5729 23D967BF B3667A2E C4614AB8 5D681B02 2A6F2B94 B40BBE37 C30C8EA1 5A05DF1B 2D02EF8D'; // Adapted from JBrowse1 crc32 implementation.
-// https://github.com/GMOD/jbrowse/blob/b8324df0033796b6d502696dc65c9ff888aae2f3/src/JBrowse/Digest/Crc32.js
-
-/**
- *  Returns an array of bytes given a string
- * @param str - string
- */
-
-function stringToBytes(str) {
-  var ch;
-  var st;
-  var re = [];
-
-  for (var i = 0; i < str.length; i++) {
-    ch = str.charCodeAt(i); // get char
-
-    st = []; // set up "stack"
-
-    do {
-      st.push(ch & 0xff); // push byte to stack
-
-      ch >>= 8; // shift value down by 1 byte
-    } while (ch); // add stack contents to result
-    // done because chars have "wrong" endianness
-
-
-    re = re.concat(st.reverse());
-  }
-
-  return re;
-}
-/**
- * crc32 given a string
- * @param str - string
- * @param crc - number
- */
-
-function crc32(str) {
-  var crc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var bytes = stringToBytes(str);
-  var n = 0; // a number between 0 and 255
-
-  var x; // a hex number
-
-  var table = crc32Table;
-  crc ^= -1;
-
-  for (var i = 0, iTop = bytes.length; i < iTop; i++) {
-    n = (crc ^ bytes[i]) & 0xff;
-    x = "0x".concat(table.substr(n * 9, 8));
-    crc = crc >>> 8 ^ parseInt(x, 16);
-  }
-
-  crc ^= -1; // convert to unsigned 32-bit int if needed
-
-  if (crc < 0) {
-    crc += 4294967296;
-  }
-
-  return crc;
-}
-
 var HttpMap = /*#__PURE__*/function () {
   function HttpMap(args) {
     _classCallCheck(this, HttpMap);
 
     // make sure url has a trailing slash
     this.url = /\/$/.test(args.url) ? args.url : "".concat(args.url, "/");
-    this.isElectron = args.isElectron;
   }
   /**
    * loads meta.json file from names directory and reads number of hash_bits used
@@ -1138,47 +1142,25 @@ var HttpMap = /*#__PURE__*/function () {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.prev = 0;
-                _context.next = 3;
+                _context.next = 2;
                 return this.loadFile('meta.json');
 
-              case 3:
+              case 2:
                 meta = _context.sent;
-
-                if (!(meta !== {})) {
-                  _context.next = 11;
-                  break;
-                }
-
                 compress = meta.compress, tracks = meta.track_names;
-                this.compress = compress;
                 hashHexCharacters = Math.ceil(meta.hash_bits / 4);
-                this.hash_hex_characters = hashHexCharacters;
-                this.tracks = tracks;
                 return _context.abrupt("return", {
                   hashHexCharacters: hashHexCharacters,
                   compress: compress,
                   tracks: tracks
                 });
 
-              case 11:
-                throw new Error('Error parsing meta.json');
-
-              case 14:
-                _context.prev = 14;
-                _context.t0 = _context["catch"](0);
-                // throw Error(err)
-                console.warn("Error: ".concat(_context.t0));
-
-              case 17:
-                return _context.abrupt("return", {});
-
-              case 18:
+              case 6:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, this, [[0, 14]]);
+        }, _callee, this);
       }));
 
       function readMeta() {
@@ -1196,22 +1178,14 @@ var HttpMap = /*#__PURE__*/function () {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                if (!this.hash_hex_characters) {
-                  _context2.next = 2;
-                  break;
-                }
-
-                return _context2.abrupt("return", this.hash_hex_characters);
-
-              case 2:
-                _context2.next = 4;
+                _context2.next = 2;
                 return this.readMeta();
 
-              case 4:
+              case 2:
                 meta = _context2.sent;
                 return _context2.abrupt("return", meta.hashHexCharacters);
 
-              case 6:
+              case 4:
               case "end":
                 return _context2.stop();
             }
@@ -1234,22 +1208,14 @@ var HttpMap = /*#__PURE__*/function () {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                if (!this.compress) {
-                  _context3.next = 2;
-                  break;
-                }
-
-                return _context3.abrupt("return", this.compress);
-
-              case 2:
-                _context3.next = 4;
+                _context3.next = 2;
                 return this.readMeta();
 
-              case 4:
+              case 2:
                 meta = _context3.sent;
                 return _context3.abrupt("return", meta.compress);
 
-              case 6:
+              case 4:
               case "end":
                 return _context3.stop();
             }
@@ -1272,22 +1238,14 @@ var HttpMap = /*#__PURE__*/function () {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                if (!this.tracks) {
-                  _context4.next = 2;
-                  break;
-                }
-
-                return _context4.abrupt("return", this.tracks);
-
-              case 2:
-                _context4.next = 4;
+                _context4.next = 2;
                 return this.readMeta();
 
-              case 4:
+              case 2:
                 meta = _context4.sent;
                 return _context4.abrupt("return", meta.tracks);
 
-              case 6:
+              case 4:
               case "end":
                 return _context4.stop();
             }
@@ -1345,45 +1303,25 @@ var HttpMap = /*#__PURE__*/function () {
     key: "getBucket",
     value: function () {
       var _getBucket = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6(key) {
-        var bucketIdent, hexToDirPath, value;
+        var bucketIdent, hexToDirPath;
         return runtime_1.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
                 bucketIdent = this.hash(key);
-                _context6.prev = 1;
-                _context6.next = 4;
+                _context6.next = 3;
                 return this.hexToDirPath(bucketIdent);
 
-              case 4:
+              case 3:
                 hexToDirPath = _context6.sent;
-                _context6.next = 7;
-                return this.loadFile(hexToDirPath);
-
-              case 7:
-                value = _context6.sent;
-                return _context6.abrupt("return", value);
+                return _context6.abrupt("return", this.loadFile(hexToDirPath));
 
-              case 11:
-                _context6.prev = 11;
-                _context6.t0 = _context6["catch"](1);
-
-                if (!(this.isElectron || _context6.t0.status === 404)) {
-                  _context6.next = 15;
-                  break;
-                }
-
-                return _context6.abrupt("return", {});
-
-              case 15:
-                return _context6.abrupt("return", {});
-
-              case 16:
+              case 5:
               case "end":
                 return _context6.stop();
             }
           }
-        }, _callee6, this, [[1, 11]]);
+        }, _callee6, this);
       }));
 
       function getBucket(_x2) {
@@ -1402,45 +1340,33 @@ var HttpMap = /*#__PURE__*/function () {
     key: "loadFile",
     value: function () {
       var _loadFile = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7(id) {
-        var response, data;
+        var response;
         return runtime_1.wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
               case 0:
                 _context7.next = 2;
-                return fetch("".concat(this.url).concat(id), {
-                  headers: {
-                    'Content-Type': 'application/json',
-                    'Access-Control-Allow-Origin': '*'
-                  }
-                });
+                return fetch("".concat(this.url).concat(id));
 
               case 2:
                 response = _context7.sent;
-                _context7.prev = 3;
-                _context7.next = 6;
-                return response.json();
 
-              case 6:
-                data = _context7.sent;
-                return _context7.abrupt("return", data);
+                if (response.ok) {
+                  _context7.next = 5;
+                  break;
+                }
 
-              case 10:
-                _context7.prev = 10;
-                _context7.t0 = _context7["catch"](3);
-                // handle error
-                // throw Error(err)
-                console.warn("Error: ".concat(_context7.t0));
+                throw new Error("HTTP ".concat(response.status, " ").concat(response.statusText));
 
-              case 13:
-                return _context7.abrupt("return", {});
+              case 5:
+                return _context7.abrupt("return", response.json());
 
-              case 14:
+              case 6:
               case "end":
                 return _context7.stop();
             }
           }
-        }, _callee7, this, [[3, 10]]);
+        }, _callee7, this);
       }));
 
       function loadFile(_x3) {
@@ -1510,33 +1436,29 @@ var HttpMap = /*#__PURE__*/function () {
 
       return hexToDirPath;
     }()
-    /**
-     * Returns crc32 hash given a string.
-     * (Note: this is using JBrowse1 implementation of crc32.)
-     * @param data - string
-     */
-
   }, {
     key: "hash",
     value: function hash(data) {
-      return crc32(data).toString(16).toLowerCase().replace('-', 'n');
+      return crc32(Buffer.from(data)).toString('hex').toLowerCase().replace('-', 'n');
     }
   }]);
 
   return HttpMap;
 }();
 
+// Uses index built by generate-names.pl
+
 var JBrowse1TextSearchAdapter = /*#__PURE__*/function (_BaseAdapter) {
   _inherits(JBrowse1TextSearchAdapter, _BaseAdapter);
 
   var _super = /*#__PURE__*/_createSuper(JBrowse1TextSearchAdapter);
 
-  function JBrowse1TextSearchAdapter(config) {
+  function JBrowse1TextSearchAdapter(config, getSubAdapter, pluginManager) {
     var _this;
 
     _classCallCheck(this, JBrowse1TextSearchAdapter);
 
-    _this = _super.call(this, config);
+    _this = _super.call(this, config, getSubAdapter, pluginManager);
     var namesIndexLocation = readConfObject(config, 'namesIndexLocation');
 
     if (!namesIndexLocation) {
@@ -1544,8 +1466,7 @@ var JBrowse1TextSearchAdapter = /*#__PURE__*/function (_BaseAdapter) {
     }
 
     _this.httpMap = new HttpMap({
-      url: namesIndexLocation.baseUri ? new URL(namesIndexLocation.uri, namesIndexLocation.baseUri).href : namesIndexLocation.uri,
-      isElectron: isElectron
+      url: namesIndexLocation.baseUri ? new URL(namesIndexLocation.uri, namesIndexLocation.baseUri).href : namesIndexLocation.uri
     });
     return _this;
   }
@@ -1560,19 +1481,13 @@ var JBrowse1TextSearchAdapter = /*#__PURE__*/function (_BaseAdapter) {
     key: "loadIndexFile",
     value: function () {
       var _loadIndexFile = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(query) {
-        var bucketContents;
         return runtime_1.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.httpMap.getBucket(query);
+                return _context.abrupt("return", this.httpMap.getBucket(query));
 
-              case 2:
-                bucketContents = _context.sent;
-                return _context.abrupt("return", bucketContents);
-
-              case 4:
+              case 1:
               case "end":
                 return _context.stop();
             }
@@ -1586,12 +1501,6 @@ var JBrowse1TextSearchAdapter = /*#__PURE__*/function (_BaseAdapter) {
 
       return loadIndexFile;
     }()
-    /**
-     * Returns list of results
-     * @param args - search options/arguments include: search query
-     * limit of results to return, SearchType...prefix | full | exact", etc.
-     */
-
   }, {
     key: "searchIndex",
     value: function () {
@@ -1602,42 +1511,38 @@ var JBrowse1TextSearchAdapter = /*#__PURE__*/function (_BaseAdapter) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 searchType = args.searchType, queryString = args.queryString;
+                _context2.t0 = this.tracksNames;
 
-                if (!this.tracksNames) {
-                  _context2.next = 5;
+                if (_context2.t0) {
+                  _context2.next = 6;
                   break;
                 }
 
-                _context2.t0 = this.tracksNames;
-                _context2.next = 8;
-                break;
-
-              case 5:
-                _context2.next = 7;
+                _context2.next = 5;
                 return this.httpMap.getTrackNames();
 
-              case 7:
+              case 5:
                 _context2.t0 = _context2.sent;
 
-              case 8:
+              case 6:
                 tracks = _context2.t0;
-                _context2.next = 11;
-                return this.loadIndexFile(queryString);
+                _context2.next = 9;
+                return this.loadIndexFile(queryString.toLowerCase());
 
-              case 11:
+              case 9:
                 entries = _context2.sent;
 
-                if (!(entries !== {} && entries[queryString])) {
-                  _context2.next = 14;
+                if (!entries[queryString]) {
+                  _context2.next = 12;
                   break;
                 }
 
-                return _context2.abrupt("return", this.formatResults(entries[queryString][searchType || 'exact'], tracks));
+                return _context2.abrupt("return", this.formatResults(entries[queryString], tracks, searchType));
 
-              case 14:
+              case 12:
                 return _context2.abrupt("return", []);
 
-              case 15:
+              case 13:
               case "end":
                 return _context2.stop();
             }
@@ -1653,41 +1558,30 @@ var JBrowse1TextSearchAdapter = /*#__PURE__*/function (_BaseAdapter) {
     }()
   }, {
     key: "formatResults",
-    value: function formatResults(results, tracksNames) {
-      if (results.length === 0) {
-        return [];
-      }
-
-      var formattedResults = results.map(function (result) {
-        if (result && Array.isArray(result)) {
-          var name = result[0];
-          var trackIndex = result[1];
-          var refName = result[3];
-          var start = result[4];
-          var end = result[5];
-          var locstring = "".concat(refName || name, ":").concat(start, "-").concat(end);
-          var formattedResult = new LocStringResult({
-            locString: locstring,
-            label: name,
-            matchedAttribute: 'name',
-            matchedObject: result,
-            trackId: tracksNames[trackIndex]
-          });
-          return formattedResult;
-        } // {"name":"too many matches","hitLimit":1}
-
-
-        var defaultLabel = _typeof(result) === 'object' ? result.name : result;
-        var defaultResult = new BaseResult({
-          label: defaultLabel,
+    value: function formatResults(results, tracks, searchType) {
+      return [].concat(_toConsumableArray(searchType === 'exact' ? [] : results.prefix.map(function (result) {
+        return new BaseResult({
+          label: _typeof(result) === 'object' ? result.name : result,
           matchedAttribute: 'name',
           matchedObject: {
             result: result
           }
         });
-        return defaultResult;
-      });
-      return formattedResults.filter(function (result) {
+      })), _toConsumableArray(results.exact.map(function (result) {
+        var name = result[0];
+        var trackIndex = result[1];
+        var refName = result[3];
+        var start = result[4];
+        var end = result[5];
+        var locstring = "".concat(refName || name, ":").concat(start, "-").concat(end);
+        return new BaseResult({
+          locString: locstring,
+          label: name,
+          matchedAttribute: 'name',
+          matchedObject: result,
+          trackId: tracks[trackIndex]
+        });
+      }))).filter(function (result) {
         return result.getLabel() !== 'too many matches';
       });
     }
@@ -1704,7 +1598,8 @@ var jbrowse1AdapterConfigSchema = /*#__PURE__*/ConfigurationSchema('JBrowse1Text
   namesIndexLocation: {
     type: 'fileLocation',
     defaultValue: {
-      uri: '/volvox/names'
+      uri: '/volvox/names',
+      locationType: 'UriLocation'
     },
     description: 'the location of the JBrowse1 names index data directory'
   },
@@ -1713,7 +1608,7 @@ var jbrowse1AdapterConfigSchema = /*#__PURE__*/ConfigurationSchema('JBrowse1Text
     defaultValue: [],
     description: 'List of tracks covered by text search adapter'
   },
-  assemblies: {
+  assemblyNames: {
     type: 'stringArray',
     defaultValue: [],
     description: 'List of assemblies covered by text search adapter'
@@ -1727,7 +1622,8 @@ var jbrowse1ConfigSchema = /*#__PURE__*/ConfigurationSchema('JBrowse1Connection'
   dataDirLocation: {
     type: 'fileLocation',
     defaultValue: {
-      uri: 'http://mysite.com/jbrowse/data/'
+      uri: 'http://mysite.com/jbrowse/data/',
+      locationType: 'UriLocation'
     },
     description: 'the location of the JBrowse 1 data directory, often something like http://mysite.com/jbrowse/data/'
   },
@@ -1947,10 +1843,10 @@ function parse(text, url) {
           parsedValue = JSON.parse(match[1]);
         } // parse numbers if it looks numeric
         else if (/^[+-]?[\d.,]+([eE][-+]?\d+)?$/.test(value)) {
-            parsedValue = parseFloat(value.replace(/,/g, ''));
-          } else {
-            parsedValue = value;
-          }
+          parsedValue = parseFloat(value.replace(/,/g, ''));
+        } else {
+          parsedValue = value;
+        }
 
         if (!keyPath) {
           throw new Error("Error parsing in section ".concat(section.join(' - ')));
@@ -2006,33 +1902,33 @@ function parse(text, url) {
       }
     } // new value
     else if (match = line.match(value === undefined ? /^([^+=]+)(\+?=)(.*)/ : /^(\S[^+=]+)(\+?=)(.*)/)) {
-        recordVal();
-        keyPath = match[1].trim().split(/\s*\.\s*/);
-        var _match = match;
+      recordVal();
+      keyPath = match[1].trim().split(/\s*\.\s*/);
+      var _match = match;
 
-        var _match2 = _slicedToArray(_match, 3);
+      var _match2 = _slicedToArray(_match, 3);
 
-        operation = _match2[2];
+      operation = _match2[2];
 
-        if (isAlwaysArray(section.concat(keyPath).join('.'))) {
-          operation = '+=';
-        }
+      if (isAlwaysArray(section.concat(keyPath).join('.'))) {
+        operation = '+=';
+      }
 
-        value = match[3].trim();
-      } // add to existing array value
-      else if (keyPath !== undefined && (match = line.match(/^\s{0,4}\+\s*(.+)/))) {
-          recordVal();
-          operation = '+=';
-          value = match[1].trim();
-        } // add to existing value
-        else if (value !== undefined && (match = line.match(/^\s+(\S.*)/))) {
-            value += value.length ? " ".concat(match[1].trim()) : match[1].trim();
-          } // done with last value
-          else {
-              recordVal();
-              keyPath = undefined;
-              value = undefined;
-            }
+      value = match[3].trim();
+    } // add to existing array value
+    else if (keyPath !== undefined && (match = line.match(/^\s{0,4}\+\s*(.+)/))) {
+      recordVal();
+      operation = '+=';
+      value = match[1].trim();
+    } // add to existing value
+    else if (value !== undefined && (match = line.match(/^\s+(\S.*)/))) {
+      value += value.length ? " ".concat(match[1].trim()) : match[1].trim();
+    } // done with last value
+    else {
+      recordVal();
+      keyPath = undefined;
+      value = undefined;
+    }
   });
   recordVal();
   return data;
@@ -2054,23 +1950,23 @@ function regularizeConf(conf, url) {
       conf.tracks = [conf.tracks];
     } // otherwise, coerce it to an array
     else {
-        var tracks = [];
+      var tracks = [];
 
-        for (var _i = 0, _Object$keys = Object.keys(conf.tracks); _i < _Object$keys.length; _i++) {
-          var label = _Object$keys[_i];
-          var track = conf.tracks[label];
+      for (var _i = 0, _Object$keys = Object.keys(conf.tracks); _i < _Object$keys.length; _i++) {
+        var label = _Object$keys[_i];
+        var track = conf.tracks[label];
 
-          if (isTrack(track)) {
-            tracks.push(track);
-          } else {
-            tracks.push(_objectSpread2({
-              label: label
-            }, track));
-          }
+        if (isTrack(track)) {
+          tracks.push(track);
+        } else {
+          tracks.push(_objectSpread2({
+            label: label
+          }, track));
         }
-
-        conf.tracks = tracks;
       }
+
+      conf.tracks = tracks;
+    }
   } // regularize trackMetadata.sources
 
 
@@ -2371,13 +2267,15 @@ function _fetchJb() {
         switch (_context.prev = _context.next) {
           case 0:
             dataRoot = _args.length > 0 && _args[0] !== undefined ? _args[0] : {
-              uri: ''
+              uri: '',
+              locationType: 'UriLocation'
             };
             baseConfig = _args.length > 1 && _args[1] !== undefined ? _args[1] : {
               include: ['{dataRoot}/trackList.json', '{dataRoot}/tracks.conf']
             };
             baseConfigRoot = _args.length > 2 && _args[2] !== undefined ? _args[2] : {
-              uri: ''
+              uri: '',
+              locationType: 'UriLocation'
             };
             protocol = 'uri' in dataRoot ? 'uri' : 'localPath';
             dataRootReg = JSON.parse(JSON.stringify(dataRoot));
@@ -2700,7 +2598,8 @@ function _loadIncludes() {
                                     include.cacheBuster = inputConfig.cacheBuster;
                                     _context4.next = 3;
                                     return fetchConfigFile({
-                                      uri: new URL(include.url, sourceUrl).href
+                                      uri: new URL(include.url, sourceUrl).href,
+                                      locationType: 'UriLocation'
                                     });
 
                                   case 3:
@@ -2906,27 +2805,31 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
       var adapter = {
         type: 'BamAdapter',
         bamLocation: {
-          uri: urlTemplate
+          uri: urlTemplate,
+          locationType: 'UriLocation'
         }
       };
 
       if (jb1TrackConfig.baiUrlTemplate) {
         adapter.index = {
           location: {
-            uri: resolveUrlTemplate(jb1TrackConfig.baiUrlTemplate)
+            uri: resolveUrlTemplate(jb1TrackConfig.baiUrlTemplate),
+            locationType: 'UriLocation'
           }
         };
       } else if (jb1TrackConfig.csiUrlTemplate) {
         adapter.index = {
           location: {
-            uri: resolveUrlTemplate(jb1TrackConfig.csiUrlTemplate)
+            uri: resolveUrlTemplate(jb1TrackConfig.csiUrlTemplate),
+            locationType: 'UriLocation'
           },
           indexType: 'CSI'
         };
       } else {
         adapter.index = {
           location: {
-            uri: "".concat(urlTemplate, ".bai")
+            uri: "".concat(urlTemplate, ".bai"),
+            locationType: 'UriLocation'
           }
         };
       }
@@ -2941,18 +2844,21 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
       var _adapter = {
         type: 'CramAdapter',
         cramLocation: {
-          uri: urlTemplate
+          uri: urlTemplate,
+          locationType: 'UriLocation'
         },
         sequenceAdapter: sequenceAdapter
       };
 
       if (jb1TrackConfig.craiUrlTemplate) {
         _adapter.craiLocation = {
-          uri: resolveUrlTemplate(jb1TrackConfig.craiUrlTemplate)
+          uri: resolveUrlTemplate(jb1TrackConfig.craiUrlTemplate),
+          locationType: 'UriLocation'
         };
       } else {
         _adapter.craiLocation = {
-          uri: "".concat(urlTemplate, ".crai")
+          uri: "".concat(urlTemplate, ".crai"),
+          locationType: 'UriLocation'
         };
       }
 
@@ -2968,7 +2874,8 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
         adapter: {
           type: 'NCListAdapter',
           rootUrlTemplate: {
-            uri: urlTemplate
+            uri: urlTemplate,
+            locationType: 'UriLocation'
           }
         }
       });
@@ -2986,7 +2893,8 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
         adapter: {
           type: 'BigWigAdapter',
           bigWigLocation: {
-            uri: urlTemplate
+            uri: urlTemplate,
+            locationType: 'UriLocation'
           }
         }
       });
@@ -2996,27 +2904,31 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
       var _adapter2 = {
         type: 'VcfTabixAdapter',
         vcfGzLocation: {
-          uri: urlTemplate
+          uri: urlTemplate,
+          locationType: 'UriLocation'
         }
       };
 
       if (jb1TrackConfig.tbiUrlTemplate) {
         _adapter2.index = {
           location: {
-            uri: resolveUrlTemplate(jb1TrackConfig.tbiUrlTemplate)
+            uri: resolveUrlTemplate(jb1TrackConfig.tbiUrlTemplate),
+            locationType: 'UriLocation'
           }
         };
       } else if (jb1TrackConfig.csiUrlTemplate) {
         _adapter2.index = {
           location: {
-            uri: resolveUrlTemplate(jb1TrackConfig.csiUrlTemplate)
+            uri: resolveUrlTemplate(jb1TrackConfig.csiUrlTemplate),
+            locationType: 'UriLocation'
           },
           indexType: 'CSI'
         };
       } else {
         _adapter2.index = {
           location: {
-            uri: "".concat(urlTemplate, ".tbi")
+            uri: "".concat(urlTemplate, ".tbi"),
+            locationType: 'UriLocation'
           }
         };
       }
@@ -3041,7 +2953,8 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
         adapter: {
           type: 'BigBedAdapter',
           bigBedLocation: {
-            uri: urlTemplate
+            uri: urlTemplate,
+            locationType: 'UriLocation'
           }
         }
       });
@@ -3051,27 +2964,31 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
       var _adapter3 = {
         type: 'Gff3TabixAdapter',
         gffGzLocation: {
-          uri: urlTemplate
+          uri: urlTemplate,
+          locationType: 'UriLocation'
         }
       };
 
       if (jb1TrackConfig.tbiUrlTemplate) {
         _adapter3.index = {
           location: {
-            uri: resolveUrlTemplate(jb1TrackConfig.tbiUrlTemplate)
+            uri: resolveUrlTemplate(jb1TrackConfig.tbiUrlTemplate),
+            locationType: 'UriLocation'
           }
         };
       } else if (jb1TrackConfig.csiUrlTemplate) {
         _adapter3.index = {
           location: {
-            uri: resolveUrlTemplate(jb1TrackConfig.csiUrlTemplate)
+            uri: resolveUrlTemplate(jb1TrackConfig.csiUrlTemplate),
+            locationType: 'UriLocation'
           },
           indexType: 'CSI'
         };
       } else {
         _adapter3.index = {
           location: {
-            uri: "".concat(urlTemplate, ".tbi")
+            uri: "".concat(urlTemplate, ".tbi"),
+            locationType: 'UriLocation'
           }
         };
       }
@@ -3090,27 +3007,31 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
       var _adapter4 = {
         type: 'BedTabixAdapter',
         bedGzLocation: {
-          uri: urlTemplate
+          uri: urlTemplate,
+          locationType: 'UriLocation'
         }
       };
 
       if (jb1TrackConfig.tbiUrlTemplate) {
         _adapter4.index = {
           location: {
-            uri: resolveUrlTemplate(jb1TrackConfig.tbiUrlTemplate)
+            uri: resolveUrlTemplate(jb1TrackConfig.tbiUrlTemplate),
+            locationType: 'UriLocation'
           }
         };
       } else if (jb1TrackConfig.csiUrlTemplate) {
         _adapter4.index = {
           location: {
-            uri: resolveUrlTemplate(jb1TrackConfig.csiUrlTemplate)
+            uri: resolveUrlTemplate(jb1TrackConfig.csiUrlTemplate),
+            locationType: 'UriLocation'
           },
           indexType: 'CSI'
         };
       } else {
         _adapter4.index = {
           location: {
-            uri: "".concat(urlTemplate, ".tbi")
+            uri: "".concat(urlTemplate, ".tbi"),
+            locationType: 'UriLocation'
           }
         };
       }
@@ -3137,17 +3058,20 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
       var _adapter5 = {
         type: 'IndexedFastaAdapter',
         fastaLocation: {
-          uri: urlTemplate
+          uri: urlTemplate,
+          locationType: 'UriLocation'
         }
       };
 
       if (jb1TrackConfig.faiUrlTemplate) {
         _adapter5.faiLocation = {
-          uri: resolveUrlTemplate(jb1TrackConfig.faiUrlTemplate)
+          uri: resolveUrlTemplate(jb1TrackConfig.faiUrlTemplate),
+          locationType: 'UriLocation'
         };
       } else {
         _adapter5.faiLocation = {
-          uri: "".concat(urlTemplate, ".fai")
+          uri: "".concat(urlTemplate, ".fai"),
+          locationType: 'UriLocation'
         };
       }
 
@@ -3161,27 +3085,32 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
       var _adapter6 = {
         type: 'BgzipFastaAdapter',
         fastaLocation: {
-          uri: urlTemplate
+          uri: urlTemplate,
+          locationType: 'UriLocation'
         }
       };
 
       if (jb1TrackConfig.faiUrlTemplate) {
         _adapter6.faiLocation = {
-          uri: resolveUrlTemplate(jb1TrackConfig.faiUrlTemplate)
+          uri: resolveUrlTemplate(jb1TrackConfig.faiUrlTemplate),
+          locationType: 'UriLocation'
         };
       } else {
         _adapter6.faiLocation = {
-          uri: "".concat(urlTemplate, ".fai")
+          uri: "".concat(urlTemplate, ".fai"),
+          locationType: 'UriLocation'
         };
       }
 
       if (jb1TrackConfig.gziUrlTemplate) {
         _adapter6.gziLocation = {
-          uri: resolveUrlTemplate(jb1TrackConfig.gziUrlTemplate)
+          uri: resolveUrlTemplate(jb1TrackConfig.gziUrlTemplate),
+          locationType: 'UriLocation'
         };
       } else {
         _adapter6.gziLocation = {
-          uri: "".concat(urlTemplate, ".gzi")
+          uri: "".concat(urlTemplate, ".gzi"),
+          locationType: 'UriLocation'
         };
       }
 
@@ -3197,7 +3126,8 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
         adapter: {
           type: 'TwoBitAdapter',
           twoBitLocation: {
-            uri: urlTemplate
+            uri: urlTemplate,
+            locationType: 'UriLocation'
           }
         }
       });
@@ -3206,10 +3136,9 @@ function convertTrackConfig(jb1TrackConfig, dataRoot, sequenceAdapter) {
 
 
   jb2TrackConfig.adapter = guessAdapter({
-    uri: urlTemplate
-  }, undefined, function () {
-    return urlTemplate;
-  });
+    uri: urlTemplate,
+    locationType: 'UriLocation'
+  }, undefined, urlTemplate);
 
   if (!jb2TrackConfig.adapter) {
     throw new Error('Could not determine adapter');
@@ -3317,6 +3246,22 @@ var LegacyJBrowsePlugin = /*#__PURE__*/function (_Plugin) {
           }
         });
       });
+      pluginManager.addToExtensionPoint('Core-guessAdapterForLocation', function (adapterGuesser) {
+        return function (file, index, adapterHint) {
+          var regexGuess = /trackData.jsonz?$/i;
+          var adapterName = 'NCListAdapter';
+          var fileName = getFileName(file);
+
+          if (regexGuess.test(fileName) || adapterHint === adapterName) {
+            return {
+              type: adapterName,
+              rootUrlTemplate: file
+            };
+          }
+
+          return adapterGuesser(file, index, adapterHint);
+        };
+      });
       pluginManager.addTextSearchAdapterType(function () {
         return new TextSearchAdapterType({
           name: 'JBrowse1TextSearchAdapter',
@@ -3472,12 +3417,12 @@ var NCListAdapter = /*#__PURE__*/function (_BaseFeatureDataAdapt) {
 
   var _super = /*#__PURE__*/_createSuper(NCListAdapter);
 
-  function NCListAdapter(config) {
+  function NCListAdapter(config, getSubAdapter, pluginManager) {
     var _this;
 
     _classCallCheck(this, NCListAdapter);
 
-    _this = _super.call(this, config);
+    _this = _super.call(this, config, getSubAdapter, pluginManager);
     var refNames = readConfObject(config, 'refNames');
     var rootUrlTemplate = readConfObject(config, 'rootUrlTemplate');
     _this.configRefNames = refNames;
@@ -3485,7 +3430,7 @@ var NCListAdapter = /*#__PURE__*/function (_BaseFeatureDataAdapt) {
       baseUrl: '',
       urlTemplate: rootUrlTemplate.uri,
       readFile: function readFile(url) {
-        return openUrl(rootUrlTemplate.baseUri ? new URL(url, rootUrlTemplate.baseUri).toString() : url).readFile();
+        return new RemoteFile(String(rootUrlTemplate.baseUri ? new URL(url, rootUrlTemplate.baseUri).toString() : url)).readFile();
       }
     });
     return _this;
@@ -3508,14 +3453,14 @@ var NCListAdapter = /*#__PURE__*/function (_BaseFeatureDataAdapt) {
       var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return ObservableCreate( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(observer) {
-          var signal, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, feature;
+          var signal, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, feature;
 
           return runtime_1.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
                   signal = opts.signal;
-                  _iteratorNormalCompletion = true;
+                  _iteratorAbruptCompletion = false;
                   _didIteratorError = false;
                   _context.prev = 3;
                   _iterator = _asyncIterator(_this2.nclist.getFeatures(region, opts));
@@ -3525,75 +3470,67 @@ var NCListAdapter = /*#__PURE__*/function (_BaseFeatureDataAdapt) {
                   return _iterator.next();
 
                 case 7:
-                  _step = _context.sent;
-                  _iteratorNormalCompletion = _step.done;
-                  _context.next = 11;
-                  return _step.value;
-
-                case 11:
-                  _value = _context.sent;
-
-                  if (_iteratorNormalCompletion) {
-                    _context.next = 19;
+                  if (!(_iteratorAbruptCompletion = !(_step = _context.sent).done)) {
+                    _context.next = 14;
                     break;
                   }
 
-                  feature = _value;
+                  feature = _step.value;
                   checkAbortSignal(signal);
                   observer.next(_this2.wrapFeature(feature));
 
-                case 16:
-                  _iteratorNormalCompletion = true;
+                case 11:
+                  _iteratorAbruptCompletion = false;
                   _context.next = 5;
                   break;
 
-                case 19:
-                  _context.next = 25;
+                case 14:
+                  _context.next = 20;
                   break;
 
-                case 21:
-                  _context.prev = 21;
+                case 16:
+                  _context.prev = 16;
                   _context.t0 = _context["catch"](3);
                   _didIteratorError = true;
                   _iteratorError = _context.t0;
 
-                case 25:
-                  _context.prev = 25;
-                  _context.prev = 26;
+                case 20:
+                  _context.prev = 20;
+                  _context.prev = 21;
 
-                  if (!(!_iteratorNormalCompletion && _iterator["return"] != null)) {
-                    _context.next = 30;
+                  if (!(_iteratorAbruptCompletion && _iterator["return"] != null)) {
+                    _context.next = 25;
                     break;
                   }
 
-                  _context.next = 30;
+                  _context.next = 25;
                   return _iterator["return"]();
 
-                case 30:
-                  _context.prev = 30;
+                case 25:
+                  _context.prev = 25;
 
                   if (!_didIteratorError) {
-                    _context.next = 33;
+                    _context.next = 28;
                     break;
                   }
 
                   throw _iteratorError;
 
-                case 33:
-                  return _context.finish(30);
-
-                case 34:
+                case 28:
                   return _context.finish(25);
 
-                case 35:
+                case 29:
+                  return _context.finish(20);
+
+                case 30:
                   observer.complete();
 
-                case 36:
+                case 31:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[3, 21, 25, 35], [26,, 30, 34]]);
+          }, _callee, null, [[3, 16, 20, 30], [21,, 25, 29]]);
         }));
 
         return function (_x) {