@jbrowse/plugin-dotplot-view 2.17.0 → 2.18.0

package/dist/ComparativeRenderer/index.d.ts

@@ -1,6 +1,6 @@
 import RpcMethodType from '@jbrowse/core/pluggableElementTypes/RpcMethodType';
-import ComparativeRenderer, { RenderArgs as ComparativeRenderArgs, RenderArgsSerialized as ComparativeRenderArgsSerialized, RenderResults, ResultsSerialized } from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType';
-import { RemoteAbortSignal } from '@jbrowse/core/rpc/remoteAbortSignals';
+import type { RenderArgs as ComparativeRenderArgs, RenderArgsSerialized as ComparativeRenderArgsSerialized, RenderResults, ResultsSerialized } from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType';
+import type ComparativeRenderer from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType';
 interface RenderArgs extends ComparativeRenderArgs {
     adapterConfig: Record<string, unknown>;
     rendererType: string;
@@ -9,18 +9,13 @@ interface RenderArgsSerialized extends ComparativeRenderArgsSerialized {
     adapterConfig: Record<string, unknown>;
     rendererType: string;
 }
-/**
- * call a synteny renderer with the given args
- * param views: a set of views that each contain a set of regions
- * used instead of passing regions directly as in render()
- */
 export default class ComparativeRender extends RpcMethodType {
     name: string;
     renameRegionsIfNeeded(args: RenderArgs, rend: ComparativeRenderer): Promise<ComparativeRenderArgs>;
     getRenderer(rendererType: string): ComparativeRenderer;
     serializeArguments(args: RenderArgs, rpcDriver: string): Promise<ComparativeRenderArgs | import("@jbrowse/core/pluggableElementTypes/renderers/ServerSideRendererType").RenderArgsSerialized>;
     execute(args: RenderArgsSerialized & {
-        signal?: RemoteAbortSignal;
+        stopToken?: string;
     }, rpcDriver: string): Promise<RenderResults | import("@jbrowse/core/pluggableElementTypes/renderers/ServerSideRendererType").ResultsSerialized>;
     deserializeReturn(val: RenderResults | ResultsSerialized, args: RenderArgs, rpcDriver: string): Promise<unknown>;
 }

package/dist/ComparativeRenderer/index.js

@@ -3,13 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("@jbrowse/core/util");
 const RpcMethodType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/RpcMethodType"));
-/**
- * call a synteny renderer with the given args
- * param views: a set of views that each contain a set of regions
- * used instead of passing regions directly as in render()
- */
+const stopToken_1 = require("@jbrowse/core/util/stopToken");
 class ComparativeRender extends RpcMethodType_1.default {
     constructor() {
         super(...arguments);
@@ -36,11 +31,11 @@ class ComparativeRender extends RpcMethodType_1.default {
         if (rpcDriver !== 'MainThreadRpcDriver') {
             deserializedArgs = await this.deserializeArguments(args, rpcDriver);
         }
-        const { sessionId, rendererType, signal } = deserializedArgs;
+        const { sessionId, rendererType, stopToken } = deserializedArgs;
         if (!sessionId) {
             throw new Error('must pass a unique session id');
         }
-        (0, util_1.checkAbortSignal)(signal);
+        (0, stopToken_1.checkStopToken)(stopToken);
         const renderer = this.getRenderer(rendererType);
         return rpcDriver === 'MainThreadRpcDriver'
             ? renderer.render(deserializedArgs)

package/dist/DotplotDisplay/components/DotplotDisplay.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DotplotDisplayModel } from '../stateModelFactory';
+import type { DotplotDisplayModel } from '../stateModelFactory';
 declare const DotplotDisplay: (props: {
     model: DotplotDisplayModel;
     children?: React.ReactNode;

package/dist/DotplotDisplay/components/DotplotDisplay.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
-const mobx_react_1 = require("mobx-react");
 const util_1 = require("@jbrowse/core/util");
+const mobx_react_1 = require("mobx-react");
 const DotplotDisplay = (0, mobx_react_1.observer)(function DotplotDisplay(props) {
     const { model, children } = props;
     const { offsetX = 0, offsetY = 0 } = model.data || {};

package/dist/DotplotDisplay/index.d.ts

@@ -1,11 +1,5 @@
-import PluginManager from '@jbrowse/core/PluginManager';
+import type PluginManager from '@jbrowse/core/PluginManager';
 export default function DotplotDisplayF(pm: PluginManager): void;
-/**
- * #config DotplotDisplay
- */
 export declare function configSchemaFactory(pm: any): import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-    /**
-     * #slot
-     */
     renderer: import("mobx-state-tree").IOptionalIType<any, [undefined]>;
 }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "displayId">>;

package/dist/DotplotDisplay/index.js

@@ -6,11 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = DotplotDisplayF;
 exports.configSchemaFactory = configSchemaFactory;
 const configuration_1 = require("@jbrowse/core/configuration");
-const mobx_state_tree_1 = require("mobx-state-tree");
 const DisplayType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/DisplayType"));
-// locals
-const stateModelFactory_1 = require("./stateModelFactory");
+const mobx_state_tree_1 = require("mobx-state-tree");
 const DotplotDisplay_1 = __importDefault(require("./components/DotplotDisplay"));
+const stateModelFactory_1 = require("./stateModelFactory");
 function DotplotDisplayF(pm) {
     pm.addDisplayType(() => {
         const configSchema = configSchemaFactory(pm);
@@ -25,21 +24,12 @@ function DotplotDisplayF(pm) {
         });
     });
 }
-/**
- * #config DotplotDisplay
- */
 function configSchemaFactory(pm) {
     return (0, configuration_1.ConfigurationSchema)('DotplotDisplay', {
-        /**
-         * #slot
-         */
         renderer: mobx_state_tree_1.types.optional(pm.pluggableConfigSchemaType('renderer'), {
             type: 'DotplotRenderer',
         }),
     }, {
-        /**
-         * #identifier
-         */
         explicitIdentifier: 'displayId',
         explicitlyTyped: true,
     });

package/dist/DotplotDisplay/renderDotplotBlock.d.ts

@@ -1,4 +1,4 @@
-import { IAnyStateTreeNode } from 'mobx-state-tree';
+import type { IAnyStateTreeNode } from 'mobx-state-tree';
 export declare function renderBlockData(self: IAnyStateTreeNode): {
     rendererType: any;
     rpcManager: import("@jbrowse/core/rpc/RpcManager").default;

package/dist/DotplotDisplay/renderDotplotBlock.js

@@ -1,22 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderBlockData = renderBlockData;
 exports.renderBlockEffect = renderBlockEffect;
-const clone_1 = __importDefault(require("clone"));
 const configuration_1 = require("@jbrowse/core/configuration");
+const util_1 = require("@jbrowse/core/util");
 const tracks_1 = require("@jbrowse/core/util/tracks");
 const mobx_state_tree_1 = require("mobx-state-tree");
-const util_1 = require("@jbrowse/core/util");
 function renderBlockData(self) {
     const { rpcManager } = (0, util_1.getSession)(self);
     const { rendererType } = self;
     const { adapterConfig } = self;
     const parent = (0, util_1.getContainingView)(self);
-    // Alternative to readConfObject(config) is below used because renderProps is
-    // something under our control.  Compare to serverSideRenderedBlock
     (0, configuration_1.readConfObject)(self.configuration);
     (0, mobx_state_tree_1.getSnapshot)(parent);
     if (parent.initialized) {
@@ -26,7 +20,7 @@ function renderBlockData(self) {
             rpcManager,
             renderProps: {
                 ...self.renderProps(),
-                view: (0, clone_1.default)((0, mobx_state_tree_1.getSnapshot)(parent)),
+                view: structuredClone((0, mobx_state_tree_1.getSnapshot)(parent)),
                 width: viewWidth,
                 height: viewHeight,
                 borderSize,
@@ -35,7 +29,7 @@ function renderBlockData(self) {
                 adapterConfig,
                 rendererType: rendererType.name,
                 sessionId: (0, tracks_1.getRpcSessionId)(self),
-                timeout: 1000000, // 10000,
+                timeout: 1000000,
             },
         };
     }

package/dist/DotplotDisplay/stateModelFactory.d.ts

@@ -1,36 +1,21 @@
 import React from 'react';
-import { ThemeOptions } from '@mui/material';
-import { Instance } from 'mobx-state-tree';
-import { AnyConfigurationSchemaType } from '@jbrowse/core/configuration';
-import { ExportSvgOptions } from '../DotplotView/model';
-/**
- * #stateModel DotplotDisplay
- * #category display
- */
+import type { ExportSvgOptions } from '../DotplotView/model';
+import type { AnyConfigurationSchemaType } from '@jbrowse/core/configuration';
+import type { ThemeOptions } from '@mui/material';
+import type { Instance } from 'mobx-state-tree';
 export declare function stateModelFactory(configSchema: AnyConfigurationSchemaType): 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>;
     rpcDriverName: import("mobx-state-tree").IMaybe<import("mobx-state-tree").ISimpleType<string>>;
 } & {
-    /**
-     * #property
-     */
     type: import("mobx-state-tree").ISimpleType<"DotplotDisplay">;
-    /**
-     * #property
-     */
     configuration: AnyConfigurationSchemaType;
 }, {
     rendererTypeName: string;
     error: unknown;
     message: string | undefined;
 } & {
-    readonly RenderingComponent: React.
-    /**
-     * #stateModel DotplotDisplay
-     * #category display
-     */
-    FC<{
+    readonly RenderingComponent: React.FC<{
         model: {
             id: string;
             type: string;
@@ -84,11 +69,11 @@ export declare function stateModelFactory(configSchema: AnyConfigurationSchemaTy
     setRpcDriverName(rpcDriverName: string): void;
     reload(): void;
 } & {
+    stopToken: string | undefined;
     warnings: {
         message: string;
         effect: string;
     }[];
-    renderInProgress: AbortController | undefined;
     filled: boolean;
     data: any;
     reactElement: React.ReactElement | undefined;
@@ -97,42 +82,21 @@ export declare function stateModelFactory(configSchema: AnyConfigurationSchemaTy
     ReactComponent2: React.FC<any>;
 } & {
     readonly shouldDisplay: boolean;
-    /**
-     * #getter
-     */
     readonly rendererTypeName: any;
-    /**
-     * #method
-     */
     renderProps(): any;
 } & {
-    /**
-     * #method
-     */
     renderSvg(opts: ExportSvgOptions & {
         theme?: ThemeOptions;
     }): Promise<React.JSX.Element | null>;
 } & {
     afterAttach(): void;
-    /**
-     * #action
-     */
-    setLoading(abortController: AbortController): void;
-    /**
-     * #action
-     */
+    setLoading(stopToken?: string): void;
     setMessage(messageText: string): void;
-    /**
-     * #action
-     */
     setRendered(args?: {
         data: any;
         reactElement: React.ReactElement;
         renderingComponent: React.Component;
     }): void;
-    /**
-     * #action
-     */
     setError(error: unknown): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type DotplotDisplayStateModel = ReturnType<typeof stateModelFactory>;

package/dist/DotplotDisplay/stateModelFactory.js

@@ -5,34 +5,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stateModelFactory = stateModelFactory;
 const react_1 = __importDefault(require("react"));
-const mobx_state_tree_1 = require("mobx-state-tree");
 const configuration_1 = require("@jbrowse/core/configuration");
-const tracks_1 = require("@jbrowse/core/util/tracks");
-const util_1 = require("@jbrowse/core/util");
 const models_1 = require("@jbrowse/core/pluggableElementTypes/models");
-// locals
+const util_1 = require("@jbrowse/core/util");
+const tracks_1 = require("@jbrowse/core/util/tracks");
+const mobx_state_tree_1 = require("mobx-state-tree");
 const ServerSideRenderedBlockContent_1 = __importDefault(require("../ServerSideRenderedBlockContent"));
 const renderDotplotBlock_1 = require("./renderDotplotBlock");
-/**
- * #stateModel DotplotDisplay
- * #category display
- */
 function stateModelFactory(configSchema) {
     return mobx_state_tree_1.types
         .compose('DotplotDisplay', models_1.BaseDisplay, mobx_state_tree_1.types
         .model({
-        /**
-         * #property
-         */
         type: mobx_state_tree_1.types.literal('DotplotDisplay'),
-        /**
-         * #property
-         */
         configuration: (0, configuration_1.ConfigurationReference)(configSchema),
     })
         .volatile(() => ({
+        stopToken: undefined,
         warnings: [],
-        renderInProgress: undefined,
         filled: false,
         data: undefined,
         reactElement: undefined,
@@ -46,15 +35,9 @@ function stateModelFactory(configSchema) {
             return (vview.bpPerPx === self.data.bpPerPxY &&
                 hview.bpPerPx === self.data.bpPerPxX);
         },
-        /**
-         * #getter
-         */
         get rendererTypeName() {
             return (0, configuration_1.getConf)(self, ['renderer', 'type']);
         },
-        /**
-         * #method
-         */
         renderProps() {
             return {
                 ...(0, tracks_1.getParentRenderProps)(self),
@@ -65,9 +48,6 @@ function stateModelFactory(configSchema) {
         },
     }))
         .views(self => ({
-        /**
-         * #method
-         */
         async renderSvg(opts) {
             const props = (0, renderDotplotBlock_1.renderBlockData)(self);
             if (!props) {
@@ -86,77 +66,55 @@ function stateModelFactory(configSchema) {
                 react_1.default.createElement(util_1.ReactRendering, { rendering: rendering })));
         },
     }))
-        .actions(self => {
-        let renderInProgress;
-        return {
-            afterAttach() {
-                (0, util_1.makeAbortableReaction)(self, () => (0, renderDotplotBlock_1.renderBlockData)(self), blockData => (0, renderDotplotBlock_1.renderBlockEffect)(blockData), {
-                    name: `${self.type} ${self.id} rendering`,
-                    delay: 500,
-                    fireImmediately: true,
-                }, this.setLoading, this.setRendered, this.setError);
-            },
-            /**
-             * #action
-             */
-            setLoading(abortController) {
-                self.filled = false;
-                self.message = undefined;
-                self.reactElement = undefined;
-                self.data = undefined;
-                self.error = undefined;
-                self.renderingComponent = undefined;
-                renderInProgress = abortController;
-            },
-            /**
-             * #action
-             */
-            setMessage(messageText) {
-                if (renderInProgress && !renderInProgress.signal.aborted) {
-                    renderInProgress.abort();
-                }
-                self.filled = false;
-                self.message = messageText;
-                self.reactElement = undefined;
-                self.data = undefined;
-                self.error = undefined;
-                self.renderingComponent = undefined;
-                renderInProgress = undefined;
-            },
-            /**
-             * #action
-             */
-            setRendered(args) {
-                if (args === undefined) {
-                    return;
-                }
-                const { data, reactElement, renderingComponent } = args;
-                self.warnings = data.warnings;
-                self.filled = true;
-                self.message = undefined;
-                self.reactElement = reactElement;
-                self.data = data;
-                self.error = undefined;
-                self.renderingComponent = renderingComponent;
-                renderInProgress = undefined;
-            },
-            /**
-             * #action
-             */
-            setError(error) {
-                console.error(error);
-                if (renderInProgress && !renderInProgress.signal.aborted) {
-                    renderInProgress.abort();
-                }
-                // the rendering failed for some reason
-                self.filled = false;
-                self.message = undefined;
-                self.reactElement = undefined;
-                self.data = undefined;
-                self.error = error;
-                self.renderingComponent = undefined;
-                renderInProgress = undefined;
-            },
-        };
-    });
+        .actions(self => ({
+        afterAttach() {
+            (0, util_1.makeAbortableReaction)(self, () => (0, renderDotplotBlock_1.renderBlockData)(self), blockData => (0, renderDotplotBlock_1.renderBlockEffect)(blockData), {
+                name: `${self.type} ${self.id} rendering`,
+                delay: 500,
+                fireImmediately: true,
+            }, this.setLoading, this.setRendered, this.setError);
+        },
+        setLoading(stopToken) {
+            self.filled = false;
+            self.message = undefined;
+            self.reactElement = undefined;
+            self.data = undefined;
+            self.error = undefined;
+            self.renderingComponent = undefined;
+            self.stopToken = stopToken;
+        },
+        setMessage(messageText) {
+            self.filled = false;
+            self.message = messageText;
+            self.reactElement = undefined;
+            self.data = undefined;
+            self.error = undefined;
+            self.renderingComponent = undefined;
+            self.stopToken = undefined;
+        },
+        setRendered(args) {
+            if (args === undefined) {
+                return;
+            }
+            const { data, reactElement, renderingComponent } = args;
+            self.warnings = data.warnings;
+            self.filled = true;
+            self.message = undefined;
+            self.reactElement = reactElement;
+            self.data = data;
+            self.error = undefined;
+            self.renderingComponent = renderingComponent;
+            self.stopToken = undefined;
+        },
+        setError(error) {
+            console.error(error);
+            self.filled = false;
+            self.message = undefined;
+            self.reactElement = undefined;
+            self.data = undefined;
+            self.error = error;
+            self.renderingComponent = undefined;
+            self.stopToken = undefined;
+        },
+    }));
 }

package/dist/DotplotReadVsRef/DotplotReadVsRef.d.ts

@@ -1,3 +1,3 @@
-import { Feature } from '@jbrowse/core/util';
-import { LinearPileupDisplayModel } from '@jbrowse/plugin-alignments';
+import type { Feature } from '@jbrowse/core/util';
+import type { LinearPileupDisplayModel } from '@jbrowse/plugin-alignments';
 export declare function onClick(feature: Feature, self: LinearPileupDisplayModel): void;

package/dist/DotplotReadVsRef/DotplotReadVsRef.js

@@ -22,25 +22,24 @@ function onClick(feature, self) {
         const trackName = `${readName}_vs_${trackAssembly}`;
         const SA = (_a = feature.get('tags')) === null || _a === void 0 ? void 0 : _a.SA;
         const SA2 = featurizeSA(SA, feature.id(), strand, readName, true);
-        const feat = feature.toJSON();
-        feat.strand = 1;
-        feat.mate = {
-            refName: readName,
-            start: clipPos,
-            end: clipPos + getLengthSansClipping(cigar),
-        };
-        // if secondary alignment or supplementary, calculate length from SA[0]'s
-        // CIGAR which is the primary alignments. otherwise it is the primary
-        // alignment just use seq.length if primary alignment
         const totalLength = getLength(flags & 2048 ? SA2[0].CIGAR : cigar);
-        const features = [feat, ...SA2];
-        features.sort((a, b) => a.clipPos - b.clipPos);
-        const refLength = features.reduce((a, f) => a + f.end - f.start, 0);
+        const features = [
+            {
+                ...feature.toJSON(),
+                strand: 1,
+                mate: {
+                    refName: readName,
+                    start: clipPos,
+                    end: clipPos + getLengthSansClipping(cigar),
+                },
+            },
+            ...SA2,
+        ].sort((a, b) => a.clipPos - b.clipPos);
         session.addView('DotplotView', {
             type: 'DotplotView',
             hview: {
                 offsetPx: 0,
-                bpPerPx: refLength / 800,
+                bpPerPx: (0, util_1.sum)(features.map(a => a.end - a.start)) / 800,
                 displayedRegions: (0, util_1.gatherOverlaps)(features.map((f, index) => {
                     const { start, end, refName } = f;
                     return {

package/dist/DotplotReadVsRef/index.d.ts

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

package/dist/DotplotReadVsRef/index.js

@@ -4,9 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = DotplotReadVsRefMenuItem;
-// icons
 const Add_1 = __importDefault(require("@mui/icons-material/Add"));
-// local
 const DotplotReadVsRef_1 = require("./DotplotReadVsRef");
 function DotplotReadVsRefMenuItem(pluginManager) {
     pluginManager.addToExtensionPoint('Core-extendPluggableElement', (pluggableElement) => {

package/dist/DotplotRenderer/ComparativeRenderRpc.d.ts

@@ -1,6 +1,6 @@
 import RpcMethodType from '@jbrowse/core/pluggableElementTypes/RpcMethodType';
-import ComparativeRenderer, { RenderArgs as ComparativeRenderArgs, RenderArgsSerialized as ComparativeRenderArgsSerialized, RenderResults, ResultsSerialized } from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType';
-import { RemoteAbortSignal } from '@jbrowse/core/rpc/remoteAbortSignals';
+import type { RenderArgs as ComparativeRenderArgs, RenderArgsSerialized as ComparativeRenderArgsSerialized, RenderResults, ResultsSerialized } from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType';
+import type ComparativeRenderer from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType';
 interface RenderArgs extends ComparativeRenderArgs {
     adapterConfig: Record<string, unknown>;
     rendererType: string;
@@ -9,18 +9,13 @@ interface RenderArgsSerialized extends ComparativeRenderArgsSerialized {
     adapterConfig: Record<string, unknown>;
     rendererType: string;
 }
-/**
- * call a synteny renderer with the given args
- * param views: a set of views that each contain a set of regions
- * used instead of passing regions directly as in render()
- */
 export default class ComparativeRender extends RpcMethodType {
     name: string;
     renameRegionsIfNeeded(args: RenderArgs, rend: ComparativeRenderer): Promise<ComparativeRenderArgs>;
     getRenderer(rendererType: string): ComparativeRenderer;
     serializeArguments(args: RenderArgs, rpcDriver: string): Promise<ComparativeRenderArgs | import("@jbrowse/core/pluggableElementTypes/renderers/ServerSideRendererType").RenderArgsSerialized>;
     execute(args: RenderArgsSerialized & {
-        signal?: RemoteAbortSignal;
+        stopToken?: string;
     }, rpcDriver: string): Promise<RenderResults | import("@jbrowse/core/pluggableElementTypes/renderers/ServerSideRendererType").ResultsSerialized>;
     deserializeReturn(val: RenderResults | ResultsSerialized, args: RenderArgs, rpcDriver: string): Promise<unknown>;
 }

package/dist/DotplotRenderer/ComparativeRenderRpc.js

@@ -3,13 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("@jbrowse/core/util");
 const RpcMethodType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/RpcMethodType"));
-/**
- * call a synteny renderer with the given args
- * param views: a set of views that each contain a set of regions
- * used instead of passing regions directly as in render()
- */
+const stopToken_1 = require("@jbrowse/core/util/stopToken");
 class ComparativeRender extends RpcMethodType_1.default {
     constructor() {
         super(...arguments);
@@ -36,11 +31,11 @@ class ComparativeRender extends RpcMethodType_1.default {
         if (rpcDriver !== 'MainThreadRpcDriver') {
             deserializedArgs = await this.deserializeArguments(args, rpcDriver);
         }
-        const { sessionId, rendererType, signal } = deserializedArgs;
+        const { sessionId, rendererType, stopToken } = deserializedArgs;
         if (!sessionId) {
             throw new Error('must pass a unique session id');
         }
-        (0, util_1.checkAbortSignal)(signal);
+        (0, stopToken_1.checkStopToken)(stopToken);
         const renderer = this.getRenderer(rendererType);
         return rpcDriver === 'MainThreadRpcDriver'
             ? renderer.render(deserializedArgs)

package/dist/DotplotRenderer/DotplotRenderer.d.ts

@@ -1,7 +1,8 @@
-import { AnyConfigurationModel } from '@jbrowse/core/configuration';
-import { Region } from '@jbrowse/core/util';
-import ComparativeRenderer, { RenderArgsDeserialized, RenderArgs } from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType';
-import { Dotplot1DViewModel } from '../DotplotView/model';
+import ComparativeRenderer from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType';
+import type { Dotplot1DViewModel } from '../DotplotView/model';
+import type { AnyConfigurationModel } from '@jbrowse/core/configuration';
+import type { RenderArgs, RenderArgsDeserialized } from '@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType';
+import type { Region } from '@jbrowse/core/util';
 export interface DotplotRenderArgsDeserialized extends RenderArgsDeserialized {
     adapterConfig: AnyConfigurationModel;
     height: number;

package/dist/DotplotRenderer/DotplotRenderer.js

@@ -26,9 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("@jbrowse/core/util");
 const ComparativeServerSideRendererType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/renderers/ComparativeServerSideRendererType"));
-// locals
+const util_1 = require("@jbrowse/core/util");
 const model_1 = require("../DotplotView/model");
 class DotplotRenderer extends ComparativeServerSideRendererType_1.default {
     constructor() {

package/dist/DotplotRenderer/components/DotplotRendering.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { DotplotRenderArgsDeserialized } from '../DotplotRenderer';
+import type { DotplotRenderArgsDeserialized } from '../DotplotRenderer';
 declare const DotplotRendering: (props: DotplotRenderArgsDeserialized) => React.JSX.Element;
 export default DotplotRendering;