@platforma-open/milaboratories.samples-and-data.workflow 2.3.0 → 2.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -37,6 +37,10 @@ getSamples := func(dataset, importFile) {
37
37
  return result
38
38
  }
39
39
 
40
+ createGroupAxis := func(groupIdAxis, _) {
41
+ return copy(groupIdAxis)
42
+ }
43
+
40
44
  createDataset := func(blockId, sampleIdAxis, groupIdAxis, dataset, importFile) {
41
45
 
42
46
  extension := dataset.content.xsvType + (dataset.content.gzipped ? ".gz" : "")
@@ -64,5 +68,6 @@ createDataset := func(blockId, sampleIdAxis, groupIdAxis, dataset, importFile) {
64
68
  export {
65
69
  isGrouped: true,
66
70
  getSamples: getSamples,
71
+ createGroupAxis: createGroupAxis,
67
72
  createDataset: createDataset
68
73
  }
@@ -5,6 +5,10 @@ json := import("json")
5
5
  smart := import("@platforma-sdk/workflow-tengo:smart")
6
6
  util := import("@platforma-open/milaboratories.samples-and-data.workflow:util")
7
7
 
8
+ createGroupAxis := func(groupIdAxis, _) {
9
+ return copy(groupIdAxis)
10
+ }
11
+
8
12
  createDataset := func(blockId, sampleIdAxis, groupIdAxis, dataset, importFile) {
9
13
  extension := dataset.content.gzipped ? "fastq.gz" : "fastq"
10
14
 
@@ -50,6 +54,7 @@ getSamples := func(dataset, importFile) {
50
54
 
51
55
  export {
52
56
  isGrouped: true,
57
+ createGroupAxis: createGroupAxis,
53
58
  createDataset: createDataset,
54
59
  getSamples: getSamples
55
60
  }
@@ -18,10 +18,7 @@ getColumns := func(fImport, importFile) {
18
18
 
19
19
  getSamples := func(dataset, importFile) {
20
20
  result := {}
21
- sampleColumnName := dataset.content.sampleColumnName
22
- if !sampleColumnName {
23
- sampleColumnName = "sample"
24
- }
21
+ sampleColumnName := util.getSampleColumnName(dataset)
25
22
  for groupId, importHandle in dataset.content.data {
26
23
  if !importHandle {
27
24
  ll.panic("File handle not set for group %v", groupId)
@@ -36,6 +33,13 @@ getSamples := func(dataset, importFile) {
36
33
  return result
37
34
  }
38
35
 
36
+ createGroupAxis := func(groupIdAxis, dataset) {
37
+ sampleColumnName := util.getSampleColumnName(dataset)
38
+ result := copy(groupIdAxis)
39
+ result.annotations["pl7.app/sampleColumnName"] = sampleColumnName
40
+ return result
41
+ }
42
+
39
43
  createDataset := func(blockId, sampleIdAxis, groupIdAxis, dataset, importFile) {
40
44
 
41
45
  extension := "h5ad"
@@ -64,6 +68,7 @@ export {
64
68
  isGrouped: true,
65
69
  getColumns: getColumns,
66
70
  getSamples: getSamples,
71
+ createGroupAxis: createGroupAxis,
67
72
  createDataset: createDataset
68
73
  }
69
74
 
@@ -18,10 +18,7 @@ getColumns := func(fImport, importFile) {
18
18
 
19
19
  getSamples := func(dataset, importFile) {
20
20
  result := {}
21
- sampleColumnName := dataset.content.sampleColumnName
22
- if !sampleColumnName {
23
- sampleColumnName = "sample"
24
- }
21
+ sampleColumnName := util.getSampleColumnName(dataset)
25
22
  for groupId, importHandle in dataset.content.data {
26
23
  if !importHandle {
27
24
  ll.panic("File handle not set for group %v", groupId)
@@ -36,6 +33,13 @@ getSamples := func(dataset, importFile) {
36
33
  return result
37
34
  }
38
35
 
36
+ createGroupAxis := func(groupIdAxis, dataset) {
37
+ sampleColumnName := util.getSampleColumnName(dataset)
38
+ result := copy(groupIdAxis)
39
+ result.annotations["pl7.app/sampleColumnName"] = sampleColumnName
40
+ return result
41
+ }
42
+
39
43
  createDataset := func(blockId, sampleIdAxis, groupIdAxis, dataset, importFile) {
40
44
 
41
45
  extension := "rds"
@@ -64,6 +68,7 @@ export {
64
68
  isGrouped: true,
65
69
  getColumns: getColumns,
66
70
  getSamples: getSamples,
71
+ createGroupAxis: createGroupAxis,
67
72
  createDataset: createDataset
68
73
  }
69
74
 
@@ -72,9 +72,18 @@ sampleGroupsLinkerColumn := func(blockId, dataset, sampleIdAxis, groupIdAxis) {
72
72
  }
73
73
  }
74
74
 
75
+ getSampleColumnName := func(dataset) {
76
+ sampleColumnName := dataset.content.sampleColumnName
77
+ if !sampleColumnName {
78
+ return "sample"
79
+ }
80
+ return sampleColumnName
81
+ }
82
+
75
83
 
76
84
  export {
77
85
  createJsonPColumnData: createJsonPColumnData,
78
86
  datasetColumnSpecBase: datasetColumnSpecBase,
79
- sampleGroupsLinkerColumn: sampleGroupsLinkerColumn
87
+ sampleGroupsLinkerColumn: sampleGroupsLinkerColumn,
88
+ getSampleColumnName: getSampleColumnName
80
89
  }
Binary file
Binary file
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@platforma-open/milaboratories.samples-and-data.workflow",
3
- "version": "2.3.0",
3
+ "version": "2.3.1",
4
4
  "type": "module",
5
5
  "files": [
6
6
  "./dist/**/*"