@jbrowse/core 1.7.11 → 2.0.0

package/util/index.d.ts

@@ -149,12 +149,6 @@ export declare function bpSpanPx(leftBp: number, rightBp: number, region: {
     end: number;
     reversed?: boolean;
 }, bpPerPx: number): [number, number];
-export declare const objectFromEntries: {
-    <T = any>(entries: Iterable<readonly [PropertyKey, T]>): {
-        [k: string]: T;
-    };
-    (entries: Iterable<readonly any[]>): any;
-};
 export declare function iterMap<T, U>(iterable: Iterable<T>, func: (item: T) => U, sizeHint?: number): U[];
 interface Assembly {
     name: string;
@@ -222,7 +216,7 @@ export declare function renameRegionsIfNeeded<ARGTYPE extends {
 export declare function minmax(a: number, b: number): number[];
 export declare function stringify({ refName, coord, oob, }: {
     coord: number;
-    refName: string;
+    refName?: string;
     oob?: boolean;
 }): string;
 export declare const isElectron: boolean;

package/util/index.js

@@ -32,7 +32,6 @@ var _exportNames = {
   cartesianToPolar: true,
   featureSpanPx: true,
   bpSpanPx: true,
-  objectFromEntries: true,
   iterMap: true,
   mergeConfigs: true,
   findLastIndex: true,
@@ -108,7 +107,6 @@ exports.makeAbortableReaction = makeAbortableReaction;
 exports.measureText = measureText;
 exports.mergeConfigs = mergeConfigs;
 exports.minmax = minmax;
-exports.objectFromEntries = void 0;
 exports.objectHash = objectHash;
 exports.parseLocString = parseLocString;
 exports.parseLocStringOneBased = parseLocStringOneBased;
@@ -145,8 +143,6 @@ var _mobxStateTree = require("mobx-state-tree");
 
 var _mobx = require("mobx");
 
-var _object = _interopRequireDefault(require("object.fromentries"));
-
 var _deepmerge = _interopRequireDefault(require("deepmerge"));
 
 var _simpleFeature = _interopRequireWildcard(require("./simpleFeature"));
@@ -249,11 +245,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-if (!Object.fromEntries) {
-  // @ts-ignore
-  _object.default.shim();
-}
-
 var inDevelopment = (typeof process === "undefined" ? "undefined" : (0, _typeof2.default)(process)) === 'object' && process.env && process.env.NODE_ENV === 'development';
 exports.inDevelopment = inDevelopment;
 var inProduction = !inDevelopment;
@@ -789,11 +780,8 @@ function bpSpanPx(leftBp, rightBp, region, bpPerPx) {
   var start = bpToPx(leftBp, region, bpPerPx);
   var end = bpToPx(rightBp, region, bpPerPx);
   return region.reversed ? [end, start] : [start, end];
-}
-
-var objectFromEntries = Object.fromEntries.bind(Object); // do an array map of an iterable
+} // do an array map of an iterable
 
-exports.objectFromEntries = objectFromEntries;
 
 function iterMap(iterable, func, sizeHint) {
   var results = sizeHint ? new Array(sizeHint) : [];
@@ -871,7 +859,8 @@ function findLastIndex(array, predicate) {
  */
 
 
-function makeAbortableReaction(self, dataFunction, asyncReactionFunction, reactionOptions, startedFunction, successFunction, errorFunction) {
+function makeAbortableReaction(self, dataFunction, asyncReactionFunction, // @ts-ignore
+reactionOptions, startedFunction, successFunction, errorFunction) {
   var inProgress;
 
   function handleError(error) {
@@ -884,7 +873,7 @@ function makeAbortableReaction(self, dataFunction, asyncReactionFunction, reacti
     }
   }
 
-  var reactionDisposer = (0, _mobx.reaction)(function () {
+  (0, _mobxStateTree.addDisposer)(self, (0, _mobx.reaction)(function () {
     try {
       return dataFunction(self);
     } catch (e) {
@@ -915,7 +904,8 @@ function makeAbortableReaction(self, dataFunction, asyncReactionFunction, reacti
               startedFunction(thisInProgress);
               _context.prev = 6;
               _context.next = 9;
-              return asyncReactionFunction(data, thisInProgress.signal, self, mobxReactionHandle);
+              return asyncReactionFunction(data, thisInProgress.signal, self, // @ts-ignore
+              mobxReactionHandle);
 
             case 9:
               result = _context.sent;
@@ -949,8 +939,7 @@ function makeAbortableReaction(self, dataFunction, asyncReactionFunction, reacti
     return function (_x, _x2) {
       return _ref2.apply(this, arguments);
     };
-  }(), reactionOptions);
-  (0, _mobxStateTree.addDisposer)(self, reactionDisposer);
+  }(), reactionOptions));
   (0, _mobxStateTree.addDisposer)(self, function () {
     if (inProgress && !inProgress.signal.aborted) {
       inProgress.abort();
@@ -966,6 +955,7 @@ function renameRegionIfNeeded(refNameMap, region) {
   if (region && refNameMap && refNameMap[region.refName]) {
     // clone the region so we don't modify it
     if ((0, _mobxStateTree.isStateTreeNode)(region)) {
+      // @ts-ignore
       region = _objectSpread({}, (0, _mobxStateTree.getSnapshot)(region));
     } else {
       region = _objectSpread({}, region);

package/util/layouts/GranularRectLayout.js

@@ -15,8 +15,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _index = require("../index");
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -588,7 +586,7 @@ var GranularRectLayout = /*#__PURE__*/function () {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      var rectangles = (0, _index.objectFromEntries)(this.getRectangles());
+      var rectangles = Object.fromEntries(this.getRectangles());
       return {
         rectangles: rectangles,
         containsNoTransferables: true,

package/util/layouts/PrecomputedLayout.js

@@ -15,8 +15,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _ = require("..");
-
 var _rbush = _interopRequireDefault(require("rbush"));
 
 var PrecomputedLayout = /*#__PURE__*/function () {
@@ -116,7 +114,7 @@ var PrecomputedLayout = /*#__PURE__*/function () {
     key: "toJSON",
     value: function toJSON() {
       return {
-        rectangles: (0, _.objectFromEntries)(this.rectangles),
+        rectangles: Object.fromEntries(this.rectangles),
         totalHeight: this.totalHeight,
         maxHeightReached: false,
         containsNoTransferables: true

package/util/tracks.js

@@ -46,7 +46,7 @@ function getTrackAssemblyNames(track) {
 
 
 function getRpcSessionId(thisNode) {
-  var highestRpcSessionId;
+  var highestRpcSessionId; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
   for (var node = thisNode; !(0, _mobxStateTree.isRoot)(node); node = (0, _mobxStateTree.getParent)(node)) {
     if ('rpcSessionId' in node) {
@@ -69,7 +69,9 @@ function getRpcSessionId(thisNode) {
 
 
 function getParentRenderProps(node) {
-  for (var currentNode = (0, _mobxStateTree.getParent)(node); !(0, _mobxStateTree.isRoot)(currentNode); currentNode = (0, _mobxStateTree.getParent)(currentNode)) {
+  for ( // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  var currentNode = (0, _mobxStateTree.getParent)(node); !(0, _mobxStateTree.isRoot)(currentNode); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  currentNode = (0, _mobxStateTree.getParent)(currentNode)) {
     if ('renderProps' in currentNode) {
       return currentNode.renderProps();
     }

package/util/types/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Instance, SnapshotIn, IAnyStateTreeNode } from 'mobx-state-tree';
+import { Instance, SnapshotIn, IAnyStateTreeNode, IStateTreeNode, IType } from 'mobx-state-tree';
 import { AnyConfigurationModel } from '../../configuration/configurationSchema';
 import assemblyManager from '../../assemblyManager';
 import TextSearchManager from '../../TextSearch/TextSearchManager';
@@ -10,10 +10,10 @@ import { Feature } from '../simpleFeature';
 import { BaseInternetAccountModel } from '../../pluggableElementTypes/models';
 export * from './util';
 /** abstract type for a model that contains multiple views */
-export interface AbstractViewContainer extends IAnyStateTreeNode {
+export interface AbstractViewContainer extends IStateTreeNode<IType<any, unknown, any>> {
     views: AbstractViewModel[];
     removeView(view: AbstractViewModel): void;
-    addView(typeName: string, initialState?: Record<string, unknown>): void | AbstractViewModel;
+    addView(typeName: string, initialState?: Record<string, unknown>): AbstractViewModel;
 }
 export declare function isViewContainer(thing: unknown): thing is AbstractViewContainer;
 export declare type NotificationLevel = 'error' | 'info' | 'warning' | 'success';

package/util/types/mst.d.ts

@@ -108,11 +108,11 @@ export declare const FileLocation: import("mobx-state-tree").ISnapshotProcessor<
         internetAccountType: import("mobx-state-tree").ISimpleType<string>;
         authInfo: import("mobx-state-tree").IType<any, any, any>;
     }, {}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
-}>> | import("mobx-state-tree").ModelInstanceTypeProps<{
+}>> | import("mobx-state-tree").ModelInstanceType<{
     locationType: import("mobx-state-tree").ISimpleType<"BlobLocation">;
     name: import("mobx-state-tree").ISimpleType<string>;
     blobId: import("mobx-state-tree").ISimpleType<string>;
-}> | import("mobx-state-tree").ModelInstanceTypeProps<{
+}, {}> | import("mobx-state-tree").ModelInstanceType<{
     locationType: import("mobx-state-tree").ISimpleType<"LocalPathLocation">;
     localPath: import("mobx-state-tree").ISimpleType<string>;
-}>>, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
+}, {}>>, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;

package/util/types/mst.js

@@ -98,8 +98,10 @@ exports.UriLocationRaw = UriLocationRaw;
 
 var UriLocation = _mobxStateTree.types.snapshotProcessor(UriLocationRaw, {
   postProcessor: function postProcessor(snap) {
-    var baseUri = snap.baseUri,
-        rest = (0, _objectWithoutProperties2.default)(snap, _excluded);
+    // xref https://github.com/mobxjs/mobx-state-tree/issues/1524 for Omit
+    var _ref = snap,
+        baseUri = _ref.baseUri,
+        rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
 
     if (!baseUri) {
       return rest;
@@ -113,14 +115,16 @@ exports.UriLocation = UriLocation;
 
 var FileLocation = _mobxStateTree.types.snapshotProcessor(_mobxStateTree.types.union(LocalPathLocation, UriLocation, BlobLocation), {
   // @ts-ignore
-  preProcessor: function preProcessor(snapshot) {
-    if (!snapshot) {
+  preProcessor: function preProcessor(snap) {
+    if (!snap) {
       return undefined;
     } // @ts-ignore
+    // xref https://github.com/mobxjs/mobx-state-tree/issues/1524 for Omit
 
 
-    var locationType = snapshot.locationType,
-        rest = (0, _objectWithoutProperties2.default)(snapshot, _excluded2);
+    var _ref2 = snap,
+        locationType = _ref2.locationType,
+        rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
 
     if (!locationType) {
       // @ts-ignore
@@ -142,7 +146,7 @@ var FileLocation = _mobxStateTree.types.snapshotProcessor(_mobxStateTree.types.u
       });
     }
 
-    return snapshot;
+    return snap;
   }
 });