@platforma-sdk/model 1.53.10 → 1.53.13
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/dist/annotations/converter.cjs +11 -11
- package/dist/annotations/converter.cjs.map +1 -1
- package/dist/annotations/converter.d.ts +1 -1
- package/dist/annotations/converter.d.ts.map +1 -1
- package/dist/annotations/converter.js +11 -11
- package/dist/annotations/converter.js.map +1 -1
- package/dist/annotations/index.d.ts +2 -2
- package/dist/annotations/types.d.ts +4 -4
- package/dist/bconfig/index.d.ts +5 -5
- package/dist/bconfig/lambdas.d.ts +7 -7
- package/dist/bconfig/lambdas.d.ts.map +1 -1
- package/dist/bconfig/normalization.cjs.map +1 -1
- package/dist/bconfig/normalization.d.ts +3 -3
- package/dist/bconfig/normalization.js.map +1 -1
- package/dist/bconfig/types.cjs.map +1 -1
- package/dist/bconfig/types.d.ts +2 -2
- package/dist/bconfig/types.d.ts.map +1 -1
- package/dist/bconfig/types.js.map +1 -1
- package/dist/bconfig/util.d.ts +4 -4
- package/dist/bconfig/v3.d.ts +3 -3
- package/dist/block_api_v1.d.ts +2 -2
- package/dist/block_api_v1.d.ts.map +1 -1
- package/dist/block_api_v2.d.ts +2 -2
- package/dist/block_api_v2.d.ts.map +1 -1
- package/dist/block_api_v3.d.ts +3 -3
- package/dist/block_migrations.cjs +10 -10
- package/dist/block_migrations.cjs.map +1 -1
- package/dist/block_migrations.d.ts.map +1 -1
- package/dist/block_migrations.js +10 -10
- package/dist/block_migrations.js.map +1 -1
- package/dist/block_model.cjs +11 -11
- package/dist/block_model.cjs.map +1 -1
- package/dist/block_model.d.ts +8 -8
- package/dist/block_model.d.ts.map +1 -1
- package/dist/block_model.js +11 -11
- package/dist/block_model.js.map +1 -1
- package/dist/block_state_patch.d.ts +2 -2
- package/dist/block_state_util.cjs +1 -1
- package/dist/block_state_util.cjs.map +1 -1
- package/dist/block_state_util.d.ts +3 -3
- package/dist/block_state_util.js +1 -1
- package/dist/block_state_util.js.map +1 -1
- package/dist/block_storage.cjs +10 -10
- package/dist/block_storage.cjs.map +1 -1
- package/dist/block_storage.d.ts +2 -2
- package/dist/block_storage.d.ts.map +1 -1
- package/dist/block_storage.js +10 -10
- package/dist/block_storage.js.map +1 -1
- package/dist/block_storage_vm.cjs +22 -22
- package/dist/block_storage_vm.cjs.map +1 -1
- package/dist/block_storage_vm.d.ts +1 -1
- package/dist/block_storage_vm.d.ts.map +1 -1
- package/dist/block_storage_vm.js +22 -22
- package/dist/block_storage_vm.js.map +1 -1
- package/dist/builder.cjs +32 -23
- package/dist/builder.cjs.map +1 -1
- package/dist/builder.d.ts +7 -7
- package/dist/builder.d.ts.map +1 -1
- package/dist/builder.js +32 -23
- package/dist/builder.js.map +1 -1
- package/dist/components/PFrameForGraphs.cjs +7 -6
- package/dist/components/PFrameForGraphs.cjs.map +1 -1
- package/dist/components/PFrameForGraphs.d.ts +4 -4
- package/dist/components/PFrameForGraphs.d.ts.map +1 -1
- package/dist/components/PFrameForGraphs.js +7 -6
- package/dist/components/PFrameForGraphs.js.map +1 -1
- package/dist/components/PlAnnotations/filter.d.ts +14 -14
- package/dist/components/PlAnnotations/filter.d.ts.map +1 -1
- package/dist/components/PlAnnotations/filters_ui.cjs +46 -46
- package/dist/components/PlAnnotations/filters_ui.cjs.map +1 -1
- package/dist/components/PlAnnotations/filters_ui.d.ts +10 -34
- package/dist/components/PlAnnotations/filters_ui.d.ts.map +1 -1
- package/dist/components/PlAnnotations/filters_ui.js +46 -46
- package/dist/components/PlAnnotations/filters_ui.js.map +1 -1
- package/dist/components/PlAnnotations/index.d.ts +2 -2
- package/dist/components/PlAnnotations/types.d.ts +2 -2
- package/dist/components/PlDataTable.cjs +19 -20
- package/dist/components/PlDataTable.cjs.map +1 -1
- package/dist/components/PlDataTable.d.ts +27 -27
- package/dist/components/PlDataTable.d.ts.map +1 -1
- package/dist/components/PlDataTable.js +19 -20
- package/dist/components/PlDataTable.js.map +1 -1
- package/dist/components/PlMultiSequenceAlignment.cjs +2 -2
- package/dist/components/PlMultiSequenceAlignment.cjs.map +1 -1
- package/dist/components/PlMultiSequenceAlignment.d.ts +6 -6
- package/dist/components/PlMultiSequenceAlignment.d.ts.map +1 -1
- package/dist/components/PlMultiSequenceAlignment.js +2 -2
- package/dist/components/PlMultiSequenceAlignment.js.map +1 -1
- package/dist/components/PlSelectionModel.cjs.map +1 -1
- package/dist/components/PlSelectionModel.d.ts +1 -1
- package/dist/components/PlSelectionModel.js.map +1 -1
- package/dist/components/index.d.ts +5 -5
- package/dist/config/actions.cjs +39 -39
- package/dist/config/actions.cjs.map +1 -1
- package/dist/config/actions.d.ts +9 -9
- package/dist/config/actions.d.ts.map +1 -1
- package/dist/config/actions.js +39 -39
- package/dist/config/actions.js.map +1 -1
- package/dist/config/actions_kinds.d.ts +30 -30
- package/dist/config/actions_kinds.d.ts.map +1 -1
- package/dist/config/index.d.ts +6 -6
- package/dist/config/model.d.ts +28 -28
- package/dist/config/model_meta.d.ts +1 -1
- package/dist/config/type_engine.d.ts +3 -3
- package/dist/config/type_util.d.ts +2 -2
- package/dist/env_value.cjs +1 -1
- package/dist/env_value.cjs.map +1 -1
- package/dist/env_value.js +1 -1
- package/dist/env_value.js.map +1 -1
- package/dist/filters/converter.cjs +36 -32
- package/dist/filters/converter.cjs.map +1 -1
- package/dist/filters/converter.d.ts +2 -2
- package/dist/filters/converter.d.ts.map +1 -1
- package/dist/filters/converter.js +36 -32
- package/dist/filters/converter.js.map +1 -1
- package/dist/filters/index.d.ts +2 -2
- package/dist/filters/types.d.ts +33 -33
- package/dist/filters/types.d.ts.map +1 -1
- package/dist/index.d.ts +24 -24
- package/dist/internal.cjs +7 -7
- package/dist/internal.cjs.map +1 -1
- package/dist/internal.d.ts +4 -4
- package/dist/internal.d.ts.map +1 -1
- package/dist/internal.js +7 -7
- package/dist/internal.js.map +1 -1
- package/dist/package.json.cjs +1 -1
- package/dist/package.json.js +1 -1
- package/dist/pframe.cjs +1 -1
- package/dist/pframe.cjs.map +1 -1
- package/dist/pframe.d.ts +1 -1
- package/dist/pframe.js +1 -1
- package/dist/pframe.js.map +1 -1
- package/dist/pframe_utils/columns.cjs +23 -15
- package/dist/pframe_utils/columns.cjs.map +1 -1
- package/dist/pframe_utils/columns.d.ts +3 -3
- package/dist/pframe_utils/columns.d.ts.map +1 -1
- package/dist/pframe_utils/columns.js +23 -15
- package/dist/pframe_utils/columns.js.map +1 -1
- package/dist/pframe_utils/index.cjs +25 -25
- package/dist/pframe_utils/index.cjs.map +1 -1
- package/dist/pframe_utils/index.d.ts +3 -3
- package/dist/pframe_utils/index.d.ts.map +1 -1
- package/dist/pframe_utils/index.js +25 -25
- package/dist/pframe_utils/index.js.map +1 -1
- package/dist/platforma.d.ts +7 -7
- package/dist/platforma.d.ts.map +1 -1
- package/dist/raw_globals.cjs +4 -1
- package/dist/raw_globals.cjs.map +1 -1
- package/dist/raw_globals.d.ts +2 -2
- package/dist/raw_globals.d.ts.map +1 -1
- package/dist/raw_globals.js +4 -1
- package/dist/raw_globals.js.map +1 -1
- package/dist/ref_util.cjs +4 -4
- package/dist/ref_util.cjs.map +1 -1
- package/dist/ref_util.d.ts +1 -1
- package/dist/ref_util.js +4 -4
- package/dist/ref_util.js.map +1 -1
- package/dist/render/accessor.cjs +24 -24
- package/dist/render/accessor.cjs.map +1 -1
- package/dist/render/accessor.d.ts +10 -10
- package/dist/render/accessor.d.ts.map +1 -1
- package/dist/render/accessor.js +24 -24
- package/dist/render/accessor.js.map +1 -1
- package/dist/render/api.cjs +23 -23
- package/dist/render/api.cjs.map +1 -1
- package/dist/render/api.d.ts +11 -11
- package/dist/render/api.d.ts.map +1 -1
- package/dist/render/api.js +23 -23
- package/dist/render/api.js.map +1 -1
- package/dist/render/future.cjs.map +1 -1
- package/dist/render/future.d.ts +1 -1
- package/dist/render/future.js.map +1 -1
- package/dist/render/index.d.ts +6 -6
- package/dist/render/internal.cjs +4 -4
- package/dist/render/internal.cjs.map +1 -1
- package/dist/render/internal.d.ts +7 -7
- package/dist/render/internal.d.ts.map +1 -1
- package/dist/render/internal.js +4 -4
- package/dist/render/internal.js.map +1 -1
- package/dist/render/traversal_ops.d.ts +1 -1
- package/dist/render/util/axis_filtering.cjs +48 -44
- package/dist/render/util/axis_filtering.cjs.map +1 -1
- package/dist/render/util/axis_filtering.d.ts +2 -2
- package/dist/render/util/axis_filtering.js +48 -44
- package/dist/render/util/axis_filtering.js.map +1 -1
- package/dist/render/util/column_collection.cjs +42 -35
- package/dist/render/util/column_collection.cjs.map +1 -1
- package/dist/render/util/column_collection.d.ts +4 -4
- package/dist/render/util/column_collection.d.ts.map +1 -1
- package/dist/render/util/column_collection.js +42 -35
- package/dist/render/util/column_collection.js.map +1 -1
- package/dist/render/util/index.d.ts +4 -4
- package/dist/render/util/label.cjs +15 -21
- package/dist/render/util/label.cjs.map +1 -1
- package/dist/render/util/label.d.ts +2 -2
- package/dist/render/util/label.d.ts.map +1 -1
- package/dist/render/util/label.js +15 -21
- package/dist/render/util/label.js.map +1 -1
- package/dist/render/util/pcolumn_data.cjs +56 -54
- package/dist/render/util/pcolumn_data.cjs.map +1 -1
- package/dist/render/util/pcolumn_data.d.ts +5 -5
- package/dist/render/util/pcolumn_data.d.ts.map +1 -1
- package/dist/render/util/pcolumn_data.js +56 -54
- package/dist/render/util/pcolumn_data.js.map +1 -1
- package/dist/render/util/pframe_upgraders.cjs +6 -6
- package/dist/render/util/pframe_upgraders.cjs.map +1 -1
- package/dist/render/util/pframe_upgraders.d.ts +1 -1
- package/dist/render/util/pframe_upgraders.d.ts.map +1 -1
- package/dist/render/util/pframe_upgraders.js +6 -6
- package/dist/render/util/pframe_upgraders.js.map +1 -1
- package/dist/render/util/split_selectors.d.ts +1 -1
- package/dist/render/util/split_selectors.d.ts.map +1 -1
- package/dist/sdk_info.cjs.map +1 -1
- package/dist/sdk_info.js.map +1 -1
- package/dist/version.cjs.map +1 -1
- package/dist/version.js.map +1 -1
- package/package.json +23 -21
- package/src/annotations/converter.test.ts +98 -101
- package/src/annotations/converter.ts +21 -17
- package/src/annotations/index.ts +2 -2
- package/src/annotations/types.ts +4 -4
- package/src/bconfig/index.ts +5 -5
- package/src/bconfig/lambdas.ts +10 -12
- package/src/bconfig/normalization.ts +5 -5
- package/src/bconfig/types.ts +3 -5
- package/src/bconfig/util.ts +3 -3
- package/src/bconfig/v3.ts +3 -3
- package/src/block_api_v1.ts +7 -3
- package/src/block_api_v2.ts +7 -3
- package/src/block_api_v3.ts +3 -3
- package/src/block_migrations.test.ts +66 -67
- package/src/block_migrations.ts +16 -16
- package/src/block_model.ts +76 -140
- package/src/block_state_patch.ts +2 -2
- package/src/block_state_util.ts +4 -4
- package/src/block_storage.test.ts +106 -99
- package/src/block_storage.ts +22 -25
- package/src/block_storage_vm.ts +41 -35
- package/src/builder.ts +107 -95
- package/src/components/PFrameForGraphs.test.ts +261 -255
- package/src/components/PFrameForGraphs.ts +35 -22
- package/src/components/PlAnnotations/filter.ts +21 -15
- package/src/components/PlAnnotations/filters_ui.test.ts +230 -73
- package/src/components/PlAnnotations/filters_ui.ts +138 -105
- package/src/components/PlAnnotations/index.ts +2 -2
- package/src/components/PlAnnotations/types.ts +2 -2
- package/src/components/PlDataTable.ts +177 -164
- package/src/components/PlMultiSequenceAlignment.ts +11 -18
- package/src/components/PlSelectionModel.ts +1 -1
- package/src/components/index.ts +5 -5
- package/src/config/actions.ts +64 -59
- package/src/config/actions_kinds.ts +38 -34
- package/src/config/index.ts +6 -6
- package/src/config/model.ts +28 -28
- package/src/config/model_meta.ts +1 -1
- package/src/config/type_engine.ts +3 -3
- package/src/config/type_util.ts +2 -2
- package/src/env_value.ts +2 -2
- package/src/filters/converter.test.ts +185 -144
- package/src/filters/converter.ts +47 -35
- package/src/filters/index.ts +2 -2
- package/src/filters/types.ts +44 -39
- package/src/global.d.ts +1 -1
- package/src/index.ts +24 -24
- package/src/internal.ts +27 -17
- package/src/pframe.ts +3 -3
- package/src/pframe_utils/columns.ts +81 -31
- package/src/pframe_utils/index.ts +65 -43
- package/src/platforma.ts +44 -21
- package/src/raw_globals.ts +13 -7
- package/src/ref_util.ts +6 -6
- package/src/render/accessor.ts +43 -44
- package/src/render/api.ts +102 -78
- package/src/render/future.ts +2 -2
- package/src/render/index.ts +6 -6
- package/src/render/internal.ts +11 -12
- package/src/render/traversal_ops.ts +1 -1
- package/src/render/util/axis_filtering.ts +67 -52
- package/src/render/util/column_collection.ts +171 -91
- package/src/render/util/index.ts +4 -4
- package/src/render/util/label.test.ts +139 -139
- package/src/render/util/label.ts +42 -33
- package/src/render/util/pcolumn_data.ts +111 -75
- package/src/render/util/pframe_upgraders.ts +24 -13
- package/src/render/util/split_selectors.ts +6 -1
- package/src/sdk_info.ts +1 -1
- package/src/typing.test.ts +56 -56
- package/src/version.ts +1 -1
|
@@ -1,273 +1,279 @@
|
|
|
1
|
-
import { describe, expect, test } from
|
|
2
|
-
import {enrichCompatible, getAvailableWithLinkersAxes} from
|
|
1
|
+
import { describe, expect, test } from "vitest";
|
|
2
|
+
import { enrichCompatible, getAvailableWithLinkersAxes } from "./PFrameForGraphs";
|
|
3
3
|
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
4
|
+
AxisId,
|
|
5
|
+
CanonicalizedJson,
|
|
6
|
+
canonicalizeJson,
|
|
7
|
+
DataInfo,
|
|
8
|
+
getAxisId,
|
|
9
|
+
PColumn,
|
|
10
|
+
PColumnSpec,
|
|
11
|
+
PColumnValues,
|
|
12
|
+
PObjectId,
|
|
13
|
+
Annotation,
|
|
14
|
+
AxisSpecNormalized,
|
|
15
|
+
getNormalizedAxesList,
|
|
14
16
|
} from "@milaboratories/pl-model-common";
|
|
15
17
|
import { TreeNodeAccessor } from "../render";
|
|
16
18
|
|
|
17
|
-
function getAllAxesFromSpecs
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
19
|
+
function getAllAxesFromSpecs(
|
|
20
|
+
specs: PColumnSpec[],
|
|
21
|
+
): Map<CanonicalizedJson<AxisId>, AxisSpecNormalized> {
|
|
22
|
+
const allAxes: Map<CanonicalizedJson<AxisId>, AxisSpecNormalized> = new Map();
|
|
23
|
+
for (const spec of specs) {
|
|
24
|
+
for (const id of getNormalizedAxesList(spec.axesSpec)) {
|
|
25
|
+
const aid = getAxisId(id);
|
|
26
|
+
allAxes.set(canonicalizeJson(aid), id);
|
|
24
27
|
}
|
|
25
|
-
|
|
28
|
+
}
|
|
29
|
+
return allAxes;
|
|
26
30
|
}
|
|
27
|
-
describe(
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
31
|
+
describe("PFrameForGraph", () => {
|
|
32
|
+
test("columns are compatible, no additional columns", () => {
|
|
33
|
+
const columnSpec1: PColumnSpec = {
|
|
34
|
+
kind: "PColumn",
|
|
35
|
+
name: "column1",
|
|
36
|
+
valueType: "Int",
|
|
37
|
+
axesSpec: [
|
|
38
|
+
{ type: "String", name: "axis1", domain: {} },
|
|
39
|
+
{ type: "Int", name: "axis2", domain: {} },
|
|
40
|
+
],
|
|
41
|
+
};
|
|
42
|
+
const columnSpec2: PColumnSpec = {
|
|
43
|
+
kind: "PColumn",
|
|
44
|
+
name: "column2",
|
|
45
|
+
valueType: "Int",
|
|
46
|
+
axesSpec: [{ type: "String", name: "axis1", domain: {} }],
|
|
47
|
+
};
|
|
48
|
+
const columns: PColumn<TreeNodeAccessor | PColumnValues>[] = [
|
|
49
|
+
{
|
|
50
|
+
id: "id1" as PObjectId,
|
|
51
|
+
spec: columnSpec1,
|
|
52
|
+
data: [],
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
id: "id2" as PObjectId,
|
|
56
|
+
spec: columnSpec2,
|
|
57
|
+
data: [],
|
|
58
|
+
},
|
|
59
|
+
] as PColumn<PColumnValues>[];
|
|
60
|
+
const allAxes = getAllAxesFromSpecs([columnSpec1, columnSpec2]);
|
|
55
61
|
|
|
56
|
-
|
|
57
|
-
|
|
62
|
+
expect(enrichCompatible(allAxes, columns).length).toEqual(2);
|
|
63
|
+
});
|
|
58
64
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
65
|
+
test("columns are not compatible, 1 additional column", () => {
|
|
66
|
+
const columnSpec1: PColumnSpec = {
|
|
67
|
+
kind: "PColumn",
|
|
68
|
+
name: "column1",
|
|
69
|
+
valueType: "Int",
|
|
70
|
+
axesSpec: [{ type: "String", name: "axis1", domain: { key1: "a" } }],
|
|
71
|
+
};
|
|
72
|
+
const columnSpec2: PColumnSpec = {
|
|
73
|
+
kind: "PColumn",
|
|
74
|
+
name: "column2",
|
|
75
|
+
valueType: "Int",
|
|
76
|
+
axesSpec: [{ type: "String", name: "axis1", domain: {} }],
|
|
77
|
+
};
|
|
78
|
+
const allAxes = getAllAxesFromSpecs([columnSpec1]);
|
|
79
|
+
const columns: PColumn<TreeNodeAccessor | PColumnValues>[] = [
|
|
80
|
+
{ id: "id1" as PObjectId, spec: columnSpec1, data: [] },
|
|
81
|
+
{ id: "id2" as PObjectId, spec: columnSpec2, data: [] },
|
|
82
|
+
] as PColumn<PColumnValues>[];
|
|
77
83
|
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
});
|
|
84
|
+
const resultColumns = enrichCompatible(allAxes, columns);
|
|
85
|
+
expect(resultColumns.length).toEqual(3);
|
|
86
|
+
expect(resultColumns[2].id === columns[0].id).toEqual(false);
|
|
87
|
+
expect(resultColumns[2].id === columns[1].id).toEqual(false);
|
|
88
|
+
expect(resultColumns[2].spec).toEqual({
|
|
89
|
+
kind: "PColumn",
|
|
90
|
+
name: "column2",
|
|
91
|
+
valueType: "Int",
|
|
92
|
+
axesSpec: [{ type: "String", name: "axis1", domain: { key1: "a" }, parentAxesSpec: [] }],
|
|
93
|
+
annotations: { [Annotation.Graph.IsVirtual]: "true" },
|
|
89
94
|
});
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
95
|
+
});
|
|
96
|
+
test("columns are not compatible, additional columns are impossible", () => {
|
|
97
|
+
const columnSpec1: PColumnSpec = {
|
|
98
|
+
kind: "PColumn",
|
|
99
|
+
name: "column1",
|
|
100
|
+
valueType: "Int",
|
|
101
|
+
axesSpec: [{ type: "String", name: "axis1", domain: { key1: "a" } }],
|
|
102
|
+
};
|
|
103
|
+
const columnSpec2: PColumnSpec = {
|
|
104
|
+
kind: "PColumn",
|
|
105
|
+
name: "column2",
|
|
106
|
+
valueType: "Int",
|
|
107
|
+
axesSpec: [{ type: "String", name: "axis1", domain: { key2: "b" } }],
|
|
108
|
+
};
|
|
109
|
+
const allAxes = getAllAxesFromSpecs([columnSpec1]);
|
|
110
|
+
const columns: PColumn<TreeNodeAccessor | PColumnValues>[] = [
|
|
111
|
+
{ id: "id1" as PObjectId, spec: columnSpec1, data: [] },
|
|
112
|
+
{ id: "id2" as PObjectId, spec: columnSpec2, data: [] },
|
|
113
|
+
] as PColumn<PColumnValues>[];
|
|
108
114
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
115
|
+
const resultColumns = enrichCompatible(allAxes, columns);
|
|
116
|
+
expect(resultColumns.length).toEqual(2);
|
|
117
|
+
});
|
|
118
|
+
test("columns are not compatible, 2 additional columns", () => {
|
|
119
|
+
const columnSpec1: PColumnSpec = {
|
|
120
|
+
kind: "PColumn",
|
|
121
|
+
name: "column1",
|
|
122
|
+
valueType: "Int",
|
|
123
|
+
axesSpec: [
|
|
124
|
+
{ type: "String", name: "axis1", domain: { key1: "a" } },
|
|
125
|
+
{ type: "String", name: "axis1", domain: { key1: "b" } },
|
|
126
|
+
],
|
|
127
|
+
};
|
|
128
|
+
const columnSpec2: PColumnSpec = {
|
|
129
|
+
kind: "PColumn",
|
|
130
|
+
name: "column2",
|
|
131
|
+
valueType: "Int",
|
|
132
|
+
axesSpec: [{ type: "String", name: "axis1", domain: {} }],
|
|
133
|
+
};
|
|
134
|
+
const allAxes = getAllAxesFromSpecs([columnSpec1]);
|
|
135
|
+
const columns: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[] = [
|
|
136
|
+
{ id: "id1" as PObjectId, spec: columnSpec1, data: [] },
|
|
137
|
+
{ id: "id2" as PObjectId, spec: columnSpec2, data: [] },
|
|
138
|
+
] as PColumn<PColumnValues>[];
|
|
133
139
|
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
140
|
+
const resultColumns = enrichCompatible(allAxes, columns);
|
|
141
|
+
expect(resultColumns.length).toEqual(4);
|
|
142
|
+
});
|
|
143
|
+
test("columns are not compatible, 4 additional columns - by 2 axes", () => {
|
|
144
|
+
const columnSpec1: PColumnSpec = {
|
|
145
|
+
kind: "PColumn",
|
|
146
|
+
name: "column1",
|
|
147
|
+
valueType: "Int",
|
|
148
|
+
axesSpec: [
|
|
149
|
+
{ type: "String", name: "axis1", domain: { key1: "a" } },
|
|
150
|
+
{ type: "String", name: "axis1", domain: { key1: "b" } },
|
|
151
|
+
{ type: "String", name: "axis2", domain: { key1: "a" } },
|
|
152
|
+
{ type: "String", name: "axis2", domain: { key1: "b" } },
|
|
153
|
+
],
|
|
154
|
+
};
|
|
155
|
+
const columnSpec2: PColumnSpec = {
|
|
156
|
+
kind: "PColumn",
|
|
157
|
+
name: "column2",
|
|
158
|
+
valueType: "Int",
|
|
159
|
+
axesSpec: [
|
|
160
|
+
{ type: "String", name: "axis1", domain: {} },
|
|
161
|
+
{ type: "String", name: "axis2", domain: {} },
|
|
162
|
+
],
|
|
163
|
+
};
|
|
164
|
+
const allAxes = getAllAxesFromSpecs([columnSpec1]);
|
|
165
|
+
const columns: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[] = [
|
|
166
|
+
{ id: "id1" as PObjectId, spec: columnSpec1, data: [] },
|
|
167
|
+
{ id: "id2" as PObjectId, spec: columnSpec2, data: [] },
|
|
168
|
+
];
|
|
169
|
+
const resultColumns = enrichCompatible(allAxes, columns);
|
|
170
|
+
expect(resultColumns.length).toEqual(6);
|
|
171
|
+
});
|
|
166
172
|
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
173
|
+
test("Labels of added columns include added domains, but not include common domains", () => {
|
|
174
|
+
const columnSpec1: PColumnSpec = {
|
|
175
|
+
kind: "PColumn",
|
|
176
|
+
name: "column1",
|
|
177
|
+
valueType: "Int",
|
|
178
|
+
axesSpec: [
|
|
179
|
+
{ type: "String", name: "axis1", domain: { key0: "commonDomain", key1: "a", key2: "c" } },
|
|
180
|
+
{ type: "String", name: "axis1", domain: { key0: "commonDomain", key1: "b", key2: "c" } },
|
|
181
|
+
],
|
|
182
|
+
};
|
|
183
|
+
const columnSpec2: PColumnSpec = {
|
|
184
|
+
kind: "PColumn",
|
|
185
|
+
name: "column2",
|
|
186
|
+
valueType: "Int",
|
|
187
|
+
annotations: { [Annotation.Label]: "Label of column2" },
|
|
188
|
+
axesSpec: [{ type: "String", name: "axis1", domain: { key0: "commonDomain" } }],
|
|
189
|
+
};
|
|
190
|
+
const allAxes = getAllAxesFromSpecs([columnSpec1]);
|
|
191
|
+
const columns: PColumn<TreeNodeAccessor | PColumnValues>[] = [
|
|
192
|
+
{ id: "id1" as PObjectId, spec: columnSpec1, data: [] },
|
|
193
|
+
{ id: "id2" as PObjectId, spec: columnSpec2, data: [] },
|
|
194
|
+
] as PColumn<PColumnValues>[];
|
|
189
195
|
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
196
|
+
const resultColumns = enrichCompatible(allAxes, columns);
|
|
197
|
+
expect(resultColumns[2].spec.annotations?.[Annotation.Label]).toEqual("Label of column2 / a");
|
|
198
|
+
expect(resultColumns[3].spec.annotations?.[Annotation.Label]).toEqual("Label of column2 / b");
|
|
199
|
+
});
|
|
194
200
|
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
201
|
+
test("Linker column adds available axis", () => {
|
|
202
|
+
const columnSpec1: PColumnSpec = {
|
|
203
|
+
kind: "PColumn",
|
|
204
|
+
name: "column1",
|
|
205
|
+
valueType: "Int",
|
|
206
|
+
axesSpec: [
|
|
207
|
+
{ type: "String", name: "axis1", domain: { key1: "a" } },
|
|
208
|
+
{ type: "String", name: "axis2", domain: { key1: "b" } },
|
|
209
|
+
],
|
|
210
|
+
};
|
|
211
|
+
const linkerColumn13: PColumnSpec = {
|
|
212
|
+
kind: "PColumn",
|
|
213
|
+
name: "linker13",
|
|
214
|
+
valueType: "String",
|
|
215
|
+
annotations: { [Annotation.IsLinkerColumn]: "true" },
|
|
216
|
+
axesSpec: [
|
|
217
|
+
{ type: "String", name: "axis1" },
|
|
218
|
+
{ type: "String", name: "axis3" },
|
|
219
|
+
],
|
|
220
|
+
};
|
|
215
221
|
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
222
|
+
const linkerColumns = [{ id: "id5" as PObjectId, spec: linkerColumn13, data: [] }];
|
|
223
|
+
const availableAxes = getAvailableWithLinkersAxes(
|
|
224
|
+
linkerColumns,
|
|
225
|
+
getAllAxesFromSpecs([columnSpec1]),
|
|
226
|
+
);
|
|
227
|
+
expect([...availableAxes.values()].map((id) => id.name)).toEqual(["axis3"]);
|
|
228
|
+
});
|
|
223
229
|
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
230
|
+
test("Linker columns add available axes by chains", () => {
|
|
231
|
+
const columnSpec1: PColumnSpec = {
|
|
232
|
+
kind: "PColumn",
|
|
233
|
+
name: "column1",
|
|
234
|
+
valueType: "Int",
|
|
235
|
+
axesSpec: [{ type: "String", name: "axis1" }],
|
|
236
|
+
};
|
|
237
|
+
const linkerColumn12: PColumnSpec = {
|
|
238
|
+
kind: "PColumn",
|
|
239
|
+
name: "linker12",
|
|
240
|
+
valueType: "String",
|
|
241
|
+
annotations: { [Annotation.IsLinkerColumn]: "true" },
|
|
242
|
+
axesSpec: [
|
|
243
|
+
{ type: "String", name: "axis1" },
|
|
244
|
+
{ type: "String", name: "axis2" },
|
|
245
|
+
],
|
|
246
|
+
};
|
|
247
|
+
const linkerColumn23: PColumnSpec = {
|
|
248
|
+
kind: "PColumn",
|
|
249
|
+
name: "linker23",
|
|
250
|
+
valueType: "String",
|
|
251
|
+
annotations: { [Annotation.IsLinkerColumn]: "true" },
|
|
252
|
+
axesSpec: [
|
|
253
|
+
{ type: "String", name: "axis2" },
|
|
254
|
+
{ type: "String", name: "axis3" },
|
|
255
|
+
],
|
|
256
|
+
};
|
|
257
|
+
const linkerColumn34: PColumnSpec = {
|
|
258
|
+
kind: "PColumn",
|
|
259
|
+
name: "linker34",
|
|
260
|
+
valueType: "String",
|
|
261
|
+
annotations: { [Annotation.IsLinkerColumn]: "true" },
|
|
262
|
+
axesSpec: [
|
|
263
|
+
{ type: "String", name: "axis3" },
|
|
264
|
+
{ type: "String", name: "axis4" },
|
|
265
|
+
],
|
|
266
|
+
};
|
|
261
267
|
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
})
|
|
268
|
+
const linkerColumns = [
|
|
269
|
+
{ id: "id3" as PObjectId, spec: linkerColumn12, data: [] },
|
|
270
|
+
{ id: "id4" as PObjectId, spec: linkerColumn23, data: [] },
|
|
271
|
+
{ id: "id5" as PObjectId, spec: linkerColumn34, data: [] },
|
|
272
|
+
];
|
|
273
|
+
const availableAxes = getAvailableWithLinkersAxes(
|
|
274
|
+
linkerColumns,
|
|
275
|
+
getAllAxesFromSpecs([columnSpec1]),
|
|
276
|
+
);
|
|
277
|
+
expect([...availableAxes.values()].map((id) => id.name)).toEqual(["axis2", "axis3", "axis4"]);
|
|
278
|
+
});
|
|
279
|
+
});
|