@platforma-open/milaboratories.vj-usage.model 2.0.0 → 2.1.0

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@platforma-open/milaboratories.vj-usage.model",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Block model",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@platforma-sdk/model": "^1.29.2",
-    "@milaboratories/graph-maker": "^1.1.71"
+    "@platforma-sdk/model": "^1.34.10",
+    "@milaboratories/graph-maker": "^1.1.119"
   },
   "devDependencies": {
-    "@platforma-sdk/block-tools": "^2.5.36",
+    "@platforma-sdk/block-tools": "^2.5.57",
     "typescript": "~5.5.4",
     "vite": "^6.2.2",
     "tsup": "~8.3.5",

package/src/index.ts

@@ -1,11 +1,11 @@
 import type { GraphMakerState } from '@milaboratories/graph-maker';
-import type { InferOutputsType, PlRef, SUniversalPColumnId } from '@platforma-sdk/model';
-import { BlockModel, createPFrameForGraphs, isPColumnSpec } from '@platforma-sdk/model';
+import type { InferOutputsType, PlRef } from '@platforma-sdk/model';
+import { BlockModel, createPFrameForGraphs } from '@platforma-sdk/model';
 
 export type BlockArgs = {
-  vGeneRef?: PlRef;
-  jGeneRef?: SUniversalPColumnId;
-  abundanceRef?: SUniversalPColumnId;
+  datasetRef?: PlRef;
+  scChain?: string;
+  allele?: boolean;
 };
 
 export type UiState = {
@@ -18,71 +18,74 @@ export type UiState = {
 
 export const model = BlockModel.create()
 
-  .withArgs<BlockArgs>({})
+  .withArgs<BlockArgs>({
+    scChain: 'A',
+    allele: false,
+  })
 
   .withUiState<UiState>({
     blockTitle: 'V/J Usage',
     weightedFlag: true,
     vUsagePlotState: {
       title: 'V Usage',
-      template: 'heatmap',
+      template: 'heatmapClustered',
       currentTab: 'settings',
+      layersSettings: {
+        heatmapClustered: {
+          normalizationDirection: null,
+        },
+      },
     },
     jUsagePlotState: {
       title: 'V Usage',
-      template: 'heatmap',
+      template: 'heatmapClustered',
       currentTab: null,
+      layersSettings: {
+        heatmapClustered: {
+          normalizationDirection: null,
+        },
+      },
     },
     vjUsagePlotState: {
       title: 'V/J Usage',
-      template: 'heatmap',
+      template: 'heatmapClustered',
       currentTab: null,
+      layersSettings: {
+        heatmapClustered: {
+          normalizationDirection: null,
+        },
+      },
     },
   })
 
-  .argsValid((ctx) =>
-    ctx.args.vGeneRef !== undefined
-    && ctx.args.jGeneRef !== undefined
-    && ctx.args.abundanceRef !== undefined,
+  .argsValid((ctx) => ctx.args.datasetRef !== undefined)
+
+  .output('datasetOptions', (ctx) =>
+    ctx.resultPool.getOptions([{
+      axes: [
+        { name: 'pl7.app/sampleId' },
+        { name: 'pl7.app/vdj/clonotypeKey' },
+      ],
+      annotations: { 'pl7.app/isAnchor': 'true' },
+    }, {
+      axes: [
+        { name: 'pl7.app/sampleId' },
+        { name: 'pl7.app/vdj/scClonotypeKey' },
+      ],
+      annotations: { 'pl7.app/isAnchor': 'true' },
+    }],
+    {
+      // suppress native label of the column (e.g. "Number of Reads") to show only the dataset label
+      label: { includeNativeLabel: false },
+    }),
   )
 
-  .output('vGeneOptions', (ctx) =>
-    ctx.resultPool.getOptions((c) =>
-      isPColumnSpec(c) && c.valueType === 'String'
-      && (c.name === 'pl7.app/vdj/geneHit' || c.name === 'pl7.app/vdj/geneHitWithAllele')
-      && c.domain?.['pl7.app/vdj/reference'] === 'VGene',
-    ))
-
-  .output('jGeneOptions', (ctx) => {
-    const inputRef = ctx.args.vGeneRef;
-    if (inputRef === undefined) return undefined;
-    const vGeneSpec = ctx.resultPool.getPColumnSpecByRef(inputRef);
-    if (vGeneSpec === undefined) return undefined;
-    return ctx.resultPool.getCanonicalOptions({ main: inputRef }, [
-      {
-        axes: [{ anchor: 'main', idx: 0 }],
-        name: vGeneSpec.name,
-        domain: {
-          'pl7.app/vdj/reference': 'JGene',
-          'pl7.app/vdj/scClonotypeChain': { anchor: 'main' },
-          'pl7.app/vdj/scClonotypeChain/index': { anchor: 'main' },
-        },
-      },
-    ], { ignoreMissingDomains: true });
-  })
+  .output('datasetSpec', (ctx) => {
+    if (ctx.args.datasetRef === undefined) {
+      return undefined;
+    }
 
-  .output('abundanceOptions', (ctx) => {
-    const inputRef = ctx.args.vGeneRef;
-    if (inputRef === undefined) return undefined;
-    return ctx.resultPool.getCanonicalOptions({ main: inputRef },
-      {
-        axes: [{/* sampleId */}, { anchor: 'main', idx: 0 }],
-        annotations: {
-          'pl7.app/isAbundance': 'true',
-          'pl7.app/abundance/normalized': 'false',
-        },
-      },
-    );
+    return ctx.resultPool.getPColumnSpecByRef(ctx.args.datasetRef);
   })
 
   .output('pf', (ctx) => {