@platforma-sdk/model 1.79.3 → 1.79.14

package/dist/columns/column_collection_builder.cjs

@@ -2,8 +2,8 @@ require("../_virtual/_rolldown/runtime.cjs");
 const require_accessor = require("../render/accessor.cjs");
 const require_get_services = require("../services/get_services.cjs");
 require("../services/index.cjs");
-const require_column_selector = require("./column_selector.cjs");
 const require_column_snapshot_provider = require("./column_snapshot_provider.cjs");
+const require_column_selector = require("./column_selector.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 let _milaboratories_helpers = require("@milaboratories/helpers");
 //#region src/columns/column_collection_builder.ts

package/dist/columns/column_collection_builder.js

@@ -1,8 +1,8 @@
 import { TreeNodeAccessor } from "../render/accessor.js";
 import { getService } from "../services/get_services.js";
 import "../services/index.js";
-import { convertColumnSelectorToMultiColumnSelector } from "./column_selector.js";
 import { ArrayColumnProvider, toColumnSnapshotProvider } from "./column_snapshot_provider.js";
+import { convertColumnSelectorToMultiColumnSelector } from "./column_selector.js";
 import { deriveNativeId, isPColumnSpec } from "@milaboratories/pl-model-common";
 import { throwError } from "@milaboratories/helpers";
 //#region src/columns/column_collection_builder.ts

package/dist/columns/index.cjs

@@ -1,6 +1,6 @@
-require("./column_selector.cjs");
+require("./column_snapshot.cjs");
 require("./column_snapshot_provider.cjs");
+require("./column_selector.cjs");
 require("./column_collection_builder.cjs");
 require("./ctx_column_sources.cjs");
-require("./column_snapshot.cjs");
 require("./expand_by_partition.cjs");

package/dist/columns/index.js

@@ -1,6 +1,6 @@
-import "./column_selector.js";
+import "./column_snapshot.js";
 import "./column_snapshot_provider.js";
+import "./column_selector.js";
 import "./column_collection_builder.js";
 import "./ctx_column_sources.js";
-import "./column_snapshot.js";
 import "./expand_by_partition.js";

package/dist/components/PlDatasetSelector/build_dataset_options.cjs

@@ -1,7 +1,7 @@
 require("../../_virtual/_rolldown/runtime.cjs");
-const require_filter_discovery = require("./filter_discovery.cjs");
 const require_column_collection_builder = require("../../columns/column_collection_builder.cjs");
 const require_ctx_column_sources = require("../../columns/ctx_column_sources.cjs");
+const require_filter_discovery = require("./filter_discovery.cjs");
 const require_enrichment_discovery = require("./enrichment_discovery.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 //#region src/components/PlDatasetSelector/build_dataset_options.ts

package/dist/components/PlDatasetSelector/build_dataset_options.js

@@ -1,6 +1,6 @@
-import { buildRefMap, filterMatchesToOptions, findFilterColumns } from "./filter_discovery.js";
 import { ColumnCollectionBuilder } from "../../columns/column_collection_builder.js";
 import { ResultPoolColumnSnapshotProvider, collectCtxColumnSnapshotProviders } from "../../columns/ctx_column_sources.js";
+import { buildRefMap, filterMatchesToOptions, findFilterColumns } from "./filter_discovery.js";
 import { enrichmentVariantsToRefs, findEnrichmentColumns } from "./enrichment_discovery.js";
 import { multiColumnSelectorsToPredicate } from "@milaboratories/pl-model-common";
 //#region src/components/PlDatasetSelector/build_dataset_options.ts

package/dist/index.cjs

@@ -28,15 +28,18 @@ const require_block_model_legacy = require("./block_model_legacy.cjs");
 const require_plugin_model = require("./plugin_model.cjs");
 const require_block_model = require("./block_model.cjs");
 const require_axes = require("./pframe_utils/axes.cjs");
+const require_column_snapshot = require("./columns/column_snapshot.cjs");
+const require_column_snapshot_provider = require("./columns/column_snapshot_provider.cjs");
+const require_column_selector = require("./columns/column_selector.cjs");
+const require_column_collection_builder = require("./columns/column_collection_builder.cjs");
+const require_ctx_column_sources = require("./columns/ctx_column_sources.cjs");
+const require_expand_by_partition = require("./columns/expand_by_partition.cjs");
+require("./columns/index.cjs");
 const require_columns = require("./pframe_utils/columns.cjs");
 const require_PFrameForGraphs = require("./components/PFrameForGraphs.cjs");
 const require_filters_ui = require("./components/PlAnnotations/filters_ui.cjs");
 const require_dataset_selection = require("./components/PlDatasetSelector/dataset_selection.cjs");
 const require_filter_discovery = require("./components/PlDatasetSelector/filter_discovery.cjs");
-const require_column_selector = require("./columns/column_selector.cjs");
-const require_column_snapshot_provider = require("./columns/column_snapshot_provider.cjs");
-const require_column_collection_builder = require("./columns/column_collection_builder.cjs");
-const require_ctx_column_sources = require("./columns/ctx_column_sources.cjs");
 const require_build_dataset_options = require("./components/PlDatasetSelector/build_dataset_options.cjs");
 const require_filterToQuery = require("./filters/converters/filterToQuery.cjs");
 const require_filterUiToExpressionImpl = require("./filters/converters/filterUiToExpressionImpl.cjs");
@@ -44,9 +47,6 @@ const require_distill = require("./filters/distill.cjs");
 require("./filters/index.cjs");
 const require_state_migration = require("./components/PlDataTable/state-migration.cjs");
 const require_createPlDataTableSheet = require("./components/PlDataTable/createPlDataTableSheet.cjs");
-const require_column_snapshot = require("./columns/column_snapshot.cjs");
-const require_expand_by_partition = require("./columns/expand_by_partition.cjs");
-require("./columns/index.cjs");
 const require_derive_distinct_tooltips = require("./labels/derive_distinct_tooltips.cjs");
 const require_utils = require("./components/PlDataTable/createPlDataTable/utils.cjs");
 const require_createPlDataTableV2 = require("./components/PlDataTable/createPlDataTable/createPlDataTableV2.cjs");

package/dist/index.js

@@ -27,15 +27,18 @@ import { BlockModel } from "./block_model_legacy.js";
 import { PluginDataModel, PluginDataModelBuilder, PluginInstance, PluginModel } from "./plugin_model.js";
 import { BlockModelV3 } from "./block_model.js";
 import { enrichCompatible, getAvailableWithLinkersAxes } from "./pframe_utils/axes.js";
+import { createColumnSnapshot, createReadyColumnData } from "./columns/column_snapshot.js";
+import { ArrayColumnProvider, OutputColumnProvider, SnapshotColumnProvider, isColumnSnapshotProvider, toColumnSnapshotProvider } from "./columns/column_snapshot_provider.js";
+import { convertColumnSelectorToMultiColumnSelector, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector } from "./columns/column_selector.js";
+import { ColumnCollectionBuilder } from "./columns/column_collection_builder.js";
+import { ResultPoolColumnSnapshotProvider, collectCtxColumnSnapshotProviders } from "./columns/ctx_column_sources.js";
+import { expandByPartition } from "./columns/expand_by_partition.js";
+import "./columns/index.js";
 import { getAllRelatedColumns, getRelatedColumns } from "./pframe_utils/columns.js";
 import { createPFrameForGraphs, isHiddenFromGraphColumn, isHiddenFromUIColumn } from "./components/PFrameForGraphs.js";
 import { compileAnnotationScript, compileFilter, compileFilters, unreachable } from "./components/PlAnnotations/filters_ui.js";
 import { createDatasetSelection, isDatasetSelection } from "./components/PlDatasetSelector/dataset_selection.js";
 import { buildRefMap, filterMatchesToOptions, findFilterColumns } from "./components/PlDatasetSelector/filter_discovery.js";
-import { convertColumnSelectorToMultiColumnSelector, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector } from "./columns/column_selector.js";
-import { ArrayColumnProvider, OutputColumnProvider, SnapshotColumnProvider, isColumnSnapshotProvider, toColumnSnapshotProvider } from "./columns/column_snapshot_provider.js";
-import { ColumnCollectionBuilder } from "./columns/column_collection_builder.js";
-import { ResultPoolColumnSnapshotProvider, collectCtxColumnSnapshotProviders } from "./columns/ctx_column_sources.js";
 import { buildDatasetOptions } from "./components/PlDatasetSelector/build_dataset_options.js";
 import { filterSpecToSpecQueryExpr } from "./filters/converters/filterToQuery.js";
 import { convertFilterUiToExpressionImpl, convertFilterUiToExpressions } from "./filters/converters/filterUiToExpressionImpl.js";
@@ -43,9 +46,6 @@ import { distillFilterSpec } from "./filters/distill.js";
 import "./filters/index.js";
 import { createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTableStateV2 } from "./components/PlDataTable/state-migration.js";
 import { createPlDataTableSheet } from "./components/PlDataTable/createPlDataTableSheet.js";
-import { createColumnSnapshot, createReadyColumnData } from "./columns/column_snapshot.js";
-import { expandByPartition } from "./columns/expand_by_partition.js";
-import "./columns/index.js";
 import { deriveDistinctTooltips } from "./labels/derive_distinct_tooltips.js";
 import { getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional } from "./components/PlDataTable/createPlDataTable/utils.js";
 import { createPlDataTableV2 } from "./components/PlDataTable/createPlDataTable/createPlDataTableV2.js";

package/dist/package.cjs

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "1.79.3";
+var version = "1.79.14";
 //#endregion
 Object.defineProperty(exports, "version", {
 	enumerable: true,

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "1.79.3";
+var version = "1.79.14";
 //#endregion
 export { version };
 

package/dist/pframe_utils/columns.cjs

@@ -2,6 +2,9 @@ require("../_virtual/_rolldown/runtime.cjs");
 const require_column_collection = require("../render/util/column_collection.cjs");
 require("../render/index.cjs");
 const require_axes = require("./axes.cjs");
+const require_column_collection_builder = require("../columns/column_collection_builder.cjs");
+const require_ctx_column_sources = require("../columns/ctx_column_sources.cjs");
+require("../columns/index.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 //#region src/pframe_utils/columns.ts
 function getAllRelatedColumns(ctx, predicate) {
@@ -58,7 +61,28 @@ function getRelatedColumns(ctx, { columns: rootColumns, predicate }) {
 		dontWaitAllData: true,
 		overrideLabelAnnotation: false
 	}) ?? []).filter((column) => (0, _milaboratories_pl_model_common.isLabelColumn)(column.spec));
-	return require_axes.enrichCompatible(blockAxes, [...compatibleWithoutLabels, ...compatibleLabels]);
+	const compatible = [...compatibleWithoutLabels, ...compatibleLabels];
+	const integrableIds = discoverIntegrableColumnIds(ctx, rootColumns);
+	const rootIds = new Set(rootColumns.map((c) => c.id));
+	return require_axes.enrichCompatible(blockAxes, compatible.filter((c) => rootIds.has(c.id) || (0, _milaboratories_pl_model_common.isLinkerColumn)(c.spec) || (integrableIds?.has(c.id) ?? true)));
+}
+/** Column ids that discovery confirms integrate with the block, or `undefined` when it can't decide. */
+function discoverIntegrableColumnIds(ctx, rootColumns) {
+	const anchorSpecs = Array.from(new Map(rootColumns.map((c) => [(0, _milaboratories_pl_model_common.canonicalizeJson)(c.spec), c.spec])).values());
+	if (anchorSpecs.length === 0) return void 0;
+	try {
+		const collection = new require_column_collection_builder.ColumnCollectionBuilder().addSources(require_ctx_column_sources.collectCtxColumnSnapshotProviders(ctx)).build({
+			allowPartialColumnList: true,
+			anchors: Object.fromEntries(anchorSpecs.map((spec, i) => [`anchor_${i}`, spec]))
+		});
+		try {
+			return new Set(collection.findColumns({ mode: "enrichment" }).map((m) => m.column.id));
+		} finally {
+			collection.dispose();
+		}
+	} catch {
+		return;
+	}
 }
 //#endregion
 exports.getAllRelatedColumns = getAllRelatedColumns;

package/dist/pframe_utils/columns.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"columns.cjs","names":["PColumnCollection","enrichCompatible","getAvailableWithLinkersAxes"],"sources":["../../src/pframe_utils/columns.ts"],"sourcesContent":["import type { PColumn, PColumnSpec, PColumnLazy, PFrameDef } from \"@milaboratories/pl-model-common\";\nimport {\n  getNormalizedAxesList,\n  getAxisId,\n  canonicalizeJson,\n  isLinkerColumn,\n  matchAxisId,\n  isLabelColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxesVault } from \"./axes\";\nimport { enrichCompatible, getAvailableWithLinkersAxes } from \"./axes\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../render\";\nimport { PColumnCollection } from \"../render\";\n\nexport function getAllRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  predicate: (spec: PColumnSpec) => boolean,\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block doesn't produce own columns then use all columns from result pool\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  const allColumns =\n    columns.getColumns(predicate, {\n      dontWaitAllData: true,\n      overrideLabelAnnotation: false,\n    }) ?? [];\n\n  const allAxes: AxesVault = new Map(\n    allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n  return extendedColumns;\n}\n\nexport function getRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  {\n    columns: rootColumns,\n    predicate,\n  }: {\n    columns: PColumn<PColumnDataUniversal>[];\n    predicate: (spec: PColumnSpec) => boolean;\n  },\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(rootColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of rootColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns =\n    columns.getColumns((spec) => predicate(spec) && isLinkerColumn(spec), {\n      dontWaitAllData: true,\n    }) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return blockAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.every((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => isLabelColumn(column.spec));\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, compatible);\n\n  return extendedColumns;\n}\n"],"mappings":"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"}
+{"version":3,"file":"columns.cjs","names":["PColumnCollection","enrichCompatible","getAvailableWithLinkersAxes","ColumnCollectionBuilder","collectCtxColumnSnapshotProviders"],"sources":["../../src/pframe_utils/columns.ts"],"sourcesContent":["import type {\n  PColumn,\n  PColumnSpec,\n  PColumnLazy,\n  PFrameDef,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  getNormalizedAxesList,\n  getAxisId,\n  canonicalizeJson,\n  isLinkerColumn,\n  matchAxisId,\n  isLabelColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxesVault } from \"./axes\";\nimport { enrichCompatible, getAvailableWithLinkersAxes } from \"./axes\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../render\";\nimport { PColumnCollection } from \"../render\";\nimport { ColumnCollectionBuilder } from \"../columns\";\nimport { collectCtxColumnSnapshotProviders } from \"../columns/ctx_column_sources\";\n\nexport function getAllRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  predicate: (spec: PColumnSpec) => boolean,\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block doesn't produce own columns then use all columns from result pool\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  const allColumns =\n    columns.getColumns(predicate, {\n      dontWaitAllData: true,\n      overrideLabelAnnotation: false,\n    }) ?? [];\n\n  const allAxes: AxesVault = new Map(\n    allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n  return extendedColumns;\n}\n\nexport function getRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  {\n    columns: rootColumns,\n    predicate,\n  }: {\n    columns: PColumn<PColumnDataUniversal>[];\n    predicate: (spec: PColumnSpec) => boolean;\n  },\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(rootColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of rootColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns =\n    columns.getColumns((spec) => predicate(spec) && isLinkerColumn(spec), {\n      dontWaitAllData: true,\n    }) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return blockAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.every((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => isLabelColumn(column.spec));\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // Drop result-pool columns that share an axis with the block but cannot join it.\n  const integrableIds = discoverIntegrableColumnIds(ctx, rootColumns);\n  const rootIds = new Set(rootColumns.map((c) => c.id));\n  const connected = compatible.filter(\n    (c) => rootIds.has(c.id) || isLinkerColumn(c.spec) || (integrableIds?.has(c.id) ?? true),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, connected);\n\n  return extendedColumns;\n}\n\n/** Column ids that discovery confirms integrate with the block, or `undefined` when it can't decide. */\nfunction discoverIntegrableColumnIds<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  rootColumns: PColumn<PColumnDataUniversal>[],\n): Set<PObjectId> | undefined {\n  const anchorSpecs = Array.from(\n    new Map(rootColumns.map((c) => [canonicalizeJson(c.spec), c.spec])).values(),\n  );\n  if (anchorSpecs.length === 0) return undefined;\n\n  try {\n    const collection = new ColumnCollectionBuilder()\n      .addSources(collectCtxColumnSnapshotProviders(ctx))\n      .build({\n        allowPartialColumnList: true,\n        anchors: Object.fromEntries(anchorSpecs.map((spec, i) => [`anchor_${i}`, spec])),\n      });\n    try {\n      return new Set(collection.findColumns({ mode: \"enrichment\" }).map((m) => m.column.id));\n    } finally {\n      collection.dispose();\n    }\n  } catch {\n    return undefined;\n  }\n}\n"],"mappings":";;;;;;;;;AAsBA,SAAgB,qBACd,KACA,WAC0F;CAE1F,MAAM,UAAU,IAAIA,0BAAAA,mBAAmB;AACvC,SAAQ,kBAAkB,IAAI,WAAW;CACzC,MAAM,aACJ,QAAQ,WAAW,WAAW;EAC5B,iBAAiB;EACjB,yBAAyB;EAC1B,CAAC,IAAI,EAAE;AAcV,QAFwBC,aAAAA,iBAVG,IAAI,IAC7B,WACG,SAAS,YAAA,GAAA,gCAAA,uBAAiC,OAAO,KAAK,SAAS,CAAC,CAChE,KAAK,aAAa;AAEjB,SAAO,EAAA,GAAA,gCAAA,mBAAA,GAAA,gCAAA,WADkB,SAAS,CACF,EAAE,SAAS;GAC3C,CACL,EAGiD,WAAW;;AAK/D,SAAgB,kBACd,KACA,EACE,SAAS,aACT,aAKwF;CAE1F,MAAM,UAAU,IAAID,0BAAAA,mBAAmB;AACvC,SAAQ,kBAAkB,IAAI,WAAW;AACzC,SAAQ,WAAW,YAAY;CAG/B,MAAM,4BAAuB,IAAI,KAAK;CAEtC,MAAM,0BAAqB,IAAI,KAAK;AACpC,MAAK,MAAM,KAAK,YACd,MAAK,MAAM,SAAA,GAAA,gCAAA,uBAA8B,EAAE,KAAK,SAAS,EAAE;EACzD,MAAM,OAAA,GAAA,gCAAA,WAAgB,KAAK;AAC3B,YAAU,KAAA,GAAA,gCAAA,kBAAqB,IAAI,EAAE,KAAK;AAC1C,UAAQ,KAAA,GAAA,gCAAA,kBAAqB,IAAI,EAAE,KAAK;;CAS5C,MAAM,2BAA2BE,aAAAA,4BAH/B,QAAQ,YAAY,SAAS,UAAU,KAAK,KAAA,GAAA,gCAAA,gBAAmB,KAAK,EAAE,EACpE,iBAAiB,MAClB,CAAC,IAAI,EAAE,EACkE,UAAU;AAGtF,MAAK,MAAM,QAAQ,0BAA0B;AAC3C,YAAU,IAAI,GAAG,KAAK;AACtB,UAAQ,IAAI,GAAG,KAAK;;CAGtB,MAAM,eAAe,MAAM,KAAK,UAAU,QAAQ,CAAC;CAEnD,IAAI,2BACF,QAAQ,YACL,SACC,UAAU,KAAK,IACf,KAAK,SAAS,MAAM,aAAa;EAC/B,MAAM,UAAA,GAAA,gCAAA,WAAmB,SAAS;AAClC,SAAO,aAAa,MAAM,sBAAA,GAAA,gCAAA,cAAA,GAAA,gCAAA,WACF,iBAAiB,EAAE,OAAO,CACjD;GACD,EACJ;EAAE,iBAAiB;EAAM,yBAAyB;EAAO,CAC1D,IAAI,EAAE,EACP,QAAQ,WAAW,EAAA,GAAA,gCAAA,eAAe,OAAO,KAAK,CAAC;AAGjD,MAAK,MAAM,KAAK,wBACd,MAAK,MAAM,SAAA,GAAA,gCAAA,uBAA8B,EAAE,KAAK,SAAS,EAAE;EACzD,MAAM,OAAA,GAAA,gCAAA,WAAgB,KAAK;AAC3B,UAAQ,KAAA,GAAA,gCAAA,kBAAqB,IAAI,EAAE,KAAK;;CAI5C,MAAM,aAAa,MAAM,KAAK,QAAQ,QAAQ,CAAC;AAE/C,4BACE,QAAQ,YACL,SACC,UAAU,KAAK,IACf,KAAK,SAAS,OAAO,aAAa;EAChC,MAAM,UAAA,GAAA,gCAAA,WAAmB,SAAS;AAClC,SAAO,WAAW,MAAM,sBAAA,GAAA,gCAAA,cAAA,GAAA,gCAAA,WACA,iBAAiB,EAAE,OAAO,CACjD;GACD,EACJ;EAAE,iBAAiB;EAAM,yBAAyB;EAAO,CAC1D,IAAI,EAAE,EACP,QAAQ,WAAW,EAAA,GAAA,gCAAA,eAAe,OAAO,KAAK,CAAC;CAGjD,MAAM,oBACJ,QAAQ,YACL,SACC,UAAU,KAAK,IACf,KAAK,SAAS,MAAM,aAAa;EAC/B,MAAM,UAAA,GAAA,gCAAA,WAAmB,SAAS;AAClC,SAAO,WAAW,MAAM,sBAAA,GAAA,gCAAA,cAAA,GAAA,gCAAA,WACA,iBAAiB,EAAE,OAAO,CACjD;GACD,EACJ;EAAE,iBAAiB;EAAM,yBAAyB;EAAO,CAC1D,IAAI,EAAE,EACP,QAAQ,YAAA,GAAA,gCAAA,eAAyB,OAAO,KAAK,CAAC;CAEhD,MAAM,aAAa,CAAC,GAAG,yBAAyB,GAAG,iBAAiB;CAGpE,MAAM,gBAAgB,4BAA4B,KAAK,YAAY;CACnE,MAAM,UAAU,IAAI,IAAI,YAAY,KAAK,MAAM,EAAE,GAAG,CAAC;AAQrD,QAFwBD,aAAAA,iBAAiB,WALvB,WAAW,QAC1B,MAAM,QAAQ,IAAI,EAAE,GAAG,KAAA,GAAA,gCAAA,gBAAmB,EAAE,KAAK,KAAK,eAAe,IAAI,EAAE,GAAG,IAAI,MACpF,CAG6D;;;AAMhE,SAAS,4BACP,KACA,aAC4B;CAC5B,MAAM,cAAc,MAAM,KACxB,IAAI,IAAI,YAAY,KAAK,MAAM,EAAA,GAAA,gCAAA,kBAAkB,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,QAAQ,CAC7E;AACD,KAAI,YAAY,WAAW,EAAG,QAAO,KAAA;AAErC,KAAI;EACF,MAAM,aAAa,IAAIE,kCAAAA,yBAAyB,CAC7C,WAAWC,2BAAAA,kCAAkC,IAAI,CAAC,CAClD,MAAM;GACL,wBAAwB;GACxB,SAAS,OAAO,YAAY,YAAY,KAAK,MAAM,MAAM,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC;GACjF,CAAC;AACJ,MAAI;AACF,UAAO,IAAI,IAAI,WAAW,YAAY,EAAE,MAAM,cAAc,CAAC,CAAC,KAAK,MAAM,EAAE,OAAO,GAAG,CAAC;YAC9E;AACR,cAAW,SAAS;;SAEhB;AACN"}

package/dist/pframe_utils/columns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"columns.d.ts","names":[],"sources":["../../src/pframe_utils/columns.ts"],"mappings":";;;;;iBAcgB,oBAAA,MAAA,CACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,GACtB,SAAA,GAAY,IAAA,EAAM,WAAA,eACjB,SAAA,CAAU,OAAA,CAAQ,oBAAA,IAAwB,WAAA,aAAwB,oBAAA;AAAA,iBAyBrD,iBAAA,MAAA,CACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA;EAEpB,OAAA,EAAS,WAAA;EACT;AAAA;EAEA,OAAA,EAAS,OAAA,CAAQ,oBAAA;EACjB,SAAA,GAAY,IAAA,EAAM,WAAA;AAAA,IAEnB,SAAA,CAAU,OAAA,CAAQ,oBAAA,IAAwB,WAAA,aAAwB,oBAAA"}
+{"version":3,"file":"columns.d.ts","names":[],"sources":["../../src/pframe_utils/columns.ts"],"mappings":";;;;;iBAsBgB,oBAAA,MAAA,CACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,GACtB,SAAA,GAAY,IAAA,EAAM,WAAA,eACjB,SAAA,CAAU,OAAA,CAAQ,oBAAA,IAAwB,WAAA,aAAwB,oBAAA;AAAA,iBAyBrD,iBAAA,MAAA,CACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA;EAEpB,OAAA,EAAS,WAAA;EACT;AAAA;EAEA,OAAA,EAAS,OAAA,CAAQ,oBAAA;EACjB,SAAA,GAAY,IAAA,EAAM,WAAA;AAAA,IAEnB,SAAA,CAAU,OAAA,CAAQ,oBAAA,IAAwB,WAAA,aAAwB,oBAAA"}

package/dist/pframe_utils/columns.js

@@ -1,6 +1,9 @@
 import { PColumnCollection } from "../render/util/column_collection.js";
 import "../render/index.js";
 import { enrichCompatible, getAvailableWithLinkersAxes } from "./axes.js";
+import { ColumnCollectionBuilder } from "../columns/column_collection_builder.js";
+import { collectCtxColumnSnapshotProviders } from "../columns/ctx_column_sources.js";
+import "../columns/index.js";
 import { canonicalizeJson, getAxisId, getNormalizedAxesList, isLabelColumn, isLinkerColumn, matchAxisId } from "@milaboratories/pl-model-common";
 //#region src/pframe_utils/columns.ts
 function getAllRelatedColumns(ctx, predicate) {
@@ -57,7 +60,28 @@ function getRelatedColumns(ctx, { columns: rootColumns, predicate }) {
 		dontWaitAllData: true,
 		overrideLabelAnnotation: false
 	}) ?? []).filter((column) => isLabelColumn(column.spec));
