@jbrowse/core 2.4.0 → 2.4.1

package/pluggableElementTypes/renderers/ComparativeServerSideRendererType.js

@@ -67,9 +67,7 @@ class ComparativeServerSideRenderer extends ServerSideRendererType_1.default {
         const pm = this.pluginManager;
         const { sessionId, adapterConfig } = renderArgs;
         const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(pm, sessionId, adapterConfig);
-        let regions = [];
-        // @ts-ignore this is instantiated by the getFeatures call
-        regions = renderArgs.regions;
+        const regions = renderArgs.regions;
         if (!regions || regions.length === 0) {
             console.warn('no regions supplied to comparative renderer');
             return [];

package/pluggableElementTypes/renderers/ServerSideRendererType.d.ts

@@ -25,7 +25,6 @@ export interface RenderArgsDeserialized extends BaseRenderArgs {
     config: AnyConfigurationModel;
     filters: SerializableFilterChain;
 }
-export type { RenderResults };
 export interface ResultsSerialized extends Omit<RenderResults, 'reactElement'> {
     html: string;
 }
@@ -87,3 +86,4 @@ export default class ServerSideRenderer extends RendererType {
     renderInWorker(args: RenderArgsSerialized): Promise<ResultsSerialized>;
     freeResourcesInClient(rpcManager: RpcManager, args: RenderArgs): Promise<number>;
 }
+export { type RenderResults } from './RendererType';

package/pluggableElementTypes/renderers/index.d.ts

@@ -1,9 +1,7 @@
-import BoxRendererType from './BoxRendererType';
-import CircularChordRendererType from './CircularChordRendererType';
-import ComparativeServerSideRendererType from './ComparativeServerSideRendererType';
-import FeatureRendererType from './FeatureRendererType';
-import RendererType, { RenderProps } from './RendererType';
-import ServerSideRenderedContent from './ServerSideRenderedContent';
-import ServerSideRendererType from './ServerSideRendererType';
-export { BoxRendererType, CircularChordRendererType, ComparativeServerSideRendererType, FeatureRendererType, RendererType, ServerSideRenderedContent, ServerSideRendererType, };
-export type { RenderProps };
+export { default as BoxRendererType } from './BoxRendererType';
+export { default as ComparativeServerSideRendererType } from './ComparativeServerSideRendererType';
+export { default as CircularChordRendererType } from './CircularChordRendererType';
+export { default as RendererType, type RenderProps } from './RendererType';
+export { default as FeatureRendererType } from './FeatureRendererType';
+export { default as ServerSideRenderedContent } from './ServerSideRenderedContent';
+export { default as ServerSideRendererType } from './ServerSideRendererType';

package/pluggableElementTypes/renderers/index.js

@@ -3,18 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerSideRendererType = exports.ServerSideRenderedContent = exports.RendererType = exports.FeatureRendererType = exports.ComparativeServerSideRendererType = exports.CircularChordRendererType = exports.BoxRendererType = void 0;
-const BoxRendererType_1 = __importDefault(require("./BoxRendererType"));
-exports.BoxRendererType = BoxRendererType_1.default;
-const CircularChordRendererType_1 = __importDefault(require("./CircularChordRendererType"));
-exports.CircularChordRendererType = CircularChordRendererType_1.default;
-const ComparativeServerSideRendererType_1 = __importDefault(require("./ComparativeServerSideRendererType"));
-exports.ComparativeServerSideRendererType = ComparativeServerSideRendererType_1.default;
-const FeatureRendererType_1 = __importDefault(require("./FeatureRendererType"));
-exports.FeatureRendererType = FeatureRendererType_1.default;
-const RendererType_1 = __importDefault(require("./RendererType"));
-exports.RendererType = RendererType_1.default;
-const ServerSideRenderedContent_1 = __importDefault(require("./ServerSideRenderedContent"));
-exports.ServerSideRenderedContent = ServerSideRenderedContent_1.default;
-const ServerSideRendererType_1 = __importDefault(require("./ServerSideRendererType"));
-exports.ServerSideRendererType = ServerSideRendererType_1.default;
+exports.ServerSideRendererType = exports.ServerSideRenderedContent = exports.FeatureRendererType = exports.RendererType = exports.CircularChordRendererType = exports.ComparativeServerSideRendererType = exports.BoxRendererType = void 0;
+var BoxRendererType_1 = require("./BoxRendererType");
+Object.defineProperty(exports, "BoxRendererType", { enumerable: true, get: function () { return __importDefault(BoxRendererType_1).default; } });
+var ComparativeServerSideRendererType_1 = require("./ComparativeServerSideRendererType");
+Object.defineProperty(exports, "ComparativeServerSideRendererType", { enumerable: true, get: function () { return __importDefault(ComparativeServerSideRendererType_1).default; } });
+var CircularChordRendererType_1 = require("./CircularChordRendererType");
+Object.defineProperty(exports, "CircularChordRendererType", { enumerable: true, get: function () { return __importDefault(CircularChordRendererType_1).default; } });
+var RendererType_1 = require("./RendererType");
+Object.defineProperty(exports, "RendererType", { enumerable: true, get: function () { return __importDefault(RendererType_1).default; } });
+var FeatureRendererType_1 = require("./FeatureRendererType");
+Object.defineProperty(exports, "FeatureRendererType", { enumerable: true, get: function () { return __importDefault(FeatureRendererType_1).default; } });
+var ServerSideRenderedContent_1 = require("./ServerSideRenderedContent");
+Object.defineProperty(exports, "ServerSideRenderedContent", { enumerable: true, get: function () { return __importDefault(ServerSideRenderedContent_1).default; } });
+var ServerSideRendererType_1 = require("./ServerSideRendererType");
+Object.defineProperty(exports, "ServerSideRendererType", { enumerable: true, get: function () { return __importDefault(ServerSideRendererType_1).default; } });

package/pluggableElementTypes/renderers/util/serializableFilterChain.js

@@ -15,7 +15,7 @@ class SerializableFilterChain {
     passes(...args) {
         for (let i = 0; i < this.filterChain.length; i += 1) {
             if (
-            // @ts-ignore
+            // @ts-expect-error
             !this.filterChain[i].expr.evalSync({ feature: args[0] })) {
                 return false;
             }

package/rpc/BaseRpcDriver.js

@@ -76,7 +76,7 @@ class BaseRpcDriver {
     filterArgs(thing, sessionId) {
         if (Array.isArray(thing)) {
             return thing
-                .filter(isClonable)
+                .filter(thing => isClonable(thing))
                 .map(t => this.filterArgs(t, sessionId));
         }
         if (typeof thing === 'object' && thing !== null) {
@@ -106,7 +106,11 @@ class BaseRpcDriver {
         const hardwareConcurrency = detectHardwareConcurrency();
         const workerCount = (0, configuration_1.readConfObject)(this.config, 'workerCount') ||
             (0, util_1.clamp)(1, Math.max(1, hardwareConcurrency - 1), 5);
-        return [...new Array(workerCount)].map(() => new LazyWorker(this));
+        const workers = [];
+        for (let i = 0; i < workerCount; i++) {
+            workers.push(new LazyWorker(this));
+        }
+        return workers;
     }
     getWorkerPool() {
         if (!this.workerPool) {
@@ -125,12 +129,7 @@ class BaseRpcDriver {
             this.lastWorkerAssignment = workerAssignment;
             workerNumber = workerAssignment;
         }
-        // console.log(`${sessionId} -> worker ${workerNumber}`)
-        const worker = workers[workerNumber].getWorker();
-        if (!worker) {
-            throw new Error('no web workers registered for RPC');
-        }
-        return worker;
+        return workers[workerNumber].getWorker();
     }
     async call(pluginManager, sessionId, functionName, args, options = {}) {
         if (!sessionId) {

package/rpc/WebWorkerRpcDriver.js

@@ -46,18 +46,24 @@ class WebWorkerRpcDriver extends BaseRpcDriver_1.default {
         // send the worker its boot configuration using info from the pluginManager
         return new Promise((resolve, reject) => {
             const listener = (e) => {
-                if (e.data.message === 'ready') {
-                    resolve(worker);
-                    worker.workers[0].removeEventListener('message', listener);
-                }
-                else if (e.data.message === 'readyForConfig') {
-                    worker.workers[0].postMessage({
-                        message: 'config',
-                        config: this.workerBootConfiguration,
-                    });
-                }
-                else if (e.data.message === 'error') {
-                    reject((0, serialize_error_1.deserializeError)(e.data.error));
+                switch (e.data.message) {
+                    case 'ready': {
+                        resolve(worker);
+                        worker.workers[0].removeEventListener('message', listener);
+                        break;
+                    }
+                    case 'readyForConfig': {
+                        worker.workers[0].postMessage({
+                            message: 'config',
+                            config: this.workerBootConfiguration,
+                        });
+                        break;
+                    }
+                    case 'error': {
+                        reject((0, serialize_error_1.deserializeError)(e.data.error));
+                        break;
+                    }
+                    // No default
                 }
             };
             worker.workers[0].addEventListener('message', listener);

package/rpc/coreRpcMethods.d.ts

@@ -1,11 +1,9 @@
-import CoreGetRefNames from './methods/CoreGetRefNames';
-import CoreGetMetadata from './methods/CoreGetMetadata';
-import CoreGetFeatureDetails from './methods/CoreGetFeatureDetails';
-import CoreGetFeatures from './methods/CoreGetFeatures';
-import CoreGetFileInfo from './methods/CoreGetFileInfo';
-import CoreFreeResources from './methods/CoreFreeResources';
-import CoreRender from './methods/CoreRender';
-import CoreEstimateRegionStats from './methods/CoreEstimateRegionStats';
-import { RenderArgs } from './methods/util';
-export type { RenderArgs };
-export { CoreGetRefNames, CoreGetFileInfo, CoreGetMetadata, CoreGetFeatures, CoreRender, CoreGetFeatureDetails, CoreFreeResources, CoreEstimateRegionStats, };
+export { default as CoreGetRefNames } from './methods/CoreGetRefNames';
+export { default as CoreGetFeatureDetails } from './methods/CoreGetFeatureDetails';
+export { default as CoreGetMetadata } from './methods/CoreGetMetadata';
+export { default as CoreGetFileInfo } from './methods/CoreGetFileInfo';
+export { default as CoreGetFeatures } from './methods/CoreGetFeatures';
+export { default as CoreRender } from './methods/CoreRender';
+export { default as CoreFreeResources } from './methods/CoreFreeResources';
+export { type RenderArgs } from './methods/util';
+export { default as CoreEstimateRegionStats } from './methods/CoreEstimateRegionStats';

package/rpc/coreRpcMethods.js

@@ -3,20 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoreEstimateRegionStats = exports.CoreFreeResources = exports.CoreGetFeatureDetails = exports.CoreRender = exports.CoreGetFeatures = exports.CoreGetMetadata = exports.CoreGetFileInfo = exports.CoreGetRefNames = void 0;
-const CoreGetRefNames_1 = __importDefault(require("./methods/CoreGetRefNames"));
-exports.CoreGetRefNames = CoreGetRefNames_1.default;
-const CoreGetMetadata_1 = __importDefault(require("./methods/CoreGetMetadata"));
-exports.CoreGetMetadata = CoreGetMetadata_1.default;
-const CoreGetFeatureDetails_1 = __importDefault(require("./methods/CoreGetFeatureDetails"));
-exports.CoreGetFeatureDetails = CoreGetFeatureDetails_1.default;
-const CoreGetFeatures_1 = __importDefault(require("./methods/CoreGetFeatures"));
-exports.CoreGetFeatures = CoreGetFeatures_1.default;
-const CoreGetFileInfo_1 = __importDefault(require("./methods/CoreGetFileInfo"));
-exports.CoreGetFileInfo = CoreGetFileInfo_1.default;
-const CoreFreeResources_1 = __importDefault(require("./methods/CoreFreeResources"));
-exports.CoreFreeResources = CoreFreeResources_1.default;
-const CoreRender_1 = __importDefault(require("./methods/CoreRender"));
-exports.CoreRender = CoreRender_1.default;
-const CoreEstimateRegionStats_1 = __importDefault(require("./methods/CoreEstimateRegionStats"));
-exports.CoreEstimateRegionStats = CoreEstimateRegionStats_1.default;
+exports.CoreEstimateRegionStats = exports.CoreFreeResources = exports.CoreRender = exports.CoreGetFeatures = exports.CoreGetFileInfo = exports.CoreGetMetadata = exports.CoreGetFeatureDetails = exports.CoreGetRefNames = void 0;
+var CoreGetRefNames_1 = require("./methods/CoreGetRefNames");
+Object.defineProperty(exports, "CoreGetRefNames", { enumerable: true, get: function () { return __importDefault(CoreGetRefNames_1).default; } });
+var CoreGetFeatureDetails_1 = require("./methods/CoreGetFeatureDetails");
+Object.defineProperty(exports, "CoreGetFeatureDetails", { enumerable: true, get: function () { return __importDefault(CoreGetFeatureDetails_1).default; } });
+var CoreGetMetadata_1 = require("./methods/CoreGetMetadata");
+Object.defineProperty(exports, "CoreGetMetadata", { enumerable: true, get: function () { return __importDefault(CoreGetMetadata_1).default; } });
+var CoreGetFileInfo_1 = require("./methods/CoreGetFileInfo");
+Object.defineProperty(exports, "CoreGetFileInfo", { enumerable: true, get: function () { return __importDefault(CoreGetFileInfo_1).default; } });
+var CoreGetFeatures_1 = require("./methods/CoreGetFeatures");
+Object.defineProperty(exports, "CoreGetFeatures", { enumerable: true, get: function () { return __importDefault(CoreGetFeatures_1).default; } });
+var CoreRender_1 = require("./methods/CoreRender");
+Object.defineProperty(exports, "CoreRender", { enumerable: true, get: function () { return __importDefault(CoreRender_1).default; } });
+var CoreFreeResources_1 = require("./methods/CoreFreeResources");
+Object.defineProperty(exports, "CoreFreeResources", { enumerable: true, get: function () { return __importDefault(CoreFreeResources_1).default; } });
+var CoreEstimateRegionStats_1 = require("./methods/CoreEstimateRegionStats");
+Object.defineProperty(exports, "CoreEstimateRegionStats", { enumerable: true, get: function () { return __importDefault(CoreEstimateRegionStats_1).default; } });

package/rpc/methods/CoreGetFeatureDetails.js

@@ -34,7 +34,7 @@ class CoreGetFeatureDetails extends RpcMethodType_1.default {
         }
         const { rendererType, featureId } = deserializedArgs;
         const RendererType = (0, util_2.validateRendererType)(rendererType, this.pluginManager.getRendererType(rendererType));
-        // @ts-ignore
+        // @ts-expect-error
         const sess = RendererType.sessions[(0, util_1.getLayoutId)(args)];
         const { layout } = sess.cachedLayout;
         const xref = layout.getDataByID(featureId);

package/rpc/methods/util.d.ts

@@ -1,4 +1,4 @@
-import ServerSideRendererType, { RenderArgs as ServerSideRenderArgs, RenderArgsSerialized as ServerSideRenderArgsSerialized, RenderResults, ResultsSerialized } from '../../pluggableElementTypes/renderers/ServerSideRendererType';
+import ServerSideRendererType, { RenderArgs as ServerSideRenderArgs, RenderArgsSerialized as ServerSideRenderArgsSerialized } from '../../pluggableElementTypes/renderers/ServerSideRendererType';
 import { Region } from '../../util';
 export interface RenderArgs extends ServerSideRenderArgs {
     adapterConfig: {};
@@ -10,5 +10,5 @@ export interface RenderArgsSerialized extends ServerSideRenderArgsSerialized {
     adapterConfig: {};
     rendererType: string;
 }
-export type { RenderResults, ResultsSerialized };
 export declare function validateRendererType<T>(rendererType: string, RendererType: T): T & ServerSideRendererType;
+export { type RenderResults, type ResultsSerialized, } from '../../pluggableElementTypes/renderers/ServerSideRendererType';

package/rpc/methods/util.js

@@ -9,12 +9,12 @@ function validateRendererType(rendererType, RendererType) {
     if (!RendererType) {
         throw new Error(`renderer "${rendererType}" not found`);
     }
-    // @ts-ignore
+    // @ts-expect-error
     if (!RendererType.ReactComponent) {
         throw new Error(`renderer ${rendererType} has no ReactComponent, it may not be completely implemented yet`);
     }
     if (!(RendererType instanceof ServerSideRendererType_1.default)) {
-        throw new Error('CoreRender requires a renderer that is a subclass of ServerSideRendererType');
+        throw new TypeError('CoreRender requires a renderer that is a subclass of ServerSideRendererType');
     }
     return RendererType;
 }

package/rpc/remoteAbortSignals.js

@@ -38,7 +38,6 @@ function isRemoteAbortSignal(thing) {
     return (typeof thing === 'object' &&
         thing !== null &&
         'abortSignalId' in thing &&
-        // @ts-ignore
         typeof thing.abortSignalId === 'number');
 }
 exports.isRemoteAbortSignal = isRemoteAbortSignal;