@jbrowse/core 1.7.10 → 1.7.11

package/util/index.d.ts

@@ -24,7 +24,7 @@ export declare function getSession(node: IAnyStateTreeNode): import("./types").A
 /** get the state model of the view in the state tree that contains the given node */
 export declare function getContainingView(node: IAnyStateTreeNode): import("./types").AbstractViewModel & IAnyStateTreeNode;
 /** get the state model of the view in the state tree that contains the given node */
-export declare function getContainingTrack(node: IAnyStateTreeNode): IAnyStateTreeNode;
+export declare function getContainingTrack(node: IAnyStateTreeNode): import("./types").AbstractTrackModel & IAnyStateTreeNode;
 export declare function getContainingDisplay(node: IAnyStateTreeNode): import("./types").AbstractDisplayModel & IAnyStateTreeNode;
 /**
  * Assemble a 1-based "locString" from an interbase genomic location
@@ -344,7 +344,6 @@ export declare function supportedIndexingAdapters(type: string): boolean;
 export declare function getBpDisplayStr(totalBp: number): string;
 export declare function toLocale(n: number): string;
 export declare function getTickDisplayStr(totalBp: number, bpPerPx: number): string;
-export declare function getTickDisplayStr2(totalBp: number, bpPerPx: number): string;
 export declare function getViewParams(model: IAnyStateTreeNode, exportSVG?: boolean): {
     offsetPx: number;
     offsetPx1: number;

package/util/index.js

@@ -60,7 +60,6 @@ var _exportNames = {
   getBpDisplayStr: true,
   toLocale: true,
   getTickDisplayStr: true,
-  getTickDisplayStr2: true,
   getViewParams: true,
   getLayoutId: true,
   SimpleFeature: true,
@@ -95,7 +94,6 @@ exports.getContainingView = getContainingView;
 exports.getLayoutId = getLayoutId;
 exports.getSession = getSession;
 exports.getTickDisplayStr = getTickDisplayStr;
-exports.getTickDisplayStr2 = getTickDisplayStr2;
 exports.getViewParams = getViewParams;
 exports.hashCode = hashCode;
 exports.isElectron = exports.inProduction = exports.inDevelopment = void 0;
@@ -1423,7 +1421,7 @@ function getBpDisplayStr(totalBp) {
   } else if (Math.floor(totalBp / 1000) > 0) {
     str = "".concat(parseFloat((totalBp / 1000).toPrecision(3)), "Kbp");
   } else {
-    str = "".concat(Math.floor(totalBp).toLocaleString('en-US'), "bp");
+    str = "".concat(toLocale(Math.floor(totalBp)), "bp");
   }
 
   return str;
@@ -1445,18 +1443,6 @@ function getTickDisplayStr(totalBp, bpPerPx) {
   return str;
 }
 
-function getTickDisplayStr2(totalBp, bpPerPx) {
-  var str;
-
-  if (Math.floor(bpPerPx / 1000) > 0) {
-    str = "".concat(toLocale(parseFloat((totalBp / 1000000).toFixed(2))), "Mbp");
-  } else {
-    str = "".concat(toLocale(Math.floor(totalBp)), "bp");
-  }
-
-  return str;
-}
-
 function getViewParams(model, exportSVG) {
   // @ts-ignore
   var _getContainingView = getContainingView(model),

package/util/offscreenCanvasPonyfill.js

@@ -31,10 +31,8 @@ imageData, context) {
   if (imageData.serializedCommands) {
     var seq = new _canvasSequencer.CanvasSequence(imageData.serializedCommands);
     seq.execute(context);
-  } else if (imageData instanceof ImageBitmapType) {
+  } else {
     context.drawImage(imageData, 0, 0);
-  } else if (imageData.dataURL) {
-    throw new Error('dataURL deserialization no longer supported');
   }
 }
 
@@ -54,11 +52,11 @@ if (weHave.realOffscreenCanvas) {
   exports.ImageBitmapType = ImageBitmapType = window.ImageBitmap || self.ImageBitmap;
 } else if (weHave.node) {
   // use node-canvas if we are running in node (i.e. automated tests)
-  var _require = require('canvas'),
-      nodeCreateCanvas = _require.createCanvas,
-      Image = _require.Image;
-
-  exports.createCanvas = createCanvas = nodeCreateCanvas;
+  exports.createCanvas = createCanvas = function createCanvas() {
+    // @ts-ignore
+    // eslint-disable-next-line no-undef
+    return nodeCreateCanvas.apply(void 0, arguments);
+  };
 
   exports.createImageBitmap = createImageBitmap = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(canvas) {
@@ -77,8 +75,10 @@ if (weHave.realOffscreenCanvas) {
               throw new Error('only one-argument uses of createImageBitmap are supported by the node offscreencanvas ponyfill');
 
             case 2:
-              dataUri = canvas.toDataURL();
-              img = new Image();
+              dataUri = canvas.toDataURL(); // @ts-ignore
+              // eslint-disable-next-line no-undef
+
+              img = new nodeImage();
               return _context.abrupt("return", new Promise(function (resolve, reject) {
                 img.onload = function () {
                   return resolve(img);
@@ -100,8 +100,6 @@ if (weHave.realOffscreenCanvas) {
       return _ref.apply(this, arguments);
     };
   }();
-
-  exports.ImageBitmapType = ImageBitmapType = Image;
 } else {
   exports.createCanvas = createCanvas = function createCanvas(width, height) {
     var context = new _canvasSequencer.CanvasSequence();

package/util/types/index.d.ts

@@ -43,6 +43,7 @@ export interface JBrowsePlugin {
 export declare type DialogComponentType = React.LazyExoticComponent<React.FC<any>> | React.FC<any>;
 /** minimum interface that all session state models must implement */
 export interface AbstractSessionModel extends AbstractViewContainer {
+    drawerPosition?: string;
     setSelection(feature: Feature): void;
     clearSelection(): void;
     configuration: AnyConfigurationModel;
@@ -63,6 +64,8 @@ export interface AbstractSessionModel extends AbstractViewContainer {
     sessionConnections?: AnyConfigurationModel[];
     connectionInstances?: {
         name: string;
+        connectionId: string;
+        tracks: AnyConfigurationModel[];
     }[];
     makeConnection?: Function;
     adminMode?: boolean;
@@ -73,6 +76,7 @@ export interface AbstractSessionModel extends AbstractViewContainer {
     queueDialog: (callback: (doneCallback: Function) => [DialogComponentType, any]) => void;
     name: string;
     id?: string;
+    tracks: AnyConfigurationModel[];
 }
 export declare function isSessionModel(thing: unknown): thing is AbstractSessionModel;
 /** abstract interface for a session allows editing configurations */
@@ -110,6 +114,10 @@ export interface SessionWithDrawerWidgets extends SessionWithWidgets {
     setDrawerPosition(arg: string): void;
 }
 export declare function isSessionModelWithWidgets(thing: unknown): thing is SessionWithWidgets;
+interface SessionWithConnections {
+    addConnectionConf: (arg: AnyConfigurationModel) => void;
+}
+export declare function isSessionModelWithConnections(thing: unknown): thing is SessionWithConnections;
 export interface SessionWithSessionPlugins extends AbstractSessionModel {
     sessionPlugins: JBrowsePlugin[];
     addSessionPlugin: Function;
@@ -133,7 +141,9 @@ export interface AbstractViewModel {
     menuItems: () => MenuItem[];
 }
 export declare function isViewModel(thing: unknown): thing is AbstractViewModel;
-declare type AbstractTrackModel = {};
+export interface AbstractTrackModel {
+    displays: AbstractDisplayModel[];
+}
 export declare function isTrackModel(thing: unknown): thing is AbstractTrackModel;
 export interface AbstractDisplayModel {
     id: string;

package/util/types/index.js

@@ -11,6 +11,7 @@ var _exportNames = {
   isSessionModelWithConfigEditing: true,
   isSessionWithAddTracks: true,
   isSessionModelWithWidgets: true,
+  isSessionModelWithConnections: true,
   isSessionWithSessionPlugins: true,
   isSelectionContainer: true,
   isViewModel: true,
@@ -34,6 +35,7 @@ exports.isRetryException = isRetryException;
 exports.isSelectionContainer = isSelectionContainer;
 exports.isSessionModel = isSessionModel;
 exports.isSessionModelWithConfigEditing = isSessionModelWithConfigEditing;
+exports.isSessionModelWithConnections = isSessionModelWithConnections;
 exports.isSessionModelWithWidgets = isSessionModelWithWidgets;
 exports.isSessionWithAddTracks = isSessionWithAddTracks;
 exports.isSessionWithSessionPlugins = isSessionWithSessionPlugins;
@@ -103,6 +105,10 @@ function isSessionModelWithWidgets(thing) {
   return isSessionModel(thing) && 'widgets' in thing;
 }
 
+function isSessionModelWithConnections(thing) {
+  return isSessionModel(thing) && 'addConnectionConf' in thing;
+}
+
 function isSessionWithSessionPlugins(thing) {
   return isSessionModel(thing) && 'sessionPlugins' in thing;
 }