@platforma-open/milaboratories.sequence-properties.model 1.2.1 → 1.2.2

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/work/sequence-properties/sequence-properties/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-open/milaboratories.sequence-properties.model@1.2.1 build /home/runner/work/sequence-properties/sequence-properties/model
+> @platforma-open/milaboratories.sequence-properties.model@1.2.2 build /home/runner/work/sequence-properties/sequence-properties/model
 > ts-builder build --target block-model && block-tools build-model
 
 Building block-model project...
@@ -11,18 +11,18 @@ Building block-model project...
 [log] <DIR>/types.d.ts.map      asset │ size:  0.39 kB
 [log] <DIR>/dataModel.js.map    asset │ size:  1.54 kB
 [log] <DIR>/index.d.ts.map      asset │ size:  2.00 kB
-[log] <DIR>/index.js.map        asset │ size: 11.83 kB
+[log] <DIR>/index.js.map        asset │ size: 11.98 kB
 [log] <DIR>/dataModel.d.ts      chunk │ size:  0.29 kB
 [log] <DIR>/dataModel.js        chunk │ size:  0.84 kB
 [log] <DIR>/types.d.ts          chunk │ size:  0.89 kB
-[log] <DIR>/index.js            chunk │ size:  4.46 kB
+[log] <DIR>/index.js            chunk │ size:  4.55 kB
 [log] <DIR>/index.d.ts          chunk │ size: 58.05 kB
 [log] <DIR>/dataModel.cjs.map  asset │ size:  1.58 kB
-[log] <DIR>/index.cjs.map      asset │ size: 11.96 kB
+[log] <DIR>/index.cjs.map      asset │ size: 12.12 kB
 [log] <DIR>/dataModel.cjs      chunk │ size:  0.88 kB
-[log] <DIR>/index.cjs          chunk │ size:  4.72 kB
-[log] <DIR>/bundle.js.map  asset │ size: 696.37 kB
-[log] <DIR>/bundle.js      chunk │ size: 351.91 kB
+[log] <DIR>/index.cjs          chunk │ size:  4.81 kB
+[log] <DIR>/bundle.js.map  asset │ size: 711.70 kB
+[log] <DIR>/bundle.js      chunk │ size: 360.85 kB
 [log]
-[success] rolldown v1.0.0-rc.16 Finished in 7.06 s
+[success] rolldown v1.0.0-rc.16 Finished in 4.81 s
 Build completed successfully

package/.turbo/turbo-check.log

@@ -1,21 +1,21 @@
  WARN  Issue while reading "/home/runner/work/sequence-properties/sequence-properties/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-open/milaboratories.sequence-properties.model@1.2.1 check /home/runner/work/sequence-properties/sequence-properties/model
+> @platforma-open/milaboratories.sequence-properties.model@1.2.2 check /home/runner/work/sequence-properties/sequence-properties/model
 > ts-builder check --target block-model
 
 ↳ tsc --noEmit --project ./tsconfig.json --customConditions ,
 Linting project...
 ↳ oxlint --config /home/runner/work/sequence-properties/sequence-properties/model/.oxlintrc.json --deny-warnings
 Found 0 warnings and 0 errors.
-Finished in 13ms on 3 files with 90 rules using 2 threads.
+Finished in 12ms on 3 files with 90 rules using 2 threads.
 Linting completed successfully
 Checking formatting...
 ↳ oxfmt --check --config /home/runner/work/sequence-properties/sequence-properties/model/.oxfmtrc.json
-(node:2570) ExperimentalWarning: glob is an experimental feature and might change at any time
+(node:2578) ExperimentalWarning: glob is an experimental feature and might change at any time
 (Use `node --trace-warnings ...` to show where the warning was created)
 Checking formatting...
 
 All matched files use the correct format.
-Finished in 458ms on 7 files using 2 threads.
+Finished in 369ms on 7 files using 2 threads.
 Format check completed successfully
 All checks passed!

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @platforma-open/MiLaboratories.sequence-properties.model
 
