@jbrowse/plugin-wiggle 2.4.1 → 2.5.0

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/esm/shared/SetMinMaxDialog.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export default function SetMinMaxDlg(props: {
     model: {
         minScore: number;

package/esm/shared/YScaleBar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { axisPropsFromTickScale } from 'react-d3-axis-mod';
 declare const _default: ({ model, orientation, }: {
     model: {

package/esm/util.d.ts

@@ -1,4 +1,4 @@
-import { FeatureStats } from '@jbrowse/core/util/stats';
+import { QuantitativeStats } from '@jbrowse/core/util/stats';
 import { AnyConfigurationModel } from '@jbrowse/core/configuration';
 export declare const YSCALEBAR_LABEL_OFFSET = 5;
 export interface ScaleOpts {
@@ -50,22 +50,25 @@ export declare function getNiceDomain({ scaleType, domain, bounds, }: {
 export declare function groupBy<T>(array: T[], predicate: (v: T) => string): {
     [key: string]: T[];
 };
-export declare function getStats(self: {
+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<FeatureStats>;
-export declare function statsAutorun(self: {
-    estimatedStatsReady: boolean;
+}): Promise<QuantitativeStats>;
+export declare function quantitativeStatsAutorun(self: {
+    featureDensityStatsReady: boolean;
     regionTooLarge: boolean;
+    error: unknown;
     setLoading: (aborter: AbortController) => void;
     setError: (error: unknown) => void;
-    updateStats: (stats: FeatureStats, statsRegion: string) => void;
+    updateQuantitativeStats: (stats: QuantitativeStats, statsRegion: string) => void;
     renderProps: () => Record<string, unknown>;
+    configuration: AnyConfigurationModel;
     adapterConfig: AnyConfigurationModel;
     autoscaleType: string;
     setMessage: (str: string) => void;

package/esm/util.js

@@ -135,7 +135,7 @@ export function groupBy(array, predicate) {
     }
     return result;
 }
-export async function getStats(self, opts) {
+export async function getQuantitativeStats(self, opts) {
     const { rpcManager } = getSession(self);
     const nd = getConf(self, 'numStdDev') || 3;
     const { adapterConfig, autoscaleType } = self;
@@ -151,7 +151,7 @@ export async function getStats(self, opts) {
         ...opts,
     };
     if (autoscaleType === 'global' || autoscaleType === 'globalsd') {
-        const results = (await rpcManager.call(sessionId, 'WiggleGetGlobalStats', params));
+        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
@@ -166,7 +166,7 @@ export async function getStats(self, opts) {
     }
     if (autoscaleType === 'local' || autoscaleType === 'localsd') {
         const { dynamicBlocks, bpPerPx } = getContainingView(self);
-        const results = (await rpcManager.call(sessionId, 'WiggleGetMultiRegionStats', {
+        const results = (await rpcManager.call(sessionId, 'WiggleGetMultiRegionQuantitativeStats', {
             ...params,
             regions: dynamicBlocks.contentBlocks.map(region => {
                 const { start, end } = region;
@@ -191,28 +191,29 @@ export async function getStats(self, opts) {
             : results;
     }
     if (autoscaleType === 'zscale') {
-        return rpcManager.call(sessionId, 'WiggleGetGlobalStats', params);
+        return rpcManager.call(sessionId, 'WiggleGetGlobalQuantitativeStats', params);
     }
     throw new Error(`invalid autoscaleType '${autoscaleType}'`);
 }
-export function statsAutorun(self) {
+export function quantitativeStatsAutorun(self) {
     addDisposer(self, autorun(async () => {
         try {
             const aborter = new AbortController();
             const view = getContainingView(self);
             self.setLoading(aborter);
             if (!view.initialized ||
-                !self.estimatedStatsReady ||
-                self.regionTooLarge) {
+                !self.featureDensityStatsReady ||
+                self.regionTooLarge ||
+                self.error) {
                 return;
             }
             const statsRegion = JSON.stringify(view.dynamicBlocks);
-            const wiggleStats = await getStats(self, {
+            const wiggleStats = await getQuantitativeStats(self, {
                 signal: aborter.signal,
                 ...self.renderProps(),
             });
             if (isAlive(self)) {
-                self.updateStats(wiggleStats, statsRegion);
+                self.updateQuantitativeStats(wiggleStats, statsRegion);
             }
         }
         catch (e) {

package/esm/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-wiggle",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "JBrowse 2 wiggle adapters, tracks, etc.",
   "keywords": [
     "jbrowse",
@@ -55,7 +55,7 @@
     "@jbrowse/plugin-data-management": "^2.0.0",
     "@jbrowse/plugin-linear-genome-view": "^2.0.0",
     "@mui/material": "^5.0.0",
-    "@mui/x-data-grid": "^5.0.1",
+    "@mui/x-data-grid": "^6.0.1",
     "mobx": "^6.0.0",
     "mobx-react": "^7.0.0",
     "mobx-state-tree": "^5.0.0",
@@ -69,5 +69,5 @@
   "distModule": "esm/index.js",
   "srcModule": "src/index.ts",
   "module": "esm/index.js",
-  "gitHead": "747c50c4edc0184827efa4f8dfc576ca9a72caeb"
+  "gitHead": "d1ca073996d008f0fe9a52f7c1a47ae649dcfdaf"
 }

package/src/BigWigAdapter/BigWigAdapter.test.ts

@@ -36,7 +36,7 @@ describe('adapter can fetch features from volvox.bw', () => {
   })
   it('get region stats', async () => {
     expect(
-      await adapter.getRegionStats({
+      await adapter.getRegionQuantitativeStats({
         refName: 'ctgA',
         start: 10000,
         end: 40000,
@@ -47,14 +47,19 @@ describe('adapter can fetch features from volvox.bw', () => {
 
   it('get local stats', async () => {
     expect(
-      await adapter.getMultiRegionStats([
+      await adapter.getMultiRegionQuantitativeStats([
         {
           refName: 'ctgA',
           start: 10000,
           end: 39999,
           assemblyName: 'volvox',
         },
-        { refName: 'ctgB', start: 0, end: 99, assemblyName: 'volvox' },
+        {
+          refName: 'ctgB',
+          start: 0,
+          end: 99,
+          assemblyName: 'volvox',
+        },
       ]),
     ).toMatchSnapshot()
   })

package/src/BigWigAdapter/BigWigAdapter.ts

@@ -7,7 +7,10 @@ import { AugmentedRegion as Region } from '@jbrowse/core/util/types'
 import { openLocation } from '@jbrowse/core/util/io'
 import { updateStatus, Feature } from '@jbrowse/core/util'
 import { ObservableCreate } from '@jbrowse/core/util/rxjs'
-import { rectifyStats, UnrectifiedFeatureStats } from '@jbrowse/core/util/stats'
+import {
+  rectifyStats,
+  UnrectifiedQuantitativeStats,
+} from '@jbrowse/core/util/stats'
 
 interface WiggleOptions extends BaseOptions {
   resolution?: number
@@ -61,7 +64,7 @@ export default class BigWigAdapter extends BaseFeatureDataAdapter {
 
   public async getGlobalStats(opts?: BaseOptions) {
     const { header } = await this.setup(opts)
-    return rectifyStats(header.totalSummary as UnrectifiedFeatureStats)
+    return rectifyStats(header.totalSummary as UnrectifiedQuantitativeStats)
   }
 
   public getFeatures(region: Region, opts: WiggleOptions = {}) {
@@ -103,7 +106,7 @@ export default class BigWigAdapter extends BaseFeatureDataAdapter {
   }
 
   // always render bigwig instead of calculating a feature density for it
-  async estimateRegionsStats(_regions: Region[]) {
+  async getMultiRegionFeatureDensityStats(_regions: Region[]) {
     return { featureDensity: 0 }
   }
 

package/src/LinearWiggleDisplay/models/model.tsx

@@ -17,15 +17,14 @@ import {
   LinearGenomeViewModel,
 } from '@jbrowse/plugin-linear-genome-view'
 import { when } from 'mobx'
-import { isAlive, types, Instance } from 'mobx-state-tree'
+import { types, Instance } from 'mobx-state-tree'
 import PluginManager from '@jbrowse/core/PluginManager'
 
 import { axisPropsFromTickScale } from 'react-d3-axis-mod'
 import {
   getNiceDomain,
   getScale,
-  getStats,
-  statsAutorun,
+  quantitativeStatsAutorun,
   YSCALEBAR_LABEL_OFFSET,
 } from '../../util'
 
@@ -134,7 +133,7 @@ function stateModelFactory(
       /**
        * #action
        */
-      updateStats(stats: { scoreMin: number; scoreMax: number }) {
+      updateQuantitativeStats(stats: { scoreMin: number; scoreMax: number }) {
         const { scoreMin, scoreMax } = stats
         const EPSILON = 0.000001
         if (!self.stats) {
@@ -343,9 +342,6 @@ function stateModelFactory(
        * #getter
        */
       get rendererConfig() {
-        const configBlob =
-          getConf(self, ['renderers', self.rendererTypeName]) || {}
-
         const {
           color,
           displayCrossHatches,
@@ -355,8 +351,9 @@ function stateModelFactory(
           posColor,
           summaryScoreMode,
           scaleType,
+          rendererTypeName,
         } = self
-
+        const configBlob = getConf(self, ['renderers', rendererTypeName]) || {}
         return self.rendererType.configSchema.create(
           {
             ...configBlob,
@@ -382,15 +379,13 @@ function stateModelFactory(
          * #getter
          */
         get filled() {
-          const { fill, rendererConfig: conf } = self
-          return fill ?? readConfObject(conf, 'filled')
+          return readConfObject(self.rendererConfig, 'filled')
         },
         /**
          * #getter
          */
         get summaryScoreModeSetting() {
-          const { summaryScoreMode, rendererConfig: conf } = self
-          return summaryScoreMode ?? readConfObject(conf, 'summaryScoreMode')
+          return readConfObject(self.rendererConfig, 'summaryScoreMode')
         },
         /**
          * #getter
@@ -460,8 +455,7 @@ function stateModelFactory(
          * #getter
          */
         get displayCrossHatchesSetting() {
-          const { displayCrossHatches: hatches, rendererConfig: conf } = self
-          return hatches ?? readConfObject(conf, 'displayCrossHatches')
+          return readConfObject(self.rendererConfig, 'displayCrossHatches')
         },
       }
     })
@@ -682,23 +676,11 @@ function stateModelFactory(
          */
         async reload() {
           self.setError()
-          const aborter = new AbortController()
-          self.setLoading(aborter)
-          try {
-            const stats = await getStats(self, {
-              signal: aborter.signal,
-              ...self.renderProps(),
-            })
-            if (isAlive(self)) {
-              self.updateStats(stats)
-              superReload()
-            }
-          } catch (e) {
-            self.setError(e)
-          }
+          superReload()
         },
+
         afterAttach() {
-          statsAutorun(self)
+          quantitativeStatsAutorun(self)
         },
         /**
          * #action

package/src/MultiLinearWiggleDisplay/components/SetColorDialog.tsx

@@ -129,6 +129,11 @@ export default function SetColorDialog({
   )
 }
 
+interface SortField {
+  idx: number
+  field: string | null
+}
+
 function SourcesGrid({
   rows,
   onChange,
@@ -143,53 +148,11 @@ function SourcesGrid({
 
   // @ts-expect-error
   const { name: _name, color: _color, baseUri: _baseUri, ...rest } = rows[0]
-
-  // similar to BaseFeatureDetail data-grid for auto-measuring columns
-  const columns = [
-    {
-      field: 'color',
-      headerName: 'Color',
-      renderCell: (params: GridCellParams) => {
-        const { value, id } = params
-        return (
-          <ColorPicker
-            color={value || 'blue'}
-            onChange={c => {
-              const elt = rows.find(f => f.name === id)
-              if (elt) {
-                elt.color = c
-              }
-              onChange([...rows])
-            }}
-          />
-        )
-      },
-    },
-    {
-      field: 'name',
-      sortingOrder: [null],
-      headerName: 'Name',
-      width: measureGridWidth(rows.map(r => r.name)),
-    },
-    ...Object.keys(rest).map(val => ({
-      field: val,
-      sortingOrder: [null],
-      renderCell: (params: GridCellParams) => {
-        const { value } = params
-        return isUriLocation(value) ? <UriLink value={value} /> : getStr(value)
-      },
-      // @ts-expect-error
-      width: measureGridWidth(rows.map(r => r[val])),
-    })),
-  ]
-
-  // this helps keep track of the selection, even though it is not used
-  // anywhere except inside the picker
   const [widgetColor, setWidgetColor] = useState('blue')
-  const [currSort, setCurrSort] = useState<{
-    idx: number
-    field: string | null
-  }>({ idx: 0, field: null })
+  const [currSort, setCurrSort] = useState<SortField>({
+    idx: 0,
+    field: null,
+  })
 
   return (
     <div>
@@ -247,12 +210,52 @@ function SourcesGrid({
         <DataGrid
           getRowId={row => row.name}
           checkboxSelection
-          disableSelectionOnClick
-          onSelectionModelChange={arg => setSelected(arg as string[])}
+          disableRowSelectionOnClick
+          onRowSelectionModelChange={arg => setSelected(arg as string[])}
           rows={rows}
           rowHeight={25}
-          headerHeight={33}
-          columns={columns}
+          columnHeaderHeight={33}
+          columns={[
+            {
+              field: 'color',
+              headerName: 'Color',
+              renderCell: params => {
+                const { value, id } = params
+                return (
+                  <ColorPicker
+                    color={value || 'blue'}
+                    onChange={c => {
+                      const elt = rows.find(f => f.name === id)
+                      if (elt) {
+                        elt.color = c
+                      }
+                      onChange([...rows])
+                    }}
+                  />
+                )
+              },
+            },
+            {
+              field: 'name',
+              sortingOrder: [null],
+              headerName: 'Name',
+              width: measureGridWidth(rows.map(r => r.name)),
+            },
+            ...Object.keys(rest).map(val => ({
+              field: val,
+              sortingOrder: [null],
+              renderCell: (params: GridCellParams) => {
+                const { value } = params
+                return isUriLocation(value) ? (
+                  <UriLink value={value} />
+                ) : (
+                  getStr(value)
+                )
+              },
+              // @ts-ignore
+              width: measureGridWidth(rows.map(r => r[val])),
+            })),
+          ]}
           sortModel={
             [
               /* we control the sort as a controlled component using onSortModelChange */

package/src/MultiLinearWiggleDisplay/models/model.tsx

@@ -30,8 +30,7 @@ import {
 import {
   getNiceDomain,
   getScale,
-  getStats,
-  statsAutorun,
+  quantitativeStatsAutorun,
   YSCALEBAR_LABEL_OFFSET,
 } from '../../util'
 
@@ -110,7 +109,7 @@ const stateModelFactory = (
       clearLayout() {
         self.layout = []
       },
-      updateStats(stats: { scoreMin: number; scoreMax: number }) {
+      updateQuantitativeStats(stats: { scoreMin: number; scoreMax: number }) {
         const { scoreMin, scoreMax } = stats
         const EPSILON = 0.000001
         if (!self.stats) {
@@ -662,27 +661,12 @@ const stateModelFactory = (
       type ExportSvgOpts = Parameters<typeof superRenderSvg>[0]
 
       return {
-        // re-runs stats and refresh whole display on reload
         async reload() {
           self.setError()
-          const aborter = new AbortController()
-          let stats
-          try {
-            self.setLoading(aborter)
-            stats = await getStats(self, {
-              signal: aborter.signal,
-              ...self.renderProps(),
-            })
-            if (isAlive(self)) {
-              self.updateStats(stats)
-              superReload()
-            }
-          } catch (e) {
-            self.setError(e)
-          }
+          superReload()
         },
         afterAttach() {
-          statsAutorun(self)
+          quantitativeStatsAutorun(self)
           addDisposer(
             self,
             autorun(async () => {

package/src/MultiWiggleAdapter/MultiWiggleAdapter.ts

@@ -106,7 +106,7 @@ export default class MultiWiggleAdapter extends BaseFeatureDataAdapter {
   }
 
   // always render bigwig instead of calculating a feature density for it
-  async estimateRegionsStats(_regions: Region[]) {
+  async getMultiRegionFeatureDensityStats(_regions: Region[]) {
     return { featureDensity: 0 }
   }
 

package/src/WiggleRPC/MultiWiggleGetSources.ts

@@ -0,0 +1,68 @@
+import RpcMethodType from '@jbrowse/core/pluggableElementTypes/RpcMethodType'
+import SerializableFilterChain from '@jbrowse/core/pluggableElementTypes/renderers/util/serializableFilterChain'
+import { getAdapter } from '@jbrowse/core/data_adapters/dataAdapterCache'
+import { RenderArgs } from '@jbrowse/core/rpc/coreRpcMethods'
+import { renameRegionsIfNeeded, Region } from '@jbrowse/core/util'
+import { RemoteAbortSignal } from '@jbrowse/core/rpc/remoteAbortSignals'
+import { AnyConfigurationModel } from '@jbrowse/core/configuration'
+
+export class MultiWiggleGetSources extends RpcMethodType {
+  name = 'MultiWiggleGetSources'
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async deserializeArguments(args: any, rpcDriverClassName: string) {
+    const l = await super.deserializeArguments(args, rpcDriverClassName)
+    return {
+      ...l,
+      filters: args.filters
+        ? new SerializableFilterChain({
+            filters: args.filters,
+          })
+        : undefined,
+    }
+  }
+
+  async serializeArguments(
+    args: RenderArgs & {
+      signal?: AbortSignal
+      statusCallback?: (arg: string) => void
+    },
+    rpcDriverClassName: string,
+  ) {
+    const pm = this.pluginManager
+    const assemblyManager = pm.rootModel?.session?.assemblyManager
+    if (!assemblyManager) {
+      return args
+    }
+
+    const renamedArgs = await renameRegionsIfNeeded(assemblyManager, {
+      ...args,
+      filters: args.filters?.toJSON().filters,
+    })
+
+    return super.serializeArguments(renamedArgs, rpcDriverClassName)
+  }
+
+  async execute(
+    args: {
+      adapterConfig: AnyConfigurationModel
+      signal?: RemoteAbortSignal
+      sessionId: string
+      headers?: Record<string, string>
+      regions: Region[]
+      bpPerPx: number
+    },
+    rpcDriverClassName: string,
+  ) {
+    const pm = this.pluginManager
+    const deserializedArgs = await this.deserializeArguments(
+      args,
+      rpcDriverClassName,
+    )
+    const { regions, adapterConfig, sessionId } = deserializedArgs
+    const { dataAdapter } = await getAdapter(pm, sessionId, adapterConfig)
+
+    // @ts-expect-error
+    return dataAdapter.getSources(regions, deserializedArgs)
+  }
+}

package/src/WiggleRPC/WiggleGetGlobalQuantitativeStats.ts

@@ -0,0 +1,44 @@
+import RpcMethodType from '@jbrowse/core/pluggableElementTypes/RpcMethodType'
+import SerializableFilterChain from '@jbrowse/core/pluggableElementTypes/renderers/util/serializableFilterChain'
+import { getAdapter } from '@jbrowse/core/data_adapters/dataAdapterCache'
+import { RemoteAbortSignal } from '@jbrowse/core/rpc/remoteAbortSignals'
+import { QuantitativeStats } from '@jbrowse/core/util/stats'
+import { AnyConfigurationModel } from '@jbrowse/core/configuration'
+
+export class WiggleGetGlobalQuantitativeStats extends RpcMethodType {
+  name = 'WiggleGetGlobalQuantitativeStats'
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async deserializeArguments(args: any, rpcDriverClassName: string) {
+    const l = await super.deserializeArguments(args, rpcDriverClassName)
+    return {
+      ...l,
+      filters: args.filters
+        ? new SerializableFilterChain({
+            filters: args.filters,
+          })
+        : undefined,
+    }
+  }
+
+  async execute(
+    args: {
+      adapterConfig: AnyConfigurationModel
+      signal?: RemoteAbortSignal
+      headers?: Record<string, string>
+      sessionId: string
+    },
+    rpcDriverClassName: string,
+  ): Promise<QuantitativeStats> {
+    const pm = this.pluginManager
+    const deserializedArgs = await this.deserializeArguments(
+      args,
+      rpcDriverClassName,
+    )
+    const { adapterConfig, sessionId } = deserializedArgs
+    const { dataAdapter } = await getAdapter(pm, sessionId, adapterConfig)
+
+    // @ts-expect-error
+    return dataAdapter.getGlobalStats(deserializedArgs)
+  }
+}