@platforma-open/milaboratories.repertoire-diversity-2.model 1.5.4 → 1.5.6

package/package.json

@@ -1,39 +1,39 @@
 {
   "name": "@platforma-open/milaboratories.repertoire-diversity-2.model",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "Block model",
   "type": "module",
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts",
+      "sources": "./src/index.ts"
+    },
+    "./dist/model.json": "./dist/model.json"
+  },
   "dependencies": {
-    "@platforma-sdk/model": "^1.45.0",
-    "@milaboratories/graph-maker": "^1.1.175"
+    "@platforma-sdk/model": "1.51.2",
+    "@milaboratories/graph-maker": "1.1.202"
   },
   "devDependencies": {
-    "@platforma-sdk/block-tools": "^2.6.25",
-    "typescript": "~5.5.4",
-    "vite": "^6.2.2",
-    "tsup": "~8.3.5",
-    "@platforma-sdk/eslint-config": "^1.1.0"
-  },
-  "tsup": {
-    "entry": [
-      "src/index.ts"
-    ],
-    "splitting": false,
-    "treeshake": true,
-    "clean": true,
-    "format": [
-      "cjs",
-      "esm"
-    ],
-    "dts": true,
-    "minify": false,
-    "sourcemap": true
+    "@milaboratories/ts-builder": "1.2.1",
+    "@milaboratories/ts-configs": "1.2.0",
+    "@platforma-sdk/block-tools": "2.6.29",
+    "@platforma-sdk/eslint-config": "1.2.0",
+    "@platforma-sdk/test": "1.51.3",
+    "typescript": "~5.6.3",
+    "vitest": "^4.0.7",
+    "eslint": "^9.25.1"
   },
   "scripts": {
-    "build": "tsup && vite build && block-tools build-model",
-    "lint": "eslint ."
+    "build": "ts-builder build --target block-model && block-tools build-model",
+    "watch": "ts-builder build --target block-model --watch",
+    "type-check": "ts-builder types --target block-model",
+    "lint": "eslint .",
+    "test": "vitest"
   }
 }

package/src/index.ts

@@ -1,5 +1,5 @@
 import type { GraphMakerState } from '@milaboratories/graph-maker';
-import type { InferOutputsType, PColumnIdAndSpec, PlDataTableStateV2, PlRef } from '@platforma-sdk/model';
+import type { PColumnIdAndSpec, PlDataTableStateV2, PlRef } from '@platforma-sdk/model';
 import { BlockModel, createPFrameForGraphs, createPlDataTableStateV2, createPlDataTableV2 } from '@platforma-sdk/model';
 
 export * from './converters';
@@ -23,13 +23,14 @@ export type MetricUI = Metric & {
 };
 
 export type BlockArgs = {
+  defaultBlockLabel: string;
+  customBlockLabel: string;
   abundanceRef?: PlRef;
   metrics: Metric[];
 };
 
 export type UiState = {
   metrics: MetricUI[];
-  blockTitle: string;
   tableState: PlDataTableStateV2;
   graphState: GraphMakerState;
 };
@@ -37,10 +38,11 @@ export type UiState = {
 export const model = BlockModel.create()
   .withArgs<BlockArgs>({
     metrics: [],
+    defaultBlockLabel: '',
+    customBlockLabel: '',
   })
 
   .withUiState<UiState>({
-    blockTitle: 'Repertoire Diversity',
     graphState: {
       title: 'Repertoire Diversity',
       template: 'bar',
@@ -113,10 +115,10 @@ export const model = BlockModel.create()
         'pl7.app/abundance/isPrimary': 'true',
       },
     },
-    ]),
+    ], { includeNativeLabel: true }),
   )
 
