@platforma-open/milaboratories.mixcr-shm-trees.workflow 3.7.0 → 3.8.1

package/dist/tengo/lib/prepare-donor-column.lib.tengo

@@ -1,12 +1,14 @@
 ll := import("@platforma-sdk/workflow-tengo:ll")
 smart := import("@platforma-sdk/workflow-tengo:smart")
 maps := import("@platforma-sdk/workflow-tengo:maps")
+slices := import("@platforma-sdk/workflow-tengo:slices")
+pSpec := import("@platforma-sdk/workflow-tengo:pframes.spec")
 
 json := import("json")
 
 _P_COLUMN_DATA_RESOURCE_MAP := { Name: "PColumnData/ResourceMap", Version: "1" }
 
-groupDataByDonorId := func(donorColumn, datasets) {
+groupDataByDonorId := func(donorColumn, datasets, firstDatasetSpec) {
 
 
 
@@ -23,9 +25,11 @@ groupDataByDonorId := func(donorColumn, datasets) {
 
     donorColumnSpec := donorColumn.spec
 
+    trace := pSpec.makeTrace(firstDatasetSpec)
+
     sampleIdAxis := donorColumnSpec.axesSpec[0]
 
-    resultSpec := maps.clone({
+    resultSpec := trace.inject(maps.clone({
         kind: "PColumn",
         name: "mixcr.com/clns",
         valueType: "File",
@@ -47,7 +51,7 @@ groupDataByDonorId := func(donorColumn, datasets) {
                 }
             }
         ]
-    }, { removeUndefs: true })
+    }, { removeUndefs: true }))
 
 
 

package/dist/tengo/lib/{tablesAggregation.lib.tengo → tables-aggregation.lib.tengo}

@@ -1,60 +1,65 @@
 ll := import("@platforma-sdk/workflow-tengo:ll")
 exec := import("@platforma-sdk/workflow-tengo:exec")
 assets := import("@platforma-sdk/workflow-tengo:assets")
+slices := import("@platforma-sdk/workflow-tengo:slices")
 json := import("json")
-paggregateSw := assets.importSoftware("@platforma-open/milaboratories.software-ptransform:main")
 
+paggregateSw := assets.importSoftware("@platforma-open/milaboratories.software-ptransform:main")
 
-ensureUniqueness := func(inputTsv, pfConvParams, ...aggParams) {
-    keyColumns := []
-    for axis in pfConvParams.axes {
-        keyColumns = append(keyColumns, axis.column)
+ensureUniquenessParamsFromPconvParams := func(pfConvParams) {
+    return {
+        axes: slices.map(pfConvParams.axes, func(axis) {
+            return axis.column
+        }),
+        columns: slices.map(pfConvParams.columns, func(col) {
+            return col.column
+        })
     }
+}
+
+
+ensureUniqueness := func(inputTsv, params, ...aggParams) {
+    keyColumns := params.axes
+    pickCols := params.columns
 
     aggregationWorkflow := undefined
     if len(aggParams) > 1 {
         pickCols := []
-        for col in pfConvParams.columns {
+        for col in pickCols {
             pickCols = append(pickCols, [
-                col.column,
-                col.column
+                col,
+                col
                 ]
             )
         }
 
         rankingCol := aggParams[1]
-        aggregationWorkflow = { 
-            steps: [
-                {
-                    type: "aggregate",
-                    groupBy: keyColumns,
-                    aggregations: [
-                        {
-                            type: aggParams[0],
-                            rankingCol: rankingCol,
-                            pickCols: pickCols
-                        }           
-                    ]
-                }
-            ] 
+        aggregationWorkflow = {
+            steps: [ {
+                type: "aggregate",
+                groupBy: keyColumns,
+                aggregations: [ {
+                    type: aggParams[0],
+                    rankingCol: rankingCol,
+                    pickCols: pickCols
+                } ]
+            } ]
         }
     } else {
         aggregations := []
-        for col in pfConvParams.columns {
+        for col in pickCols {
             aggregations = append(aggregations, {
                 type: aggParams[0],
-                src: col.column,
-                dst: col.column
+                src: col,
+                dst: col
             })
         }
 
-        aggregationWorkflow = { steps: [ 
-            {
+        aggregationWorkflow = { steps: [ {
                 type: "aggregate",
                 groupBy: keyColumns,
                 aggregations: aggregations
-                } 
-            ]
+            } ]
         }
     }
 
@@ -71,5 +76,6 @@ ensureUniqueness := func(inputTsv, pfConvParams, ...aggParams) {
 }
 
 export ll.toStrict({
-	ensureUniqueness: ensureUniqueness
-})
+	ensureUniqueness: ensureUniqueness,
+    ensureUniquenessParamsFromPconvParams: ensureUniquenessParamsFromPconvParams
+})

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@platforma-open/milaboratories.mixcr-shm-trees.workflow",
-  "version": "3.7.0",
+  "version": "3.8.1",
   "type": "module",
   "description": "Tengo-based template",
   "//": {
     "build": "node ./scripts/build-static.mjs src/pfconv_params.json src/pfconv_params.lib.tengo && rm -rf dist && pl-tengo check && pl-tengo build && ./create_tags.sh"
   },
   "dependencies": {
-    "@platforma-sdk/workflow-tengo": "^4.2.2"
+    "@platforma-sdk/workflow-tengo": "^4.4.4"
   },
   "devDependencies": {
     "@platforma-sdk/tengo-builder": "^2.1.3",
     "@platforma-open/milaboratories.software-mixcr": "4.7.0-165-develop",
     "@platforma-open/milaboratories.software-mitool": "2.3.1-5-main",
-    "@platforma-open/milaboratories.software-ptransform": "^1.3.1",
-    "@platforma-sdk/test": "^1.30.9",
+    "@platforma-open/milaboratories.software-ptransform": "^1.4.3",
+    "@platforma-sdk/test": "^1.30.32",
     "vitest": "~2.1.8",
     "typescript": "~5.6.3"
   },