@jbrowse/plugin-wiggle 4.1.13 → 4.1.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/DensityRenderer/configSchema.d.ts +1 -1
- package/esm/LinePlotRenderer/configSchema.d.ts +1 -1
- package/esm/LinearWiggleDisplay/configSchema.d.ts +3 -3
- package/esm/LinearWiggleDisplay/model.d.ts +4 -3
- package/esm/MultiDensityRenderer/configSchema.d.ts +1 -1
- package/esm/MultiLineRenderer/configSchema.d.ts +2 -2
- package/esm/MultiLinearWiggleDisplay/configSchema.d.ts +3 -3
- package/esm/MultiLinearWiggleDisplay/model.d.ts +12 -9
- package/esm/MultiRowLineRenderer/configSchema.d.ts +2 -2
- package/esm/MultiRowXYPlotRenderer/configSchema.d.ts +2 -2
- package/esm/MultiXYPlotRenderer/configSchema.d.ts +2 -2
- package/esm/WiggleRPC/MultiWiggleGetScoreMatrix.js +3 -1
- package/esm/WiggleRPC/executeClusterScoreMatrix.js +12 -7
- package/esm/WiggleRPC/getScoreMatrix.js +3 -1
- package/esm/WiggleRPC/types.d.ts +2 -1
- package/esm/XYPlotRenderer/configSchema.d.ts +2 -2
- package/esm/configSchema.d.ts +1 -1
- package/esm/index.d.ts +2 -2
- package/esm/shared/SharedWiggleConfigSchema.d.ts +2 -2
- package/esm/shared/SharedWiggleMixin.d.ts +2 -1
- package/esm/shared/SharedWiggleMixin.js +10 -10
- package/esm/shared/axisPropsFromTickScale.d.ts +1 -1
- package/esm/util.d.ts +1 -1
- package/esm/util.js +2 -2
- package/package.json +10 -10
|
@@ -24,7 +24,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
24
24
|
};
|
|
25
25
|
bicolorPivot: {
|
|
26
26
|
type: string;
|
|
27
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
27
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
28
28
|
description: string;
|
|
29
29
|
defaultValue: string;
|
|
30
30
|
};
|
|
@@ -30,7 +30,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
30
30
|
};
|
|
31
31
|
bicolorPivot: {
|
|
32
32
|
type: string;
|
|
33
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
33
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
34
34
|
description: string;
|
|
35
35
|
defaultValue: string;
|
|
36
36
|
};
|
|
@@ -2,7 +2,7 @@ import type PluginManager from '@jbrowse/core/PluginManager';
|
|
|
2
2
|
export default function WiggleConfigFactory(pluginManager: PluginManager): import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
|
|
3
3
|
defaultRendering: {
|
|
4
4
|
type: string;
|
|
5
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
5
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"line" | "density" | "xyplot">;
|
|
6
6
|
defaultValue: string;
|
|
7
7
|
};
|
|
8
8
|
renderers: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
|
|
@@ -14,7 +14,7 @@ export default function WiggleConfigFactory(pluginManager: PluginManager): impor
|
|
|
14
14
|
autoscale: {
|
|
15
15
|
type: string;
|
|
16
16
|
defaultValue: string;
|
|
17
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
17
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"local" | "global" | "globalsd" | "localsd" | "zscore">;
|
|
18
18
|
description: string;
|
|
19
19
|
};
|
|
20
20
|
minimalTicks: {
|
|
@@ -39,7 +39,7 @@ export default function WiggleConfigFactory(pluginManager: PluginManager): impor
|
|
|
39
39
|
};
|
|
40
40
|
scaleType: {
|
|
41
41
|
type: string;
|
|
42
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
42
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"log" | "linear">;
|
|
43
43
|
description: string;
|
|
44
44
|
defaultValue: string;
|
|
45
45
|
};
|
|
@@ -1105,6 +1105,7 @@ declare function stateModelFactory(pluginManager: PluginManager, configSchema: A
|
|
|
1105
1105
|
onMouseMove(_: unknown, featureId?: string): void;
|
|
1106
1106
|
onMouseLeave(_: unknown): void;
|
|
1107
1107
|
onContextMenu(_: unknown): void;
|
|
1108
|
+
onFeatureClick(_: unknown, featureId?: string): void;
|
|
1108
1109
|
};
|
|
1109
1110
|
renderProps(): any;
|
|
1110
1111
|
} & {
|
|
@@ -1155,7 +1156,7 @@ declare function stateModelFactory(pluginManager: PluginManager, configSchema: A
|
|
|
1155
1156
|
} & {
|
|
1156
1157
|
readonly adapterCapabilities: string[];
|
|
1157
1158
|
readonly rendererConfig: {
|
|
1158
|
-
scaleType:
|
|
1159
|
+
scaleType: any;
|
|
1159
1160
|
filled: any;
|
|
1160
1161
|
displayCrossHatches: any;
|
|
1161
1162
|
summaryScoreMode: any;
|
|
@@ -1225,8 +1226,8 @@ declare function stateModelFactory(pluginManager: PluginManager, configSchema: A
|
|
|
1225
1226
|
readonly ticks: {
|
|
1226
1227
|
range: number[];
|
|
1227
1228
|
values: number[];
|
|
1228
|
-
format: (d: import("d3-scale").NumberValue) => string;
|
|
1229
|
-
position: import("d3-scale").ScaleLinear<number, number, never> | import("d3-scale").ScaleQuantize<number, never>;
|
|
1229
|
+
format: (d: import("@mui/x-charts-vendor/d3-scale").NumberValue) => string;
|
|
1230
|
+
position: import("@mui/x-charts-vendor/d3-scale").ScaleLinear<number, number, never> | import("@mui/x-charts-vendor/d3-scale").ScaleQuantize<number, never>;
|
|
1230
1231
|
} | undefined;
|
|
1231
1232
|
} & {
|
|
1232
1233
|
renderProps(): any;
|
|
@@ -24,7 +24,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
24
24
|
};
|
|
25
25
|
bicolorPivot: {
|
|
26
26
|
type: string;
|
|
27
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
27
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
28
28
|
description: string;
|
|
29
29
|
defaultValue: string;
|
|
30
30
|
};
|
|
@@ -6,7 +6,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
6
6
|
};
|
|
7
7
|
summaryScoreMode: {
|
|
8
8
|
type: string;
|
|
9
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
9
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"max" | "min" | "whiskers" | "avg">;
|
|
10
10
|
description: string;
|
|
11
11
|
defaultValue: string;
|
|
12
12
|
};
|
|
@@ -36,7 +36,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
36
36
|
};
|
|
37
37
|
bicolorPivot: {
|
|
38
38
|
type: string;
|
|
39
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
39
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
40
40
|
description: string;
|
|
41
41
|
defaultValue: string;
|
|
42
42
|
};
|
|
@@ -2,7 +2,7 @@ import type PluginManager from '@jbrowse/core/PluginManager';
|
|
|
2
2
|
export default function WiggleConfigFactory(pluginManager: PluginManager): import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
|
|
3
3
|
defaultRendering: {
|
|
4
4
|
type: string;
|
|
5
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
5
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"multiline" | "xyplot" | "multirowxy" | "multirowdensity" | "multirowline">;
|
|
6
6
|
defaultValue: string;
|
|
7
7
|
};
|
|
8
8
|
renderers: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
|
|
@@ -20,7 +20,7 @@ export default function WiggleConfigFactory(pluginManager: PluginManager): impor
|
|
|
20
20
|
autoscale: {
|
|
21
21
|
type: string;
|
|
22
22
|
defaultValue: string;
|
|
23
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
23
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"local" | "global" | "globalsd" | "localsd" | "zscore">;
|
|
24
24
|
description: string;
|
|
25
25
|
};
|
|
26
26
|
minimalTicks: {
|
|
@@ -45,7 +45,7 @@ export default function WiggleConfigFactory(pluginManager: PluginManager): impor
|
|
|
45
45
|
};
|
|
46
46
|
scaleType: {
|
|
47
47
|
type: string;
|
|
48
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
48
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"log" | "linear">;
|
|
49
49
|
description: string;
|
|
50
50
|
defaultValue: string;
|
|
51
51
|
};
|
|
@@ -1113,6 +1113,7 @@ export declare function stateModelFactory(_pluginManager: PluginManager, configS
|
|
|
1113
1113
|
onMouseMove(_: unknown, featureId?: string): void;
|
|
1114
1114
|
onMouseLeave(_: unknown): void;
|
|
1115
1115
|
onContextMenu(_: unknown): void;
|
|
1116
|
+
onFeatureClick(_: unknown, featureId?: string): void;
|
|
1116
1117
|
};
|
|
1117
1118
|
renderProps(): any;
|
|
1118
1119
|
} & {
|
|
@@ -1163,7 +1164,7 @@ export declare function stateModelFactory(_pluginManager: PluginManager, configS
|
|
|
1163
1164
|
} & {
|
|
1164
1165
|
readonly adapterCapabilities: string[];
|
|
1165
1166
|
readonly rendererConfig: {
|
|
1166
|
-
scaleType:
|
|
1167
|
+
scaleType: any;
|
|
1167
1168
|
filled: any;
|
|
1168
1169
|
displayCrossHatches: any;
|
|
1169
1170
|
summaryScoreMode: any;
|
|
@@ -1282,8 +1283,8 @@ export declare function stateModelFactory(_pluginManager: PluginManager, configS
|
|
|
1282
1283
|
readonly ticks: {
|
|
1283
1284
|
range: number[];
|
|
1284
1285
|
values: number[];
|
|
1285
|
-
format: (d: import("d3-scale").NumberValue) => string;
|
|
1286
|
-
position: import("d3-scale").ScaleLinear<number, number, never> | import("d3-scale").ScaleQuantize<number, never>;
|
|
1286
|
+
format: (d: import("@mui/x-charts-vendor/d3-scale").NumberValue) => string;
|
|
1287
|
+
position: import("@mui/x-charts-vendor/d3-scale").ScaleLinear<number, number, never> | import("@mui/x-charts-vendor/d3-scale").ScaleQuantize<number, never>;
|
|
1287
1288
|
} | undefined;
|
|
1288
1289
|
readonly colors: string[];
|
|
1289
1290
|
readonly quantitativeStatsRelevantToCurrentZoom: boolean;
|
|
@@ -2456,6 +2457,7 @@ export declare function stateModelFactory(_pluginManager: PluginManager, configS
|
|
|
2456
2457
|
onMouseMove(_: unknown, featureId?: string): void;
|
|
2457
2458
|
onMouseLeave(_: unknown): void;
|
|
2458
2459
|
onContextMenu(_: unknown): void;
|
|
2460
|
+
onFeatureClick(_: unknown, featureId?: string): void;
|
|
2459
2461
|
};
|
|
2460
2462
|
renderProps(): any;
|
|
2461
2463
|
} & {
|
|
@@ -2506,7 +2508,7 @@ export declare function stateModelFactory(_pluginManager: PluginManager, configS
|
|
|
2506
2508
|
} & {
|
|
2507
2509
|
readonly adapterCapabilities: string[];
|
|
2508
2510
|
readonly rendererConfig: {
|
|
2509
|
-
scaleType:
|
|
2511
|
+
scaleType: any;
|
|
2510
2512
|
filled: any;
|
|
2511
2513
|
displayCrossHatches: any;
|
|
2512
2514
|
summaryScoreMode: any;
|
|
@@ -2625,8 +2627,8 @@ export declare function stateModelFactory(_pluginManager: PluginManager, configS
|
|
|
2625
2627
|
readonly ticks: {
|
|
2626
2628
|
range: number[];
|
|
2627
2629
|
values: number[];
|
|
2628
|
-
format: (d: import("d3-scale").NumberValue) => string;
|
|
2629
|
-
position: import("d3-scale").ScaleLinear<number, number, never> | import("d3-scale").ScaleQuantize<number, never>;
|
|
2630
|
+
format: (d: import("@mui/x-charts-vendor/d3-scale").NumberValue) => string;
|
|
2631
|
+
position: import("@mui/x-charts-vendor/d3-scale").ScaleLinear<number, number, never> | import("@mui/x-charts-vendor/d3-scale").ScaleQuantize<number, never>;
|
|
2630
2632
|
} | undefined;
|
|
2631
2633
|
readonly colors: string[];
|
|
2632
2634
|
readonly quantitativeStatsRelevantToCurrentZoom: boolean;
|
|
@@ -3737,6 +3739,7 @@ export declare function stateModelFactory(_pluginManager: PluginManager, configS
|
|
|
3737
3739
|
onMouseMove(_: unknown, featureId?: string): void;
|
|
3738
3740
|
onMouseLeave(_: unknown): void;
|
|
3739
3741
|
onContextMenu(_: unknown): void;
|
|
3742
|
+
onFeatureClick(_: unknown, featureId?: string): void;
|
|
3740
3743
|
};
|
|
3741
3744
|
renderProps(): any;
|
|
3742
3745
|
} & {
|
|
@@ -3787,7 +3790,7 @@ export declare function stateModelFactory(_pluginManager: PluginManager, configS
|
|
|
3787
3790
|
} & {
|
|
3788
3791
|
readonly adapterCapabilities: string[];
|
|
3789
3792
|
readonly rendererConfig: {
|
|
3790
|
-
scaleType:
|
|
3793
|
+
scaleType: any;
|
|
3791
3794
|
filled: any;
|
|
3792
3795
|
displayCrossHatches: any;
|
|
3793
3796
|
summaryScoreMode: any;
|
|
@@ -3906,8 +3909,8 @@ export declare function stateModelFactory(_pluginManager: PluginManager, configS
|
|
|
3906
3909
|
readonly ticks: {
|
|
3907
3910
|
range: number[];
|
|
3908
3911
|
values: number[];
|
|
3909
|
-
format: (d: import("d3-scale").NumberValue) => string;
|
|
3910
|
-
position: import("d3-scale").ScaleLinear<number, number, never> | import("d3-scale").ScaleQuantize<number, never>;
|
|
3912
|
+
format: (d: import("@mui/x-charts-vendor/d3-scale").NumberValue) => string;
|
|
3913
|
+
position: import("@mui/x-charts-vendor/d3-scale").ScaleLinear<number, number, never> | import("@mui/x-charts-vendor/d3-scale").ScaleQuantize<number, never>;
|
|
3911
3914
|
} | undefined;
|
|
3912
3915
|
readonly colors: string[];
|
|
3913
3916
|
readonly quantitativeStatsRelevantToCurrentZoom: boolean;
|
|
@@ -6,7 +6,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
6
6
|
};
|
|
7
7
|
summaryScoreMode: {
|
|
8
8
|
type: string;
|
|
9
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
9
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"max" | "min" | "whiskers" | "avg">;
|
|
10
10
|
description: string;
|
|
11
11
|
defaultValue: string;
|
|
12
12
|
};
|
|
@@ -36,7 +36,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
36
36
|
};
|
|
37
37
|
bicolorPivot: {
|
|
38
38
|
type: string;
|
|
39
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
39
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
40
40
|
description: string;
|
|
41
41
|
defaultValue: string;
|
|
42
42
|
};
|
|
@@ -10,7 +10,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
10
10
|
};
|
|
11
11
|
summaryScoreMode: {
|
|
12
12
|
type: string;
|
|
13
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
13
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"max" | "min" | "whiskers" | "avg">;
|
|
14
14
|
description: string;
|
|
15
15
|
defaultValue: string;
|
|
16
16
|
};
|
|
@@ -44,7 +44,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
44
44
|
};
|
|
45
45
|
bicolorPivot: {
|
|
46
46
|
type: string;
|
|
47
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
47
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
48
48
|
description: string;
|
|
49
49
|
defaultValue: string;
|
|
50
50
|
};
|
|
@@ -10,7 +10,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
10
10
|
};
|
|
11
11
|
summaryScoreMode: {
|
|
12
12
|
type: string;
|
|
13
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
13
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"max" | "min" | "whiskers" | "avg">;
|
|
14
14
|
description: string;
|
|
15
15
|
defaultValue: string;
|
|
16
16
|
};
|
|
@@ -44,7 +44,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
44
44
|
};
|
|
45
45
|
bicolorPivot: {
|
|
46
46
|
type: string;
|
|
47
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
47
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
48
48
|
description: string;
|
|
49
49
|
defaultValue: string;
|
|
50
50
|
};
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import RpcMethodTypeWithFiltersAndRenameRegions from '@jbrowse/core/pluggableElementTypes/RpcMethodTypeWithFiltersAndRenameRegions';
|
|
2
|
+
import { createStopTokenChecker } from '@jbrowse/core/util/stopToken';
|
|
2
3
|
import { getScoreMatrix } from "./getScoreMatrix.js";
|
|
3
4
|
export class MultiWiggleGetScoreMatrix extends RpcMethodTypeWithFiltersAndRenameRegions {
|
|
4
5
|
name = 'MultiWiggleGetScoreMatrix';
|
|
5
6
|
async execute(args, rpcDriverClassName) {
|
|
6
7
|
const deserializedArgs = await this.deserializeArguments(args, rpcDriverClassName);
|
|
8
|
+
const stopTokenCheck = createStopTokenChecker(deserializedArgs.stopToken);
|
|
7
9
|
return getScoreMatrix({
|
|
8
|
-
args: deserializedArgs,
|
|
10
|
+
args: { ...deserializedArgs, stopTokenCheck },
|
|
9
11
|
pluginManager: this.pluginManager,
|
|
10
12
|
});
|
|
11
13
|
}
|
|
@@ -1,18 +1,23 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { clusterObject, toNewick } from '@gmod/hclust';
|
|
2
|
+
import { checkStopToken2, createStopTokenChecker, } from '@jbrowse/core/util/stopToken';
|
|
2
3
|
import { getScoreMatrix } from "./getScoreMatrix.js";
|
|
3
4
|
export async function executeClusterScoreMatrix({ pluginManager, args, }) {
|
|
5
|
+
const stopTokenCheck = createStopTokenChecker(args.stopToken);
|
|
4
6
|
const matrix = await getScoreMatrix({
|
|
5
7
|
pluginManager,
|
|
6
|
-
args
|
|
8
|
+
args: {
|
|
9
|
+
...args,
|
|
10
|
+
stopTokenCheck,
|
|
11
|
+
},
|
|
7
12
|
});
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
data: Object.values(matrix),
|
|
11
|
-
sampleLabels,
|
|
12
|
-
stopToken: args.stopToken,
|
|
13
|
+
const result = await clusterObject({
|
|
14
|
+
data: matrix,
|
|
13
15
|
onProgress: a => {
|
|
14
16
|
args.statusCallback?.(a);
|
|
15
17
|
},
|
|
18
|
+
checkCancellation: () => {
|
|
19
|
+
checkStopToken2(stopTokenCheck);
|
|
20
|
+
},
|
|
16
21
|
});
|
|
17
22
|
return {
|
|
18
23
|
order: result.order,
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { getAdapter } from '@jbrowse/core/data_adapters/dataAdapterCache';
|
|
2
2
|
import { groupBy } from '@jbrowse/core/util';
|
|
3
|
+
import { checkStopToken2 } from '@jbrowse/core/util/stopToken';
|
|
3
4
|
import { firstValueFrom, toArray } from 'rxjs';
|
|
4
5
|
export async function getScoreMatrix({ pluginManager, args, }) {
|
|
5
|
-
const { sources, regions, adapterConfig, sessionId, bpPerPx } = args;
|
|
6
|
+
const { sources, regions, adapterConfig, sessionId, bpPerPx, stopTokenCheck, } = args;
|
|
6
7
|
const adapter = await getAdapter(pluginManager, sessionId, adapterConfig);
|
|
7
8
|
const dataAdapter = adapter.dataAdapter;
|
|
8
9
|
const r0 = regions[0];
|
|
@@ -30,6 +31,7 @@ export async function getScoreMatrix({ pluginManager, args, }) {
|
|
|
30
31
|
}
|
|
31
32
|
}
|
|
32
33
|
rows[name] = Array.from(arr);
|
|
34
|
+
checkStopToken2(stopTokenCheck);
|
|
33
35
|
}
|
|
34
36
|
return rows;
|
|
35
37
|
}
|
package/esm/WiggleRPC/types.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { Source } from '../util.ts';
|
|
2
2
|
import type { AnyConfigurationModel } from '@jbrowse/core/configuration';
|
|
3
|
-
import type { Region } from '@jbrowse/core/util';
|
|
3
|
+
import type { LastStopTokenCheck, Region } from '@jbrowse/core/util';
|
|
4
4
|
export interface GetScoreMatrixArgs {
|
|
5
5
|
adapterConfig: AnyConfigurationModel;
|
|
6
6
|
stopToken?: string;
|
|
7
|
+
stopTokenCheck?: LastStopTokenCheck;
|
|
7
8
|
sessionId: string;
|
|
8
9
|
headers?: Record<string, string>;
|
|
9
10
|
regions: Region[];
|
|
@@ -10,7 +10,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
10
10
|
};
|
|
11
11
|
summaryScoreMode: {
|
|
12
12
|
type: string;
|
|
13
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
13
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"max" | "min" | "whiskers" | "avg">;
|
|
14
14
|
description: string;
|
|
15
15
|
defaultValue: string;
|
|
16
16
|
};
|
|
@@ -44,7 +44,7 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
44
44
|
};
|
|
45
45
|
bicolorPivot: {
|
|
46
46
|
type: string;
|
|
47
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
47
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
48
48
|
description: string;
|
|
49
49
|
defaultValue: string;
|
|
50
50
|
};
|
package/esm/configSchema.d.ts
CHANGED
|
@@ -24,7 +24,7 @@ declare const WiggleRenderer: import("@jbrowse/core/configuration/configurationS
|
|
|
24
24
|
};
|
|
25
25
|
bicolorPivot: {
|
|
26
26
|
type: string;
|
|
27
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
27
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
28
28
|
description: string;
|
|
29
29
|
defaultValue: string;
|
|
30
30
|
};
|
package/esm/index.d.ts
CHANGED
|
@@ -33,7 +33,7 @@ export default class WigglePlugin extends Plugin {
|
|
|
33
33
|
};
|
|
34
34
|
summaryScoreMode: {
|
|
35
35
|
type: string;
|
|
36
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
36
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"max" | "min" | "whiskers" | "avg">;
|
|
37
37
|
description: string;
|
|
38
38
|
defaultValue: string;
|
|
39
39
|
};
|
|
@@ -67,7 +67,7 @@ export default class WigglePlugin extends Plugin {
|
|
|
67
67
|
};
|
|
68
68
|
bicolorPivot: {
|
|
69
69
|
type: string;
|
|
70
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
70
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"none" | "numeric" | "mean" | "z_score">;
|
|
71
71
|
description: string;
|
|
72
72
|
defaultValue: string;
|
|
73
73
|
};
|
|
@@ -2,7 +2,7 @@ export default function sharedWiggleConfigFactory(): import("@jbrowse/core/confi
|
|
|
2
2
|
autoscale: {
|
|
3
3
|
type: string;
|
|
4
4
|
defaultValue: string;
|
|
5
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
5
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"local" | "global" | "globalsd" | "localsd" | "zscore">;
|
|
6
6
|
description: string;
|
|
7
7
|
};
|
|
8
8
|
minimalTicks: {
|
|
@@ -27,7 +27,7 @@ export default function sharedWiggleConfigFactory(): import("@jbrowse/core/confi
|
|
|
27
27
|
};
|
|
28
28
|
scaleType: {
|
|
29
29
|
type: string;
|
|
30
|
-
model: import("@jbrowse/mobx-state-tree").ISimpleType<
|
|
30
|
+
model: import("@jbrowse/mobx-state-tree").ISimpleType<"log" | "linear">;
|
|
31
31
|
description: string;
|
|
32
32
|
defaultValue: string;
|
|
33
33
|
};
|
|
@@ -1100,6 +1100,7 @@ export default function SharedWiggleMixin(configSchema: AnyConfigurationSchemaTy
|
|
|
1100
1100
|
onMouseMove(_: unknown, featureId?: string): void;
|
|
1101
1101
|
onMouseLeave(_: unknown): void;
|
|
1102
1102
|
onContextMenu(_: unknown): void;
|
|
1103
|
+
onFeatureClick(_: unknown, featureId?: string): void;
|
|
1103
1104
|
};
|
|
1104
1105
|
renderProps(): any;
|
|
1105
1106
|
} & {
|
|
@@ -1150,7 +1151,7 @@ export default function SharedWiggleMixin(configSchema: AnyConfigurationSchemaTy
|
|
|
1150
1151
|
} & {
|
|
1151
1152
|
readonly adapterCapabilities: string[];
|
|
1152
1153
|
readonly rendererConfig: {
|
|
1153
|
-
scaleType:
|
|
1154
|
+
scaleType: any;
|
|
1154
1155
|
filled: any;
|
|
1155
1156
|
displayCrossHatches: any;
|
|
1156
1157
|
summaryScoreMode: any;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { lazy } from 'react';
|
|
2
|
-
import { ConfigurationReference, getConf
|
|
2
|
+
import { ConfigurationReference, getConf } from '@jbrowse/core/configuration';
|
|
3
3
|
import { getEnv, getSession, isSelectionContainer } from '@jbrowse/core/util';
|
|
4
4
|
import { stopStopToken } from '@jbrowse/core/util/stopToken';
|
|
5
5
|
import { types } from '@jbrowse/mobx-state-tree';
|
|
@@ -144,17 +144,17 @@ export default function SharedWiggleMixin(configSchema) {
|
|
|
144
144
|
return pluginManager.getAdapterType(type).adapterCapabilities;
|
|
145
145
|
},
|
|
146
146
|
get rendererConfig() {
|
|
147
|
-
const { color, displayCrossHatches, fill, minSize, negColor, posColor, summaryScoreMode,
|
|
147
|
+
const { color, displayCrossHatches, fill, minSize, negColor, posColor, summaryScoreMode, scale, rendererTypeName, } = self;
|
|
148
148
|
const conf = self.configuration.renderers?.[rendererTypeName];
|
|
149
149
|
return {
|
|
150
|
-
scaleType:
|
|
151
|
-
filled: fill ??
|
|
152
|
-
displayCrossHatches: displayCrossHatches ??
|
|
153
|
-
summaryScoreMode: summaryScoreMode ??
|
|
154
|
-
color: color ??
|
|
155
|
-
negColor: negColor ??
|
|
156
|
-
posColor: posColor ??
|
|
157
|
-
minSize: minSize ??
|
|
150
|
+
scaleType: scale ?? conf?.scaleType?.value,
|
|
151
|
+
filled: fill ?? conf?.filled?.value,
|
|
152
|
+
displayCrossHatches: displayCrossHatches ?? conf?.displayCrossHatches?.value,
|
|
153
|
+
summaryScoreMode: summaryScoreMode ?? conf?.summaryScoreMode?.value,
|
|
154
|
+
color: color ?? conf?.color?.value,
|
|
155
|
+
negColor: negColor ?? conf?.negColor?.value,
|
|
156
|
+
posColor: posColor ?? conf?.posColor?.value,
|
|
157
|
+
minSize: minSize ?? conf?.minSize?.value,
|
|
158
158
|
};
|
|
159
159
|
},
|
|
160
160
|
get autoscaleType() {
|
|
@@ -2,6 +2,6 @@ import type { ScaleLinear, ScaleQuantize } from '@mui/x-charts-vendor/d3-scale';
|
|
|
2
2
|
export default function axisPropsFromTickScale(scale: ScaleLinear<number, number> | ScaleQuantize<number>, tickCount: number): {
|
|
3
3
|
range: number[];
|
|
4
4
|
values: number[];
|
|
5
|
-
format: (d: import("d3-scale").NumberValue) => string;
|
|
5
|
+
format: (d: import("@mui/x-charts-vendor/d3-scale").NumberValue) => string;
|
|
6
6
|
position: ScaleLinear<number, number, never> | ScaleQuantize<number, never>;
|
|
7
7
|
};
|
package/esm/util.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ export interface Source {
|
|
|
19
19
|
color?: string;
|
|
20
20
|
group?: string;
|
|
21
21
|
}
|
|
22
|
-
export declare function getScale({ domain, range, scaleType, pivotValue, inverted, }: ScaleOpts): import("d3-scale").ScaleLinear<number, number, never> | import("d3-scale").ScaleLogarithmic<number, number, never> | import("d3-scale").ScaleQuantize<number, never>;
|
|
22
|
+
export declare function getScale({ domain, range, scaleType, pivotValue, inverted, }: ScaleOpts): import("@mui/x-charts-vendor/d3-scale").ScaleLinear<number, number, never> | import("@mui/x-charts-vendor/d3-scale").ScaleLogarithmic<number, number, never> | import("@mui/x-charts-vendor/d3-scale").ScaleQuantize<number, never>;
|
|
23
23
|
export declare function getOrigin(scaleType: string): 0 | 1;
|
|
24
24
|
export declare function getNiceDomain({ scaleType, domain, bounds, }: {
|
|
25
25
|
scaleType: string;
|
package/esm/util.js
CHANGED
|
@@ -3,12 +3,12 @@ import { scaleLinear, scaleLog, scaleQuantize, } from '@mui/x-charts-vendor/d3-s
|
|
|
3
3
|
export const YSCALEBAR_LABEL_OFFSET = 5;
|
|
4
4
|
export const WIGGLE_COLOR_DEFAULT = '#f0f';
|
|
5
5
|
export function getColorCallback(config, opts) {
|
|
6
|
-
const color = readConfObject(config, 'color');
|
|
7
6
|
const colorIsCallback = config.color?.isCallback;
|
|
8
|
-
const colorIsDefault = color === WIGGLE_COLOR_DEFAULT;
|
|
9
7
|
if (colorIsCallback) {
|
|
10
8
|
return (feature) => readConfObject(config, 'color', { feature });
|
|
11
9
|
}
|
|
10
|
+
const color = readConfObject(config, 'color');
|
|
11
|
+
const colorIsDefault = color === WIGGLE_COLOR_DEFAULT;
|
|
12
12
|
if (!colorIsDefault) {
|
|
13
13
|
return () => color;
|
|
14
14
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jbrowse/plugin-wiggle",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.15",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "JBrowse 2 wiggle adapters, tracks, etc.",
|
|
6
6
|
"keywords": [
|
|
@@ -21,13 +21,13 @@
|
|
|
21
21
|
"esm"
|
|
22
22
|
],
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@gmod/bbi": "^
|
|
25
|
-
"@gmod/hclust": "^
|
|
26
|
-
"@jbrowse/mobx-state-tree": "^5.
|
|
27
|
-
"@mui/icons-material": "^7.3.
|
|
28
|
-
"@mui/material": "^7.3.
|
|
24
|
+
"@gmod/bbi": "^9.0.7",
|
|
25
|
+
"@gmod/hclust": "^3.0.4",
|
|
26
|
+
"@jbrowse/mobx-state-tree": "^5.6.0",
|
|
27
|
+
"@mui/icons-material": "^7.3.9",
|
|
28
|
+
"@mui/material": "^7.3.9",
|
|
29
29
|
"@mui/x-charts-vendor": "^8.26.0",
|
|
30
|
-
"@mui/x-data-grid": "^8.
|
|
30
|
+
"@mui/x-data-grid": "^8.28.2",
|
|
31
31
|
"@types/file-saver-es": "^2.0.3",
|
|
32
32
|
"colord": "^2.9.3",
|
|
33
33
|
"copy-to-clipboard": "^3.3.3",
|
|
@@ -36,9 +36,9 @@
|
|
|
36
36
|
"mobx": "^6.15.0",
|
|
37
37
|
"mobx-react": "^9.2.1",
|
|
38
38
|
"rxjs": "^7.8.2",
|
|
39
|
-
"@jbrowse/plugin-data-management": "^4.1.
|
|
40
|
-
"@jbrowse/core": "^4.1.
|
|
41
|
-
"@jbrowse/plugin-linear-genome-view": "^4.1.
|
|
39
|
+
"@jbrowse/plugin-data-management": "^4.1.15",
|
|
40
|
+
"@jbrowse/core": "^4.1.15",
|
|
41
|
+
"@jbrowse/plugin-linear-genome-view": "^4.1.15"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"react": ">=18.0.0"
|