@jbrowse/plugin-wiggle 2.17.0 → 3.0.0

package/esm/MultiWiggleAdapter/configSchema.d.ts

@@ -1,15 +1,9 @@
 declare const MultiWiggleAdapter: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-    /**
-     * #slot
-     */
     subadapters: {
         type: string;
         defaultValue: never[];
         description: string;
     };
-    /**
-     * #slot
-     */
     bigWigs: {
         type: string;
         description: string;

package/esm/MultiWiggleAdapter/configSchema.js

@@ -1,20 +1,11 @@
 import { ConfigurationSchema } from '@jbrowse/core/configuration';
-/**
- * #config MultiWiggleAdapter
- */
-function x() { } // eslint-disable-line @typescript-eslint/no-unused-vars
+function x() { }
 const MultiWiggleAdapter = ConfigurationSchema('MultiWiggleAdapter', {
-    /**
-     * #slot
-     */
     subadapters: {
         type: 'frozen',
         defaultValue: [],
         description: 'array of subadapter JSON objects',
     },
-    /**
-     * #slot
-     */
     bigWigs: {
         type: 'frozen',
         description: 'array of bigwig filenames, alternative to the subadapters slot',

package/esm/MultiWiggleAdapter/index.d.ts

@@ -1,2 +1,2 @@
-import PluginManager from '@jbrowse/core/PluginManager';
+import type PluginManager from '@jbrowse/core/PluginManager';
 export default function MultiWiggleAdapterF(pluginManager: PluginManager): void;

package/esm/MultiWiggleAdapter/index.js

@@ -1,5 +1,5 @@
-import configSchema from './configSchema';
 import AdapterType from '@jbrowse/core/pluggableElementTypes/AdapterType';
+import configSchema from './configSchema';
 export default function MultiWiggleAdapterF(pluginManager) {
     pluginManager.addAdapterType(() => new AdapterType({
         name: 'MultiWiggleAdapter',

package/esm/MultiWiggleAddTrackWorkflow/AddTrackWorkflow.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-import { AddTrackModel } from '@jbrowse/plugin-data-management';
-export default function MultiWiggleWidget({ model }: {
+import type { AddTrackModel } from '@jbrowse/plugin-data-management';
+declare const MultiWiggleAddTrackWorkflow: ({ model, }: {
     model: AddTrackModel;
-}): React.JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;
+export default MultiWiggleAddTrackWorkflow;

package/esm/MultiWiggleAddTrackWorkflow/AddTrackWorkflow.js

@@ -1,8 +1,10 @@
-import React, { useState } from 'react';
-import { Button, Paper, TextField } from '@mui/material';
-import { makeStyles } from 'tss-react/mui';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
 import { getSession, isElectron, isSessionModelWithWidgets, isSessionWithAddTracks, } from '@jbrowse/core/util';
 import { storeBlobLocation } from '@jbrowse/core/util/tracks';
+import { Button, Paper, TextField } from '@mui/material';
+import { observer } from 'mobx-react';
+import { makeStyles } from 'tss-react/mui';
 const useStyles = makeStyles()(theme => ({
     paper: {
         margin: theme.spacing(),
@@ -14,7 +16,6 @@ const useStyles = makeStyles()(theme => ({
         display: 'block',
     },
 }));
-// on electron, use path to LocalFileLocation, on web, use the BlobLocation
 function makeFileLocation(file) {
     const { webUtils } = window.require('electron');
     return isElectron
@@ -24,82 +25,64 @@ function makeFileLocation(file) {
         }
         : storeBlobLocation({ blob: file });
 }
-export default function MultiWiggleWidget({ model }) {
+function doSubmit({ trackName, val, model, }) {
+    var _a;
+    const session = getSession(model);
+    try {
+        const trackId = [
+            `${trackName.toLowerCase().replaceAll(' ', '_')}-${Date.now()}`,
+            session.adminMode ? '' : '-sessionTrack',
+        ].join('');
+        let bigWigs;
+        try {
+            bigWigs = JSON.parse(val);
+        }
+        catch (e) {
+            bigWigs = val
+                .split(/\n|\r\n|\r/)
+                .map(f => f.trim())
+                .filter(f => !!f);
+        }
+        const obj = typeof bigWigs[0] === 'string' ? { bigWigs } : { subadapters: bigWigs };
+        if (isSessionWithAddTracks(session)) {
+            session.addTrackConf({
+                trackId,
+                type: 'MultiQuantitativeTrack',
+                name: trackName,
+                assemblyNames: [model.assembly],
+                adapter: {
+                    type: 'MultiWiggleAdapter',
+                    ...obj,
+                },
+            });
+            (_a = model.view) === null || _a === void 0 ? void 0 : _a.showTrack(trackId);
+        }
+        model.clearData();
+        if (isSessionModelWithWidgets(session)) {
+            session.hideWidget(model);
+        }
+    }
+    catch (e) {
+        console.error(e);
+        session.notifyError(`${e}`, e);
+    }
+}
+const MultiWiggleAddTrackWorkflow = observer(function ({ model, }) {
     const { classes } = useStyles();
     const [val, setVal] = useState('');
     const [trackName, setTrackName] = useState(`MultiWiggle${+Date.now()}`);
-    return (React.createElement(Paper, { className: classes.paper },
-        React.createElement("ul", null,
-            React.createElement("li", null, "Enter list of URLs for bigwig files in the textbox"),
-            React.createElement("li", null, "Or, use the button below the text box to select files from your computer")),
-        React.createElement(TextField, { multiline: true, fullWidth: true, rows: 10, value: val, placeholder: "Paste list of URLs here, or use file selector below", variant: "outlined", onChange: event => {
-                setVal(event.target.value);
-            } }),
-        React.createElement(Button, { variant: "outlined", component: "label" },
-            "Choose Files from your computer",
-            React.createElement("input", { type: "file", hidden: true, multiple: true, onChange: ({ target }) => {
-                    const res = [...(target.files || [])].map(file => ({
-                        type: 'BigWigAdapter',
-                        bigWigLocation: makeFileLocation(file),
-                        source: file.name,
-                    }));
-                    setVal(JSON.stringify(res, null, 2));
-                } })),
-        React.createElement(TextField, { value: trackName, helperText: "Track name", onChange: event => {
-                setTrackName(event.target.value);
-            } }),
-        React.createElement(Button, { variant: "contained", className: classes.submit, onClick: () => {
-                var _a;
-                const session = getSession(model);
-                try {
-                    const trackId = [
-                        `${trackName.toLowerCase().replaceAll(' ', '_')}-${Date.now()}`,
-                        session.adminMode ? '' : '-sessionTrack',
-                    ].join('');
-                    // allow list of bigwigs in JSON format or line-by-line
-                    let bigWigs;
-                    try {
-                        bigWigs = JSON.parse(val);
-                    }
-                    catch (e) {
-                        bigWigs = val
-                            .split(/\n|\r\n|\r/)
-                            .map(f => f.trim())
-                            .filter(f => !!f);
-                    }
-                    const obj = typeof bigWigs[0] === 'string'
-                        ? { bigWigs }
-                        : { subadapters: bigWigs };
-                    if (isSessionWithAddTracks(session)) {
-                        session.addTrackConf({
-                            trackId,
-                            type: 'MultiQuantitativeTrack',
-                            name: trackName,
-                            assemblyNames: [model.assembly],
-                            adapter: {
-                                type: 'MultiWiggleAdapter',
-                                ...obj,
-                            },
-                        });
-                        (_a = model.view) === null || _a === void 0 ? void 0 : _a.showTrack(trackId);
-                    }
-                    model.clearData();
-                    if (isSessionModelWithWidgets(session)) {
-                        session.hideWidget(model);
-                    }
-                }
-                catch (e) {
-                    console.error(e);
-                    session.notifyError(`${e}`, e);
-                }
-            } }, "Submit"),
-        React.createElement("p", null, "Additional notes: "),
-        React.createElement("ul", null,
-            React.createElement("li", null,
-                "The list of bigwig files in the text box can be a list of URLs, or a list of elements like",
-                ' ',
-                React.createElement("code", null, `[{"type":"BigWigAdapter","bigWigLocation":{"uri":"http://host/file.bw"}, "color":"green","source":"name for subtrack"}]`),
-                ' ',
-                "to apply e.g. the color attribute to the view"),
-            React.createElement("li", null, "Adding local files will update the textbox with JSON contents that are ready to submit with the \"Submit\" button"))));
-}
+    return (_jsxs(Paper, { className: classes.paper, children: [_jsxs("ul", { children: [_jsx("li", { children: "Enter list of URLs for bigwig files in the textbox" }), _jsx("li", { children: "Or, use the button below the text box to select files from your computer" })] }), _jsx(TextField, { multiline: true, fullWidth: true, rows: 10, value: val, placeholder: "Paste list of URLs here, or use file selector below", variant: "outlined", onChange: event => {
+                    setVal(event.target.value);
+                } }), _jsxs(Button, { variant: "outlined", component: "label", children: ["Choose Files from your computer", _jsx("input", { type: "file", hidden: true, multiple: true, onChange: ({ target }) => {
+                            setVal(JSON.stringify([...(target.files || [])].map(file => ({
+                                type: 'BigWigAdapter',
+                                bigWigLocation: makeFileLocation(file),
+                                source: file.name,
+                            })), null, 2));
+                        } })] }), _jsx(TextField, { value: trackName, helperText: "Track name", onChange: event => {
+                    setTrackName(event.target.value);
+                } }), _jsx(Button, { variant: "contained", className: classes.submit, onClick: () => {
+                    doSubmit({ trackName, val, model });
+                }, children: "Submit" }), _jsx("p", { children: "Additional notes: " }), _jsxs("ul", { children: [_jsxs("li", { children: ["The list of bigwig files in the text box can be a list of URLs, or a list of elements like", ' ', _jsx("code", { children: `[{"type":"BigWigAdapter","bigWigLocation":{"uri":"http://host/file.bw"}, "color":"green","source":"name for subtrack"}]` }), ' ', "to apply e.g. the color attribute to the view"] }), _jsx("li", { children: "Adding local files will update the textbox with JSON contents that are ready to submit with the \"Submit\" button" })] })] }));
+});
+export default MultiWiggleAddTrackWorkflow;

package/esm/MultiWiggleAddTrackWorkflow/index.d.ts

@@ -1,2 +1,2 @@
-import PluginManager from '@jbrowse/core/PluginManager';
+import type PluginManager from '@jbrowse/core/PluginManager';
 export default function MultiWiggleAddTrackWorkflowF(pm: PluginManager): void;

package/esm/MultiWiggleAddTrackWorkflow/index.js

@@ -1,7 +1,6 @@
+import { lazy } from 'react';
 import { AddTrackWorkflowType } from '@jbrowse/core/pluggableElementTypes';
 import { types } from 'mobx-state-tree';
-// locals
-import { lazy } from 'react';
 export default function MultiWiggleAddTrackWorkflowF(pm) {
     pm.addAddTrackWorkflowType(() => new AddTrackWorkflowType({
         name: 'Multi-wiggle track',

package/esm/MultiWiggleRendering.d.ts

@@ -1,7 +1,6 @@
-import React from 'react';
-import { Region } from '@jbrowse/core/util/types';
-import { Feature } from '@jbrowse/core/util';
-import { Source } from './util';
+import type { Source } from './util';
+import type { Feature } from '@jbrowse/core/util';
+import type { Region } from '@jbrowse/core/util/types';
 declare const MultiWiggleRendering: (props: {
     regions: Region[];
     features: Map<string, Feature>;
@@ -16,5 +15,5 @@ declare const MultiWiggleRendering: (props: {
     onMouseLeave?: (event: React.MouseEvent) => void;
     onMouseMove?: (event: React.MouseEvent, arg?: Feature) => void;
     onFeatureClick?: (event: React.MouseEvent, arg?: Feature) => void;
-}) => React.JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;
 export default MultiWiggleRendering;

package/esm/MultiWiggleRendering.js

@@ -1,7 +1,8 @@
-import { observer } from 'mobx-react';
-import React, { useRef } from 'react';
-import { SimpleFeature } from '@jbrowse/core/util';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useRef } from 'react';
 import { PrerenderedCanvas } from '@jbrowse/core/ui';
+import { SimpleFeature } from '@jbrowse/core/util';
+import { observer } from 'mobx-react';
 const MultiWiggleRendering = observer(function (props) {
     const { regions, features, bpPerPx, width, height, sources, onMouseLeave = () => { }, onMouseMove = () => { }, onFeatureClick = () => { }, displayModel, } = props;
     const region = regions[0];
@@ -59,7 +60,7 @@ const MultiWiggleRendering = observer(function (props) {
         }
         return featureUnderMouse;
     }
-    return (React.createElement("div", { ref: ref, onMouseMove: event => {
+    return (_jsx("div", { ref: ref, onMouseMove: event => {
             const { clientX, clientY } = event;
             const featureUnderMouse = getFeatureUnderMouse(clientX, clientY);
             onMouseMove(event, featureUnderMouse);
@@ -73,7 +74,6 @@ const MultiWiggleRendering = observer(function (props) {
             overflow: 'visible',
             position: 'relative',
             height,
-        } },
-        React.createElement(PrerenderedCanvas, { ...props })));
+        }, children: _jsx(PrerenderedCanvas, { ...props }) }));
 });
 export default MultiWiggleRendering;

package/esm/MultiXYPlotRenderer/MultiXYPlotRenderer.d.ts

@@ -1,5 +1,6 @@
-import { Feature } from '@jbrowse/core/util';
-import WiggleBaseRenderer, { MultiRenderArgsDeserialized as MultiArgs } from '../WiggleBaseRenderer';
+import WiggleBaseRenderer from '../WiggleBaseRenderer';
+import type { MultiRenderArgsDeserialized as MultiArgs } from '../WiggleBaseRenderer';
+import type { Feature } from '@jbrowse/core/util';
 export default class MultiXYPlotRenderer extends WiggleBaseRenderer {
     draw(ctx: CanvasRenderingContext2D, props: MultiArgs): Promise<{
         reducedFeatures: Feature[];

package/esm/MultiXYPlotRenderer/MultiXYPlotRenderer.js

@@ -1,12 +1,11 @@
 import { groupBy } from '@jbrowse/core/util';
-import { drawXY } from '../drawXY';
-import { YSCALEBAR_LABEL_OFFSET } from '../util';
 import WiggleBaseRenderer from '../WiggleBaseRenderer';
+import { YSCALEBAR_LABEL_OFFSET } from '../util';
 export default class MultiXYPlotRenderer extends WiggleBaseRenderer {
-    // @ts-expect-error
     async draw(ctx, props) {
         const { sources, features } = props;
         const groups = groupBy(features.values(), f => f.get('source'));
+        const { drawXY } = await import('../drawXY');
         let feats = [];
         for (const source of sources) {
             const features = groups[source.name] || [];

package/esm/MultiXYPlotRenderer/configSchema.d.ts

@@ -1,31 +1,19 @@
 declare const configSchema: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-    /**
-     * #slot
-     */
     filled: {
         type: string;
         defaultValue: boolean;
     };
-    /**
-     * #slot
-     */
     displayCrossHatches: {
         type: string;
         description: string;
         defaultValue: boolean;
     };
-    /**
-     * #slot
-     */
     summaryScoreMode: {
         type: string;
         model: import("mobx-state-tree").ISimpleType<string>;
         description: string;
         defaultValue: string;
     };
-    /**
-     * #slot
-     */
     minSize: {
         type: string;
         defaultValue: number;

package/esm/MultiXYPlotRenderer/configSchema.js

@@ -1,46 +1,28 @@
 import { ConfigurationSchema } from '@jbrowse/core/configuration';
 import { types } from 'mobx-state-tree';
 import baseWiggleRendererConfigSchema from '../configSchema';
-/**
- * #config MultiXYPlotRenderer
- */
-function x() { } // eslint-disable-line @typescript-eslint/no-unused-vars
+function x() { }
 const configSchema = ConfigurationSchema('MultiXYPlotRenderer', {
-    /**
-     * #slot
-     */
     filled: {
         type: 'boolean',
         defaultValue: true,
     },
-    /**
-     * #slot
-     */
     displayCrossHatches: {
         type: 'boolean',
         description: 'choose to draw cross hatches (sideways lines)',
         defaultValue: false,
     },
-    /**
-     * #slot
-     */
     summaryScoreMode: {
         type: 'stringEnum',
         model: types.enumeration('Score type', ['max', 'min', 'avg', 'whiskers']),
         description: 'choose whether to use max/min/average or whiskers which combines all three into the same rendering',
         defaultValue: 'avg',
     },
-    /**
-     * #slot
-     */
     minSize: {
         type: 'number',
         defaultValue: 0.7,
     },
 }, {
-    /**
-     * #baseConfiguration
-     */
     baseConfiguration: baseWiggleRendererConfigSchema,
     explicitlyTyped: true,
 });

package/esm/MultiXYPlotRenderer/index.d.ts

@@ -1,2 +1,2 @@
-import PluginManager from '@jbrowse/core/PluginManager';
+import type PluginManager from '@jbrowse/core/PluginManager';
 export default function MultiXYPlotRendererF(pluginManager: PluginManager): void;

package/esm/QuantitativeTrack/configSchema.d.ts

@@ -1,4 +1,4 @@
-import PluginManager from '@jbrowse/core/PluginManager';
+import type PluginManager from '@jbrowse/core/PluginManager';
 declare function configSchemaFactory(pluginManager: PluginManager): import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{}, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
     name: {
         description: string;

package/esm/QuantitativeTrack/configSchema.js

@@ -1,14 +1,8 @@
 import { ConfigurationSchema } from '@jbrowse/core/configuration';
 import { createBaseTrackConfig } from '@jbrowse/core/pluggableElementTypes/models';
-/**
- * #config QuantitativeTrack
- */
-function x() { } // eslint-disable-line @typescript-eslint/no-unused-vars
+function x() { }
 function configSchemaFactory(pluginManager) {
     return ConfigurationSchema('QuantitativeTrack', {}, {
-        /**
-         * #baseConfiguration
-         */
         baseConfiguration: createBaseTrackConfig(pluginManager),
     });
 }

package/esm/QuantitativeTrack/index.d.ts

@@ -1,2 +1,2 @@
-import PluginManager from '@jbrowse/core/PluginManager';
+import type PluginManager from '@jbrowse/core/PluginManager';
 export default function QuantitativeTrackF(pluginManager: PluginManager): void;

package/esm/QuantitativeTrack/index.js

@@ -1,5 +1,5 @@
-import { createBaseTrackModel } from '@jbrowse/core/pluggableElementTypes/models';
 import TrackType from '@jbrowse/core/pluggableElementTypes/TrackType';
+import { createBaseTrackModel } from '@jbrowse/core/pluggableElementTypes/models';
 import configSchemaF from './configSchema';
 export default function QuantitativeTrackF(pluginManager) {
     pluginManager.addTrackType(() => {

package/esm/Tooltip.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
-import { Feature } from '@jbrowse/core/util';
+import type { Feature } from '@jbrowse/core/util';
 type Coord = [number, number];
 export type TooltipContentsComponent = React.ForwardRefExoticComponent<{
     feature: Feature;
@@ -15,5 +14,5 @@ declare const Tooltip: ({ model, height, clientMouseCoord, offsetMouseCoord, cli
     offsetMouseCoord: Coord;
     clientRect?: DOMRect;
     TooltipContents: TooltipContentsComponent;
-}) => React.JSX.Element | null;
+}) => import("react/jsx-runtime").JSX.Element | null;
 export default Tooltip;

package/esm/Tooltip.js

@@ -1,8 +1,8 @@
-import React, { Suspense } from 'react';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { Suspense } from 'react';
+import BaseTooltip from '@jbrowse/core/ui/BaseTooltip';
 import { observer } from 'mobx-react';
 import { makeStyles } from 'tss-react/mui';
-import BaseTooltip from '@jbrowse/core/ui/BaseTooltip';
-// locals
 import { YSCALEBAR_LABEL_OFFSET } from './util';
 const useStyles = makeStyles()({
     hoverVertical: {
@@ -21,13 +21,9 @@ const Tooltip = observer(function Tooltip({ model, height, clientMouseCoord, off
     const { classes } = useStyles();
     const x = clientMouseCoord[0] + 5;
     const y = useClientY ? clientMouseCoord[1] : (clientRect === null || clientRect === void 0 ? void 0 : clientRect.top) || 0;
-    return featureUnderMouse ? (React.createElement(React.Fragment, null,
-        React.createElement(Suspense, { fallback: null },
-            React.createElement(BaseTooltip, { clientPoint: { x, y } },
-                React.createElement(TooltipContents, { model: model, feature: featureUnderMouse }))),
-        React.createElement("div", { className: classes.hoverVertical, style: {
-                left: offsetMouseCoord[0],
-                height: height - YSCALEBAR_LABEL_OFFSET * 2,
-            } }))) : null;
+    return featureUnderMouse ? (_jsxs(_Fragment, { children: [_jsx(Suspense, { fallback: null, children: _jsx(BaseTooltip, { clientPoint: { x, y }, children: _jsx(TooltipContents, { model: model, feature: featureUnderMouse }) }) }), _jsx("div", { className: classes.hoverVertical, style: {
+                    left: offsetMouseCoord[0],
+                    height: height - YSCALEBAR_LABEL_OFFSET * 2,
+                } })] })) : null;
 });
 export default Tooltip;

package/esm/WiggleBaseRenderer.d.ts

@@ -1,7 +1,8 @@
-import FeatureRendererType, { RenderArgs as FeatureRenderArgs, RenderArgsDeserialized as FeatureRenderArgsDeserialized } from '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType';
-import { Feature } from '@jbrowse/core/util';
-import { ThemeOptions } from '@mui/material';
-import { ScaleOpts, Source } from './util';
+import FeatureRendererType from '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType';
+import type { ScaleOpts, Source } from './util';
+import type { RenderArgs as FeatureRenderArgs, RenderArgsDeserialized as FeatureRenderArgsDeserialized } from '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType';
+import type { Feature } from '@jbrowse/core/util';
+import type { ThemeOptions } from '@mui/material';
 export interface RenderArgs extends FeatureRenderArgs {
     scaleOpts: ScaleOpts;
 }
@@ -30,14 +31,14 @@ export default abstract class WiggleBaseRenderer extends FeatureRendererType {
         width: number;
         containsNoTransferables: boolean;
         canvasRecordedData: any;
-        reactElement?: import("react").ReactElement;
+        reactElement?: React.ReactElement;
         html?: string;
     } | {
         features: Map<string, Feature>;
         height: number;
         width: number;
         containsNoTransferables: boolean;
-        reactElement: React.JSX.Element;
+        reactElement: import("react/jsx-runtime").JSX.Element;
         html?: string;
     } | {
         features: Map<string, Feature>;
@@ -45,13 +46,9 @@ export default abstract class WiggleBaseRenderer extends FeatureRendererType {
         width: number;
         containsNoTransferables: boolean;
         imageData: any;
-        reactElement?: import("react").ReactElement;
+        reactElement?: React.ReactElement;
         html?: string;
     }>;
-    /**
-     * draw features to context given props, to be used by derived renderer
-     * classes
-     */
     abstract draw<T extends RenderArgsDeserializedWithFeatures>(ctx: CanvasRenderingContext2D, props: T): Promise<Record<string, unknown> | undefined>;
 }
 export type { RenderArgsSerialized, RenderResults, ResultsDeserialized, ResultsSerialized, } from '@jbrowse/core/pluggableElementTypes/renderers/FeatureRendererType';

package/esm/WiggleBaseRenderer.js

@@ -10,7 +10,6 @@ export default class WiggleBaseRenderer extends FeatureRendererType {
         const { height, regions, bpPerPx } = renderProps;
         const region = regions[0];
         const width = (region.end - region.start) / bpPerPx;
-        // @ts-expect-error
         const { reducedFeatures, ...rest } = await renderToAbstractCanvas(width, height, renderProps, ctx => this.draw(ctx, {
             ...renderProps,
             features,

package/esm/WiggleRPC/MultiWiggleGetSources.d.ts

@@ -1,18 +1,11 @@
-import RpcMethodType from '@jbrowse/core/pluggableElementTypes/RpcMethodType';
-import { RenderArgs } from '@jbrowse/core/rpc/coreRpcMethods';
-import { Region } from '@jbrowse/core/util';
-import { RemoteAbortSignal } from '@jbrowse/core/rpc/remoteAbortSignals';
-import { AnyConfigurationModel } from '@jbrowse/core/configuration';
-export declare class MultiWiggleGetSources extends RpcMethodType {
+import RpcMethodTypeWithFiltersAndRenameRegions from '@jbrowse/core/pluggableElementTypes/RpcMethodTypeWithFiltersAndRenameRegions';
+import type { AnyConfigurationModel } from '@jbrowse/core/configuration';
+import type { Region } from '@jbrowse/core/util';
+export declare class MultiWiggleGetSources extends RpcMethodTypeWithFiltersAndRenameRegions {
     name: string;
-    deserializeArguments(args: any, rpcDriverClassName: string): Promise<any>;
-    serializeArguments(args: RenderArgs & {
-        signal?: AbortSignal;
-        statusCallback?: (arg: string) => void;
-    }, rpcDriverClassName: string): Promise<Record<string, unknown>>;
     execute(args: {
         adapterConfig: AnyConfigurationModel;
-        signal?: RemoteAbortSignal;
+        stopToken?: string;
         sessionId: string;
         headers?: Record<string, string>;
         regions: Region[];

package/esm/WiggleRPC/MultiWiggleGetSources.js

@@ -1,42 +1,15 @@
-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 { renameRegionsIfNeeded } from '@jbrowse/core/util';
-export class MultiWiggleGetSources extends RpcMethodType {
+import RpcMethodTypeWithFiltersAndRenameRegions from '@jbrowse/core/pluggableElementTypes/RpcMethodTypeWithFiltersAndRenameRegions';
+export class MultiWiggleGetSources extends RpcMethodTypeWithFiltersAndRenameRegions {
     constructor() {
         super(...arguments);
         this.name = 'MultiWiggleGetSources';
     }
-    async deserializeArguments(args, rpcDriverClassName) {
-        const l = await super.deserializeArguments(args, rpcDriverClassName);
-        return {
-            ...l,
-            filters: args.filters
-                ? new SerializableFilterChain({
-                    filters: args.filters,
-                })
-                : undefined,
-        };
-    }
-    async serializeArguments(args, rpcDriverClassName) {
-        var _a, _b, _c;
-        const pm = this.pluginManager;
-        const assemblyManager = (_b = (_a = pm.rootModel) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.assemblyManager;
-        if (!assemblyManager) {
-            return args;
-        }
-        const renamedArgs = await renameRegionsIfNeeded(assemblyManager, {
-            ...args,
-            filters: (_c = args.filters) === null || _c === void 0 ? void 0 : _c.toJSON().filters,
-        });
-        return super.serializeArguments(renamedArgs, rpcDriverClassName);
-    }
     async execute(args, rpcDriverClassName) {
         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/esm/WiggleRPC/WiggleGetGlobalQuantitativeStats.d.ts

@@ -1,13 +1,11 @@
-import RpcMethodType from '@jbrowse/core/pluggableElementTypes/RpcMethodType';
-import { RemoteAbortSignal } from '@jbrowse/core/rpc/remoteAbortSignals';
-import { QuantitativeStats } from '@jbrowse/core/util/stats';
-import { AnyConfigurationModel } from '@jbrowse/core/configuration';
-export declare class WiggleGetGlobalQuantitativeStats extends RpcMethodType {
+import RpcMethodTypeWithFiltersAndRenameRegions from '@jbrowse/core/pluggableElementTypes/RpcMethodTypeWithFiltersAndRenameRegions';
+import type { AnyConfigurationModel } from '@jbrowse/core/configuration';
+import type { QuantitativeStats } from '@jbrowse/core/util/stats';
+export declare class WiggleGetGlobalQuantitativeStats extends RpcMethodTypeWithFiltersAndRenameRegions {
     name: string;
-    deserializeArguments(args: any, rpcDriverClassName: string): Promise<any>;
     execute(args: {
         adapterConfig: AnyConfigurationModel;
-        signal?: RemoteAbortSignal;
+        stopToken?: string;
         headers?: Record<string, string>;
         sessionId: string;
     }, rpcDriverClassName: string): Promise<QuantitativeStats>;