-  .output('pt', (ctx) => {
+  .outputWithStatus('pt', (ctx) => {
     const pCols = ctx.outputs?.resolve('pf')?.getPColumns();
     if (pCols === undefined) {
       return undefined;
@@ -125,7 +127,7 @@ export const model = BlockModel.create()
     return createPlDataTableV2(ctx, pCols, ctx.uiState.tableState);
   })
 
-  .output('pf', (ctx) => {
+  .outputWithStatus('pf', (ctx) => {
     const pCols = ctx.outputs?.resolve('pf')?.getPColumns();
     if (pCols === undefined) {
       return undefined;
@@ -153,7 +155,9 @@ export const model = BlockModel.create()
 
   .output('isRunning', (ctx) => ctx.outputs?.getIsReadyOrError() === false)
 
-  .title((ctx) => ctx.uiState?.blockTitle ?? 'Repertoire Diversity')
+  .title(() => 'Repertoire Diversity')
+
+  .subtitle((ctx) => ctx.args.customBlockLabel || ctx.args.defaultBlockLabel)
 
   .sections((_) => [
     { type: 'link', href: '/', label: 'Main' },
@@ -161,5 +165,3 @@ export const model = BlockModel.create()
   ])
 
   .done(2);
-
-export type BlockOutputs = InferOutputsType<typeof model>;

package/tsconfig.json

@@ -1,16 +1,5 @@
 {
-  "compilerOptions": {
-    "target": "es2022",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "strict": true,
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "sourceMap": true,
-    "declaration": true
-  },
-  "types": [],
+  "extends": "@milaboratories/ts-configs/block/model",
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
 }

package/vitest.config.mts

@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    globals: true,
+    environment: 'node'
+  }
+});
+

package/dist/index.d.cts

@@ -1,76 +0,0 @@
-import * as _platforma_sdk_model from '@platforma-sdk/model';
-import { PlRef, PlDataTableStateV2, InferOutputsType } from '@platforma-sdk/model';
-import { GraphMakerState } from '@milaboratories/graph-maker';
-
-declare const convertMetricsUiToArgs: (metrics: MetricUI[]) => Metric[];
-
-type DiversityType = 'chao1' | 'd50' | 'efronThisted' | 'observed' | 'shannonWienerIndex' | 'shannonWiener' | 'normalizedShannonWiener' | 'inverseSimpson' | 'gini';
-type Metric = {
-    type: DiversityType | undefined;
-    downsampling: {
-        type?: 'none' | 'top' | 'cumtop' | 'hypergeometric';
-        valueChooser?: 'min' | 'fixed' | 'max' | 'auto';
-        n?: number;
-    };
-};
-type MetricUI = Metric & {
-    id: string;
-    isExpanded?: boolean;
-};
-type BlockArgs = {
-    abundanceRef?: PlRef;
-    metrics: Metric[];
-};
-type UiState = {
-    metrics: MetricUI[];
-    blockTitle: string;
-    tableState: PlDataTableStateV2;
-    graphState: GraphMakerState;
-};
-declare const model: _platforma_sdk_model.PlatformaV2<BlockArgs, {
-    abundanceOptions: _platforma_sdk_model.ValueOrErrors<{
-        readonly ref: {
-            readonly __isRef: true;
-            readonly blockId: string;
-            readonly name: string;
-            readonly requireEnrichments?: true | undefined;
-        };
-        readonly label: string;
-    }[]>;
-    pt: _platforma_sdk_model.ValueOrErrors<{
-        sourceId: string | null;
-        fullTableHandle: _platforma_sdk_model.PTableHandle;
-        visibleTableHandle: _platforma_sdk_model.PTableHandle;
-    } | undefined>;
-    pf: _platforma_sdk_model.ValueOrErrors<_platforma_sdk_model.PFrameHandle | undefined>;
-    pcols: _platforma_sdk_model.ValueOrErrors<{
-        columnId: _platforma_sdk_model.PObjectId;
-        spec: {
-            readonly valueType: _platforma_sdk_model.ValueType;
-            readonly kind: "PColumn";
-            readonly name: string;
-            readonly domain?: {
-                [x: string]: string;
-            } | undefined;
-            readonly annotations?: {
-                [x: string]: string;
-            } | undefined;
-            readonly parentAxes?: number[] | undefined;
-            readonly axesSpec: {
-                readonly type: _platforma_sdk_model.ValueType;
-                readonly name: string;
-                readonly domain?: {
-                    [x: string]: string;
-                } | undefined;
-                readonly annotations?: {
-                    [x: string]: string;
-                } | undefined;
-                readonly parentAxes?: number[] | undefined;
-            }[];
-        };
-    }[] | undefined>;
-    isRunning: _platforma_sdk_model.ValueOrErrors<boolean>;
-}, UiState, "/" | "/diversityGraph">;
-type BlockOutputs = InferOutputsType<typeof model>;
-
-export { type BlockArgs, type BlockOutputs, type DiversityType, type Metric, type MetricUI, type UiState, convertMetricsUiToArgs, model };

package/vite.config.mts

@@ -1,20 +0,0 @@
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    emptyOutDir: false,
-    lib: {
-      entry: 'src/index.ts',
-      name: 'model',
-      fileName: (format) => `my-lib.${format}.js`
-    },
-    minify: false,
-    sourcemap: true,
-    rollupOptions: {
-      output: {
-        format: 'iife',
-        entryFileNames: 'bundle.js'
-      }
-    }
-  }
-});