@platforma-open/milaboratories.vj-usage.model 2.1.4 → 2.1.6

package/package.json

@@ -1,39 +1,36 @@
 {
   "name": "@platforma-open/milaboratories.vj-usage.model",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "Block model",
   "type": "module",
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js",
+      "sources": "./src/index.ts"
+    },
+    "./dist/model.json": "./dist/model.json"
+  },
   "dependencies": {
-    "@platforma-sdk/model": "^1.45.0",
-    "@milaboratories/graph-maker": "^1.1.174"
+    "@platforma-sdk/model": "1.53.3",
+    "@milaboratories/graph-maker": "1.1.216"
   },
   "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.4",
+    "@milaboratories/ts-configs": "1.2.0",
+    "@platforma-sdk/block-tools": "2.6.36",
+    "@platforma-sdk/eslint-config": "1.2.0",
+    "eslint": "^9.25.1",
+    "typescript": "~5.6.3",
+    "vitest": "^4.0.7"
   },
   "scripts": {
-    "build": "tsup && vite build && block-tools build-model",
+    "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 ."
   }
 }

package/src/index.ts

@@ -1,15 +1,17 @@
 import type { GraphMakerState } from '@milaboratories/graph-maker';
 import type { InferOutputsType, PlRef } from '@platforma-sdk/model';
 import { BlockModel, createPFrameForGraphs } from '@platforma-sdk/model';
+import { getDefaultBlockLabel } from './label';
 
 export type BlockArgs = {
+  defaultBlockLabel: string;
+  customBlockLabel: string;
   datasetRef?: PlRef;
   scChain?: string;
   allele?: boolean;
 };
 
 export type UiState = {
-  blockTitle: string;
   weightedFlag: boolean;
   vUsagePlotState: GraphMakerState;
   jUsagePlotState: GraphMakerState;
@@ -19,12 +21,16 @@ export type UiState = {
 export const model = BlockModel.create()
 
   .withArgs<BlockArgs>({
+    defaultBlockLabel: getDefaultBlockLabel({
+      allele: false,
+      isSingleCell: false,
+    }),
+    customBlockLabel: '',
     scChain: 'A',
     allele: false,
   })
 
   .withUiState<UiState>({
-    blockTitle: 'V/J Usage',
     weightedFlag: true,
     vUsagePlotState: {
       title: 'V Usage',
@@ -37,7 +43,7 @@ export const model = BlockModel.create()
       },
     },
     jUsagePlotState: {
-      title: 'V Usage',
+      title: 'J Usage',
       template: 'heatmapClustered',
       currentTab: null,
       layersSettings: {
@@ -88,7 +94,7 @@ export const model = BlockModel.create()
     return ctx.resultPool.getPColumnSpecByRef(ctx.args.datasetRef);
   })
 
-  .output('pf', (ctx) => {
+  .outputWithStatus('pf', (ctx) => {
     const pCols = ctx.outputs?.resolve('pf')?.getPColumns();
     if (pCols === undefined) {
       return undefined;
@@ -99,7 +105,9 @@ export const model = BlockModel.create()
 
   .output('isRunning', (ctx) => ctx.outputs?.getIsReadyOrError() === false)
 
-  .title((ctx) => ctx.uiState?.blockTitle ?? 'V/J Usage')
+  .title(() => 'V/J Usage')
+
+  .subtitle((ctx) => ctx.args.customBlockLabel || ctx.args.defaultBlockLabel)
 
   .sections((_) => [
     { type: 'link', href: '/', label: 'V Gene Usage' },
@@ -110,3 +118,5 @@ export const model = BlockModel.create()
   .done(2);
 
 export type BlockOutputs = InferOutputsType<typeof model>;
+
+export { getDefaultBlockLabel } from './label';

package/src/label.ts

@@ -0,0 +1,23 @@
+export function getDefaultBlockLabel(data: {
+  datasetLabel?: string;
+  allele: boolean;
+  isSingleCell: boolean;
+  chainLabel?: string;
+}) {
+  const parts: string[] = [];
+
+  // Add dataset name
+  if (data.datasetLabel) {
+    parts.push(data.datasetLabel);
+  }
+
+  // Add allele/gene
+  parts.push(data.allele ? 'Allele' : 'Gene');
+
+  // Add chain info for single-cell datasets
+  if (data.isSingleCell && data.chainLabel) {
+    parts.push(data.chainLabel);
+  }
+
+  return parts.join(' - ');
+}

package/tsconfig.json

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

package/vitest.config.mts

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

package/dist/index.d.cts

@@ -1,55 +0,0 @@
-import * as _platforma_sdk_model from '@platforma-sdk/model';
-import { PlRef, InferOutputsType } from '@platforma-sdk/model';
-import { GraphMakerState } from '@milaboratories/graph-maker';
-
-type BlockArgs = {
-    datasetRef?: PlRef;
-    scChain?: string;
-    allele?: boolean;
-};
-type UiState = {
-    blockTitle: string;
-    weightedFlag: boolean;
-    vUsagePlotState: GraphMakerState;
-    jUsagePlotState: GraphMakerState;
-    vjUsagePlotState: GraphMakerState;
-};
-declare const model: _platforma_sdk_model.PlatformaV2<BlockArgs, {
-    datasetOptions: _platforma_sdk_model.ValueOrErrors<{
-        readonly ref: {
-            readonly __isRef: true;
-            readonly blockId: string;
-            readonly name: string;
-            readonly requireEnrichments?: true | undefined;
-        };
-        readonly label: string;
-    }[]>;
-    datasetSpec: _platforma_sdk_model.ValueOrErrors<{
-        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>;
-    pf: _platforma_sdk_model.ValueOrErrors<_platforma_sdk_model.PFrameHandle | undefined>;
-    isRunning: _platforma_sdk_model.ValueOrErrors<boolean>;
-}, UiState, "/" | "/jUsage" | "/vjUsage">;
-type BlockOutputs = InferOutputsType<typeof model>;
-
-export { type BlockArgs, type BlockOutputs, type UiState, 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'
-      }
-    }
-  }
-});