@platforma-open/milaboratories.top-antibodies 4.3.0 → 4.3.1

package/dist/index.js

@@ -14471,14 +14471,14 @@ const CLUSTER_ID_SELECTORS = [...CLUSTER_ID_AXIS_NAMES].map((name) => ({ name: e
 const OWN_PLUMBING_SELECTORS = [{ name: exactMatch("pl7.app/selectionStage") }, { name: exactMatch("pl7.app/lead-selection") }];
 /**
 * Adapt column recipes to `PColumn`s for the helpers that still take
-* materialised `PColumn[]` and have no id form (`createPFrameForGraphs`,
-* `PColumnIdAndSpec`).
+* materialised `PColumn[]` and have no id form (`getRelatedColumns`,
+* `createPFrameForGraphs`, `PColumnIdAndSpec`).
 *
 * Only bare leaves qualify: `PColumn.id` is typed `PObjectId`, which no wrapper
 * recipe carries — hence `isDataColumn` rather than `hasReachableData`, which
-* also admits spec-overrides over a leaf. Deduped by id: the same leaf can be
-* reachable via more than one path and `createPFrameForGraphs` rejects
-* duplicates.
+* also admits spec-overrides over a leaf. Deduped by id: these lists travel as
+* block columns, and a repeated id aborts the collection scan inside
+* `getRelatedColumns`.
 */
 function toGraphColumns(recipes) {
 	return dedupColumns(recipes.filter(isDataColumn).map((c) => ({
@@ -14492,32 +14492,38 @@ function accessorGraphColumns(accessor) {
 	if (!accessor) return void 0;
 	return toGraphColumns(ColumnsCollection([accessor]).getColumns());
 }
+function umapPoolColumns(ctx) {
+	const clonotypeAxisName = getSpecByRef(getInputAnchorRef(ctx.data))?.axesSpec[1]?.name;
+	if (clonotypeAxisName === void 0) return void 0;
+	const umap = ColumnsCollection(["result_pool"]).filter({ include: {
+		name: "^pl7\\.app/umap[12]$",
+		axes: [{ name: exactMatch(clonotypeAxisName) }]
+	} }).getColumns();
+	if (umap.length === 0) return void 0;
+	return toGraphColumns(umap);
+}
 /**
-* UMAP columns from the sequence-space block plus this block's own sampled-rows
-* markers, materialised for `createPFrameForGraphs` / `PColumnIdAndSpec`.
+* Ids of the columns that join the UMAP projection, discovered once per UMAP
+* column and unioned, so a second clonotype-space block keyed on its own axis
+* still contributes.
 *
-* The legacy `{ anchor: "main", idx: 1 }` axis binding has no selector form, so
-* the clonotype axis name is read off the resolved anchor spec and matched by
-* name. Omitting `partialAxesMatch` keeps the old exact-axis-set semantics.
+* Anchors are specs, never ids, so the pool's own copy of a UMAP column cannot
+* collide with one handed in here.
 */
-function umapGraphColumns(ctx) {
-	const anchorSpec = getSpecByRef(getInputAnchorRef(ctx.data));
-	const clonotypeAxisName = anchorSpec?.axesSpec[1]?.name;
-	if (anchorSpec === void 0 || clonotypeAxisName === void 0) return void 0;
-	const umap = ColumnsCollection(["result_pool"]).discover({
-		anchors: { main: anchorSpec },
-		include: {
-			name: "^pl7\\.app/umap[12]$",
-			axes: [{ name: exactMatch(clonotypeAxisName) }]
-		}
-	}).getColumns();
-	if (umap.length === 0) return void 0;
-	const sampledRows = ColumnsCollection([ctx.outputs?.resolve({
+function umapRelatedIds(umap) {
+	return [...new Set(umap.flatMap((c) => ColumnsCollection().discover({
+		mode: "enrichment",
+		maxHops: 4,
+		anchors: { main: c.spec },
+		exclude: [{ annotations: { [Annotation.HideDataFromUi]: exactMatch("true") } }, { annotations: { [Annotation.HideDataFromGraphs]: exactMatch("true") } }]
+	}).getColumnIds()))];
+}
+function sampledRowsGraphColumns(ctx) {
+	return accessorGraphColumns(ctx.outputs?.resolve({
 		field: "sampledRows",
 		assertFieldType: "Input",
 		allowPermanentAbsence: true
-	})].filter((a) => a !== void 0)).getColumns();
-	return toGraphColumns([...umap, ...sampledRows]);
+	}));
 }
 const platforma$1 = BlockModelV3.create({
 	dataModel: blockDataModel,
@@ -14806,13 +14812,14 @@ const platforma$1 = BlockModelV3.create({
 	if (ctx.outputs.getIsReadyOrError() === false) return true;
 	return false;
 }).outputWithStatus("umapPf", (ctx) => {
-	const pCols = umapGraphColumns(ctx);
-	if (pCols === void 0) return void 0;
-	return createPFrameForGraphs(ctx, pCols);
+	const umap = umapPoolColumns(ctx);
+	if (umap === void 0) return void 0;
+	if (umap.some((c) => c.data === void 0)) return void 0;
+	return ctx.createPFrame([...umapRelatedIds(umap), ...umap.map((c) => c.id)]);
 }).outputWithStatus("umapPcols", (ctx) => {
-	const pCols = umapGraphColumns(ctx);
-	if (pCols === void 0) return void 0;
-	return pCols.map((c) => ({
+	const umap = umapPoolColumns(ctx);
+	if (umap === void 0) return void 0;
+	return [...umap, ...sampledRowsGraphColumns(ctx) ?? []].map((c) => ({
 		columnId: c.id,
 		spec: c.spec
 	}));