@jbrowse/plugin-wiggle 2.16.1 → 2.17.0

package/esm/index.d.ts

@@ -9,7 +9,7 @@ export default class WigglePlugin extends Plugin {
     install(pm: PluginManager): void;
     exports: {
         LinearWiggleDisplayReactComponent: (props: {
-            model: import("./LinearWiggleDisplay/models/model").WiggleDisplayModel;
+            model: import("./LinearWiggleDisplay/model").WiggleDisplayModel;
         }) => import("react").JSX.Element;
         XYPlotRendererReactComponent: (props: {
             regions: import("@jbrowse/core/util/types").Region[];
@@ -84,5 +84,5 @@ export default class WigglePlugin extends Plugin {
 export * from './util';
 export { default as WiggleRendering } from './WiggleRendering';
 export { Tooltip, ReactComponent as LinearWiggleDisplayReactComponent, modelFactory as linearWiggleDisplayModelFactory, } from './LinearWiggleDisplay';
-export { type TooltipContentsComponent } from './Tooltip';
+export type { TooltipContentsComponent } from './Tooltip';
 export { default as WiggleBaseRenderer } from './WiggleBaseRenderer';

package/{dist/shared/modelShared.d.ts → esm/shared/SharedWiggleMixin.d.ts}

@@ -195,7 +195,9 @@ export default function SharedWiggleMixin(configSchema: AnyConfigurationSchemaTy
             message: string | undefined;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
             id: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<string>, [undefined]>;
-            type: import("mobx-state-tree").ISimpleType<string>;
+            type: import("mobx-state-tree" /**
+             * #action
+             */).ISimpleType<string>;
             rpcDriverName: import("mobx-state-tree").IMaybe<import("mobx-state-tree").ISimpleType<string>>;
         }, {
             rendererTypeName: string;
@@ -284,17 +286,28 @@ export default function SharedWiggleMixin(configSchema: AnyConfigurationSchemaTy
     renderSvg(opts: import("@jbrowse/plugin-linear-genome-view").ExportSvgDisplayOptions): Promise<import("react").JSX.Element>;
     afterAttach(): void;
 } & {
+    /**
+     * #volatile
+     */
     message: undefined | string;
+    /**
+     * #volatile
+     */
     stats: {
+        currStatsBpPerPx: number;
         scoreMin: number;
         scoreMax: number;
     } | undefined;
+    /**
+     * #volatile
+     */
     statsFetchInProgress: undefined | AbortController;
 } & {
     /**
      * #action
      */
     updateQuantitativeStats(stats: {
+        currStatsBpPerPx: number;
         scoreMin: number;
         scoreMax: number;
     }): void;
@@ -313,7 +326,7 @@ export default function SharedWiggleMixin(configSchema: AnyConfigurationSchemaTy
     /**
      * #action
      */
-    setLoading(aborter: AbortController): void;
+    setStatsLoading(aborter: AbortController): void;
     /**
      * #action
      * this overrides the BaseLinearDisplayModel to avoid popping up a
@@ -436,6 +449,7 @@ export default function SharedWiggleMixin(configSchema: AnyConfigurationSchemaTy
     readonly scaleOpts: {
         domain: number[] | undefined;
         stats: {
+            currStatsBpPerPx: number;
             scoreMin: number;
             scoreMax: number;
         } | undefined;
@@ -585,8 +599,8 @@ export default function SharedWiggleMixin(configSchema: AnyConfigurationSchemaTy
         };
     }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "displayId">>;
 }>> & import("mobx-state-tree/dist/internal").NonEmptyObject & import("mobx-state-tree")._NotCustomized, {
-    type: string;
     id: string;
+    type: string;
     configuration: import("mobx-state-tree").ModelSnapshotType<Record<string, any>>;
     heightPreConfig: number | undefined;
     rpcDriverName: string | undefined;

package/esm/shared/{modelShared.js → SharedWiggleMixin.js}

@@ -74,8 +74,17 @@ export default function SharedWiggleMixin(configSchema) {
         configuration: ConfigurationReference(configSchema),
     }))
         .volatile(() => ({
+        /**
+         * #volatile
+         */
         message: undefined,
+        /**
+         * #volatile
+         */
         stats: undefined,
+        /**
+         * #volatile
+         */
         statsFetchInProgress: undefined,
     }))
         .actions(self => ({
@@ -83,14 +92,16 @@ export default function SharedWiggleMixin(configSchema) {
          * #action
          */
         updateQuantitativeStats(stats) {
-            const { scoreMin, scoreMax } = stats;
+            const { currStatsBpPerPx, scoreMin, scoreMax } = stats;
             const EPSILON = 0.000001;
-            if (!self.stats) {
-                self.stats = { scoreMin, scoreMax };
-            }
-            else if (Math.abs(self.stats.scoreMax - scoreMax) > EPSILON ||
+            if (!self.stats ||
+                Math.abs(self.stats.scoreMax - scoreMax) > EPSILON ||
                 Math.abs(self.stats.scoreMin - scoreMin) > EPSILON) {
-                self.stats = { scoreMin, scoreMax };
+                self.stats = {
+                    currStatsBpPerPx,
+                    scoreMin,
+                    scoreMax,
+                };
             }
         },
         /**
@@ -114,10 +125,10 @@ export default function SharedWiggleMixin(configSchema) {
         /**
          * #action
          */
-        setLoading(aborter) {
-            const { statsFetchInProgress: statsFetch } = self;
-            if (statsFetch !== undefined && !statsFetch.signal.aborted) {
-                statsFetch.abort();
+        setStatsLoading(aborter) {
+            if (self.statsFetchInProgress !== undefined &&
+                !self.statsFetchInProgress.signal.aborted) {
+                self.statsFetchInProgress.abort();
             }
             self.statsFetchInProgress = aborter;
         },

package/esm/util.d.ts

@@ -1,5 +1,3 @@
-import { QuantitativeStats } from '@jbrowse/core/util/stats';
-import { AnyConfigurationModel } from '@jbrowse/core/configuration';
 export declare const YSCALEBAR_LABEL_OFFSET = 5;
 export interface ScaleOpts {
     domain: number[];
@@ -27,14 +25,15 @@ export interface Source {
  */
 export declare function getScale({ domain, range, scaleType, pivotValue, inverted, }: ScaleOpts): import("d3-scale").ScaleLinear<number, number, never> | import("d3-scale").ScaleLogarithmic<number, number, never> | import("d3-scale").ScaleQuantize<number, never>;
 /**
- * gets the origin for drawing the graph. for linear this is 0, for log this is arbitrarily set to log(1)==0
+ * gets the origin for drawing the graph. for linear this is 0, for log this is
+ * arbitrarily set to log(1)==0
  *
  * @param scaleType -
  */
-export declare function getOrigin(scaleType: string): 0 | 1;
+export declare function getOrigin(scaleType: string): 1 | 0;
 /**
- * produces a "nice" domain that actually rounds down to 0 for the min
- * or 0 to the max depending on if all values are positive or negative
+ * produces a "nice" domain that actually rounds down to 0 for the min or 0 to
+ * the max depending on if all values are positive or negative
  *
  * @param object - containing attributes
  *   - domain [min,max]
@@ -48,29 +47,6 @@ export declare function getNiceDomain({ scaleType, domain, bounds, }: {
     domain: readonly [number, number];
     bounds: readonly [number | undefined, number | undefined];
 }): [number, number];
-export declare function getQuantitativeStats(self: {
-    adapterConfig: AnyConfigurationModel;
-    configuration: AnyConfigurationModel;
-    autoscaleType: string;
-    setMessage: (str: string) => void;
-}, opts: {
-    headers?: Record<string, string>;
-    signal?: AbortSignal;
-    filters: string[];
-}): Promise<QuantitativeStats>;
-export declare function quantitativeStatsAutorun(self: {
-    featureDensityStatsReady: boolean;
-    regionTooLarge: boolean;
-    error: unknown;
-    setLoading: (aborter: AbortController) => void;
-    setError: (error: unknown) => void;
-    updateQuantitativeStats: (stats: QuantitativeStats, statsRegion: string) => void;
-    renderProps: () => Record<string, unknown>;
-    configuration: AnyConfigurationModel;
-    adapterConfig: AnyConfigurationModel;
-    autoscaleType: string;
-    setMessage: (str: string) => void;
-}): void;
 export declare function toP(s?: number): number;
 export declare function round(value: number): number;
 export declare function fillRectCtx(x: number, y: number, width: number, height: number, ctx: CanvasRenderingContext2D, color?: string): void;

package/esm/util.js

@@ -1,9 +1,4 @@
 import { scaleLinear, scaleLog, scaleQuantize, } from '@mui/x-charts-vendor/d3-scale';
-import { autorun } from 'mobx';
-import { isAbortException, getSession, getContainingView, } from '@jbrowse/core/util';
-import { getRpcSessionId } from '@jbrowse/core/util/tracks';
-import { addDisposer, isAlive } from 'mobx-state-tree';
-import { getConf } from '@jbrowse/core/configuration';
 export const YSCALEBAR_LABEL_OFFSET = 5;
 /**
  * produces a d3-scale from arguments. applies a "nice domain" adjustment
@@ -44,7 +39,8 @@ export function getScale({ domain = [], range = [], scaleType, pivotValue, inver
     return scale;
 }
 /**
- * gets the origin for drawing the graph. for linear this is 0, for log this is arbitrarily set to log(1)==0
+ * gets the origin for drawing the graph. for linear this is 0, for log this is
+ * arbitrarily set to log(1)==0
  *
  * @param scaleType -
  */
@@ -67,8 +63,8 @@ export function getOrigin(scaleType /* , pivot, stats */) {
     return 0;
 }
 /**
- * produces a "nice" domain that actually rounds down to 0 for the min
- * or 0 to the max depending on if all values are positive or negative
+ * produces a "nice" domain that actually rounds down to 0 for the min or 0 to
+ * the max depending on if all values are positive or negative
  *
  * @param object - containing attributes
  *   - domain [min,max]
@@ -121,96 +117,6 @@ export function getNiceDomain({ scaleType, domain, bounds, }) {
     scale.nice();
     return scale.domain();
 }
-export async function getQuantitativeStats(self, opts) {
-    const { rpcManager } = getSession(self);
-    const numStdDev = getConf(self, 'numStdDev') || 3;
-    const { adapterConfig, autoscaleType } = self;
-    const sessionId = getRpcSessionId(self);
-    const params = {
-        sessionId,
-        adapterConfig,
-        statusCallback: (message) => {
-            if (isAlive(self)) {
-                self.setMessage(message);
-            }
-        },
-        ...opts,
-    };
-    if (autoscaleType === 'global' || autoscaleType === 'globalsd') {
-        const results = (await rpcManager.call(sessionId, 'WiggleGetGlobalQuantitativeStats', params));
-        const { scoreMin, scoreMean, scoreStdDev } = results;
-        // globalsd uses heuristic to avoid unnecessary scoreMin<0
-        // if the scoreMin is never less than 0
-        // helps with most coverage bigwigs just being >0
-        return autoscaleType === 'globalsd'
-            ? {
-                ...results,
-                scoreMin: scoreMin >= 0 ? 0 : scoreMean - numStdDev * scoreStdDev,
-                scoreMax: scoreMean + numStdDev * scoreStdDev,
-            }
-            : results;
-    }
-    if (autoscaleType === 'local' || autoscaleType === 'localsd') {
-        const { dynamicBlocks, bpPerPx } = getContainingView(self);
-        const results = (await rpcManager.call(sessionId, 'WiggleGetMultiRegionQuantitativeStats', {
-            ...params,
-            regions: dynamicBlocks.contentBlocks.map(region => {
-                const { start, end } = region;
-                return {
-                    ...JSON.parse(JSON.stringify(region)),
-                    start: Math.floor(start),
-                    end: Math.ceil(end),
-                };
-            }),
-            bpPerPx,
-        }));
-        const { scoreMin, scoreMean, scoreStdDev } = results;
-        // localsd uses heuristic to avoid unnecessary scoreMin<0 if the
-        // scoreMin is never less than 0 helps with most coverage bigwigs
-        // just being >0
-        return autoscaleType === 'localsd'
-            ? {
-                ...results,
-                scoreMin: scoreMin >= 0 ? 0 : scoreMean - numStdDev * scoreStdDev,
-                scoreMax: scoreMean + numStdDev * scoreStdDev,
-            }
-            : results;
-    }
-    if (autoscaleType === 'zscale') {
-        return rpcManager.call(sessionId, 'WiggleGetGlobalQuantitativeStats', params);
-    }
-    throw new Error(`invalid autoscaleType '${autoscaleType}'`);
-}
-export function quantitativeStatsAutorun(self) {
-    addDisposer(self, autorun(async () => {
-        try {
-            const aborter = new AbortController();
-            const view = getContainingView(self);
-            self.setLoading(aborter);
-            if (!view.initialized ||
-                !self.featureDensityStatsReady ||
-                self.regionTooLarge ||
-                self.error) {
-                return;
-            }
-            const statsRegion = JSON.stringify(view.dynamicBlocks);
-            const wiggleStats = await getQuantitativeStats(self, {
-                signal: aborter.signal,
-                filters: [],
-                ...self.renderProps(),
-            });
-            if (isAlive(self)) {
-                self.updateQuantitativeStats(wiggleStats, statsRegion);
-            }
-        }
-        catch (e) {
-            if (!isAbortException(e) && isAlive(self)) {
-                console.error(e);
-                self.setError(e);
-            }
-        }
-    }, { delay: 1000 }));
-}
 export function toP(s = 0) {
     return +(+s).toPrecision(6);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-wiggle",
-  "version": "2.16.1",
+  "version": "2.17.0",
   "description": "JBrowse 2 wiggle adapters, tracks, etc.",
   "keywords": [
     "jbrowse",
@@ -65,5 +65,5 @@
   "distModule": "esm/index.js",
   "srcModule": "src/index.ts",
   "module": "esm/index.js",
-  "gitHead": "c6a658d2344989895543f0456b1cf7dd3b937769"
+  "gitHead": "eed30b5e671f8f7823652d7cecc51aa89226de46"
 }