@jbrowse/core 2.1.7 → 2.2.1

package/rpc/coreRpcMethods.d.ts

@@ -9,7 +9,7 @@ export declare class CoreGetRefNames extends RpcMethodType {
         sessionId: string;
         signal: RemoteAbortSignal;
         adapterConfig: {};
-    }, rpcDriverClassName: string): Promise<string[]>;
+    }, rpcDriver: string): Promise<string[]>;
 }
 export declare class CoreGetFileInfo extends RpcMethodType {
     name: string;
@@ -17,7 +17,7 @@ export declare class CoreGetFileInfo extends RpcMethodType {
         sessionId: string;
         signal: RemoteAbortSignal;
         adapterConfig: {};
-    }, rpcDriverClassName: string): Promise<unknown>;
+    }, rpcDriver: string): Promise<unknown>;
 }
 export declare class CoreGetMetadata extends RpcMethodType {
     name: string;
@@ -25,19 +25,19 @@ export declare class CoreGetMetadata extends RpcMethodType {
         sessionId: string;
         signal: RemoteAbortSignal;
         adapterConfig: {};
-    }, rpcDriverClassName: string): Promise<unknown>;
+    }, rpcDriver: string): Promise<unknown>;
 }
 export declare class CoreGetFeatures extends RpcMethodType {
     name: string;
-    deserializeReturn(feats: SimpleFeatureSerialized[], args: unknown, rpcDriverClassName: string): Promise<SimpleFeature[]>;
-    serializeArguments(args: RenderArgs, rpcDriverClassName: string): Promise<RenderArgs>;
+    deserializeReturn(feats: SimpleFeatureSerialized[], args: unknown, rpcDriver: string): Promise<SimpleFeature[]>;
+    serializeArguments(args: RenderArgs, rpcDriver: string): Promise<RenderArgs>;
     execute(args: {
         sessionId: string;
         regions: Region[];
         adapterConfig: {};
         signal?: RemoteAbortSignal;
         opts?: any;
-    }, rpcDriverClassName: string): Promise<SimpleFeatureSerialized[]>;
+    }, rpcDriver: string): Promise<SimpleFeatureSerialized[]>;
 }
 /**
  * free up any resources (e.g. cached adapter objects)
@@ -48,7 +48,7 @@ export declare class CoreGetFeatures extends RpcMethodType {
 export declare class CoreFreeResources extends RpcMethodType {
     name: string;
     execute(specification: {}): Promise<number>;
-    serializeArguments(args: {}, _rpcDriverClassName: string): Promise<{}>;
+    serializeArguments(args: {}, _rpcDriver: string): Promise<{}>;
 }
 export interface RenderArgs extends ServerSideRenderArgs {
     adapterConfig: {};
@@ -65,35 +65,35 @@ export declare class CoreEstimateRegionStats extends RpcMethodType {
     serializeArguments(args: RenderArgs & {
         signal?: AbortSignal;
         statusCallback?: (arg: string) => void;
-    }, rpcDriverClassName: string): Promise<{}>;
+    }, rpcDriver: string): Promise<{}>;
     execute(args: {
         adapterConfig: {};
         regions: Region[];
         signal?: RemoteAbortSignal;
         headers?: Record<string, string>;
         sessionId: string;
-    }, rpcDriverClassName: string): Promise<import("../data_adapters/BaseAdapter").Stats>;
+    }, rpcDriver: string): Promise<import("../data_adapters/BaseAdapter").Stats>;
 }
 /**
  * fetches features from an adapter and call a renderer with them
  */
 export declare class CoreRender extends RpcMethodType {
     name: string;
-    serializeArguments(args: RenderArgs, rpcDriverClassName: string): Promise<ServerSideRenderArgsSerialized | RenderArgs>;
+    serializeArguments(args: RenderArgs, rpcDriver: string): Promise<ServerSideRenderArgsSerialized | RenderArgs>;
     execute(args: RenderArgsSerialized & {
         signal?: RemoteAbortSignal;
-    }, rpcDriverClassName: string): Promise<ResultsSerialized | RenderResults>;
-    deserializeReturn(serializedReturn: RenderResults | ResultsSerialized, args: RenderArgs, rpcDriverClassName: string): Promise<unknown>;
+    }, rpcDriver: string): Promise<ResultsSerialized | RenderResults>;
+    deserializeReturn(serializedReturn: RenderResults | ResultsSerialized, args: RenderArgs, rpcDriver: string): Promise<unknown>;
 }
 /**
  * fetches features from an adapter and call a renderer with them
  */
 export declare class CoreGetFeatureDetails extends RpcMethodType {
     name: string;
-    serializeArguments(args: RenderArgs, rpcDriverClassName: string): Promise<ServerSideRenderArgsSerialized | RenderArgs>;
+    serializeArguments(args: RenderArgs, rpcDriver: string): Promise<ServerSideRenderArgsSerialized | RenderArgs>;
     execute(args: RenderArgsSerialized & {
         signal?: RemoteAbortSignal;
-    }, rpcDriverClassName: string): Promise<{
+    }, rpcDriver: string): Promise<{
         feature: any;
     }>;
 }

