@platforma-open/milaboratories.repertoire-diversity-2.model 1.1.2 → 1.3.0

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@platforma-open/milaboratories.repertoire-diversity-2.model",
-  "version": "1.1.2",
+  "version": "1.3.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.8",
+    "@milaboratories/graph-maker": "^1.1.114"
   },
   "devDependencies": {
-    "@platforma-sdk/block-tools": "^2.5.36",
+    "@platforma-sdk/block-tools": "^2.5.55",
     "typescript": "~5.5.4",
     "vite": "^6.2.2",
     "tsup": "~8.3.5",

package/src/index.ts

@@ -1,6 +1,6 @@
 import type { GraphMakerState } from '@milaboratories/graph-maker';
-import type { InferOutputsType, PColumnSpec, PlDataTableState, PlRef } from '@platforma-sdk/model';
-import { BlockModel, createPFrameForGraphs, createPlDataTable, isPColumnSpec } from '@platforma-sdk/model';
+import type { InferOutputsType, PColumnIdAndSpec, PlDataTableState, PlRef } from '@platforma-sdk/model';
+import { BlockModel, createPFrameForGraphs, createPlDataTable } from '@platforma-sdk/model';
 
 export type DiversityType = 'chao1' | 'd50' | 'efronThisted' |
   'observed' | 'shannonWienerIndex' | 'shannonWiener' |
@@ -26,10 +26,6 @@ export type UiState = {
   graphState: GraphMakerState;
 };
 
-function isNumericType(c: PColumnSpec): boolean {
-  return c.valueType === 'Double' || c.valueType === 'Int' || c.valueType === 'Float' || c.valueType === 'Long';
-}
-
 export const model = BlockModel.create()
 
   .withArgs<BlockArgs>({
@@ -92,11 +88,19 @@ export const model = BlockModel.create()
   .argsValid((ctx) => ctx.args.abundanceRef !== undefined)
 
   .output('abundanceOptions', (ctx) =>
-    ctx.resultPool.getOptions((c) =>
-      isPColumnSpec(c) && isNumericType(c)
-      && c.annotations?.['pl7.app/isAbundance'] === 'true'
-      && c.annotations?.['pl7.app/abundance/normalized'] === 'false',
-    ))
+    ctx.resultPool.getOptions([{
+      axes: [
+        { name: 'pl7.app/sampleId' },
+        { },
+      ],
+      annotations: {
+        'pl7.app/isAbundance': 'true',
+        'pl7.app/abundance/normalized': 'false',
+        'pl7.app/abundance/isPrimary': 'true',
+      },
+    },
+    ]),
+  )
 
   .output('pt', (ctx) => {
     const pCols = ctx.outputs?.resolve('pf')?.getPColumns();
@@ -116,6 +120,23 @@ export const model = BlockModel.create()
     return createPFrameForGraphs(ctx, pCols);
   })
 
+  // Return a list of Pcols for plot defaults
+  .output('pcols', (ctx) => {
+    const pCols = ctx.outputs?.resolve('pf')?.getPColumns();
+
+    if (pCols === undefined || pCols.length === 0) {
+      return undefined;
+    }
+
+    return pCols.map(
+      (c) =>
+        ({
+          columnId: c.id,
+          spec: c.spec,
+        } satisfies PColumnIdAndSpec),
+    );
+  })
+
   .output('isRunning', (ctx) => ctx.outputs?.getIsReadyOrError() === false)
 
   .title((ctx) => ctx.uiState?.blockTitle ?? 'Repertoire Diversity')