@jbrowse/plugin-wiggle 2.4.0 → 2.4.2

package/src/MultiXYPlotRenderer/MultiXYPlotRenderer.ts

@@ -7,16 +7,16 @@ import WiggleBaseRenderer, {
 } from '../WiggleBaseRenderer'
 
 export default class MultiXYPlotRenderer extends WiggleBaseRenderer {
-  // @ts-ignore
+  // @ts-expect-error
   async draw(ctx: CanvasRenderingContext2D, props: MultiArgs) {
     const { sources, features } = props
     const groups = groupBy([...features.values()], f => f.get('source'))
     const Color = await import('color').then(f => f.default)
     let feats = [] as Feature[]
-    sources.forEach(source => {
+    for (const source of sources) {
       const features = groups[source.name]
       if (!features) {
-        return
+        continue
       }
       const { reducedFeatures } = drawXY(ctx, {
         ...props,
@@ -25,8 +25,8 @@ export default class MultiXYPlotRenderer extends WiggleBaseRenderer {
         colorCallback: () => source.color || 'blue',
         Color,
       })
-      feats = feats.concat(reducedFeatures)
-    })
+      feats = [...feats, ...reducedFeatures]
+    }
     return { reducedFeatures: feats }
   }
 }

package/src/WiggleBaseRenderer.tsx

@@ -1,10 +1,6 @@
 import FeatureRendererType, {
   RenderArgs as FeatureRenderArgs,
-  RenderArgsSerialized,
   RenderArgsDeserialized as FeatureRenderArgsDeserialized,
-  RenderResults,
-  ResultsSerialized,
-  ResultsDeserialized,
 } from '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType'
 import { renderToAbstractCanvas, Feature } from '@jbrowse/core/util'
 import { ThemeOptions } from '@mui/material'
@@ -34,13 +30,6 @@ export interface MultiRenderArgsDeserialized
   sources: Source[]
 }
 
-export type {
-  RenderArgsSerialized,
-  RenderResults,
-  ResultsSerialized,
-  ResultsDeserialized,
-}
-
 export default abstract class WiggleBaseRenderer extends FeatureRendererType {
   supportsSVG = true
 
@@ -50,7 +39,7 @@ export default abstract class WiggleBaseRenderer extends FeatureRendererType {
     const [region] = regions
     const width = (region.end - region.start) / bpPerPx
 
-    // @ts-ignore
+    // @ts-expect-error
     const { reducedFeatures, ...rest } = await renderToAbstractCanvas(
       width,
       height,
@@ -93,3 +82,10 @@ export default abstract class WiggleBaseRenderer extends FeatureRendererType {
     props: T,
   ): Promise<Record<string, unknown> | void>
 }
+
+export {
+  type RenderArgsSerialized,
+  type RenderResults,
+  type ResultsDeserialized,
+  type ResultsSerialized,
+} from '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType'

package/src/WiggleRPC/rpcMethods.ts

@@ -40,7 +40,7 @@ export class WiggleGetGlobalStats extends RpcMethodType {
     const { adapterConfig, sessionId } = deserializedArgs
     const { dataAdapter } = await getAdapter(pm, sessionId, adapterConfig)
 
-    // @ts-ignore
+    // @ts-expect-error
     return dataAdapter.getGlobalStats(deserializedArgs)
   }
 }
@@ -164,7 +164,7 @@ export class MultiWiggleGetSources extends RpcMethodType {
     const { regions, adapterConfig, sessionId } = deserializedArgs
     const { dataAdapter } = await getAdapter(pm, sessionId, adapterConfig)
 
-    // @ts-ignore
+    // @ts-expect-error
     return dataAdapter.getSources(regions, deserializedArgs)
   }
 }

package/src/WiggleRendering.test.js

@@ -15,7 +15,7 @@ test('one', async () => {
       config={{ type: 'DummyRenderer' }}
     />,
   )
-  const test = await getByTestId('wiggle-rendering-test')
+  const test = getByTestId('wiggle-rendering-test')
   expect(fireEvent.click(test)).toBeTruthy()
   expect(container.firstChild).toMatchSnapshot()
 })

package/src/XYPlotRenderer/XYPlotRenderer.test.ts

@@ -6,9 +6,9 @@ import configSchema from './configSchema'
 import XYPlotRenderer from './XYPlotRenderer'
 import ReactComponent from '../WiggleRendering'
 
-// @ts-ignore
+// @ts-expect-error
 global.nodeImage = Image