-	return enrichCompatible(blockAxes, [...compatibleWithoutLabels, ...compatibleLabels]);
+	const compatible = [...compatibleWithoutLabels, ...compatibleLabels];
+	const integrableIds = discoverIntegrableColumnIds(ctx, rootColumns);
+	const rootIds = new Set(rootColumns.map((c) => c.id));
+	return enrichCompatible(blockAxes, compatible.filter((c) => rootIds.has(c.id) || isLinkerColumn(c.spec) || (integrableIds?.has(c.id) ?? true)));
+}
+/** Column ids that discovery confirms integrate with the block, or `undefined` when it can't decide. */
+function discoverIntegrableColumnIds(ctx, rootColumns) {
+	const anchorSpecs = Array.from(new Map(rootColumns.map((c) => [canonicalizeJson(c.spec), c.spec])).values());
+	if (anchorSpecs.length === 0) return void 0;
+	try {
+		const collection = new ColumnCollectionBuilder().addSources(collectCtxColumnSnapshotProviders(ctx)).build({
+			allowPartialColumnList: true,
+			anchors: Object.fromEntries(anchorSpecs.map((spec, i) => [`anchor_${i}`, spec]))
+		});
+		try {
+			return new Set(collection.findColumns({ mode: "enrichment" }).map((m) => m.column.id));
+		} finally {
+			collection.dispose();
+		}
+	} catch {
+		return;
+	}
 }
 //#endregion
 export { getAllRelatedColumns, getRelatedColumns };

