@platforma-open/milaboratories.mixcr-clonotyping-2.workflow 2.3.2 → 2.4.0

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/work/mixcr-clonotyping-2/mixcr-clonotyping-2/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-open/milaboratories.mixcr-clonotyping-2.workflow@2.3.2 build /home/runner/work/mixcr-clonotyping-2/mixcr-clonotyping-2/workflow
+> @platforma-open/milaboratories.mixcr-clonotyping-2.workflow@2.4.0 build /home/runner/work/mixcr-clonotyping-2/mixcr-clonotyping-2/workflow
 > rm -rf dist && pl-tengo check && pl-tengo build
 
   info: Skipping unknown file type: test/columns.test.ts

package/.turbo/turbo-test.log

@@ -1,21 +1,21 @@
  WARN  Issue while reading "/home/runner/work/mixcr-clonotyping-2/mixcr-clonotyping-2/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-open/milaboratories.mixcr-clonotyping-2.workflow@2.3.2 test /home/runner/work/mixcr-clonotyping-2/mixcr-clonotyping-2/workflow
+> @platforma-open/milaboratories.mixcr-clonotyping-2.workflow@2.4.0 test /home/runner/work/mixcr-clonotyping-2/mixcr-clonotyping-2/workflow
 > vitest
 
 
  RUN  v2.1.8 /home/runner/work/mixcr-clonotyping-2/mixcr-clonotyping-2/workflow
 
- ✓ src/test/columns.test.ts (6 tests) 54369ms
-   ✓ checking preset for 'milab-human-dna-xcr-7genes-multiplex' 14157ms
-   ✓ checking preset for '10x-sc-xcr-vdj' 8552ms
-   ✓ checking preset for 'cellecta-human-rna-xcr-umi-drivermap-…' 8021ms
-   ✓ checking preset for 'takara-human-rna-bcr-umi-smartseq' 8026ms
-   ✓ checking preset for 'rna-seq' 7808ms
-   ✓ checking preset for 'generic-single-cell-gex' 7805ms
+ ✓ src/test/columns.test.ts (6 tests) 53559ms
+   ✓ checking preset for 'milab-human-dna-xcr-7genes-multiplex' 12593ms
+   ✓ checking preset for '10x-sc-xcr-vdj' 8579ms
+   ✓ checking preset for 'cellecta-human-rna-xcr-umi-drivermap-…' 8248ms
+   ✓ checking preset for 'takara-human-rna-bcr-umi-smartseq' 8275ms
+   ✓ checking preset for 'rna-seq' 7833ms
+   ✓ checking preset for 'generic-single-cell-gex' 8029ms
 
  Test Files  1 passed (1)
       Tests  6 passed (6)
-   Start at  10:42:09
-   Duration  55.30s (transform 51ms, setup 0ms, collect 584ms, tests 54.37s, environment 0ms, prepare 94ms)
+   Start at  07:35:16
+   Duration  54.39s (transform 48ms, setup 0ms, collect 581ms, tests 53.56s, environment 0ms, prepare 65ms)
 

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @platforma-open/milaboratories.mixcr-clonotyping.workflow
 
+## 2.4.0
+
+### Minor Changes
+
+- 46dd332: Update value options in Productive column
+
+## 2.3.3
+
+### Patch Changes
+
+- 675cd29: Fix for output column domains, ordering and visibility
+
 ## 2.3.2
 
 ### Patch Changes

package/dist/tengo/lib/calculate-export-specs.lib.tengo

@@ -85,6 +85,9 @@ addSpec := func(columns, additionalSpec) {
 	})
 }
 
