@platforma-open/milaboratories.top-antibodies 4.4.2 → 4.5.0

package/dist/index.js

@@ -13791,6 +13791,13 @@ function anchorInitializedId(ref) {
 	const id = createGlobalPObjectId(ref.blockId, ref.name);
 	return isGlobalPObjectId(id) ? id : void 0;
 }
+/** The input a run, a config or a list is for: the anchor plus its dataset filter, as canonical
+*  column ids (undefined = no anchor). A different filter is a different input, as a different
+*  anchor is. Outputs carry it so the UI can tell those computed for a previous input. */
+function inputKeyOf(anchor, filter) {
+	if (!anchor) return void 0;
+	return `${anchorInitializedId(anchor) ?? ""}|${filter ? anchorInitializedId(filter) ?? "" : ""}`;
+}
 /**
 * Reads a stored defaults-init slot in either shape it has had: the
 * `{ anchor, preset }` object, or the older `JSON.stringify(anchor) + "::" +
@@ -13895,12 +13902,43 @@ function isProducedByLeadSelection(spec) {
 	const trace = readAnnotationJson(spec, Annotation.Trace);
 	return Array.isArray(trace) && trace.length > 0 && trace[trace.length - 1]?.type === LEAD_SELECTION_TRACE_TYPE;
 }
-/** Repertoire-labeling emits one such column per label. `PColumnName` has no entry for it. */
-const LABELING_TAG_COLUMN_NAME = "pl7.app/tag";
-/** `pl7.app/isSubset` marks both a dataset restriction and a presence-only column. A labeling
-*  tag is only the second, so the dataset picker must not offer it. */
-function isDatasetScopingSubset(spec) {
-	return isPColumnSpec(spec) && spec.name !== LABELING_TAG_COLUMN_NAME;
+/** The earlier name of {@link SUBSET_DOMAIN}, still carried by columns from runs made before
+*  the rename. */
+const LEGACY_SUBSET_DOMAIN = "pl7.app/subset";
+/** The subset a column or axis was computed on, read from its domain under either name
+*  (undefined = full data). */
+function inputSubsetOf(domain) {
+	return domain?.["pl7.app/inputSubset"] ?? domain?.[LEGACY_SUBSET_DOMAIN];
+}
+/**
+* The columns this block may pick as automatic defaults when it runs on `subsetId` (undefined =
+* the full dataset). Manual picks are not restricted; only the defaults follow the rule:
+*
+* - A column computed on a different subset is never a default: outside that subset it has no
+*   values, so defaulting to it would silently rank or filter out everything else.
+* - A full-data run takes only full-data columns.
+* - A subset run prefers the column computed on its own subset, and falls back to the full-data
+*   version of the same column.
+*/
+function defaultsForSubset(columns, subsetId) {
+	const subsetOf = (c) => inputSubsetOf(c.getSpec().domain);
+	const allowed = columns.filter((c) => {
+		const subset = subsetOf(c);
+		return subset === void 0 || subset === subsetId;
+	});
+	if (subsetId === void 0) return allowed;
+	const sansSubset = (c) => {
+		const spec = c.getSpec();
+		const domain = Object.entries(spec.domain ?? {}).filter(([key]) => key !== "pl7.app/inputSubset" && key !== LEGACY_SUBSET_DOMAIN).sort(([a], [b]) => a.localeCompare(b));
+		return spec.name + JSON.stringify(domain);
+	};
+	const subsetVersions = new Set(allowed.filter((c) => subsetOf(c) === subsetId).map(sansSubset));
+	return allowed.filter((c) => subsetOf(c) !== void 0 || !subsetVersions.has(sansSubset(c)));
+}
+/** Which clusterings may be the automatic diversification default on `subsetId`: those on the
+* run's own subset if any, otherwise the full-data ones. */
+function defaultClusteringSubset(available, subsetId) {
+	return subsetId !== void 0 && available.includes(subsetId) ? subsetId : void 0;
 }
 /**
 * True when a column carries no readable value. Presence is the whole signal.
@@ -14033,7 +14071,7 @@ const IN_VITRO_RANKING_SPEC_NAMES = /* @__PURE__ */ new Set([
 * Relies on the ambient render ctx (set during output evaluation) for
 * `Column` / `ColumnsCollection` resolution — no `ctx` argument needed.
 */
-function buildCollection(inputAnchor) {
+function buildCollection(inputAnchor, inputFilter) {
 	if (!inputAnchor) return void 0;
 	const anchorSpec = getSpecByRef(inputAnchor);
 	if (!anchorSpec) return void 0;
@@ -14048,7 +14086,8 @@ function buildCollection(inputAnchor) {
 		const spec = c.getSpec();
 		return spec.annotations?.[Annotation.IsScore] === "true" && isOnAnchorAxes(spec, anchorSpec);
 	});
-	const defaultFilters = computeDefaultFilters(scores, inputAnchor);
+	const defaultCandidates = defaultsForSubset(scores, inputFilter && anchorInitializedId(inputFilter));
+	const defaultFilters = computeDefaultFilters(defaultCandidates, inputAnchor);
 	return {
 		collection,
 		anchorSpec,
@@ -14057,7 +14096,7 @@ function buildCollection(inputAnchor) {
 			allMatches,
 			scores,
 			defaultFilters,
-			...computePresets(scores, defaultFilters, inputAnchor, anchorSpec)
+			...computePresets(defaultCandidates, defaultFilters, inputAnchor, anchorSpec)
 		}
 	};
 }
@@ -14719,7 +14758,7 @@ const platforma$1 = BlockModelV3.create({
 			const rowAxis = spec.axesSpec[1]?.name;
 			return rowAxis === "pl7.app/vdj/clonotypeKey" || rowAxis === "pl7.app/vdj/scClonotypeKey" || rowAxis === "pl7.app/variantKey";
 		},
-		filter: isDatasetScopingSubset
+		filter: isPColumnSpec
 	});
 	if (!opts) return opts;
 	const selfBlockId = ctx.outputs?.resolve({
@@ -14753,13 +14792,12 @@ const platforma$1 = BlockModelV3.create({
 	return isPeptideOrAmplicon(spec) ? "peptide" : "antibody_tcr";
 }, { retentive: true }).output("filterConfig", (ctx) => {
 	const inputAnchor = getInputAnchorRef(ctx.data);
-	const result = buildCollection(inputAnchor);
+	const inputFilter = getInputFilterRef(ctx.data);
+	const result = buildCollection(inputAnchor, inputFilter);
 	if (!result) return void 0;
-	const filterableMatches = dedupByLeafId(result.collection.discover({
-		anchors: { main: result.anchorSpec },
-		...ANCHORED_DISCOVERY,
-		exclude: discoveryExcludeSelectors(result.sampleAxisName)
-	}).getColumns()).filter(isSelectableMatch);
+	const datasetFilterId = inputFilter && anchorInitializedId(inputFilter);
+	const isDatasetFilter = (c) => datasetFilterId !== void 0 && extractPObjectId(c.id) === datasetFilterId;
+	const filterableMatches = result.meta.allMatches.filter((c) => !isDatasetFilter(c));
 	const labels = deriveDistinctLabels(filterableMatches.map((c) => c.getSpec()), { includeNativeLabel: true });
 	return {
 		options: filterableMatches.map((c, i) => {
@@ -14774,6 +14812,7 @@ const platforma$1 = BlockModelV3.create({
 				presenceOnly: isPresenceOnlyColumn(spec, result.anchorSpec)
 			};
 		}),
+		inputKey: inputKeyOf(inputAnchor, inputFilter),
 		defaults: result.meta.defaultFilters,
 		inVivoDefaults: result.meta.inVivoDefaults.filters,
 		inVitroDefaults: result.meta.inVitroDefaults.filters,
@@ -14781,34 +14820,24 @@ const platforma$1 = BlockModelV3.create({
 	};
 }).output("rankingConfig", (ctx) => {
 	const inputAnchor = getInputAnchorRef(ctx.data);
-	const result = buildCollection(inputAnchor);
+	const inputFilter = getInputFilterRef(ctx.data);
+	const result = buildCollection(inputAnchor, inputFilter);
 	if (!result) return void 0;
 	const rankedColumnIds = new Set(ctx.data.rankingOrder.flatMap((r) => r.value ? [r.value.column] : []));
-	const rankableMatches = dedupByLeafId(result.collection.discover({
-		anchors: { main: result.anchorSpec },
-		...ANCHORED_DISCOVERY,
-		exclude: [...discoveryExcludeSelectors(result.sampleAxisName), { type: "String" }]
-	}).getColumns()).filter((c) => isRankableMatch(c, result.anchorSpec, rankedColumnIds));
+	const rankableMatches = result.meta.allMatches.filter((c) => c.getSpec().valueType !== "String").filter((c) => isRankableMatch(c, result.anchorSpec, rankedColumnIds));
 	const labels = deriveDistinctLabels(rankableMatches.map((c) => c.getSpec()), { includeNativeLabel: true });
 	return {
 		options: rankableMatches.map((c, i) => ({
 			label: labels[i],
 			value: matchToColumnId(c, inputAnchor)
 		})),
+		inputKey: inputKeyOf(inputAnchor, inputFilter),
 		defaults: result.meta.defaultRankingOrder,
 		inVivoDefaults: result.meta.inVivoDefaults.rankingOrder,
 		inVitroDefaults: result.meta.inVitroDefaults.rankingOrder,
 		inPeptideDefaults: result.meta.inPeptideDefaults.rankingOrder
 	};
-}).output("presetConfig", (ctx) => {
-	const result = buildCollection(getInputAnchorRef(ctx.data));
-	if (!result) return void 0;
-	return {
-		detectedPreset: result.meta.detectedPreset,
-		hasRepertoireScore: result.meta.hasRepertoireScore,
-		hasEnrichmentScores: result.meta.hasEnrichmentScores
-	};
-}, { retentive: true }).outputWithStatus("pf", (ctx) => {
+}).outputWithStatus("pf", (ctx) => {
 	const anchor = getInputAnchorRef(ctx.data);
 	if (!anchor) return void 0;
 	const result = buildCollection(anchor);
@@ -14992,10 +15021,6 @@ const platforma$1 = BlockModelV3.create({
 		columnId: c.id,
 		spec: c.spec
 	}));
-}).output("hasClusterData", (ctx) => {
-	const result = buildCollection(getInputAnchorRef(ctx.data));
-	if (!result) return false;
-	return result.meta.allMatches.some((m) => m.getSpec().axesSpec.some((a) => isClusterIdAxisName(a.name)));
 }).output("clusterColumnOptions", (ctx) => {
 	const anchor = getInputAnchorRef(ctx.data);
 	if (anchor === void 0) return void 0;
@@ -15003,6 +15028,9 @@ const platforma$1 = BlockModelV3.create({
 	if (anchorSpec === void 0) return void 0;
 	const datasetClusteringId = anchorSpec.axesSpec[1]?.domain?.["pl7.app/peptide/extractionRunId"] ?? anchorSpec.axesSpec[1]?.domain?.["pl7.app/repertoire/extractionRunId"];
 	const options = [];
+	const inputFilter = getInputFilterRef(ctx.data);
+	const subsetId = inputFilter && anchorInitializedId(inputFilter);
+	const optionSubsets = [];
 	for (const idx of [0, 1]) {
 		let axesToMatch;
 		if (idx === 0) axesToMatch = [{}, anchorSpec.axesSpec[1]];
@@ -15022,12 +15050,23 @@ const platforma$1 = BlockModelV3.create({
 				const clusteringElement = JSON.parse(linkerSpec.annotations?.[Annotation.Trace] ?? "[]").find((t) => CLUSTERING_TRACE_TYPES.includes(t.type ?? ""));
 				if (clusteringElement?.label) label = clusteringElement.label;
 			} catch {}
+			const clusterSubset = inputSubsetOf(clusterAxis.domain);
+			if (clusterSubset !== void 0) {
+				const subsetRef = parseJsonSafely(clusterSubset);
+				const subsetLabel = isPlRef(subsetRef) ? getSpecByRef(subsetRef)?.annotations?.[Annotation.Label] : void 0;
+				if (subsetLabel) label = `${label} / ${subsetLabel}`;
+			}
 			options.push({
 				label,
-				ref: link.ref
+				ref: link.ref,
+				isDefault: false,
+				forInput: inputKeyOf(anchor, inputFilter)
 			});
+			optionSubsets.push(clusterSubset);
 		}
 	}
+	const defaultSubset = defaultClusteringSubset(optionSubsets, subsetId);
+	options.forEach((o, i) => o.isDefault = optionSubsets[i] === defaultSubset);
 	return options.length > 0 ? options : void 0;
 }).output("kabatWarning", (ctx) => {
 	if (!ctx.data.kabatNumbering) return void 0;
@@ -15049,11 +15088,11 @@ const platforma$1 = BlockModelV3.create({
 			href: "/",
 			label: titles.main
 		},
-		{
+		...umapPoolColumns(ctx) !== void 0 ? [{
 			type: "link",
 			href: "/umap",
 			label: spaceLabel
-		},
+		}] : [],
 		{
 			type: "link",
 			href: "/selection",