-// @ts-ignore
+// @ts-expect-error
 global.nodeCreateCanvas = createCanvas
 
 test('several features', async () => {
@@ -43,7 +43,7 @@ test('several features', async () => {
   }
 
   const res = await renderToAbstractCanvas(1000, 200, renderProps, ctx =>
-    // @ts-ignore
+    // @ts-expect-error
     renderer.draw(ctx, renderProps),
   )
   expect(res).toMatchSnapshot({

package/src/XYPlotRenderer/index.ts

@@ -2,7 +2,6 @@ import ReactComponent from '../WiggleRendering'
 import PluginManager from '@jbrowse/core/PluginManager'
 import XYPlotRenderer from './XYPlotRenderer'
 import configSchema from './configSchema'
-export { XYPlotRenderer, configSchema, ReactComponent }
 
 export default (pluginManager: PluginManager) => {
   pluginManager.addRendererType(
@@ -15,3 +14,7 @@ export default (pluginManager: PluginManager) => {
       }),
   )
 }
+
+export { default as XYPlotRenderer } from './XYPlotRenderer'
+export { default as ReactComponent } from '../WiggleRendering'
+export { default as configSchema } from './configSchema'

package/src/drawxy.ts

@@ -277,7 +277,7 @@ export function drawLine(
 
     ctx.beginPath()
     ctx.strokeStyle = c
-    const startPos = typeof lastVal !== 'undefined' ? lastVal : score
+    const startPos = lastVal !== undefined ? lastVal : score
     if (!region.reversed) {
       ctx.moveTo(leftPx, toY(startPos))
       ctx.lineTo(leftPx, toY(score))
@@ -341,13 +341,11 @@ export function drawDensity(
   })
 
   const scale2 = getScale({ ...scaleOpts, range: [0, height] })
-  let cb
-  if (color === '#f0f') {
-    cb = (_feature: Feature, score: number) => scale(score)
-  } else {
-    cb = (feature: Feature, score: number) =>
-      readConfObject(config, 'color', { feature, score })
-  }
+  const cb =
+    color === '#f0f'
+      ? (_: Feature, score: number) => scale(score)
+      : (feature: Feature, score: number) =>
+          readConfObject(config, 'color', { feature, score })
   const [niceMin, niceMax] = scale2.domain()
 
   let prevLeftPx = -Infinity

package/src/index.ts

@@ -9,7 +9,7 @@ import {
 
 // locals
 import WiggleBaseRenderer from './WiggleBaseRenderer'
-import WiggleRendering from './WiggleRendering'
+
 import BigWigAdapterF from './BigWigAdapter'
 import QuantitativeTrackF from './QuantitativeTrack'
 import MultiQuantitativeTrackF from './MultiQuantitativeTrack'
@@ -38,9 +38,8 @@ import {
 import {
   ReactComponent as LinearWiggleDisplayReactComponent,
   modelFactory as linearWiggleDisplayModelFactory,
-  Tooltip,
 } from './LinearWiggleDisplay'
-import { TooltipContentsComponent } from './Tooltip'
+
 import {
   ReactComponent as XYPlotRendererReactComponent,
   configSchema as xyPlotRendererConfigSchema,
@@ -120,12 +119,12 @@ export default class WigglePlugin extends Plugin {
 
 export * from './util'
 
+export { default as WiggleRendering } from './WiggleRendering'
 export {
-  LinearWiggleDisplayReactComponent,
   Tooltip,
-  WiggleRendering,
-  WiggleBaseRenderer,
-  linearWiggleDisplayModelFactory,
-}
+  ReactComponent as LinearWiggleDisplayReactComponent,
+  modelFactory as linearWiggleDisplayModelFactory,
+} from './LinearWiggleDisplay'
+export { type TooltipContentsComponent } from './Tooltip'
 
-export type { TooltipContentsComponent }
+export { default as WiggleBaseRenderer } from './WiggleBaseRenderer'

package/src/util.ts

@@ -168,11 +168,12 @@ export function getNiceDomain({
 }
 
 export function groupBy<T>(array: T[], predicate: (v: T) => string) {
-  return array.reduce((acc, value) => {
-    const entry = (acc[predicate(value)] ||= [])
+  const result = {} as { [key: string]: T[] }
+  for (const value of array) {
+    const entry = (result[predicate(value)] ||= [])
     entry.push(value)
-    return acc
-  }, {} as { [key: string]: T[] })
+  }
+  return result
 }
 
 export async function getStats(