@nfdi4plants/arctrl 3.2.2 → 3.2.3
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.
- package/README.md +0 -64
- package/dist/ts/ts/ARC.d.ts +3 -3
- package/dist/ts/ts/ARC.d.ts.map +1 -1
- package/dist/ts/ts/ARC.js +161 -103
- package/dist/ts/ts/ContractIO/ContractIO.d.ts +7 -0
- package/dist/ts/ts/ContractIO/ContractIO.d.ts.map +1 -1
- package/dist/ts/ts/ContractIO/ContractIO.js +82 -4
- package/dist/ts/ts/ContractIO/FileSystemHelper.d.ts +1 -0
- package/dist/ts/ts/ContractIO/FileSystemHelper.d.ts.map +1 -1
- package/dist/ts/ts/ContractIO/FileSystemHelper.js +12 -5
- package/dist/ts/ts/Conversion/Investigation.d.ts.map +1 -1
- package/dist/ts/ts/Conversion/Investigation.js +4 -3
- package/dist/ts/ts/Conversion/Process.d.ts +4 -2
- package/dist/ts/ts/Conversion/Process.d.ts.map +1 -1
- package/dist/ts/ts/Conversion/Process.js +37 -21
- package/dist/ts/ts/Conversion/Table.d.ts +3 -2
- package/dist/ts/ts/Conversion/Table.d.ts.map +1 -1
- package/dist/ts/ts/Conversion/Table.js +3 -3
- package/dist/ts/ts/Core/Conversion.d.ts.map +1 -1
- package/dist/ts/ts/Core/Conversion.js +33 -24
- package/dist/ts/ts/Core/Data.d.ts +6 -0
- package/dist/ts/ts/Core/Data.d.ts.map +1 -1
- package/dist/ts/ts/Core/Data.js +18 -1
- package/dist/ts/ts/Core/Table/ArcTableAux.d.ts.map +1 -1
- package/dist/ts/ts/Core/Table/ArcTableAux.js +9 -0
- package/dist/ts/ts/Core/Table/CompositeCell.d.ts +4 -0
- package/dist/ts/ts/Core/Table/CompositeCell.d.ts.map +1 -1
- package/dist/ts/ts/Core/Table/CompositeCell.js +39 -2
- package/dist/ts/ts/Spreadsheet/ArcInvestigation.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/ArcInvestigation.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/Assays.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/Assays.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/Comment.d.ts +8 -0
- package/dist/ts/ts/Spreadsheet/Metadata/Comment.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/Comment.js +13 -2
- package/dist/ts/ts/Spreadsheet/Metadata/Contacts.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/Contacts.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/Factors.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/Factors.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/OntologyAnnotation.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/OntologyAnnotation.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/OntologySourceReference.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/OntologySourceReference.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/Protocols.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/Protocols.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/Publication.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/Publication.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/Run.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/Run.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/Study.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/Study.js +2 -4
- package/dist/ts/ts/Spreadsheet/Metadata/Workflow.d.ts.map +1 -1
- package/dist/ts/ts/Spreadsheet/Metadata/Workflow.js +2 -4
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -41,70 +41,6 @@ pip install arctrl
|
|
|
41
41
|
|
|
42
42
|
Documentation can be found [here](https://nfdi4plants.github.io/nfdi4plants.knowledgebase/arctrl/)
|
|
43
43
|
|
|
44
|
-
## Development
|
|
45
|
-
|
|
46
|
-
#### Requirements
|
|
47
|
-
|
|
48
|
-
- [nodejs and npm](https://nodejs.org/en/download)
|
|
49
|
-
- verify with `node --version` (Tested with v18.16.1)
|
|
50
|
-
- verify with `npm --version` (Tested with v9.2.0)
|
|
51
|
-
- [.NET SDK](https://dotnet.microsoft.com/en-us/download)
|
|
52
|
-
- verify with `dotnet --version` (Tested with 7.0.306)
|
|
53
|
-
- [Python](https://www.python.org/downloads/)
|
|
54
|
-
- verify with `py --version` (Tested with 3.12.2, known to work only for >=3.11)
|
|
55
|
-
|
|
56
|
-
#### Local Setup
|
|
57
|
-
|
|
58
|
-
##### Windows
|
|
59
|
-
|
|
60
|
-
On windows you can use the `setup.cmd` to run the following steps automatically!
|
|
61
|
-
|
|
62
|
-
1. Setup dotnet tools
|
|
63
|
-
|
|
64
|
-
`dotnet tool restore`
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
2. Install NPM dependencies
|
|
68
|
-
|
|
69
|
-
`npm install`
|
|
70
|
-
|
|
71
|
-
3. Setup python environment
|
|
72
|
-
|
|
73
|
-
`py -m venv .venv`
|
|
74
|
-
|
|
75
|
-
4. Install [uv](https://docs.astral.sh/uv/) and dependencies
|
|
76
|
-
|
|
77
|
-
1. `.\.venv\Scripts\python.exe -m pip install -U pip setuptools`
|
|
78
|
-
2. `.\.venv\Scripts\python.exe -m pip install uv`
|
|
79
|
-
3. `.\.venv\Scripts\python.exe -m uv pip install -r pyproject.toml --group dev`
|
|
80
|
-
|
|
81
|
-
Verify correct setup with `./build.cmd runtests` ✨
|
|
82
|
-
|
|
83
|
-
##### Linux / macOS
|
|
84
|
-
|
|
85
|
-
On unix you can use the `setup.sh` to run the following steps automatically!
|
|
86
|
-
|
|
87
|
-
1. Setup dotnet tools
|
|
88
|
-
|
|
89
|
-
`dotnet tool restore`
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
2. Install NPM dependencies
|
|
93
|
-
|
|
94
|
-
`npm install`
|
|
95
|
-
|
|
96
|
-
3. Setup python environment
|
|
97
|
-
|
|
98
|
-
`python -m venv .venv`
|
|
99
|
-
|
|
100
|
-
4. Install [uv](https://docs.astral.sh/uv/) and dependencies
|
|
101
|
-
|
|
102
|
-
1. `.venv/bin/python -m pip install -U pip setuptools`
|
|
103
|
-
2. `.venv/bin/python -m pip install uv`
|
|
104
|
-
3. `.venv/bin/python -m uv pip install -r pyproject.toml --group dev`
|
|
105
|
-
|
|
106
|
-
Verify correct setup with `bash build.sh runtests` ✨
|
|
107
|
-
|
|
108
44
|
## Branding
|
|
109
45
|
|
|
110
46
|
Feel free to reference `ARCtrl` on slides or elsewhere using our logos:
|
package/dist/ts/ts/ARC.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FileSystem } from './FileSystem/FileSystem.ts';
|
|
2
2
|
import { Option } from '@fable-org/fable-library-ts/Option.ts';
|
|
3
3
|
import { License } from './License.ts';
|
|
4
|
-
import {
|
|
4
|
+
import { ArcRun, ArcWorkflow, ArcStudy, ArcAssay, ArcInvestigation } from './Core/ArcTypes.ts';
|
|
5
5
|
import { MutableArray } from '@fable-org/fable-library-ts/Util.ts';
|
|
6
6
|
import { Contract } from './Contract/Contract.ts';
|
|
7
7
|
import { FSharpResult$2_$union } from '@fable-org/fable-library-ts/Result.ts';
|
|
@@ -29,7 +29,7 @@ export declare class ARC extends ArcInvestigation {
|
|
|
29
29
|
get License(): License | undefined;
|
|
30
30
|
set License(license: Option<License>);
|
|
31
31
|
static fromArcInvestigation(isa: ArcInvestigation, fs?: FileSystem, license?: License): ARC;
|
|
32
|
-
TryWriteAsync(arcPath: string, forceOverwrite?: boolean): Promise<FSharpResult$2_$union<MutableArray<Contract>, MutableArray<string>>>;
|
|
32
|
+
TryWriteAsync(arcPath: string, forceOverwrite?: boolean, additionalContracts?: MutableArray<Contract>): Promise<FSharpResult$2_$union<MutableArray<Contract>, MutableArray<string>>>;
|
|
33
33
|
TryUpdateAsync(arcPath: string, forceOverwrite?: boolean): Promise<FSharpResult$2_$union<MutableArray<Contract>, MutableArray<string>>>;
|
|
34
34
|
SetLicenseFulltext(fulltext: string, path?: string): void;
|
|
35
35
|
static tryLoadAsync(arcPath: string): Promise<FSharpResult$2_$union<ARC, MutableArray<string>>>;
|
|
@@ -53,7 +53,7 @@ export declare class ARC extends ArcInvestigation {
|
|
|
53
53
|
TryRemoveStudyAsync(arcPath: string, studyIdentifier: string): Promise<FSharpResult$2_$union<MutableArray<Contract>, MutableArray<string>>>;
|
|
54
54
|
GetStudyRenameContracts(oldStudyIdentifier: string, newStudyIdentifier: string): MutableArray<Contract>;
|
|
55
55
|
TryRenameStudyAsync(arcPath: string, oldStudyIdentifier: string, newStudyIdentifier: string): Promise<FSharpResult$2_$union<MutableArray<Contract>, MutableArray<string>>>;
|
|
56
|
-
WriteAsync(arcPath: string): Promise<void>;
|
|
56
|
+
WriteAsync(arcPath: string, additionalContracts?: MutableArray<Contract>): Promise<void>;
|
|
57
57
|
UpdateAsync(arcPath: string): Promise<void>;
|
|
58
58
|
RemoveAssayAsync(arcPath: string, assayIdentifier: string): Promise<void>;
|
|
59
59
|
RenameAssayAsync(arcPath: string, oldAssayIdentifier: string, newAssayIdentifier: string): Promise<void>;
|
package/dist/ts/ts/ARC.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ARC.d.ts","sourceRoot":"","sources":["../../../src/ARCtrl/ts/ARC.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAgC,MAAM,EAAU,MAAM,uCAAuC,CAAC;AACrG,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAgC,
|
|
1
|
+
{"version":3,"file":"ARC.d.ts","sourceRoot":"","sources":["../../../src/ARCtrl/ts/ARC.ts"],"names":[],"mappings":"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"}
|
package/dist/ts/ts/ARC.js
CHANGED
|
@@ -2,20 +2,21 @@ import { FileSystem } from './FileSystem/FileSystem.js';
|
|
|
2
2
|
import { unwrap, defaultArg, value } from '../node_modules/@fable-org/fable-library-ts/Option.js';
|
|
3
3
|
import { License } from './License.js';
|
|
4
4
|
import { ArcInvestigation, ArcInvestigation_$reflection } from './Core/ArcTypes.js';
|
|
5
|
+
import { append, map, choose, item, fold, concat, contains as contains$2, tryPick, equalsWith } from '../node_modules/@fable-org/fable-library-ts/Array.js';
|
|
5
6
|
import { defaultOf, stringHash, Exception, comparePrimitives, curry2, safeHash, getEnumerator, disposeSafe, equals } from '../node_modules/@fable-org/fable-library-ts/Util.js';
|
|
6
7
|
import { Contract } from './Contract/Contract.js';
|
|
7
|
-
import { fullFillContractBatchAsync } from './ContractIO/ContractIO.js';
|
|
8
|
+
import { fullFillContractBatchAsync, tryFulfillEmptyEntityContractAsync } from './ContractIO/ContractIO.js';
|
|
8
9
|
import { FSharpResult$2_Error$, FSharpResult$2_Ok } from '../node_modules/@fable-org/fable-library-ts/Result.js';
|
|
9
10
|
import { PromiseBuilder__Run_212F1D4B, PromiseBuilder__Delay_62FBFDE1 } from './fable_modules/Fable.Promise.3.2.0/Promise.fs.js';
|
|
10
11
|
import { promise } from './fable_modules/Fable.Promise.3.2.0/PromiseImpl.fs.js';
|
|
11
12
|
import { getAllFilePathsAsync } from './ContractIO/FileSystemHelper.js';
|
|
12
|
-
import { toArray, contains, delay, append, singleton, iterate, tryFind, find, collect, empty, toList } from '../node_modules/@fable-org/fable-library-ts/Seq.js';
|
|
13
|
-
import {
|
|
13
|
+
import { toArray, contains, delay, append as append$1, singleton, iterate, tryFind, find, collect, empty, toList } from '../node_modules/@fable-org/fable-library-ts/Seq.js';
|
|
14
|
+
import { all } from './CrossAsync.js';
|
|
15
|
+
import { split, getAssayFolderPath, getRunFolderPath, getWorkflowFolderPath, getStudyFolderPath, combine, normalizePathKey } from './FileSystem/Path.js';
|
|
14
16
|
import { ARCtrl_ArcAssay__ArcAssay_ToDeleteContract, ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49, ARCtrl_ArcAssay__ArcAssay_ToUpdateContract, ARCtrl_ArcAssay__ArcAssay_tryFromReadContract_Static_7570923F } from './Contract/ArcAssay.js';
|
|
15
17
|
import { ARCtrl_ArcRun__ArcRun_ToDeleteContract, ARCtrl_ArcRun__ArcRun_ToCreateContract_6FCE9E49, ARCtrl_ArcRun__ArcRun_ToUpdateContract, ARCtrl_ArcRun__ArcRun_tryFromReadContract_Static_7570923F, ARCtrl_ArcRun__ArcRun_tryCWLFromReadContract_Static, ARCtrl_ArcRun__ArcRun_tryYMLFromReadContract_Static } from './Contract/ArcRun.js';
|
|
16
18
|
import { ARCtrl_ArcWorkflow__ArcWorkflow_ToDeleteContract, ARCtrl_ArcWorkflow__ArcWorkflow_ToCreateContract_6FCE9E49, ARCtrl_ArcWorkflow__ArcWorkflow_ToUpdateContract, ARCtrl_ArcWorkflow__ArcWorkflow_tryFromReadContract_Static_7570923F, ARCtrl_ArcWorkflow__ArcWorkflow_tryCWLFromReadContract_Static } from './Contract/ArcWorkflow.js';
|
|
17
19
|
import { join, toFail, printf, replace, concat as concat$1, toText } from '../node_modules/@fable-org/fable-library-ts/String.js';
|
|
18
|
-
import { map, choose, fold, concat, contains as contains$2, append as append$1, tryPick, equalsWith, item } from '../node_modules/@fable-org/fable-library-ts/Array.js';
|
|
19
20
|
import { ARCtrl_ArcInvestigation__ArcInvestigation_ToUpdateContract, ARCtrl_ArcInvestigation__ArcInvestigation_ToCreateContract, ARCtrl_ArcInvestigation__ArcInvestigation_tryFromReadContract_Static_7570923F } from './Contract/ArcInvestigation.js';
|
|
20
21
|
import { createMissingIdentifier, Workflow_cwlFileNameFromIdentifier, Run_cwlFileNameFromIdentifier } from './Core/Helper/Identifier.js';
|
|
21
22
|
import { ofSeq, contains as contains$1, unionMany, FSharpSet__Contains } from '../node_modules/@fable-org/fable-library-ts/Set.js';
|
|
@@ -70,9 +71,9 @@ class ARC extends ArcInvestigation {
|
|
|
70
71
|
static fromArcInvestigation(isa, fs, license) {
|
|
71
72
|
return new ARC(isa.Identifier, unwrap(isa.Title), unwrap(isa.Description), unwrap(isa.SubmissionDate), unwrap(isa.PublicReleaseDate), isa.OntologySourceReferences, isa.Publications, isa.Contacts, isa.Assays, isa.Studies, isa.Workflows, isa.Runs, isa.RegisteredStudyIdentifiers, isa.Comments, isa.Remarks, unwrap(fs), unwrap(license));
|
|
72
73
|
}
|
|
73
|
-
TryWriteAsync(arcPath, forceOverwrite) {
|
|
74
|
+
TryWriteAsync(arcPath, forceOverwrite, additionalContracts) {
|
|
74
75
|
const this$ = this;
|
|
75
|
-
const cs = this$.GetWriteContracts();
|
|
76
|
+
const cs = append(this$.GetWriteContracts(), defaultArg(additionalContracts, []));
|
|
76
77
|
return fullFillContractBatchAsync(defaultArg(forceOverwrite, false), arcPath, cs);
|
|
77
78
|
}
|
|
78
79
|
TryUpdateAsync(arcPath, forceOverwrite) {
|
|
@@ -102,17 +103,75 @@ class ARC extends ArcInvestigation {
|
|
|
102
103
|
return PromiseBuilder__Run_212F1D4B(promise, PromiseBuilder__Delay_62FBFDE1(promise, () => getAllFilePathsAsync(arcPath).then((_arg) => {
|
|
103
104
|
const arc = ARC.fromFilePaths(toArray(_arg));
|
|
104
105
|
const contracts = arc.GetReadContracts();
|
|
105
|
-
return
|
|
106
|
-
const
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
const
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
106
|
+
return all(map((c) => tryFulfillEmptyEntityContractAsync(arcPath, c), contracts)).then((_arg_1) => {
|
|
107
|
+
const recoveredContracts_1 = choose((x) => x, _arg_1);
|
|
108
|
+
const contracts_1 = contracts.filter((c_1) => !recoveredContracts_1.some((rc) => rc.Path === c_1.Path));
|
|
109
|
+
return fullFillContractBatchAsync(false, arcPath, contracts_1).then((_arg_2) => {
|
|
110
|
+
const fulFilledContracts = _arg_2;
|
|
111
|
+
if (fulFilledContracts.tag === /* Error */
|
|
112
|
+
1) {
|
|
113
|
+
const e = fulFilledContracts.fields[0];
|
|
114
|
+
return Promise.resolve(FSharpResult$2_Error$(e));
|
|
115
|
+
} else {
|
|
116
|
+
const c_2 = fulFilledContracts.fields[0];
|
|
117
|
+
arc.SetISAFromContracts(append(c_2, recoveredContracts_1));
|
|
118
|
+
recoveredContracts_1.forEach((rc_1) => {
|
|
119
|
+
const identifier = item(1, split(rc_1.Path));
|
|
120
|
+
const matchValue = rc_1.DTOType;
|
|
121
|
+
let matchResult = void 0;
|
|
122
|
+
if (matchValue != null) {
|
|
123
|
+
switch (value(matchValue)) {
|
|
124
|
+
case "ISA_Assay": {
|
|
125
|
+
matchResult = 0;
|
|
126
|
+
break;
|
|
127
|
+
}
|
|
128
|
+
case "ISA_Study": {
|
|
129
|
+
matchResult = 1;
|
|
130
|
+
break;
|
|
131
|
+
}
|
|
132
|
+
case "ISA_Workflow": {
|
|
133
|
+
matchResult = 2;
|
|
134
|
+
break;
|
|
135
|
+
}
|
|
136
|
+
case "ISA_Run": {
|
|
137
|
+
matchResult = 3;
|
|
138
|
+
break;
|
|
139
|
+
}
|
|
140
|
+
default:
|
|
141
|
+
matchResult = 4;
|
|
142
|
+
}
|
|
143
|
+
} else {
|
|
144
|
+
matchResult = 4;
|
|
145
|
+
}
|
|
146
|
+
switch (matchResult) {
|
|
147
|
+
case 0: {
|
|
148
|
+
const a = arc.GetAssay(identifier);
|
|
149
|
+
a.StaticHash = a.GetLightHashCode() + 1 | 0;
|
|
150
|
+
break;
|
|
151
|
+
}
|
|
152
|
+
case 1: {
|
|
153
|
+
const s = arc.GetStudy(identifier);
|
|
154
|
+
s.StaticHash = s.GetLightHashCode() + 1 | 0;
|
|
155
|
+
break;
|
|
156
|
+
}
|
|
157
|
+
case 2: {
|
|
158
|
+
const w = arc.GetWorkflow(identifier);
|
|
159
|
+
w.StaticHash = w.GetLightHashCode() + 1 | 0;
|
|
160
|
+
break;
|
|
161
|
+
}
|
|
162
|
+
case 3: {
|
|
163
|
+
const r = arc.GetRun(identifier);
|
|
164
|
+
r.StaticHash = r.GetLightHashCode() + 1 | 0;
|
|
165
|
+
break;
|
|
166
|
+
}
|
|
167
|
+
case 4: {
|
|
168
|
+
break;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
});
|
|
172
|
+
return Promise.resolve(FSharpResult$2_Ok(arc));
|
|
173
|
+
}
|
|
174
|
+
});
|
|
116
175
|
});
|
|
117
176
|
})));
|
|
118
177
|
}
|
|
@@ -131,7 +190,7 @@ class ARC extends ArcInvestigation {
|
|
|
131
190
|
const assayFolderPath = getAssayFolderPath(assayIdentifier);
|
|
132
191
|
const filteredPaths = paths.filter((p) => !p.startsWith(assayFolderPath));
|
|
133
192
|
this$.SetFilePaths(filteredPaths);
|
|
134
|
-
return toArray(delay(() => append(singleton(ARCtrl_ArcAssay__ArcAssay_ToDeleteContract(assay)), delay(() => this$.GetUpdateContracts()))));
|
|
193
|
+
return toArray(delay(() => append$1(singleton(ARCtrl_ArcAssay__ArcAssay_ToDeleteContract(assay)), delay(() => this$.GetUpdateContracts()))));
|
|
135
194
|
}
|
|
136
195
|
GetRunRemoveContracts(runIdentifier) {
|
|
137
196
|
const this$ = this;
|
|
@@ -147,7 +206,7 @@ class ARC extends ArcInvestigation {
|
|
|
147
206
|
const runFolderPath = getRunFolderPath(runIdentifier);
|
|
148
207
|
const filteredPaths = paths.filter((p) => !p.startsWith(runFolderPath));
|
|
149
208
|
this$.SetFilePaths(filteredPaths);
|
|
150
|
-
return toArray(delay(() => append(singleton(ARCtrl_ArcRun__ArcRun_ToDeleteContract(run)), delay(() => this$.GetUpdateContracts()))));
|
|
209
|
+
return toArray(delay(() => append$1(singleton(ARCtrl_ArcRun__ArcRun_ToDeleteContract(run)), delay(() => this$.GetUpdateContracts()))));
|
|
151
210
|
}
|
|
152
211
|
GetWorkflowRemoveContracts(workflowIdentifier) {
|
|
153
212
|
const this$ = this;
|
|
@@ -163,7 +222,7 @@ class ARC extends ArcInvestigation {
|
|
|
163
222
|
const workflowFolderPath = getWorkflowFolderPath(workflowIdentifier);
|
|
164
223
|
const filteredPaths = paths.filter((p) => !p.startsWith(workflowFolderPath));
|
|
165
224
|
this$.SetFilePaths(filteredPaths);
|
|
166
|
-
return toArray(delay(() => append(singleton(ARCtrl_ArcWorkflow__ArcWorkflow_ToDeleteContract(workflow)), delay(() => this$.GetUpdateContracts()))));
|
|
225
|
+
return toArray(delay(() => append$1(singleton(ARCtrl_ArcWorkflow__ArcWorkflow_ToDeleteContract(workflow)), delay(() => this$.GetUpdateContracts()))));
|
|
167
226
|
}
|
|
168
227
|
TryRemoveAssayAsync(arcPath, assayIdentifier) {
|
|
169
228
|
const this$ = this;
|
|
@@ -255,7 +314,7 @@ class ARC extends ArcInvestigation {
|
|
|
255
314
|
const newAssayFolderPath = getAssayFolderPath(newAssayIdentifier);
|
|
256
315
|
const renamedPaths = map((p) => replace(p, oldAssayFolderPath, newAssayFolderPath), paths);
|
|
257
316
|
this$.SetFilePaths(renamedPaths);
|
|
258
|
-
return toArray(delay(() => append(singleton(Contract.createRename(oldAssayFolderPath, newAssayFolderPath)), delay(() => this$.GetUpdateContracts()))));
|
|
317
|
+
return toArray(delay(() => append$1(singleton(Contract.createRename(oldAssayFolderPath, newAssayFolderPath)), delay(() => this$.GetUpdateContracts()))));
|
|
259
318
|
}
|
|
260
319
|
GetRunRenameContracts(oldRunIdentifier, newRunIdentifier) {
|
|
261
320
|
const this$ = this;
|
|
@@ -271,7 +330,7 @@ class ARC extends ArcInvestigation {
|
|
|
271
330
|
const newPath = getRunFolderPath(newRunIdentifier);
|
|
272
331
|
const renamedPaths = map((p) => replace(p, oldPath, newPath), paths);
|
|
273
332
|
this$.SetFilePaths(renamedPaths);
|
|
274
|
-
return toArray(delay(() => append(singleton(Contract.createRename(oldPath, newPath)), delay(() => this$.GetUpdateContracts()))));
|
|
333
|
+
return toArray(delay(() => append$1(singleton(Contract.createRename(oldPath, newPath)), delay(() => this$.GetUpdateContracts()))));
|
|
275
334
|
}
|
|
276
335
|
GetWorkflowRenameContracts(oldWorkflowIdentifier, newWorkflowIdentifier) {
|
|
277
336
|
const this$ = this;
|
|
@@ -287,7 +346,7 @@ class ARC extends ArcInvestigation {
|
|
|
287
346
|
const newPath = getWorkflowFolderPath(newWorkflowIdentifier);
|
|
288
347
|
const renamedPaths = map((p) => replace(p, oldPath, newPath), paths);
|
|
289
348
|
this$.SetFilePaths(renamedPaths);
|
|
290
|
-
return toArray(delay(() => append(singleton(Contract.createRename(oldPath, newPath)), delay(() => this$.GetUpdateContracts()))));
|
|
349
|
+
return toArray(delay(() => append$1(singleton(Contract.createRename(oldPath, newPath)), delay(() => this$.GetUpdateContracts()))));
|
|
291
350
|
}
|
|
292
351
|
TryRenameAssayAsync(arcPath, oldAssayIdentifier, newAssayIdentifier) {
|
|
293
352
|
const this$ = this;
|
|
@@ -320,15 +379,15 @@ class ARC extends ArcInvestigation {
|
|
|
320
379
|
const newStudyFolderPath = getStudyFolderPath(newStudyIdentifier);
|
|
321
380
|
const renamedPaths = map((p) => replace(p, oldStudyFolderPath, newStudyFolderPath), paths);
|
|
322
381
|
this$.SetFilePaths(renamedPaths);
|
|
323
|
-
return toArray(delay(() => append(singleton(Contract.createRename(oldStudyFolderPath, newStudyFolderPath)), delay(() => this$.GetUpdateContracts()))));
|
|
382
|
+
return toArray(delay(() => append$1(singleton(Contract.createRename(oldStudyFolderPath, newStudyFolderPath)), delay(() => this$.GetUpdateContracts()))));
|
|
324
383
|
}
|
|
325
384
|
TryRenameStudyAsync(arcPath, oldStudyIdentifier, newStudyIdentifier) {
|
|
326
385
|
const this$ = this;
|
|
327
386
|
return fullFillContractBatchAsync(false, arcPath, this$.GetStudyRenameContracts(oldStudyIdentifier, newStudyIdentifier));
|
|
328
387
|
}
|
|
329
|
-
WriteAsync(arcPath) {
|
|
388
|
+
WriteAsync(arcPath, additionalContracts) {
|
|
330
389
|
const this$ = this;
|
|
331
|
-
return PromiseBuilder__Run_212F1D4B(promise, PromiseBuilder__Delay_62FBFDE1(promise, () => this$.TryWriteAsync(arcPath).then((_arg) => {
|
|
390
|
+
return PromiseBuilder__Run_212F1D4B(promise, PromiseBuilder__Delay_62FBFDE1(promise, () => this$.TryWriteAsync(arcPath, void 0, unwrap(additionalContracts)).then((_arg) => {
|
|
332
391
|
const result = _arg;
|
|
333
392
|
if (result.tag === /* Error */
|
|
334
393
|
1) {
|
|
@@ -625,57 +684,56 @@ class ARC extends ArcInvestigation {
|
|
|
625
684
|
if (!defaultArg(skipUpdateFS, false)) {
|
|
626
685
|
this$.UpdateFileSystem();
|
|
627
686
|
}
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
}));
|
|
687
|
+
this$.StaticHash = this$.GetLightHashCode() | 0;
|
|
688
|
+
const investigationContract = ARCtrl_ArcInvestigation__ArcInvestigation_ToCreateContract(this$);
|
|
689
|
+
return toArray(delay(() => append$1(singleton(investigationContract), delay(() => append$1(collect((s) => {
|
|
690
|
+
s.StaticHash = s.GetLightHashCode() | 0;
|
|
691
|
+
return append$1(ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49(s, true), delay(() => {
|
|
692
|
+
if (s.Datamap != null) {
|
|
693
|
+
const dm = value(s.Datamap);
|
|
694
|
+
dm.StaticHash = safeHash(dm) | 0;
|
|
695
|
+
return singleton(ARCtrl_Datamap__Datamap_ToCreateContractForStudy_Z721C83C5(dm, s.Identifier));
|
|
696
|
+
} else {
|
|
697
|
+
return empty();
|
|
698
|
+
}
|
|
699
|
+
}));
|
|
700
|
+
}, this$.Studies), delay(() => append$1(collect((a) => {
|
|
701
|
+
a.StaticHash = a.GetLightHashCode() | 0;
|
|
702
|
+
return append$1(ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49(a, true), delay(() => {
|
|
703
|
+
if (a.Datamap != null) {
|
|
704
|
+
const dm_1 = value(a.Datamap);
|
|
705
|
+
dm_1.StaticHash = safeHash(dm_1) | 0;
|
|
706
|
+
return singleton(ARCtrl_Datamap__Datamap_ToCreateContractForAssay_Z721C83C5(dm_1, a.Identifier));
|
|
707
|
+
} else {
|
|
708
|
+
return empty();
|
|
709
|
+
}
|
|
710
|
+
}));
|
|
711
|
+
}, this$.Assays), delay(() => append$1(collect((w) => {
|
|
712
|
+
w.StaticHash = w.GetLightHashCode() | 0;
|
|
713
|
+
return append$1(ARCtrl_ArcWorkflow__ArcWorkflow_ToCreateContract_6FCE9E49(w, true), delay(() => {
|
|
714
|
+
if (w.Datamap != null) {
|
|
715
|
+
const dm_2 = value(w.Datamap);
|
|
716
|
+
dm_2.StaticHash = safeHash(dm_2) | 0;
|
|
717
|
+
return singleton(ARCtrl_Datamap__Datamap_ToCreateContractForWorkflow_Z721C83C5(dm_2, w.Identifier));
|
|
718
|
+
} else {
|
|
719
|
+
return empty();
|
|
720
|
+
}
|
|
721
|
+
}));
|
|
722
|
+
}, this$.Workflows), delay(() => append$1(collect((r) => {
|
|
723
|
+
r.StaticHash = r.GetLightHashCode() | 0;
|
|
724
|
+
return append$1(ARCtrl_ArcRun__ArcRun_ToCreateContract_6FCE9E49(r, true), delay(() => {
|
|
725
|
+
if (r.Datamap != null) {
|
|
726
|
+
const dm_3 = value(r.Datamap);
|
|
727
|
+
dm_3.StaticHash = safeHash(dm_3) | 0;
|
|
728
|
+
return singleton(ARCtrl_Datamap__Datamap_ToCreateContractForRun_Z721C83C5(dm_3, r.Identifier));
|
|
729
|
+
} else {
|
|
730
|
+
return empty();
|
|
731
|
+
}
|
|
732
|
+
}));
|
|
733
|
+
}, this$.Runs), delay(() => {
|
|
734
|
+
let l = void 0;
|
|
735
|
+
return append$1(this$.License != null ? (l = value(this$.License), l.StaticHash = safeHash(l) | 0, singleton(l.ToCreateContract())) : empty(), delay(() => append$1(singleton(Contract.createCreate(combine("assays", ".gitkeep"), "PlainText")), delay(() => append$1(singleton(Contract.createCreate(combine("studies", ".gitkeep"), "PlainText")), delay(() => append$1(singleton(Contract.createCreate(combine("workflows", ".gitkeep"), "PlainText")), delay(() => singleton(Contract.createCreate(combine("runs", ".gitkeep"), "PlainText"))))))))));
|
|
736
|
+
}))))))))))));
|
|
679
737
|
}
|
|
680
738
|
/**
|
|
681
739
|
* This function returns the all update Contracts for the current state of the ARC. Only update contracts for those ISA objects that have been changed will be returned.
|
|
@@ -693,11 +751,11 @@ class ARC extends ArcInvestigation {
|
|
|
693
751
|
} else {
|
|
694
752
|
return toArray(delay(() => {
|
|
695
753
|
const hash = this$.GetLightHashCode() | 0;
|
|
696
|
-
return append(this$.StaticHash !== hash ? singleton(ARCtrl_ArcInvestigation__ArcInvestigation_ToUpdateContract(this$)) : empty(), delay(() => {
|
|
754
|
+
return append$1(this$.StaticHash !== hash ? singleton(ARCtrl_ArcInvestigation__ArcInvestigation_ToUpdateContract(this$)) : empty(), delay(() => {
|
|
697
755
|
this$.StaticHash = hash | 0;
|
|
698
|
-
return append(collect((s) => {
|
|
756
|
+
return append$1(collect((s) => {
|
|
699
757
|
const hash_1 = s.GetLightHashCode() | 0;
|
|
700
|
-
return append(s.StaticHash === 0 ? ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49(s, true) : s.StaticHash !== hash_1 ? singleton(ARCtrl_ArcStudy__ArcStudy_ToUpdateContract(s)) : empty(), delay(() => {
|
|
758
|
+
return append$1(s.StaticHash === 0 ? ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49(s, true) : s.StaticHash !== hash_1 ? singleton(ARCtrl_ArcStudy__ArcStudy_ToUpdateContract(s)) : empty(), delay(() => {
|
|
701
759
|
let dm = void 0, dm_1 = void 0;
|
|
702
760
|
s.StaticHash = hash_1 | 0;
|
|
703
761
|
const matchValue = s.Datamap;
|
|
@@ -717,12 +775,12 @@ class ARC extends ArcInvestigation {
|
|
|
717
775
|
}
|
|
718
776
|
switch (matchResult) {
|
|
719
777
|
case 0:
|
|
720
|
-
return append(singleton(ARCtrl_Datamap__Datamap_ToCreateContractForStudy_Z721C83C5(dm_2, s.Identifier)), delay(() => {
|
|
778
|
+
return append$1(singleton(ARCtrl_Datamap__Datamap_ToCreateContractForStudy_Z721C83C5(dm_2, s.Identifier)), delay(() => {
|
|
721
779
|
dm_2.StaticHash = safeHash(dm_2) | 0;
|
|
722
780
|
return empty();
|
|
723
781
|
}));
|
|
724
782
|
case 1:
|
|
725
|
-
return append(singleton(ARCtrl_Datamap__Datamap_ToUpdateContractForStudy_Z721C83C5(dm_3, s.Identifier)), delay(() => {
|
|
783
|
+
return append$1(singleton(ARCtrl_Datamap__Datamap_ToUpdateContractForStudy_Z721C83C5(dm_3, s.Identifier)), delay(() => {
|
|
726
784
|
dm_3.StaticHash = safeHash(dm_3) | 0;
|
|
727
785
|
return empty();
|
|
728
786
|
}));
|
|
@@ -731,9 +789,9 @@ class ARC extends ArcInvestigation {
|
|
|
731
789
|
}
|
|
732
790
|
}
|
|
733
791
|
}));
|
|
734
|
-
}, this$.Studies), delay(() => append(collect((a) => {
|
|
792
|
+
}, this$.Studies), delay(() => append$1(collect((a) => {
|
|
735
793
|
const hash_2 = a.GetLightHashCode() | 0;
|
|
736
|
-
return append(a.StaticHash === 0 ? ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49(a, true) : a.StaticHash !== hash_2 ? singleton(ARCtrl_ArcAssay__ArcAssay_ToUpdateContract(a)) : empty(), delay(() => {
|
|
794
|
+
return append$1(a.StaticHash === 0 ? ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49(a, true) : a.StaticHash !== hash_2 ? singleton(ARCtrl_ArcAssay__ArcAssay_ToUpdateContract(a)) : empty(), delay(() => {
|
|
737
795
|
let dm_4 = void 0, dm_5 = void 0;
|
|
738
796
|
a.StaticHash = hash_2 | 0;
|
|
739
797
|
const matchValue_1 = a.Datamap;
|
|
@@ -753,12 +811,12 @@ class ARC extends ArcInvestigation {
|
|
|
753
811
|
}
|
|
754
812
|
switch (matchResult_1) {
|
|
755
813
|
case 0:
|
|
756
|
-
return append(singleton(ARCtrl_Datamap__Datamap_ToCreateContractForAssay_Z721C83C5(dm_6, a.Identifier)), delay(() => {
|
|
814
|
+
return append$1(singleton(ARCtrl_Datamap__Datamap_ToCreateContractForAssay_Z721C83C5(dm_6, a.Identifier)), delay(() => {
|
|
757
815
|
dm_6.StaticHash = safeHash(dm_6) | 0;
|
|
758
816
|
return empty();
|
|
759
817
|
}));
|
|
760
818
|
case 1:
|
|
761
|
-
return append(singleton(ARCtrl_Datamap__Datamap_ToUpdateContractForAssay_Z721C83C5(dm_7, a.Identifier)), delay(() => {
|
|
819
|
+
return append$1(singleton(ARCtrl_Datamap__Datamap_ToUpdateContractForAssay_Z721C83C5(dm_7, a.Identifier)), delay(() => {
|
|
762
820
|
dm_7.StaticHash = safeHash(dm_7) | 0;
|
|
763
821
|
return empty();
|
|
764
822
|
}));
|
|
@@ -767,9 +825,9 @@ class ARC extends ArcInvestigation {
|
|
|
767
825
|
}
|
|
768
826
|
}
|
|
769
827
|
}));
|
|
770
|
-
}, this$.Assays), delay(() => append(collect((w) => {
|
|
828
|
+
}, this$.Assays), delay(() => append$1(collect((w) => {
|
|
771
829
|
const hash_3 = w.GetLightHashCode() | 0;
|
|
772
|
-
return append(w.StaticHash === 0 ? ARCtrl_ArcWorkflow__ArcWorkflow_ToCreateContract_6FCE9E49(w, true) : w.StaticHash !== hash_3 ? singleton(ARCtrl_ArcWorkflow__ArcWorkflow_ToUpdateContract(w)) : empty(), delay(() => {
|
|
830
|
+
return append$1(w.StaticHash === 0 ? ARCtrl_ArcWorkflow__ArcWorkflow_ToCreateContract_6FCE9E49(w, true) : w.StaticHash !== hash_3 ? singleton(ARCtrl_ArcWorkflow__ArcWorkflow_ToUpdateContract(w)) : empty(), delay(() => {
|
|
773
831
|
let dm_8 = void 0, dm_9 = void 0;
|
|
774
832
|
w.StaticHash = hash_3 | 0;
|
|
775
833
|
const matchValue_2 = w.Datamap;
|
|
@@ -789,12 +847,12 @@ class ARC extends ArcInvestigation {
|
|
|
789
847
|
}
|
|
790
848
|
switch (matchResult_2) {
|
|
791
849
|
case 0:
|
|
792
|
-
return append(singleton(ARCtrl_Datamap__Datamap_ToCreateContractForWorkflow_Z721C83C5(dm_10, w.Identifier)), delay(() => {
|
|
850
|
+
return append$1(singleton(ARCtrl_Datamap__Datamap_ToCreateContractForWorkflow_Z721C83C5(dm_10, w.Identifier)), delay(() => {
|
|
793
851
|
dm_10.StaticHash = safeHash(dm_10) | 0;
|
|
794
852
|
return empty();
|
|
795
853
|
}));
|
|
796
854
|
case 1:
|
|
797
|
-
return append(singleton(ARCtrl_Datamap__Datamap_ToUpdateContractForWorkflow_Z721C83C5(dm_11, w.Identifier)), delay(() => {
|
|
855
|
+
return append$1(singleton(ARCtrl_Datamap__Datamap_ToUpdateContractForWorkflow_Z721C83C5(dm_11, w.Identifier)), delay(() => {
|
|
798
856
|
dm_11.StaticHash = safeHash(dm_11) | 0;
|
|
799
857
|
return empty();
|
|
800
858
|
}));
|
|
@@ -803,9 +861,9 @@ class ARC extends ArcInvestigation {
|
|
|
803
861
|
}
|
|
804
862
|
}
|
|
805
863
|
}));
|
|
806
|
-
}, this$.Workflows), delay(() => append(collect((r) => {
|
|
864
|
+
}, this$.Workflows), delay(() => append$1(collect((r) => {
|
|
807
865
|
const hash_4 = r.GetLightHashCode() | 0;
|
|
808
|
-
return append(r.StaticHash === 0 ? ARCtrl_ArcRun__ArcRun_ToCreateContract_6FCE9E49(r, true) : r.StaticHash !== hash_4 ? singleton(ARCtrl_ArcRun__ArcRun_ToUpdateContract(r)) : empty(), delay(() => {
|
|
866
|
+
return append$1(r.StaticHash === 0 ? ARCtrl_ArcRun__ArcRun_ToCreateContract_6FCE9E49(r, true) : r.StaticHash !== hash_4 ? singleton(ARCtrl_ArcRun__ArcRun_ToUpdateContract(r)) : empty(), delay(() => {
|
|
809
867
|
let dm_12 = void 0, dm_13 = void 0;
|
|
810
868
|
r.StaticHash = hash_4 | 0;
|
|
811
869
|
const matchValue_3 = r.Datamap;
|
|
@@ -825,12 +883,12 @@ class ARC extends ArcInvestigation {
|
|
|
825
883
|
}
|
|
826
884
|
switch (matchResult_3) {
|
|
827
885
|
case 0:
|
|
828
|
-
return append(singleton(ARCtrl_Datamap__Datamap_ToCreateContractForRun_Z721C83C5(dm_14, r.Identifier)), delay(() => {
|
|
886
|
+
return append$1(singleton(ARCtrl_Datamap__Datamap_ToCreateContractForRun_Z721C83C5(dm_14, r.Identifier)), delay(() => {
|
|
829
887
|
dm_14.StaticHash = safeHash(dm_14) | 0;
|
|
830
888
|
return empty();
|
|
831
889
|
}));
|
|
832
890
|
case 1:
|
|
833
|
-
return append(singleton(ARCtrl_Datamap__Datamap_ToUpdateContractForRun_Z721C83C5(dm_15, r.Identifier)), delay(() => {
|
|
891
|
+
return append$1(singleton(ARCtrl_Datamap__Datamap_ToUpdateContractForRun_Z721C83C5(dm_15, r.Identifier)), delay(() => {
|
|
834
892
|
dm_15.StaticHash = safeHash(dm_15) | 0;
|
|
835
893
|
return empty();
|
|
836
894
|
}));
|
|
@@ -846,7 +904,7 @@ class ARC extends ArcInvestigation {
|
|
|
846
904
|
} else {
|
|
847
905
|
const l = value(matchValue_4);
|
|
848
906
|
const hash_5 = safeHash(l) | 0;
|
|
849
|
-
return append(l.StaticHash === 0 ? singleton(l.ToCreateContract()) : l.StaticHash !== hash_5 ? singleton(l.ToUpdateContract()) : empty(), delay(() => {
|
|
907
|
+
return append$1(l.StaticHash === 0 ? singleton(l.ToCreateContract()) : l.StaticHash !== hash_5 ? singleton(l.ToUpdateContract()) : empty(), delay(() => {
|
|
850
908
|
l.StaticHash = hash_5 | 0;
|
|
851
909
|
return empty();
|
|
852
910
|
}));
|
|
@@ -859,7 +917,7 @@ class ARC extends ArcInvestigation {
|
|
|
859
917
|
GetGitInitContracts(branch, repositoryAddress, defaultGitignore, defaultGitattributes) {
|
|
860
918
|
const defaultGitignore_1 = defaultArg(defaultGitignore, false);
|
|
861
919
|
const defaultGitattributes_1 = defaultArg(defaultGitattributes, false);
|
|
862
|
-
return toArray(delay(() => append(singleton(Init_createInitContract_6DFDD678(unwrap(branch))), delay(() => append(defaultGitignore_1 ? singleton(gitignoreContract) : empty(), delay(() => append(defaultGitattributes_1 ? singleton(gitattributesContract) : empty(), delay(() => repositoryAddress != null ? singleton(Init_createAddRemoteContract_Z721C83C5(value(repositoryAddress))) : empty()))))))));
|
|
920
|
+
return toArray(delay(() => append$1(singleton(Init_createInitContract_6DFDD678(unwrap(branch))), delay(() => append$1(defaultGitignore_1 ? singleton(gitignoreContract) : empty(), delay(() => append$1(defaultGitattributes_1 ? singleton(gitattributesContract) : empty(), delay(() => repositoryAddress != null ? singleton(Init_createAddRemoteContract_Z721C83C5(value(repositoryAddress))) : empty()))))))));
|
|
863
921
|
}
|
|
864
922
|
static getCloneContract(remoteUrl, merge, branch, token, nolfs) {
|
|
865
923
|
return Clone_createCloneContract_5000466F(remoteUrl, unwrap(merge), unwrap(branch), unwrap(token), unwrap(nolfs));
|
|
@@ -932,13 +990,13 @@ class ARC extends ArcInvestigation {
|
|
|
932
990
|
const copy = this$.Copy();
|
|
933
991
|
const registeredStudies = copy.Studies.slice();
|
|
934
992
|
const registeredAssays = concat(map((s) => s.RegisteredAssays.slice(), registeredStudies));
|
|
935
|
-
const includeFiles = unionMany([ofSeq(toList(delay(() => append(singleton("isa.investigation.xlsx"), delay(() => append(singleton("README.md"), delay(() => this$.License != null ? singleton(value(this$.License).Path) : empty())))))), {
|
|
993
|
+
const includeFiles = unionMany([ofSeq(toList(delay(() => append$1(singleton("isa.investigation.xlsx"), delay(() => append$1(singleton("README.md"), delay(() => this$.License != null ? singleton(value(this$.License).Path) : empty())))))), {
|
|
936
994
|
Compare: (x, y) => comparePrimitives(x, y) | 0
|
|
937
995
|
}), unionMany(map((s_1) => {
|
|
938
996
|
const studyFoldername = concat$1("studies", "/", s_1.Identifier);
|
|
939
|
-
return ofSeq(toList(delay(() => append(singleton(concat$1(studyFoldername, "/", "isa.study.xlsx")), delay(() => append(singleton(concat$1(studyFoldername, "/", "README.md")), delay(() => collect((table) => collect((kv) => {
|
|
997
|
+
return ofSeq(toList(delay(() => append$1(singleton(concat$1(studyFoldername, "/", "isa.study.xlsx")), delay(() => append$1(singleton(concat$1(studyFoldername, "/", "README.md")), delay(() => collect((table) => collect((kv) => {
|
|
940
998
|
const textValue = kv[1].ToFreeTextCell().AsFreeText;
|
|
941
|
-
return append(singleton(textValue), delay(() => append(singleton(`${studyFoldername}/${"resources"}/${textValue}`), delay(() => singleton(`${studyFoldername}/${"protocols"}/${textValue}`)))));
|
|
999
|
+
return append$1(singleton(textValue), delay(() => append$1(singleton(`${studyFoldername}/${"resources"}/${textValue}`), delay(() => singleton(`${studyFoldername}/${"protocols"}/${textValue}`)))));
|
|
942
1000
|
}, table.Values), s_1.Tables))))))), {
|
|
943
1001
|
Compare: (x_1, y_1) => comparePrimitives(x_1, y_1) | 0
|
|
944
1002
|
});
|
|
@@ -946,9 +1004,9 @@ class ARC extends ArcInvestigation {
|
|
|
946
1004
|
Compare: (x_2, y_2) => comparePrimitives(x_2, y_2) | 0
|
|
947
1005
|
}), unionMany(map((a) => {
|
|
948
1006
|
const assayFoldername = concat$1("assays", "/", a.Identifier);
|
|
949
|
-
return ofSeq(toList(delay(() => append(singleton(concat$1(assayFoldername, "/", "isa.assay.xlsx")), delay(() => append(singleton(concat$1(assayFoldername, "/", "README.md")), delay(() => collect((table_1) => collect((kv_1) => {
|
|
1007
|
+
return ofSeq(toList(delay(() => append$1(singleton(concat$1(assayFoldername, "/", "isa.assay.xlsx")), delay(() => append$1(singleton(concat$1(assayFoldername, "/", "README.md")), delay(() => collect((table_1) => collect((kv_1) => {
|
|
950
1008
|
const textValue_1 = kv_1[1].ToFreeTextCell().AsFreeText;
|
|
951
|
-
return append(singleton(textValue_1), delay(() => append(singleton(`${assayFoldername}/${"dataset"}/${textValue_1}`), delay(() => singleton(`${assayFoldername}/${"protocols"}/${textValue_1}`)))));
|
|
1009
|
+
return append$1(singleton(textValue_1), delay(() => append$1(singleton(`${assayFoldername}/${"dataset"}/${textValue_1}`), delay(() => singleton(`${assayFoldername}/${"protocols"}/${textValue_1}`)))));
|
|
952
1010
|
}, table_1.Values), a.Tables))))))), {
|
|
953
1011
|
Compare: (x_3, y_3) => comparePrimitives(x_3, y_3) | 0
|
|
954
1012
|
});
|
|
@@ -1051,7 +1109,7 @@ class ARC extends ArcInvestigation {
|
|
|
1051
1109
|
Equals: (x, y) => x === y,
|
|
1052
1110
|
GetHashCode: (x) => stringHash(x) | 0
|
|
1053
1111
|
})) {
|
|
1054
|
-
const filePaths = append
|
|
1112
|
+
const filePaths = append([ValidationPackagesConfigHelper_ConfigFilePath], paths);
|
|
1055
1113
|
this$.SetFilePaths(filePaths);
|
|
1056
1114
|
}
|
|
1057
1115
|
return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toCreateContract_Static_724DAE55(vpc);
|
|
@@ -1225,7 +1283,7 @@ function ARCAux_updateFSByARC(isa, license, fs) {
|
|
|
1225
1283
|
runsFolder = FileSystemTree.createRunsFolder(runs);
|
|
1226
1284
|
const investigation = FileSystemTree.createInvestigationFile();
|
|
1227
1285
|
let tree_1;
|
|
1228
|
-
const tree = FileSystemTree.createRootFolder(toArray(delay(() => append(singleton(investigation), delay(() => append(singleton(assaysFolder), delay(() => append(singleton(studiesFolder), delay(() => append(singleton(workflowsFolder), delay(() => append(singleton(runsFolder), delay(() => license != null ? singleton(FileSystemTree_File(value(license).Path)) : empty())))))))))))));
|
|
1286
|
+
const tree = FileSystemTree.createRootFolder(toArray(delay(() => append$1(singleton(investigation), delay(() => append$1(singleton(assaysFolder), delay(() => append$1(singleton(studiesFolder), delay(() => append$1(singleton(workflowsFolder), delay(() => append$1(singleton(runsFolder), delay(() => license != null ? singleton(FileSystemTree_File(value(license).Path)) : empty())))))))))))));
|
|
1229
1287
|
tree_1 = FileSystem.create({
|
|
1230
1288
|
tree
|
|
1231
1289
|
});
|