package/rpc/coreRpcMethods.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreGetFeatureDetails = exports.CoreRender = exports.CoreEstimateRegionStats = exports.CoreFreeResources = exports.CoreGetFeatures = exports.CoreGetMetadata = exports.CoreGetFileInfo = exports.CoreGetRefNames = void 0;
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 const operators_1 = require("rxjs/operators");
 const dataAdapterCache_1 = require("../data_adapters/dataAdapterCache");
 const RpcMethodType_1 = __importDefault(require("../pluggableElementTypes/RpcMethodType"));
@@ -16,10 +17,11 @@ class CoreGetRefNames extends RpcMethodType_1.default {
         super(...arguments);
         this.name = 'CoreGetRefNames';
     }
-    async execute(args, rpcDriverClassName) {
-        const deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
+    async execute(args, rpcDriver) {
+        const pm = this.pluginManager;
+        const deserializedArgs = await this.deserializeArguments(args, rpcDriver);
         const { sessionId, adapterConfig } = deserializedArgs;
-        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(this.pluginManager, sessionId, adapterConfig);
+        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(pm, sessionId, adapterConfig);
         if ((0, BaseAdapter_1.isFeatureAdapter)(dataAdapter)) {
             return dataAdapter.getRefNames(deserializedArgs);
         }
@@ -32,10 +34,11 @@ class CoreGetFileInfo extends RpcMethodType_1.default {
         super(...arguments);
         this.name = 'CoreGetInfo';
     }
-    async execute(args, rpcDriverClassName) {
-        const deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
+    async execute(args, rpcDriver) {
+        const pm = this.pluginManager;
+        const deserializedArgs = await this.deserializeArguments(args, rpcDriver);
         const { sessionId, adapterConfig } = deserializedArgs;
-        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(this.pluginManager, sessionId, adapterConfig);
+        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(pm, sessionId, adapterConfig);
         return (0, BaseAdapter_1.isFeatureAdapter)(dataAdapter)
             ? dataAdapter.getHeader(deserializedArgs)
             : null;
@@ -47,10 +50,11 @@ class CoreGetMetadata extends RpcMethodType_1.default {
         super(...arguments);
         this.name = 'CoreGetMetadata';
     }
-    async execute(args, rpcDriverClassName) {
-        const deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
+    async execute(args, rpcDriver) {
+        const pm = this.pluginManager;
+        const deserializedArgs = await this.deserializeArguments(args, rpcDriver);
         const { sessionId, adapterConfig } = deserializedArgs;
-        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(this.pluginManager, sessionId, adapterConfig);
+        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(pm, sessionId, adapterConfig);
         return (0, BaseAdapter_1.isFeatureAdapter)(dataAdapter)
             ? dataAdapter.getMetadata(deserializedArgs)
             : null;
@@ -62,23 +66,21 @@ class CoreGetFeatures extends RpcMethodType_1.default {
         super(...arguments);
         this.name = 'CoreGetFeatures';
     }
-    async deserializeReturn(feats, args, rpcDriverClassName) {
-        const superDeserialized = (await super.deserializeReturn(feats, args, rpcDriverClassName));
+    async deserializeReturn(feats, args, rpcDriver) {
+        const superDeserialized = (await super.deserializeReturn(feats, args, rpcDriver));
         return superDeserialized.map(feat => new simpleFeature_1.default(feat));
     }
-    async serializeArguments(args, rpcDriverClassName) {
-        var _a, _b;
-        const assemblyManager = (_b = (_a = this.pluginManager.rootModel) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.assemblyManager;
-        const renamedArgs = assemblyManager
-            ? await (0, util_1.renameRegionsIfNeeded)(assemblyManager, args)
-            : args;
-        const superArgs = (await super.serializeArguments(renamedArgs, rpcDriverClassName));
-        return superArgs;
-    }
-    async execute(args, rpcDriverClassName) {
-        const deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
+    async serializeArguments(args, rpcDriver) {
+        const { rootModel } = this.pluginManager;
+        const assemblyManager = rootModel.session.assemblyManager;
+        const renamedArgs = await (0, util_1.renameRegionsIfNeeded)(assemblyManager, args);
+        return super.serializeArguments(renamedArgs, rpcDriver);
+    }
+    async execute(args, rpcDriver) {
+        const pm = this.pluginManager;
+        const deserializedArgs = await this.deserializeArguments(args, rpcDriver);
         const { signal, sessionId, adapterConfig, regions, opts } = deserializedArgs;
-        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(this.pluginManager, sessionId, adapterConfig);
+        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(pm, sessionId, adapterConfig);
         if (!(0, BaseAdapter_1.isFeatureAdapter)(dataAdapter)) {
             throw new Error('Adapter does not support retrieving features');
         }
@@ -114,7 +116,7 @@ class CoreFreeResources extends RpcMethodType_1.default {
         });
         return deleteCount;
     }
-    async serializeArguments(args, _rpcDriverClassName) {
+    async serializeArguments(args, _rpcDriver) {
         return args;
     }
 }
@@ -124,22 +126,21 @@ class CoreEstimateRegionStats extends RpcMethodType_1.default {
         super(...arguments);
         this.name = 'CoreEstimateRegionStats';
     }
-    async serializeArguments(args, rpcDriverClassName) {
-        var _a, _b;
-        const assemblyManager = (_b = (_a = this.pluginManager.rootModel) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.assemblyManager;
-        if (!assemblyManager) {
-            return args;
-        }
+    async serializeArguments(args, rpcDriver) {
+        var _a;
+        const { rootModel } = this.pluginManager;
+        const assemblyManager = rootModel.session.assemblyManager;
         const renamedArgs = await (0, util_1.renameRegionsIfNeeded)(assemblyManager, {
             ...args,
-            filters: args.filters && args.filters.toJSON().filters,
+            filters: (_a = args.filters) === null || _a === void 0 ? void 0 : _a.toJSON().filters,
         });
-        return super.serializeArguments(renamedArgs, rpcDriverClassName);
+        return super.serializeArguments(renamedArgs, rpcDriver);
     }
-    async execute(args, rpcDriverClassName) {
-        const deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
+    async execute(args, rpcDriver) {
+        const pm = this.pluginManager;
+        const deserializedArgs = await this.deserializeArguments(args, rpcDriver);
         const { adapterConfig, sessionId, regions } = deserializedArgs;
-        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(this.pluginManager, sessionId, adapterConfig);
+        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(pm, sessionId, adapterConfig);
         if (!(0, BaseAdapter_1.isFeatureAdapter)(dataAdapter)) {
             throw new Error('Adapter does not support retrieving features');
         }
@@ -155,24 +156,22 @@ class CoreRender extends RpcMethodType_1.default {
         super(...arguments);
         this.name = 'CoreRender';
     }
-    async serializeArguments(args, rpcDriverClassName) {
-        var _a, _b;
-        const assemblyManager = (_b = (_a = this.pluginManager.rootModel) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.assemblyManager;
-        const renamedArgs = assemblyManager
-            ? await (0, util_1.renameRegionsIfNeeded)(assemblyManager, args)
-            : args;
-        const superArgs = (await super.serializeArguments(renamedArgs, rpcDriverClassName));
-        if (rpcDriverClassName === 'MainThreadRpcDriver') {
+    async serializeArguments(args, rpcDriver) {
+        const { rootModel } = this.pluginManager;
+        const assemblyManager = rootModel.session.assemblyManager;
+        const renamedArgs = await (0, util_1.renameRegionsIfNeeded)(assemblyManager, args);
+        const superArgs = (await super.serializeArguments(renamedArgs, rpcDriver));
+        if (rpcDriver === 'MainThreadRpcDriver') {
             return superArgs;
         }
         const { rendererType } = args;
         const RendererType = validateRendererType(rendererType, this.pluginManager.getRendererType(rendererType));
         return RendererType.serializeArgsInClient(superArgs);
     }
-    async execute(args, rpcDriverClassName) {
+    async execute(args, rpcDriver) {
         let deserializedArgs = args;
-        if (rpcDriverClassName !== 'MainThreadRpcDriver') {
-            deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
+        if (rpcDriver !== 'MainThreadRpcDriver') {
+            deserializedArgs = await this.deserializeArguments(args, rpcDriver);
         }
         const { sessionId, rendererType, signal } = deserializedArgs;
         if (!sessionId) {
@@ -180,20 +179,20 @@ class CoreRender extends RpcMethodType_1.default {
         }
         (0, util_1.checkAbortSignal)(signal);
         const RendererType = validateRendererType(rendererType, this.pluginManager.getRendererType(rendererType));
-        const result = rpcDriverClassName === 'MainThreadRpcDriver'
+        const result = rpcDriver === 'MainThreadRpcDriver'
             ? await RendererType.render(deserializedArgs)
             : await RendererType.renderInWorker(deserializedArgs);
         (0, util_1.checkAbortSignal)(signal);
         return result;
     }
-    async deserializeReturn(serializedReturn, args, rpcDriverClassName) {
-        const superDeserialized = await super.deserializeReturn(serializedReturn, args, rpcDriverClassName);
-        if (rpcDriverClassName === 'MainThreadRpcDriver') {
-            return superDeserialized;
+    async deserializeReturn(serializedReturn, args, rpcDriver) {
+        const des = await super.deserializeReturn(serializedReturn, args, rpcDriver);
+        if (rpcDriver === 'MainThreadRpcDriver') {
+            return des;
         }
         const { rendererType } = args;
         const RendererType = validateRendererType(rendererType, this.pluginManager.getRendererType(rendererType));
-        return RendererType.deserializeResultsInClient(superDeserialized, args);
+        return RendererType.deserializeResultsInClient(des, args);
     }
 }
 exports.CoreRender = CoreRender;
@@ -205,24 +204,22 @@ class CoreGetFeatureDetails extends RpcMethodType_1.default {
         super(...arguments);
         this.name = 'CoreGetFeatureDetails';
     }
-    async serializeArguments(args, rpcDriverClassName) {
-        var _a, _b;
-        const assemblyManager = (_b = (_a = this.pluginManager.rootModel) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.assemblyManager;
-        const renamedArgs = assemblyManager
-            ? await (0, util_1.renameRegionsIfNeeded)(assemblyManager, args)
-            : args;
-        const superArgs = (await super.serializeArguments(renamedArgs, rpcDriverClassName));
-        if (rpcDriverClassName === 'MainThreadRpcDriver') {
+    async serializeArguments(args, rpcDriver) {
+        const { rootModel } = this.pluginManager;
+        const assemblyManager = rootModel.session.assemblyManager;
+        const renamedArgs = await (0, util_1.renameRegionsIfNeeded)(assemblyManager, args);
+        const superArgs = (await super.serializeArguments(renamedArgs, rpcDriver));
+        if (rpcDriver === 'MainThreadRpcDriver') {
             return superArgs;
         }
         const { rendererType } = args;
         const RendererType = validateRendererType(rendererType, this.pluginManager.getRendererType(rendererType));
         return RendererType.serializeArgsInClient(superArgs);
     }
-    async execute(args, rpcDriverClassName) {
+    async execute(args, rpcDriver) {
         let deserializedArgs = args;
-        if (rpcDriverClassName !== 'MainThreadRpcDriver') {
-            deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
+        if (rpcDriver !== 'MainThreadRpcDriver') {
+            deserializedArgs = await this.deserializeArguments(args, rpcDriver);
         }
         const { rendererType, featureId } = deserializedArgs;
         const RendererType = validateRendererType(rendererType, this.pluginManager.getRendererType(rendererType));

package/rpc/mainThreadRpcConfig.d.ts

@@ -0,0 +1,2 @@
+declare const MainThreadRpcDriverConfigSchema: import("../configuration").AnyConfigurationSchemaType;
+export default MainThreadRpcDriverConfigSchema;

package/rpc/mainThreadRpcConfig.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const configuration_1 = require("../configuration");
+const baseRpcConfig_1 = __importDefault(require("./baseRpcConfig"));
+/**
+ * #config MainThreadRpcDriver
+ */
+function x() { } // eslint-disable-line @typescript-eslint/no-unused-vars
+const MainThreadRpcDriverConfigSchema = (0, configuration_1.ConfigurationSchema)('MainThreadRpcDriver', {}, {
+    /**
+     * #baseConfiguration
+     */
+    baseConfiguration: baseRpcConfig_1.default,
+    explicitlyTyped: true,
+});
+exports.default = MainThreadRpcDriverConfigSchema;

package/rpc/remoteAbortSignals.d.ts

@@ -1,4 +1,4 @@
-export declare type RemoteAbortSignal = {
+export type RemoteAbortSignal = {
     abortSignalId: number;
 };
 /**

package/rpc/webWorkerRpcConfig.d.ts

@@ -0,0 +1,2 @@
+declare const WebWorkerRpcDriverConfigSchema: import("../configuration").AnyConfigurationSchemaType;
+export default WebWorkerRpcDriverConfigSchema;

package/rpc/webWorkerRpcConfig.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const configuration_1 = require("../configuration");
+const baseRpcConfig_1 = __importDefault(require("./baseRpcConfig"));
+/**
+ * #config WebWorkerRpcDriver
+ */
+function x() { } // eslint-disable-line @typescript-eslint/no-unused-vars
+const WebWorkerRpcDriverConfigSchema = (0, configuration_1.ConfigurationSchema)('WebWorkerRpcDriver', {}, {
+    /**
+     * #baseConfiguration
+     */
+    baseConfiguration: baseRpcConfig_1.default,
+    explicitlyTyped: true,
+});
+exports.default = WebWorkerRpcDriverConfigSchema;