+
+
+
 calculateExportSpecs := func(presetSpecForBack, blockId) {
 	ops := exportSpecOpsFromPreset(presetSpecForBack)
 
@@ -210,14 +213,14 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 
 	if isSingleCell {
 
-
-
-
-
-
-
-
-
+		columnsSpecPerSample = addSpec(columnsSpecPerSample, {
+			spec: {
+				annotations: {
+					"pl7.app/abundance/isPrimary": undefined,
+					"pl7.app/isAnchor": undefined
+				}
+			}
+		})
 		columnsSpecPerSampleSc = [ {
 			column: "uniqueCellCount",
 			id: "cell-count",
@@ -225,7 +228,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 			spec: {
 				name: "pl7.app/vdj/uniqueCellCount",
 				valueType: "Long",
-				annotations: a(88000, true, {
+				annotations: a(20100, true, {
 					"pl7.app/min": "1",
 					"pl7.app/isAbundance": "true",
 					"pl7.app/abundance/unit": "cells",
@@ -242,7 +245,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 			spec: {
 				name: "pl7.app/vdj/uniqueCellFraction",
 				valueType: "Double",
-				annotations: a(88000, true, {
+				annotations: a(20000, false, {
 					"pl7.app/min": "0",
 					"pl7.app/isAbundance": "true",
 					"pl7.app/abundance/unit": "cells",
@@ -254,48 +257,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 		} ]
 	}
 
-
-
 	orderP := 80000
-	geneHitColumnVariants := [ {
-			name: "pl7.app/vdj/geneHitWithAllele",
-			columnNameSuffix: "Hit",
-			idSuffix: "-hit-with-allele",
-			labelSuffix: " hit with allele",
-			argSuffix: "Hit",
-			visible: false
-		}, {
-			name: "pl7.app/vdj/geneHit",
-			columnNameSuffix: "Gene",
-			idSuffix: "-gene",
-			labelSuffix: " gene",
-			argSuffix: "Gene",
-			visible: true
-		} ]
-	for vdjcU in ["V", "D", "J", "C"] {
-		vdjcL := text.to_lower(vdjcU)
-		for variant in geneHitColumnVariants {
-			columnsSpecPerClonotype += [ {
-					column: "best" + vdjcU + variant.columnNameSuffix,
-					id: "best-" + vdjcL + variant.idSuffix,
-					naRegex: "",
-					allowNA: vdjcU == "C" || vdjcU == "D",
-					spec: {
-						name: variant.name,
-						valueType: "String",
-						domain: {
-							"pl7.app/vdj/reference": vdjcU + "Gene"
-						},
-						annotations: a(orderP, variant.visible, {
-							"pl7.app/label": "Best " + vdjcU + variant.labelSuffix,
-							"pl7.app/isDiscreteFilter": "true"
-						})
-					}
-				} ]
-			exportArgs += [ [ "-" + vdjcL + variant.argSuffix ] ]
-			orderP -= 100
-		}
-	}
 
 
 
@@ -323,7 +285,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 				alphabet := isAminoAcid ? "aminoacid" : "nucleotide"
 				alphabetShort := isAminoAcid ? "aa" : "nt"
 				alphabetShortMixcr := isAminoAcid ? "aa" : "n"
-				visibility := (featureU == "CDR3") || (featureU == assemblingFeature)
+				visibility := isSingleCell ? (featureU == "CDR3") && isAminoAcid : (featureU == "CDR3") || (featureU == assemblingFeature)
 				columnsSpecPerClonotype += [ {
 						column: alphabetShortMixcr + "Seq" + imputedU + featureU,
 						id: alphabetShortMixcr + "-seq-" + featureL + (isImputed ? "-imputed" : ""),
@@ -370,6 +332,48 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 
 
 
+	geneHitColumnVariants := [ {
+			name: "pl7.app/vdj/geneHitWithAllele",
+			columnNameSuffix: "Hit",
+			idSuffix: "-hit-with-allele",
+			labelSuffix: " hit with allele",
+			argSuffix: "Hit",
+			visible: false
+		}, {
+			name: "pl7.app/vdj/geneHit",
+			columnNameSuffix: "Gene",
+			idSuffix: "-gene",
+			labelSuffix: " gene",
+			argSuffix: "Gene",
+			visible: true
+		} ]
+	for vdjcU in ["V", "D", "J", "C"] {
+		vdjcL := text.to_lower(vdjcU)
+		for variant in geneHitColumnVariants {
+			columnsSpecPerClonotype += [ {
+					column: "best" + vdjcU + variant.columnNameSuffix,
+					id: "best-" + vdjcL + variant.idSuffix,
+					naRegex: "",
+					allowNA: vdjcU == "C" || vdjcU == "D",
+					spec: {
+						name: variant.name,
+						valueType: "String",
+						domain: {
+							"pl7.app/vdj/reference": vdjcU + "Gene"
+						},
+						annotations: a(orderP, variant.visible, {
+							"pl7.app/label": "Best " + vdjcU + variant.labelSuffix,
+							"pl7.app/isDiscreteFilter": "true"
+						})
+					}
+				} ]
+			exportArgs += [ [ "-" + vdjcL + variant.argSuffix ] ]
+			orderP -= 100
+		}
+	}
+
+
+
 	orderP = 10000
 
 	mutationColumnVariants := [ {
@@ -430,7 +434,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 			specName: "pl7.app/vdj/sequence/productive",
 			label: "Productive",
 			id: "is-productive",
-			visibility: true
+			visibility: false
 		}, {
 			columnPrefix: "isOOF",
 			arg: "-isOOF",
@@ -457,7 +461,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 					annotations: a(orderP, variant.visibility, {
 						"pl7.app/label": variant.label,
 						"pl7.app/isDiscreteFilter": "true",
-						"pl7.app/discreteValues": "['true','false']" } )
+						"pl7.app/discreteValues": string(json.encode(["True", "False"])) } )
 				}
 			} ]
 		exportArgs += [ [ variant.arg, productiveFeature ] ]
@@ -532,6 +536,10 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 		"pl7.app/vdj/clonotypingRunId": blockId
 	} } })
 
+	columnsSpecPerSampleSc = addSpec(columnsSpecPerSampleSc, { spec: { domain: {
+		"pl7.app/vdj/clonotypingRunId": blockId
+	} } })
+
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-open/milaboratories.mixcr-clonotyping-2.workflow",
-  "version": "2.3.2",
+  "version": "2.4.0",
   "description": "Tengo-based template",
   "dependencies": {
     "@platforma-sdk/workflow-tengo": "^3.1.0",

package/src/calculate-export-specs.lib.tengo

@@ -85,6 +85,9 @@ addSpec := func(columns, additionalSpec) {
 	})
 }
 
+// Ordering rules
+//   AA Sequences
+
 calculateExportSpecs := func(presetSpecForBack, blockId) {
 	ops := exportSpecOpsFromPreset(presetSpecForBack)
 
@@ -210,14 +213,14 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 
 	if isSingleCell {
 		// copying reads and umi counts and fraction removing isPrimary and isAnchor
-		// addSpec(columnsSpecPerSample, {
-		// 	spec: {
-		// 		annotations: {
-		// 			"pl7.app/abundance/isPrimary": undefined,
-		// 			"pl7.app/isAnchor": undefined
-		// 		}
-		// 	}
-		// }) +
+		columnsSpecPerSample = addSpec(columnsSpecPerSample, {
+			spec: {
+				annotations: {
+					"pl7.app/abundance/isPrimary": undefined,
+					"pl7.app/isAnchor": undefined
+				}
+			}
+		})
 		columnsSpecPerSampleSc = [ {
 			column: "uniqueCellCount",
 			id: "cell-count",
@@ -225,7 +228,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 			spec: {
 				name: "pl7.app/vdj/uniqueCellCount",
 				valueType: "Long",
-				annotations: a(88000, true, {
+				annotations: a(20100, true, {
 					"pl7.app/min": "1",
 					"pl7.app/isAbundance": "true",
 					"pl7.app/abundance/unit": "cells",
@@ -242,7 +245,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 			spec: {
 				name: "pl7.app/vdj/uniqueCellFraction",
 				valueType: "Double",
-				annotations: a(88000, true, {
+				annotations: a(20000, false, {
 					"pl7.app/min": "0",
 					"pl7.app/isAbundance": "true",
 					"pl7.app/abundance/unit": "cells",
@@ -254,48 +257,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 		} ]
 	}
 
-	// VDJC Hits
-
 	orderP := 80000
-	geneHitColumnVariants := [ {
-			name: "pl7.app/vdj/geneHitWithAllele",
-			columnNameSuffix: "Hit",
-			idSuffix: "-hit-with-allele",
-			labelSuffix: " hit with allele",
-			argSuffix: "Hit",
-			visible: false
-		}, {
-			name: "pl7.app/vdj/geneHit",
-			columnNameSuffix: "Gene",
-			idSuffix: "-gene",
-			labelSuffix: " gene",
-			argSuffix: "Gene",
-			visible: true
-		} ]
-	for vdjcU in ["V", "D", "J", "C"] {
-		vdjcL := text.to_lower(vdjcU)
-		for variant in geneHitColumnVariants {
-			columnsSpecPerClonotype += [ {
-					column: "best" + vdjcU + variant.columnNameSuffix,
-					id: "best-" + vdjcL + variant.idSuffix,
-					naRegex: "",
-					allowNA: vdjcU == "C" || vdjcU == "D",
-					spec: {
-						name: variant.name,
-						valueType: "String",
-						domain: {
-							"pl7.app/vdj/reference": vdjcU + "Gene"
-						},
-						annotations: a(orderP, variant.visible, {
-							"pl7.app/label": "Best " + vdjcU + variant.labelSuffix,
-							"pl7.app/isDiscreteFilter": "true"
-						})
-					}
-				} ]
-			exportArgs += [ [ "-" + vdjcL + variant.argSuffix ] ]
-			orderP -= 100
-		}
-	}
 
 	// Sequences
 
@@ -323,7 +285,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 				alphabet := isAminoAcid ? "aminoacid" : "nucleotide"
 				alphabetShort := isAminoAcid ? "aa" : "nt"
 				alphabetShortMixcr := isAminoAcid ? "aa" : "n"
-				visibility := (featureU == "CDR3") || (featureU == assemblingFeature)
+				visibility := isSingleCell ? (featureU == "CDR3") && isAminoAcid : (featureU == "CDR3") || (featureU == assemblingFeature)
 				columnsSpecPerClonotype += [ {
 						column: alphabetShortMixcr + "Seq" + imputedU + featureU,
 						id: alphabetShortMixcr + "-seq-" + featureL + (isImputed ? "-imputed" : ""),
@@ -368,6 +330,48 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 		}
 	}
 
+	// VDJC Hits
+
+	geneHitColumnVariants := [ {
+			name: "pl7.app/vdj/geneHitWithAllele",
+			columnNameSuffix: "Hit",
+			idSuffix: "-hit-with-allele",
+			labelSuffix: " hit with allele",
+			argSuffix: "Hit",
+			visible: false
+		}, {
+			name: "pl7.app/vdj/geneHit",
+			columnNameSuffix: "Gene",
+			idSuffix: "-gene",
+			labelSuffix: " gene",
+			argSuffix: "Gene",
+			visible: true
+		} ]
+	for vdjcU in ["V", "D", "J", "C"] {
+		vdjcL := text.to_lower(vdjcU)
+		for variant in geneHitColumnVariants {
+			columnsSpecPerClonotype += [ {
+					column: "best" + vdjcU + variant.columnNameSuffix,
+					id: "best-" + vdjcL + variant.idSuffix,
+					naRegex: "",
+					allowNA: vdjcU == "C" || vdjcU == "D",
+					spec: {
+						name: variant.name,
+						valueType: "String",
+						domain: {
+							"pl7.app/vdj/reference": vdjcU + "Gene"
+						},
+						annotations: a(orderP, variant.visible, {
+							"pl7.app/label": "Best " + vdjcU + variant.labelSuffix,
+							"pl7.app/isDiscreteFilter": "true"
+						})
+					}
+				} ]
+			exportArgs += [ [ "-" + vdjcL + variant.argSuffix ] ]
+			orderP -= 100
+		}
+	}
+
 	// Mutations
 
 	orderP = 10000
@@ -430,7 +434,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 			specName: "pl7.app/vdj/sequence/productive",
 			label: "Productive",
 			id: "is-productive",
-			visibility: true
+			visibility: false
 		}, {
 			columnPrefix: "isOOF",
 			arg: "-isOOF",
@@ -457,7 +461,7 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 					annotations: a(orderP, variant.visibility, {
 						"pl7.app/label": variant.label,
 						"pl7.app/isDiscreteFilter": "true",
-						"pl7.app/discreteValues": "['true','false']" } )
+						"pl7.app/discreteValues": string(json.encode(["True", "False"])) } )
 				}
 			} ]
 		exportArgs += [ [ variant.arg, productiveFeature ] ]
@@ -532,6 +536,10 @@ calculateExportSpecs := func(presetSpecForBack, blockId) {
 		"pl7.app/vdj/clonotypingRunId": blockId
 	} } })
 
+	columnsSpecPerSampleSc = addSpec(columnsSpecPerSampleSc, { spec: { domain: {
+		"pl7.app/vdj/clonotypingRunId": blockId
+	} } })
+
 	//   "pl7.app/segmentedBy" annotation indicates columns that can be meaningfully merged across
 	//   different runs (given they have the same name and axes signature).
 	//   Its absence indicates that merging would be semantically meaningless (e.g., abundance

package/src/process.tpl.tengo

@@ -451,7 +451,7 @@ self.body(func(inputs) {
 			for chainIdx in [0, 1] {
 				// "A" chain is always the one that is more diverse
 				chainLetterU := ["A", "B"][chainIdx]
-				chainNameU := chainInfos[receptorInfo.chains[chainIdx]].name
+				chainNameU := chainInfos[receptorInfo.chains[chainIdx]].shortName
 				chainNameL := text.to_lower(chainNameU)
 
 				for isPrimary in [true, false] {
@@ -463,12 +463,25 @@ self.body(func(inputs) {
 					// i.e. propertiesAPrimaryTsv
 					propertiesTsvOutputName := propertiesTableName + "Tsv"
 
+					annotationsTransformation := {
+						"pl7.app/label": func(label) {
+							return chainNameU + " " + label + " " + pPrefixU
+						}
+					}
+
+					if !isPrimary {
+						annotationsTransformation["pl7.app/table/visibility"] = "optional"
+					}
+
 					singleCellOutputs += [ {
 						type: "Resource",
 						spec: {
 							kind: "PColumn",
 							name: "mixcr.com/scClonotypeTable/" + chainNameL + pPrefixU,
 							domain: {
+								"pl7.app/vdj/receptor": receptor,
+								"pl7.app/vdj/scClonotypeChain": chainLetterU,
+								"pl7.app/vdj/scClonotypeChain/index": pPrefixL,
 								"pl7.app/vdj/clonotypingRunId": blockId
 							},
 							valueType: "File"
@@ -484,13 +497,10 @@ self.body(func(inputs) {
 								spec: {
 									domain: {
 										"pl7.app/vdj/receptor": receptor,
-										"pl7.app/vdj/scClonotypeChain": chainLetterU
+										"pl7.app/vdj/scClonotypeChain": chainLetterU,
+										"pl7.app/vdj/scClonotypeChain/index": pPrefixL
 									},
-									annotations: {
-										"pl7.app/label": func(label) {
-											return pPrefixU + " " + chainNameU + " " + label
-										}
-									}
+									annotations: annotationsTransformation
 								}
 							}),
 							storageFormat: "Binary",