package/dist/pframe_utils/columns.js.map

@@ -1 +1 @@
-{"version":3,"file":"columns.js","names":[],"sources":["../../src/pframe_utils/columns.ts"],"sourcesContent":["import type { PColumn, PColumnSpec, PColumnLazy, PFrameDef } from \"@milaboratories/pl-model-common\";\nimport {\n  getNormalizedAxesList,\n  getAxisId,\n  canonicalizeJson,\n  isLinkerColumn,\n  matchAxisId,\n  isLabelColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxesVault } from \"./axes\";\nimport { enrichCompatible, getAvailableWithLinkersAxes } from \"./axes\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../render\";\nimport { PColumnCollection } from \"../render\";\n\nexport function getAllRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  predicate: (spec: PColumnSpec) => boolean,\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block doesn't produce own columns then use all columns from result pool\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  const allColumns =\n    columns.getColumns(predicate, {\n      dontWaitAllData: true,\n      overrideLabelAnnotation: false,\n    }) ?? [];\n\n  const allAxes: AxesVault = new Map(\n    allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n  return extendedColumns;\n}\n\nexport function getRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  {\n    columns: rootColumns,\n    predicate,\n  }: {\n    columns: PColumn<PColumnDataUniversal>[];\n    predicate: (spec: PColumnSpec) => boolean;\n  },\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(rootColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of rootColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns =\n    columns.getColumns((spec) => predicate(spec) && isLinkerColumn(spec), {\n      dontWaitAllData: true,\n    }) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return blockAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.every((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => isLabelColumn(column.spec));\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, compatible);\n\n  return extendedColumns;\n}\n"],"mappings":";;;;;AAcA,SAAgB,qBACd,KACA,WAC0F;CAE1F,MAAM,UAAU,IAAI,mBAAmB;AACvC,SAAQ,kBAAkB,IAAI,WAAW;CACzC,MAAM,aACJ,QAAQ,WAAW,WAAW;EAC5B,iBAAiB;EACjB,yBAAyB;EAC1B,CAAC,IAAI,EAAE;AAcV,QAFwB,iBAVG,IAAI,IAC7B,WACG,SAAS,WAAW,sBAAsB,OAAO,KAAK,SAAS,CAAC,CAChE,KAAK,aAAa;AAEjB,SAAO,CAAC,iBADO,UAAU,SAAS,CACF,EAAE,SAAS;GAC3C,CACL,EAGiD,WAAW;;AAK/D,SAAgB,kBACd,KACA,EACE,SAAS,aACT,aAKwF;CAE1F,MAAM,UAAU,IAAI,mBAAmB;AACvC,SAAQ,kBAAkB,IAAI,WAAW;AACzC,SAAQ,WAAW,YAAY;CAG/B,MAAM,4BAAuB,IAAI,KAAK;CAEtC,MAAM,0BAAqB,IAAI,KAAK;AACpC,MAAK,MAAM,KAAK,YACd,MAAK,MAAM,QAAQ,sBAAsB,EAAE,KAAK,SAAS,EAAE;EACzD,MAAM,MAAM,UAAU,KAAK;AAC3B,YAAU,IAAI,iBAAiB,IAAI,EAAE,KAAK;AAC1C,UAAQ,IAAI,iBAAiB,IAAI,EAAE,KAAK;;CAS5C,MAAM,2BAA2B,4BAH/B,QAAQ,YAAY,SAAS,UAAU,KAAK,IAAI,eAAe,KAAK,EAAE,EACpE,iBAAiB,MAClB,CAAC,IAAI,EAAE,EACkE,UAAU;AAGtF,MAAK,MAAM,QAAQ,0BAA0B;AAC3C,YAAU,IAAI,GAAG,KAAK;AACtB,UAAQ,IAAI,GAAG,KAAK;;CAGtB,MAAM,eAAe,MAAM,KAAK,UAAU,QAAQ,CAAC;CAEnD,IAAI,2BACF,QAAQ,YACL,SACC,UAAU,KAAK,IACf,KAAK,SAAS,MAAM,aAAa;EAC/B,MAAM,SAAS,UAAU,SAAS;AAClC,SAAO,aAAa,MAAM,qBACxB,YAAY,UAAU,iBAAiB,EAAE,OAAO,CACjD;GACD,EACJ;EAAE,iBAAiB;EAAM,yBAAyB;EAAO,CAC1D,IAAI,EAAE,EACP,QAAQ,WAAW,CAAC,cAAc,OAAO,KAAK,CAAC;AAGjD,MAAK,MAAM,KAAK,wBACd,MAAK,MAAM,QAAQ,sBAAsB,EAAE,KAAK,SAAS,EAAE;EACzD,MAAM,MAAM,UAAU,KAAK;AAC3B,UAAQ,IAAI,iBAAiB,IAAI,EAAE,KAAK;;CAI5C,MAAM,aAAa,MAAM,KAAK,QAAQ,QAAQ,CAAC;AAE/C,4BACE,QAAQ,YACL,SACC,UAAU,KAAK,IACf,KAAK,SAAS,OAAO,aAAa;EAChC,MAAM,SAAS,UAAU,SAAS;AAClC,SAAO,WAAW,MAAM,qBACtB,YAAY,UAAU,iBAAiB,EAAE,OAAO,CACjD;GACD,EACJ;EAAE,iBAAiB;EAAM,yBAAyB;EAAO,CAC1D,IAAI,EAAE,EACP,QAAQ,WAAW,CAAC,cAAc,OAAO,KAAK,CAAC;CAGjD,MAAM,oBACJ,QAAQ,YACL,SACC,UAAU,KAAK,IACf,KAAK,SAAS,MAAM,aAAa;EAC/B,MAAM,SAAS,UAAU,SAAS;AAClC,SAAO,WAAW,MAAM,qBACtB,YAAY,UAAU,iBAAiB,EAAE,OAAO,CACjD;GACD,EACJ;EAAE,iBAAiB;EAAM,yBAAyB;EAAO,CAC1D,IAAI,EAAE,EACP,QAAQ,WAAW,cAAc,OAAO,KAAK,CAAC;AAOhD,QAFwB,iBAAiB,WAHtB,CAAC,GAAG,yBAAyB,GAAG,iBAAiB,CAGL"}
+{"version":3,"file":"columns.js","names":[],"sources":["../../src/pframe_utils/columns.ts"],"sourcesContent":["import type {\n  PColumn,\n  PColumnSpec,\n  PColumnLazy,\n  PFrameDef,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  getNormalizedAxesList,\n  getAxisId,\n  canonicalizeJson,\n  isLinkerColumn,\n  matchAxisId,\n  isLabelColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxesVault } from \"./axes\";\nimport { enrichCompatible, getAvailableWithLinkersAxes } from \"./axes\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../render\";\nimport { PColumnCollection } from \"../render\";\nimport { ColumnCollectionBuilder } from \"../columns\";\nimport { collectCtxColumnSnapshotProviders } from \"../columns/ctx_column_sources\";\n\nexport function getAllRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  predicate: (spec: PColumnSpec) => boolean,\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block doesn't produce own columns then use all columns from result pool\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  const allColumns =\n    columns.getColumns(predicate, {\n      dontWaitAllData: true,\n      overrideLabelAnnotation: false,\n    }) ?? [];\n\n  const allAxes: AxesVault = new Map(\n    allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n  return extendedColumns;\n}\n\nexport function getRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  {\n    columns: rootColumns,\n    predicate,\n  }: {\n    columns: PColumn<PColumnDataUniversal>[];\n    predicate: (spec: PColumnSpec) => boolean;\n  },\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(rootColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of rootColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns =\n    columns.getColumns((spec) => predicate(spec) && isLinkerColumn(spec), {\n      dontWaitAllData: true,\n    }) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return blockAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.every((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => isLabelColumn(column.spec));\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // Drop result-pool columns that share an axis with the block but cannot join it.\n  const integrableIds = discoverIntegrableColumnIds(ctx, rootColumns);\n  const rootIds = new Set(rootColumns.map((c) => c.id));\n  const connected = compatible.filter(\n    (c) => rootIds.has(c.id) || isLinkerColumn(c.spec) || (integrableIds?.has(c.id) ?? true),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, connected);\n\n  return extendedColumns;\n}\n\n/** Column ids that discovery confirms integrate with the block, or `undefined` when it can't decide. */\nfunction discoverIntegrableColumnIds<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  rootColumns: PColumn<PColumnDataUniversal>[],\n): Set<PObjectId> | undefined {\n  const anchorSpecs = Array.from(\n    new Map(rootColumns.map((c) => [canonicalizeJson(c.spec), c.spec])).values(),\n  );\n  if (anchorSpecs.length === 0) return undefined;\n\n  try {\n    const collection = new ColumnCollectionBuilder()\n      .addSources(collectCtxColumnSnapshotProviders(ctx))\n      .build({\n        allowPartialColumnList: true,\n        anchors: Object.fromEntries(anchorSpecs.map((spec, i) => [`anchor_${i}`, spec])),\n      });\n    try {\n      return new Set(collection.findColumns({ mode: \"enrichment\" }).map((m) => m.column.id));\n    } finally {\n      collection.dispose();\n    }\n  } catch {\n    return undefined;\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.79.3",
+  "version": "1.79.14",
   "description": "Platforma.bio SDK / Block Model",
   "files": [
     "./dist/**/*",
@@ -30,22 +30,22 @@
     "fast-json-patch": "^3.1.1",
     "utility-types": "^3.11.0",
     "zod": "~3.25.76",
-    "@milaboratories/pl-model-common": "1.46.1",
-    "@milaboratories/pl-model-middle-layer": "1.30.5",
-    "@milaboratories/ptabler-expression-js": "1.2.30",
     "@milaboratories/helpers": "1.14.2",
-    "@milaboratories/pl-error-like": "1.12.10"
+    "@milaboratories/pl-error-like": "1.12.10",
+    "@milaboratories/pl-model-common": "1.46.1",
+    "@milaboratories/pl-model-middle-layer": "1.30.6",
+    "@milaboratories/ptabler-expression-js": "1.2.30"
   },
   "devDependencies": {
     "@vitest/coverage-istanbul": "^4.1.3",
     "fast-json-patch": "^3.1.1",
     "typescript": "~5.9.3",
     "vitest": "^4.1.3",
+    "@milaboratories/ts-builder": "1.5.2",
+    "@milaboratories/pf-driver": "1.7.11",
+    "@milaboratories/pf-spec-driver": "1.4.13",
     "@milaboratories/build-configs": "2.0.0",
-    "@milaboratories/pf-driver": "1.7.9",
-    "@milaboratories/ts-builder": "1.5.0",
-    "@milaboratories/ts-configs": "1.2.3",
-    "@milaboratories/pf-spec-driver": "1.4.11"
+    "@milaboratories/ts-configs": "1.2.3"
   },
   "scripts": {
     "build": "ts-builder build --target node",

package/src/pframe_utils/columns.ts

@@ -1,4 +1,10 @@
-import type { PColumn, PColumnSpec, PColumnLazy, PFrameDef } from "@milaboratories/pl-model-common";
+import type {
+  PColumn,
+  PColumnSpec,
+  PColumnLazy,
+  PFrameDef,
+  PObjectId,
+} from "@milaboratories/pl-model-common";
 import {
   getNormalizedAxesList,
   getAxisId,
@@ -11,6 +17,8 @@ import type { AxesVault } from "./axes";
 import { enrichCompatible, getAvailableWithLinkersAxes } from "./axes";
 import type { RenderCtxBase, PColumnDataUniversal } from "../render";
 import { PColumnCollection } from "../render";
+import { ColumnCollectionBuilder } from "../columns";
+import { collectCtxColumnSnapshotProviders } from "../columns/ctx_column_sources";
 
 export function getAllRelatedColumns<A, U>(
   ctx: RenderCtxBase<A, U>,
@@ -137,8 +145,42 @@ export function getRelatedColumns<A, U>(
 
   const compatible = [...compatibleWithoutLabels, ...compatibleLabels];
 
+  // Drop result-pool columns that share an axis with the block but cannot join it.
+  const integrableIds = discoverIntegrableColumnIds(ctx, rootColumns);
+  const rootIds = new Set(rootColumns.map((c) => c.id));
+  const connected = compatible.filter(
+    (c) => rootIds.has(c.id) || isLinkerColumn(c.spec) || (integrableIds?.has(c.id) ?? true),
+  );
+
   // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match
-  const extendedColumns = enrichCompatible(blockAxes, compatible);
+  const extendedColumns = enrichCompatible(blockAxes, connected);
 
   return extendedColumns;
 }
+
+/** Column ids that discovery confirms integrate with the block, or `undefined` when it can't decide. */
+function discoverIntegrableColumnIds<A, U>(
+  ctx: RenderCtxBase<A, U>,
+  rootColumns: PColumn<PColumnDataUniversal>[],
+): Set<PObjectId> | undefined {
+  const anchorSpecs = Array.from(
+    new Map(rootColumns.map((c) => [canonicalizeJson(c.spec), c.spec])).values(),
+  );
+  if (anchorSpecs.length === 0) return undefined;
+
+  try {
+    const collection = new ColumnCollectionBuilder()
+      .addSources(collectCtxColumnSnapshotProviders(ctx))
+      .build({
+        allowPartialColumnList: true,
+        anchors: Object.fromEntries(anchorSpecs.map((spec, i) => [`anchor_${i}`, spec])),
+      });
+    try {
+      return new Set(collection.findColumns({ mode: "enrichment" }).map((m) => m.column.id));
+    } finally {
+      collection.dispose();
+    }
+  } catch {
+    return undefined;
+  }
+}