@platforma-sdk/model 1.83.0 → 1.83.9
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.d.ts +1 -3
- package/dist/annotations/converter.d.ts.map +1 -1
- package/dist/annotations/types.d.ts +5 -6
- package/dist/annotations/types.d.ts.map +1 -1
- package/dist/bconfig/lambdas.d.ts +10 -10
- package/dist/bconfig/lambdas.d.ts.map +1 -1
- package/dist/bconfig/normalization.d.ts +3 -5
- package/dist/bconfig/normalization.d.ts.map +1 -1
- package/dist/bconfig/types.d.ts +4 -5
- package/dist/bconfig/types.d.ts.map +1 -1
- package/dist/bconfig/util.d.ts +1 -3
- package/dist/bconfig/util.d.ts.map +1 -1
- package/dist/bconfig/v3.d.ts +3 -5
- package/dist/bconfig/v3.d.ts.map +1 -1
- package/dist/block_api_v1.d.ts +2 -4
- package/dist/block_api_v1.d.ts.map +1 -1
- package/dist/block_api_v2.d.ts +1 -3
- package/dist/block_api_v2.d.ts.map +1 -1
- package/dist/block_api_v3.d.ts +1 -3
- package/dist/block_api_v3.d.ts.map +1 -1
- package/dist/block_migrations.d.ts +20 -36
- package/dist/block_migrations.d.ts.map +1 -1
- package/dist/block_model.d.ts +10 -10
- package/dist/block_model.d.ts.map +1 -1
- package/dist/block_state_patch.d.ts +6 -6
- package/dist/block_state_patch.d.ts.map +1 -1
- package/dist/block_state_util.d.ts +4 -6
- package/dist/block_state_util.d.ts.map +1 -1
- package/dist/block_storage.d.ts +24 -23
- package/dist/block_storage.d.ts.map +1 -1
- package/dist/block_storage_facade.d.ts +11 -12
- package/dist/block_storage_facade.d.ts.map +1 -1
- package/dist/columns/column.d.ts +5 -6
- package/dist/columns/column.d.ts.map +1 -1
- package/dist/columns/column_providers/index.d.ts +5 -6
- package/dist/columns/column_providers/index.d.ts.map +1 -1
- package/dist/columns/column_providers/providers.d.ts +10 -11
- package/dist/columns/column_providers/providers.d.ts.map +1 -1
- package/dist/columns/column_providers/types.d.ts +2 -3
- package/dist/columns/column_providers/types.d.ts.map +1 -1
- package/dist/columns/column_recipes/column_discovered_recipe.d.ts +1 -3
- package/dist/columns/column_recipes/column_discovered_recipe.d.ts.map +1 -1
- package/dist/columns/column_recipes/column_filtered_recipe.d.ts +1 -3
- package/dist/columns/column_recipes/column_filtered_recipe.d.ts.map +1 -1
- package/dist/columns/column_recipes/column_overrided_recipe.d.ts +2 -3
- package/dist/columns/column_recipes/column_overrided_recipe.d.ts.map +1 -1
- package/dist/columns/column_recipes/index.d.ts +3 -4
- package/dist/columns/column_recipes/index.d.ts.map +1 -1
- package/dist/columns/column_recipes/types.d.ts +5 -6
- package/dist/columns/column_recipes/types.d.ts.map +1 -1
- package/dist/columns/columns_collection.d.ts +7 -8
- package/dist/columns/columns_collection.d.ts.map +1 -1
- package/dist/columns/data_column.d.ts +12 -16
- package/dist/columns/data_column.d.ts.map +1 -1
- package/dist/columns/derive_axis_values_labels.d.ts +2 -3
- package/dist/columns/derive_axis_values_labels.d.ts.map +1 -1
- package/dist/columns/split_by_axes.d.ts +3 -5
- package/dist/columns/split_by_axes.d.ts.map +1 -1
- package/dist/columns/utils.d.ts +10 -12
- package/dist/columns/utils.d.ts.map +1 -1
- package/dist/components/PFrameForGraphs.d.ts +5 -5
- package/dist/components/PFrameForGraphs.d.ts.map +1 -1
- package/dist/components/PlAnnotations/filter.d.ts +59 -40
- package/dist/components/PlAnnotations/filter.d.ts.map +1 -1
- package/dist/components/PlAnnotations/filters_ui.d.ts +18 -18
- package/dist/components/PlAnnotations/filters_ui.d.ts.map +1 -1
- package/dist/components/PlDataTable/columnResolver.cjs +2 -4
- package/dist/components/PlDataTable/columnResolver.cjs.map +1 -1
- package/dist/components/PlDataTable/columnResolver.js +2 -4
- package/dist/components/PlDataTable/columnResolver.js.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.cjs +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.cjs.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.d.ts +3 -4
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.d.ts.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.js +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.js.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.d.ts +13 -10
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.d.ts.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.js +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.js.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/discoverColumns.d.ts +5 -5
- package/dist/components/PlDataTable/createPlDataTable/discoverColumns.d.ts.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/index.d.ts +4 -4
- package/dist/components/PlDataTable/createPlDataTable/index.d.ts.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/utils.d.ts +8 -7
- package/dist/components/PlDataTable/createPlDataTable/utils.d.ts.map +1 -1
- package/dist/components/PlDataTable/createPlDataTableSheet.d.ts +2 -3
- package/dist/components/PlDataTable/createPlDataTableSheet.d.ts.map +1 -1
- package/dist/components/PlDataTable/state-migration.d.ts +6 -7
- package/dist/components/PlDataTable/state-migration.d.ts.map +1 -1
- package/dist/components/PlDataTable/typesV4.d.ts +73 -42
- package/dist/components/PlDataTable/typesV4.d.ts.map +1 -1
- package/dist/components/PlDataTable/typesV5.d.ts +3 -5
- package/dist/components/PlDataTable/typesV5.d.ts.map +1 -1
- package/dist/components/PlDataTable/typesV6.d.ts +4 -6
- package/dist/components/PlDataTable/typesV6.d.ts.map +1 -1
- package/dist/components/PlDataTable/typesV7.d.ts +45 -27
- package/dist/components/PlDataTable/typesV7.d.ts.map +1 -1
- package/dist/components/PlDataTable/typesV8.d.ts +80 -45
- package/dist/components/PlDataTable/typesV8.d.ts.map +1 -1
- package/dist/components/PlDatasetSelector/build_dataset_options.d.ts +7 -6
- package/dist/components/PlDatasetSelector/build_dataset_options.d.ts.map +1 -1
- package/dist/components/PlDatasetSelector/dataset_selection.d.ts +4 -6
- package/dist/components/PlDatasetSelector/dataset_selection.d.ts.map +1 -1
- package/dist/components/PlDatasetSelector/filter_discovery.d.ts +9 -8
- package/dist/components/PlDatasetSelector/filter_discovery.d.ts.map +1 -1
- package/dist/components/PlMultiSequenceAlignment.d.ts +6 -13
- package/dist/components/PlMultiSequenceAlignment.d.ts.map +1 -1
- package/dist/components/PlSelectionModel.d.ts +6 -6
- package/dist/components/PlSelectionModel.d.ts.map +1 -1
- package/dist/components/index.d.ts +3 -0
- package/dist/config/model.d.ts +28 -30
- package/dist/config/model.d.ts.map +1 -1
- package/dist/config/type_engine.d.ts +3 -5
- package/dist/config/type_engine.d.ts.map +1 -1
- package/dist/env_value.d.ts +1 -2
- package/dist/env_value.d.ts.map +1 -1
- package/dist/filters/converters/filterToQuery.d.ts +6 -7
- package/dist/filters/converters/filterToQuery.d.ts.map +1 -1
- package/dist/filters/converters/filterUiToExpressionImpl.d.ts +2 -4
- package/dist/filters/converters/filterUiToExpressionImpl.d.ts.map +1 -1
- package/dist/filters/distill.d.ts +1 -3
- package/dist/filters/distill.d.ts.map +1 -1
- package/dist/filters/index.d.ts +1 -0
- package/dist/filters/types.d.ts +3 -4
- package/dist/filters/types.d.ts.map +1 -1
- package/dist/index.d.ts +9 -0
- package/dist/labels/derive_distinct_labels.d.ts +28 -17
- package/dist/labels/derive_distinct_labels.d.ts.map +1 -1
- package/dist/labels/derive_distinct_tooltips.d.ts +11 -8
- package/dist/labels/derive_distinct_tooltips.d.ts.map +1 -1
- package/dist/labels/linked_column_postfix.d.ts +3 -5
- package/dist/labels/linked_column_postfix.d.ts.map +1 -1
- package/dist/package.cjs +1 -1
- package/dist/package.js +1 -1
- package/dist/pframe.d.ts +1 -3
- package/dist/pframe.d.ts.map +1 -1
- package/dist/pframe_utils/axes.d.ts +4 -5
- package/dist/pframe_utils/axes.d.ts.map +1 -1
- package/dist/pframe_utils/columns.d.ts +3 -7
- package/dist/pframe_utils/columns.d.ts.map +1 -1
- package/dist/pframe_utils/index.d.ts +9 -10
- package/dist/pframe_utils/index.d.ts.map +1 -1
- package/dist/platforma.d.ts +19 -21
- package/dist/platforma.d.ts.map +1 -1
- package/dist/plugin_handle.d.ts +11 -13
- package/dist/plugin_handle.d.ts.map +1 -1
- package/dist/plugin_model.d.ts +21 -22
- package/dist/plugin_model.d.ts.map +1 -1
- package/dist/raw_globals.d.ts +3 -4
- package/dist/raw_globals.d.ts.map +1 -1
- package/dist/render/accessor.d.ts +2 -4
- package/dist/render/accessor.d.ts.map +1 -1
- package/dist/render/api.d.ts +13 -13
- package/dist/render/api.d.ts.map +1 -1
- package/dist/render/future.d.ts +2 -4
- package/dist/render/future.d.ts.map +1 -1
- package/dist/render/index.d.ts +1 -0
- package/dist/render/internal.d.ts +11 -13
- package/dist/render/internal.d.ts.map +1 -1
- package/dist/render/traversal_ops.d.ts +14 -11
- package/dist/render/traversal_ops.d.ts.map +1 -1
- package/dist/render/util/axis_filtering.d.ts +5 -7
- package/dist/render/util/axis_filtering.d.ts.map +1 -1
- package/dist/render/util/column_collection.d.ts +14 -12
- package/dist/render/util/column_collection.d.ts.map +1 -1
- package/dist/render/util/label.d.ts +2 -3
- package/dist/render/util/label.d.ts.map +1 -1
- package/dist/render/util/pcolumn_data.d.ts +24 -25
- package/dist/render/util/pcolumn_data.d.ts.map +1 -1
- package/dist/render/util/split_selectors.d.ts +4 -6
- package/dist/render/util/split_selectors.d.ts.map +1 -1
- package/dist/services/block_services.d.ts +3 -4
- package/dist/services/block_services.d.ts.map +1 -1
- package/dist/services/get_services.d.ts +1 -3
- package/dist/services/get_services.d.ts.map +1 -1
- package/dist/services/service_bridge.d.ts +3 -5
- package/dist/services/service_bridge.d.ts.map +1 -1
- package/dist/services/service_resolve.d.ts +6 -7
- package/dist/services/service_resolve.d.ts.map +1 -1
- package/dist/version.d.ts +3 -4
- package/dist/version.d.ts.map +1 -1
- package/package.json +10 -10
- package/src/components/PlDataTable/columnResolver.test.ts +3 -5
- package/src/components/PlDataTable/columnResolver.ts +2 -12
- package/src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts +1 -4
- package/src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts +5 -4
|
@@ -1,18 +1,16 @@
|
|
|
1
1
|
import { InferServiceUi, ServiceDispatch, ServiceName, ServiceTypesLike, UiServiceRegistry, UiServices } from "@milaboratories/pl-model-common";
|
|
2
|
-
|
|
3
2
|
//#region src/services/service_bridge.d.ts
|
|
4
|
-
type ServiceProxy = <S extends ServiceTypesLike>(serviceId: ServiceName<S>) => InferServiceUi<S>;
|
|
3
|
+
export type ServiceProxy = <S extends ServiceTypesLike>(serviceId: ServiceName<S>) => InferServiceUi<S>;
|
|
5
4
|
/**
|
|
6
5
|
* Builds a lazy services object from ServiceDispatch and UiServiceRegistry.
|
|
7
6
|
* Each service is instantiated on first access. Errors are cached to prevent
|
|
8
7
|
* repeated factory calls on failure.
|
|
9
8
|
*/
|
|
10
|
-
declare function buildServices<S extends Partial<UiServices> = Partial<UiServices>>(dispatch: ServiceDispatch, registry: UiServiceRegistry): S;
|
|
9
|
+
export declare function buildServices<S extends Partial<UiServices> = Partial<UiServices>>(dispatch: ServiceDispatch, registry: UiServiceRegistry): S;
|
|
11
10
|
/**
|
|
12
11
|
* Builds a ServiceProxy from a ServiceDispatch.
|
|
13
12
|
* Each service method call is forwarded to dispatch.callServiceMethod.
|
|
14
13
|
*/
|
|
15
|
-
declare function createServiceProxy(dispatch: ServiceDispatch): ServiceProxy;
|
|
14
|
+
export declare function createServiceProxy(dispatch: ServiceDispatch): ServiceProxy;
|
|
16
15
|
//#endregion
|
|
17
|
-
export { ServiceProxy, buildServices, createServiceProxy };
|
|
18
16
|
//# sourceMappingURL=service_bridge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service_bridge.d.ts","names":[],"sources":["../../src/services/service_bridge.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"service_bridge.d.ts","names":[],"sources":["../../src/services/service_bridge.ts"],"mappings":";;YAiBY,gBAAgB,UAAU,kBACpC,WAAW,YAAY,OACpB,eAAe;;;;;;wBAOJ,cAAc,UAAU,QAAQ,cAAiB,QAAQ,aACvE,UAAU,iBACV,UAAU,oBACT;;;;;wBA6Ba,mBAAmB,UAAU,kBAAkB"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { BlockServiceFlags } from "./block_services.js";
|
|
2
2
|
import { ModelServices as ModelServices$1, ServiceNameLiterals, UiServices as UiServices$1 } from "@milaboratories/pl-model-common";
|
|
3
|
-
|
|
4
3
|
//#region src/services/service_resolve.d.ts
|
|
5
4
|
type FlagToName<Flag extends string> = Flag extends `requires${infer K}` ? K extends keyof ServiceNameLiterals ? ServiceNameLiterals[K] : never : never;
|
|
6
|
-
type RequiredServiceNames<Flags> = { [K in keyof Flags & `requires${string}`]: Flags[K] extends true ? FlagToName<K & string> : never }[keyof Flags & `requires${string}`];
|
|
7
|
-
type ResolveModelServices<Flags> = Pick<ModelServices$1, RequiredServiceNames<Flags> & keyof ModelServices$1>;
|
|
8
|
-
type ResolveUiServices<Flags> = Pick<UiServices$1, RequiredServiceNames<Flags> & keyof UiServices$1>;
|
|
9
|
-
type BlockDefaultModelServices = ResolveModelServices<BlockServiceFlags>;
|
|
10
|
-
type BlockDefaultUiServices = ResolveUiServices<BlockServiceFlags>;
|
|
5
|
+
type RequiredServiceNames<Flags> = { [K in keyof Flags & `requires${string}`]: Flags[K] extends true ? FlagToName<K & string> : never; }[keyof Flags & `requires${string}`];
|
|
6
|
+
export type ResolveModelServices<Flags> = Pick<ModelServices$1, RequiredServiceNames<Flags> & keyof ModelServices$1>;
|
|
7
|
+
export type ResolveUiServices<Flags> = Pick<UiServices$1, RequiredServiceNames<Flags> & keyof UiServices$1>;
|
|
8
|
+
export type BlockDefaultModelServices = ResolveModelServices<BlockServiceFlags>;
|
|
9
|
+
export type BlockDefaultUiServices = ResolveUiServices<BlockServiceFlags>;
|
|
11
10
|
//#endregion
|
|
12
|
-
export {
|
|
11
|
+
export type { ModelServices$1 as ModelServices, UiServices$1 as UiServices };
|
|
13
12
|
//# sourceMappingURL=service_resolve.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service_resolve.d.ts","names":[],"sources":["../../src/services/service_resolve.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"service_resolve.d.ts","names":[],"sources":["../../src/services/service_resolve.ts"],"mappings":";;;KAeK,WAAW,uBAAuB,8BAA8B,MACjE,gBAAgB,sBACd,oBAAoB;KAKrB,qBAAqB,YACvB,WAAW,8BAA8B,MAAM,kBAAkB,WAAW,6BACvE;YAII,qBAAqB,SAAS,KACxC,iBACA,qBAAqB,eAAe;YAG1B,kBAAkB,SAAS,KACrC,cACA,qBAAqB,eAAe;YAI1B,4BAA4B,qBAAqB;YACjD,yBAAyB,kBAAkB"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
//#region src/version.d.ts
|
|
2
|
-
declare const PlatformaSDKVersion: string;
|
|
3
|
-
type SdkInfo = {
|
|
2
|
+
export declare const PlatformaSDKVersion: string;
|
|
3
|
+
export type SdkInfo = {
|
|
4
4
|
readonly sdkVersion: string;
|
|
5
5
|
};
|
|
6
|
-
declare const CurrentSdkInfo: SdkInfo;
|
|
6
|
+
export declare const CurrentSdkInfo: SdkInfo;
|
|
7
7
|
//#endregion
|
|
8
|
-
export { CurrentSdkInfo, PlatformaSDKVersion, SdkInfo };
|
|
9
8
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/version.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","names":[],"sources":["../src/version.ts"],"mappings":";
|
|
1
|
+
{"version":3,"file":"version.d.ts","names":[],"sources":["../src/version.ts"],"mappings":";qBACa;YAED;WACD;;qBAGE,gBAAgB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@platforma-sdk/model",
|
|
3
|
-
"version": "1.83.
|
|
3
|
+
"version": "1.83.9",
|
|
4
4
|
"description": "Platforma.bio SDK / Block Model",
|
|
5
5
|
"files": [
|
|
6
6
|
"./dist/**/*",
|
|
@@ -31,24 +31,24 @@
|
|
|
31
31
|
"lru-cache": "^11.2.2",
|
|
32
32
|
"utility-types": "^3.11.0",
|
|
33
33
|
"zod": "~3.25.76",
|
|
34
|
-
"@milaboratories/helpers": "1.14.5",
|
|
35
|
-
"@milaboratories/pl-error-like": "1.12.10",
|
|
36
|
-
"@milaboratories/pl-model-middle-layer": "1.32.0",
|
|
37
34
|
"@milaboratories/pl-model-common": "1.48.0",
|
|
38
|
-
"@milaboratories/
|
|
35
|
+
"@milaboratories/pl-error-like": "1.12.10",
|
|
36
|
+
"@milaboratories/ptabler-expression-js": "1.2.38",
|
|
37
|
+
"@milaboratories/helpers": "1.14.5",
|
|
38
|
+
"@milaboratories/pl-model-middle-layer": "1.32.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@vitest/coverage-istanbul": "^4.1.3",
|
|
42
42
|
"fast-json-patch": "^3.1.1",
|
|
43
|
-
"typescript": "
|
|
43
|
+
"typescript": "7.0.2",
|
|
44
44
|
"vitest": "^4.1.3",
|
|
45
|
-
"@milaboratories/build-configs": "2.0.
|
|
45
|
+
"@milaboratories/build-configs": "2.0.1",
|
|
46
|
+
"@milaboratories/columns-collection-driver": "0.2.4",
|
|
46
47
|
"@milaboratories/pf-driver": "1.9.1",
|
|
47
48
|
"@milaboratories/pf-spec-driver": "1.5.1",
|
|
48
|
-
"@milaboratories/
|
|
49
|
-
"@milaboratories/ts-configs": "1.4.0",
|
|
49
|
+
"@milaboratories/ts-builder": "1.7.2",
|
|
50
50
|
"@platforma-sdk/block-kind": "1.1.0",
|
|
51
|
-
"@milaboratories/ts-
|
|
51
|
+
"@milaboratories/ts-configs": "1.4.0"
|
|
52
52
|
},
|
|
53
53
|
"scripts": {
|
|
54
54
|
"build": "ts-builder build --target node",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { afterEach, beforeEach, describe, expect, test
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, test } from "vitest";
|
|
2
2
|
import {
|
|
3
3
|
createLocalPObjectId,
|
|
4
4
|
createColumnOverriddenId,
|
|
@@ -97,7 +97,7 @@ describe("createColumnResolver", () => {
|
|
|
97
97
|
expect(r({ type: "column", id: other })).toBeUndefined();
|
|
98
98
|
});
|
|
99
99
|
|
|
100
|
-
test("collision
|
|
100
|
+
test("collision keeps first", () => {
|
|
101
101
|
const pid = createLocalPObjectId(["main", "out"], "col-1");
|
|
102
102
|
const wrappedA = wrap(pid, "A");
|
|
103
103
|
const wrappedB = wrap(pid, "B");
|
|
@@ -113,9 +113,7 @@ describe("createColumnResolver", () => {
|
|
|
113
113
|
return r;
|
|
114
114
|
};
|
|
115
115
|
|
|
116
|
-
const
|
|
117
|
-
const r = createColumnResolver([makeFake(wrappedA), makeFake(wrappedB)], { warn });
|
|
118
|
-
expect(warn).toHaveBeenCalledTimes(1);
|
|
116
|
+
const r = createColumnResolver([makeFake(wrappedA), makeFake(wrappedB)]);
|
|
119
117
|
const out = r({ type: "column", id: pid });
|
|
120
118
|
expect(out).toEqual({ type: "column", id: wrappedA });
|
|
121
119
|
});
|
|
@@ -20,10 +20,7 @@ import type { ColumnRecipe } from "../../columns";
|
|
|
20
20
|
*/
|
|
21
21
|
export type ColumnResolver = (ref: PTableColumnId) => PTableColumnId | undefined;
|
|
22
22
|
|
|
23
|
-
export function createColumnResolver(
|
|
24
|
-
columns: ColumnRecipe[],
|
|
25
|
-
deps?: { warn?: (msg: string) => void },
|
|
26
|
-
): ColumnResolver {
|
|
23
|
+
export function createColumnResolver(columns: ColumnRecipe[]): ColumnResolver {
|
|
27
24
|
const axisIds: AxisId[] = [];
|
|
28
25
|
for (const c of columns) {
|
|
29
26
|
for (const ax of c.getSpec().axesSpec) {
|
|
@@ -36,14 +33,7 @@ export function createColumnResolver(
|
|
|
36
33
|
for (const c of columns) {
|
|
37
34
|
byFullId.set(c.id, c);
|
|
38
35
|
const pid = extractPObjectId(c.id);
|
|
39
|
-
|
|
40
|
-
if (existing === undefined) {
|
|
41
|
-
byPObjectId.set(pid, c);
|
|
42
|
-
} else if (existing.id !== c.id) {
|
|
43
|
-
deps?.warn?.(
|
|
44
|
-
`Ambiguous PObjectId ${pid}: recipe ids ${existing.id} and ${c.id} both match — keeping first.`,
|
|
45
|
-
);
|
|
46
|
-
}
|
|
36
|
+
if (!byPObjectId.has(pid)) byPObjectId.set(pid, c);
|
|
47
37
|
}
|
|
48
38
|
|
|
49
39
|
return (ref: PTableColumnId): PTableColumnId | undefined => {
|
|
@@ -82,10 +82,7 @@ export function createPlDataTableV2<A, U>(
|
|
|
82
82
|
|
|
83
83
|
const fullColumns = [...columns, ...fullLabelColumns];
|
|
84
84
|
|
|
85
|
-
const resolver = createColumnResolver(
|
|
86
|
-
fullColumns.map((c) => DataColumn.fromColumn(c)),
|
|
87
|
-
{ warn: ctx.logWarn.bind(ctx) },
|
|
88
|
-
);
|
|
85
|
+
const resolver = createColumnResolver(fullColumns.map((c) => DataColumn.fromColumn(c)));
|
|
89
86
|
|
|
90
87
|
// -- Filtering: rewrite via resolver, throw if any reference is unresolved --
|
|
91
88
|
const rawFilters = tableStateNormalized.pTableParams.filters;
|
|
@@ -132,10 +132,11 @@ export function createPlDataTableV3<A, U>(
|
|
|
132
132
|
);
|
|
133
133
|
const orderByColId = evaluateRules(options.displayOptions?.ordering ?? [], allColumnsForRules);
|
|
134
134
|
|
|
135
|
-
const resolver = createColumnResolver(
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
135
|
+
const resolver = createColumnResolver([
|
|
136
|
+
...primary,
|
|
137
|
+
...direct,
|
|
138
|
+
...linked.flatMap((lc) => [...collectLinkerColumns(lc), lc]),
|
|
139
|
+
]);
|
|
139
140
|
|
|
140
141
|
const remapedDefaultFilters = remapFilterColumnIds(options.filters, resolver);
|
|
141
142
|
const filters = filterFilters(
|