+## 1.2.2
+
+### Patch Changes
+
+- 73b4e4d: Enable linker usage to show plot options
+
 ## 1.2.1
 
 ### Patch Changes

package/dist/bundle.js

@@ -4973,6 +4973,9 @@
 			Sequence: "pl7.app/vdj/sequence"
 		}
 	};
+	function isLabelColumn(column) {
+		return column.axesSpec.length === 1 && column.name === PColumnName.Label;
+	}
 	/** Get column id and spec from a column */
 	function getColumnIdAndSpec(column) {
 		return {
@@ -8170,6 +8173,198 @@
 		}
 	};
 	//#endregion
+	//#region ../node_modules/.pnpm/@platforma-sdk+model@1.75.5/node_modules/@platforma-sdk/model/dist/pframe_utils/axes.js
+	/** Create id for column copy with added keys in axes domains */
+	const colId = (id, domains, contextDomains) => {
+		let wid = id.toString();
+		domains?.forEach((domain) => {
+			if (domain) for (const [k, v] of Object.entries(domain)) {
+				wid += k;
+				wid += v;
+			}
+		});
+		contextDomains?.forEach((contextDomain) => {
+			if (contextDomain) for (const [k, v] of Object.entries(contextDomain)) {
+				wid += k;
+				wid += v;
+			}
+		});
+		return wid;
+	};
+	/** All combinations with 1 key from each list */
+	function getKeysCombinations(idsLists) {
+		if (!idsLists.length) return [];
+		let result = [[]];
+		idsLists.forEach((list) => {
+			const nextResult = [];
+			list.forEach((key) => {
+				nextResult.push(...result.map((resultItem) => [...resultItem, key]));
+			});
+			result = nextResult;
+		});
+		return result;
+	}
+	function getAvailableWithLinkersAxes(linkerColumns, blockAxes) {
+		const availableAxes = LinkerMap.fromColumns(linkerColumns.map(getColumnIdAndSpec)).getReachableByLinkersAxesFromAxesNormalized([...blockAxes.values()], (linkerKeyId, sourceAxisId) => matchAxisId(sourceAxisId, linkerKeyId));
+		return new Map(availableAxes.map((axisSpec) => {
+			return [canonicalizeJson(getAxisId(axisSpec)), axisSpec];
+		}));
+	}
+	/** Add columns with fully compatible axes created from partial compatible ones */
+	function enrichCompatible(blockAxes, columns) {
+		return columns.flatMap((column) => getAdditionalColumnsForColumn(blockAxes, column));
+	}
+	function getAdditionalColumnsForColumn(blockAxes, column) {
+		const columnAxesIds = column.spec.axesSpec.map(getAxisId);
+		if (columnAxesIds.every((id) => blockAxes.has(canonicalizeJson(id)))) return [column];
+		const secondaryIdsVariants = getKeysCombinations(columnAxesIds.map((id) => {
+			const result = [];
+			for (const [_, mainId] of blockAxes) if (matchAxisId(mainId, id) && !matchAxisId(id, mainId)) result.push(mainId);
+			return result;
+		}));
+		const allAddedDomainValues = /* @__PURE__ */ new Set();
+		const addedNotToAllVariantsDomainValues = /* @__PURE__ */ new Set();
+		const addedByVariantsDomainValues = secondaryIdsVariants.map((idsList) => {
+			const addedSet = /* @__PURE__ */ new Set();
+			idsList.map((axisId, idx) => {
+				const d1 = column.spec.axesSpec[idx].domain;
+				const d2 = axisId.domain;
+				Object.entries(d2 ?? {}).forEach(([key, value]) => {
+					if (d1?.[key] === void 0) {
+						const item = JSON.stringify([key, value]);
+						addedSet.add(item);
+						allAddedDomainValues.add(item);
+					}
+				});
+				const cd1 = column.spec.axesSpec[idx].contextDomain;
+				const cd2 = axisId.contextDomain;
+				Object.entries(cd2 ?? {}).forEach(([key, value]) => {
+					if (cd1?.[key] === void 0) {
+						const item = JSON.stringify(["ctx:" + key, value]);
+						addedSet.add(item);
+						allAddedDomainValues.add(item);
+					}
+				});
+				return {
+					...axisId,
+					annotations: column.spec.axesSpec[idx].annotations
+				};
+			});
+			return addedSet;
+		});
+		[...allAddedDomainValues].forEach((addedPart) => {
+			if (addedByVariantsDomainValues.some((s) => !s.has(addedPart))) addedNotToAllVariantsDomainValues.add(addedPart);
+		});
+		return [column, ...secondaryIdsVariants.map((idsList, idx) => {
+			const id = colId(column.id, idsList.map((id) => id.domain), idsList.map((id) => id.contextDomain));
+			const label = readAnnotation(column.spec, Annotation.Label) ?? "";
+			const labelDomainPart = [...addedByVariantsDomainValues[idx]].filter((str) => addedNotToAllVariantsDomainValues.has(str)).sort().map((v) => JSON.parse(v)?.[1]).join(" / ");
+			const annotations = {
+				...column.spec.annotations,
+				[Annotation.Graph.IsVirtual]: stringifyJson(true)
+			};
+			if (label || labelDomainPart) annotations[Annotation.Label] = label && labelDomainPart ? label + " / " + labelDomainPart : label + labelDomainPart;
+			return {
+				...column,
+				id,
+				spec: {
+					...column.spec,
+					axesSpec: idsList.map((axisId, idx) => ({
+						...axisId,
+						annotations: column.spec.axesSpec[idx].annotations
+					})),
+					annotations
+				}
+			};
+		})];
+	}
+	//#endregion
+	//#region ../node_modules/.pnpm/@platforma-sdk+model@1.75.5/node_modules/@platforma-sdk/model/dist/pframe_utils/columns.js
+	function getAllRelatedColumns(ctx, predicate) {
+		const columns = new PColumnCollection();
+		columns.addColumnProvider(ctx.resultPool);
+		const allColumns = columns.getColumns(predicate, {
+			dontWaitAllData: true,
+			overrideLabelAnnotation: false
+		}) ?? [];
+		return enrichCompatible(new Map(allColumns.flatMap((column) => getNormalizedAxesList(column.spec.axesSpec)).map((axisSpec) => {
+			return [canonicalizeJson(getAxisId(axisSpec)), axisSpec];
+		})), allColumns);
+	}
+	function getRelatedColumns(ctx, { columns: rootColumns, predicate }) {
+		const columns = new PColumnCollection();
+		columns.addColumnProvider(ctx.resultPool);
+		columns.addColumns(rootColumns);
+		const blockAxes = /* @__PURE__ */ new Map();
+		const allAxes = /* @__PURE__ */ new Map();
+		for (const c of rootColumns) for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {
+			const aid = getAxisId(spec);
+			blockAxes.set(canonicalizeJson(aid), spec);
+			allAxes.set(canonicalizeJson(aid), spec);
+		}
+		const availableWithLinkersAxes = getAvailableWithLinkersAxes(columns.getColumns((spec) => predicate(spec) && isLinkerColumn(spec), { dontWaitAllData: true }) ?? [], blockAxes);
+		for (const item of availableWithLinkersAxes) {
+			blockAxes.set(...item);
+			allAxes.set(...item);
+		}
+		const blockAxesArr = Array.from(blockAxes.values());
+		let compatibleWithoutLabels = (columns.getColumns((spec) => predicate(spec) && spec.axesSpec.some((axisSpec) => {
+			const axisId = getAxisId(axisSpec);
+			return blockAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));
+		}), {
+			dontWaitAllData: true,
+			overrideLabelAnnotation: false
+		}) ?? []).filter((column) => !isLabelColumn(column.spec));
+		for (const c of compatibleWithoutLabels) for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {
+			const aid = getAxisId(spec);
+			allAxes.set(canonicalizeJson(aid), spec);
+		}
+		const allAxesArr = Array.from(allAxes.values());
+		compatibleWithoutLabels = (columns.getColumns((spec) => predicate(spec) && spec.axesSpec.every((axisSpec) => {
+			const axisId = getAxisId(axisSpec);
+			return allAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));
+		}), {
+			dontWaitAllData: true,
+			overrideLabelAnnotation: false
+		}) ?? []).filter((column) => !isLabelColumn(column.spec));
+		const compatibleLabels = (columns.getColumns((spec) => predicate(spec) && spec.axesSpec.some((axisSpec) => {
+			const axisId = getAxisId(axisSpec);
+			return allAxesArr.some((selectorAxisSpec) => matchAxisId(getAxisId(selectorAxisSpec), axisId));
+		}), {
+			dontWaitAllData: true,
+			overrideLabelAnnotation: false
+		}) ?? []).filter((column) => isLabelColumn(column.spec));
+		return enrichCompatible(blockAxes, [...compatibleWithoutLabels, ...compatibleLabels]);
+	}
+	//#endregion
+	//#region ../node_modules/.pnpm/@platforma-sdk+model@1.75.5/node_modules/@platforma-sdk/model/dist/components/PFrameForGraphs.js
+	function isHiddenFromGraphColumn(column) {
+		return !!readAnnotationJson(column, Annotation.HideDataFromGraphs);
+	}
+	function isHiddenFromUIColumn(column) {
+		return !!readAnnotationJson(column, Annotation.HideDataFromUi);
+	}
+	/**
+	The aim of createPFrameForGraphs: to create pframe with block’s columns and all compatible columns from result pool
+	(including linker columns and all label columns).
+	Block’s columns are added to pframe as is.
+	Other columns are added basing on set of axes of block’s columns, considering available with linker columns.
+	Compatible columns must have at least one axis from block’s axes set. This axis of the compatible column from
+	result pool must satisfy matchAxisId (it can have less domain keys than in block’s axis, but without conflicting values
+	among existing ones).
+	In requests to pframe (calculateTableData) columns must have strictly the same axes. For compatibility in case
+	of partially matched axis we add to pframe a copy of this column with modified axis (with filled missed domains)
+	and modified label (with added domain values in case if more than one copy with different domains exist).
+	*/
+	function createPFrameForGraphs(ctx, blockColumns) {
+		const suitableSpec = (spec) => !isHiddenFromUIColumn(spec) && !isHiddenFromGraphColumn(spec);
+		if (!blockColumns) return ctx.createPFrame(getAllRelatedColumns(ctx, suitableSpec));
+		return ctx.createPFrame(getRelatedColumns(ctx, {
+			columns: blockColumns,
+			predicate: suitableSpec
+		}));
+	}
+	//#endregion
 	//#region ../node_modules/.pnpm/@platforma-sdk+model@1.75.5/node_modules/@platforma-sdk/model/dist/columns/column_selector.js
 	function normalizeStringMatchers(input) {
 		if (typeof input === "string") return [{
@@ -10186,7 +10381,7 @@
 				},
 				visibility: "default"
 			}, {
-				match: (spec) => !spec.annotations?.[Annotation.Trace]?.includes("milaboratories.sequence-properties") && spec.annotations?.["pl7.app/isLinkerColumn"] !== "true",
+				match: (spec) => !spec.annotations?.[Annotation.Trace]?.includes("milaboratories.sequence-properties") && spec.annotations?.["pl7.app/isLinkerColumn"] !== "true" && spec.annotations?.["pl7.app/isOutput"] !== "true",
 				visibility: "optional"
 			}] }
 		});
@@ -10202,7 +10397,7 @@
 			anchor: "main",
 			idx: 1
 		}] }]) ?? []).filter((c) => !c.spec.annotations?.[Annotation.Trace]?.includes("milaboratories.sequence-properties")) : [];
-		return ctx.createPFrame([...pCols, ...upstreamMeta]);
+		return createPFrameForGraphs(ctx, [...pCols, ...upstreamMeta]);
 	}).output("propertiesPfCols", (ctx) => {
 		const pCols = ctx.outputs?.resolve("propertiesPf")?.getPColumns();
 		if (pCols === void 0) return void 0;