@nfdi4plants/arctrl 2.1.0-alpha.2 → 2.1.0-alpha.3

package/ARC.js

@@ -1,12 +1,12 @@
 import { append as append_1, contains as contains_1, concat, fold, map, exactlyOne, tryPick, choose } from "./fable_modules/fable-library-js.4.22.0/Array.js";
-import { ARCtrl_ArcAssay__ArcAssay_ToUpdateContract_6FCE9E49, ARCtrl_ArcAssay__ArcAssay_ToCreateContract_66CF920, ARCtrl_ArcAssay__ArcAssay_ToDeleteContract, ARCtrl_ArcAssay__ArcAssay_tryFromReadContract_Static_7570923F } from "./Contract/ArcAssay.js";
-import { ARCtrl_DataMap__DataMap_tryFromReadContractForStudy_Static, ARCtrl_DataMap__DataMap_tryFromReadContractForAssay_Static } from "./Contract/Datamap.js";
-import { ARCtrl_ArcStudy__ArcStudy_ToCreateContract_66CF920, ARCtrl_ArcStudy__ArcStudy_ToUpdateContract_6FCE9E49, ARCtrl_ArcStudy__ArcStudy_tryFromReadContract_Static_7570923F } from "./Contract/ArcStudy.js";
+import { ARCtrl_ArcAssay__ArcAssay_ToUpdateContract, ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49, ARCtrl_ArcAssay__ArcAssay_ToDeleteContract, ARCtrl_ArcAssay__ArcAssay_tryFromReadContract_Static_7570923F } from "./Contract/ArcAssay.js";
+import { ARCtrl_DataMap__DataMap_ToUpdateContractForAssay_Z721C83C5, ARCtrl_DataMap__DataMap_ToCreateContractForAssay_Z721C83C5, ARCtrl_DataMap__DataMap_ToUpdateContractForStudy_Z721C83C5, ARCtrl_DataMap__DataMap_ToCreateContractForStudy_Z721C83C5, ARCtrl_DataMap__DataMap_tryFromReadContractForStudy_Static, ARCtrl_DataMap__DataMap_tryFromReadContractForAssay_Static } from "./Contract/Datamap.js";
+import { ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49, ARCtrl_ArcStudy__ArcStudy_ToUpdateContract, ARCtrl_ArcStudy__ArcStudy_tryFromReadContract_Static_7570923F } from "./Contract/ArcStudy.js";
 import { ARCtrl_ArcInvestigation__ArcInvestigation_ToUpdateContract, ARCtrl_ArcInvestigation__ArcInvestigation_tryFromReadContract_Static_7570923F } from "./Contract/ArcInvestigation.js";
-import { empty, iterate, find, tryFind, collect, singleton, append, delay, toList, contains, toArray } from "./fable_modules/fable-library-js.4.22.0/Seq.js";
+import { collect, empty, iterate, find, tryFind, map as map_1, singleton, append, delay, toList, contains, toArray } from "./fable_modules/fable-library-js.4.22.0/Seq.js";
 import { FileSystemTree } from "./FileSystem/FileSystemTree.js";
 import { FileSystem } from "./FileSystem/FileSystem.js";
-import { bind, map as map_1, value as value_2, defaultArg, unwrap } from "./fable_modules/fable-library-js.4.22.0/Option.js";
+import { bind, map as map_2, defaultArg, value as value_2, unwrap } from "./fable_modules/fable-library-js.4.22.0/Option.js";
 import { comparePrimitives, safeHash, stringHash } from "./fable_modules/fable-library-js.4.22.0/Util.js";
 import { getStudyFolderPath, getAssayFolderPath } from "./FileSystem/Path.js";
 import { printf, toText, replace } from "./fable_modules/fable-library-js.4.22.0/String.js";
@@ -19,7 +19,7 @@ import { ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF
 import { ArcInvestigation } from "./Core/ArcTypes.js";
 import { Assay_datamapFileNameFromIdentifier, Assay_fileNameFromIdentifier, Study_datamapFileNameFromIdentifier, Study_fileNameFromIdentifier } from "./Core/Helper/Identifier.js";
 import { ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522 } from "./Spreadsheet/ArcStudy.js";
-import { DataMap__set_StaticHash_Z524259A4 } from "./Core/DataMap.js";
+import { DataMap__get_StaticHash, DataMap__set_StaticHash_Z524259A4 } from "./Core/DataMap.js";
 import { toFsWorkbook } from "./Spreadsheet/DataMap.js";
 import { ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F } from "./Spreadsheet/ArcAssay.js";
 import { Dictionary_tryGet } from "./fable_modules/FsSpreadsheet.6.3.0-alpha.4/Cells/FsCellsCollection.fs.js";
@@ -143,7 +143,7 @@ export class ARC {
         const assayFolderPath = getAssayFolderPath(assayIdentifier);
         const filteredPaths = paths.filter((p) => !p.startsWith(assayFolderPath));
         this$.SetFilePaths(filteredPaths);
-        const collection = toList(delay(() => append(singleton(ARCtrl_ArcAssay__ArcAssay_ToDeleteContract(assay)), delay(() => append(singleton(ARCtrl_ArcInvestigation__ArcInvestigation_ToUpdateContract(isa)), delay(() => collect(ARCtrl_ArcStudy__ArcStudy_ToUpdateContract_6FCE9E49, studies)))))));
+        const collection = toList(delay(() => append(singleton(ARCtrl_ArcAssay__ArcAssay_ToDeleteContract(assay)), delay(() => append(singleton(ARCtrl_ArcInvestigation__ArcInvestigation_ToUpdateContract(isa)), delay(() => map_1(ARCtrl_ArcStudy__ArcStudy_ToUpdateContract, studies)))))));
         return Array.from(collection);
     }
     RenameAssay(oldAssayIdentifier, newAssayIdentifier) {
@@ -297,9 +297,8 @@ export class ARC {
         newFS = ARCAux_updateFSByCWL(this$._cwl, fs);
         this$._fs = newFS;
     }
-    GetWriteContracts(datamapAsFile) {
+    GetWriteContracts() {
         const this$ = this;
-        const datamapAsFile_1 = defaultArg(datamapAsFile, false);
         const workbooks = new Map([]);
         const matchValue = this$.ISA;
         if (matchValue == null) {
@@ -311,8 +310,8 @@ export class ARC {
             inv.StaticHash = (inv.GetLightHashCode() | 0);
             iterate((s) => {
                 s.StaticHash = (s.GetLightHashCode() | 0);
-                addToDict(workbooks, Study_fileNameFromIdentifier(s.Identifier), ["ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(s, undefined, !datamapAsFile_1)]);
-                if ((s.DataMap != null) && datamapAsFile_1) {
+                addToDict(workbooks, Study_fileNameFromIdentifier(s.Identifier), ["ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(s)]);
+                if (s.DataMap != null) {
                     const dm = value_2(s.DataMap);
                     DataMap__set_StaticHash_Z524259A4(dm, safeHash(dm));
                     addToDict(workbooks, Study_datamapFileNameFromIdentifier(s.Identifier), ["ISA_Datamap", toFsWorkbook(dm)]);
@@ -320,8 +319,8 @@ export class ARC {
             }, inv.Studies);
             iterate((a) => {
                 a.StaticHash = (a.GetLightHashCode() | 0);
-                addToDict(workbooks, Assay_fileNameFromIdentifier(a.Identifier), ["ISA_Assay", ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(a, !datamapAsFile_1)]);
-                if ((a.DataMap != null) && datamapAsFile_1) {
+                addToDict(workbooks, Assay_fileNameFromIdentifier(a.Identifier), ["ISA_Assay", ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(a)]);
+                if (a.DataMap != null) {
                     const dm_1 = value_2(a.DataMap);
                     DataMap__set_StaticHash_Z524259A4(dm_1, safeHash(dm_1));
                     addToDict(workbooks, Assay_datamapFileNameFromIdentifier(a.Identifier), ["ISA_Datamap", toFsWorkbook(dm_1)]);
@@ -340,7 +339,7 @@ export class ARC {
             }
         }, this$._fs.Tree.ToFilePaths(true));
     }
-    GetUpdateContracts(datamapAsFile) {
+    GetUpdateContracts() {
         let inv, inv_1, inv_2;
         const this$ = this;
         const matchValue = this$.ISA;
@@ -350,15 +349,81 @@ export class ARC {
                 inv_2.StaticHash = (hash | 0);
                 return append(collect((s) => {
                     const hash_1 = s.GetLightHashCode() | 0;
-                    return append((s.StaticHash === 0) ? ARCtrl_ArcStudy__ArcStudy_ToCreateContract_66CF920(s, true, unwrap(datamapAsFile)) : ARCtrl_ArcStudy__ArcStudy_ToUpdateContract_6FCE9E49(s, unwrap(datamapAsFile)), delay(() => {
+                    return append((s.StaticHash === 0) ? ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49(s, true) : ((s.StaticHash !== hash_1) ? singleton(ARCtrl_ArcStudy__ArcStudy_ToUpdateContract(s)) : empty()), delay(() => {
+                        let dm_1;
                         s.StaticHash = (hash_1 | 0);
-                        return empty();
+                        const matchValue_1 = s.DataMap;
+                        let matchResult, dm_2, dm_3;
+                        if (matchValue_1 != null) {
+                            if (DataMap__get_StaticHash(matchValue_1) === 0) {
+                                matchResult = 0;
+                                dm_2 = matchValue_1;
+                            }
+                            else if ((dm_1 = matchValue_1, DataMap__get_StaticHash(dm_1) !== safeHash(dm_1))) {
+                                matchResult = 1;
+                                dm_3 = matchValue_1;
+                            }
+                            else {
+                                matchResult = 2;
+                            }
+                        }
+                        else {
+                            matchResult = 2;
+                        }
+                        switch (matchResult) {
+                            case 0:
+                                return append(singleton(ARCtrl_DataMap__DataMap_ToCreateContractForStudy_Z721C83C5(dm_2, s.Identifier)), delay(() => {
+                                    DataMap__set_StaticHash_Z524259A4(dm_2, safeHash(dm_2));
+                                    return empty();
+                                }));
+                            case 1:
+                                return append(singleton(ARCtrl_DataMap__DataMap_ToUpdateContractForStudy_Z721C83C5(dm_3, s.Identifier)), delay(() => {
+                                    DataMap__set_StaticHash_Z524259A4(dm_3, safeHash(dm_3));
+                                    return empty();
+                                }));
+                            default: {
+                                return empty();
+                            }
+                        }
                     }));
                 }, inv_2.Studies), delay(() => collect((a) => {
                     const hash_2 = a.GetLightHashCode() | 0;
-                    return append((a.StaticHash === 0) ? ARCtrl_ArcAssay__ArcAssay_ToCreateContract_66CF920(a, true, unwrap(datamapAsFile)) : ARCtrl_ArcAssay__ArcAssay_ToUpdateContract_6FCE9E49(a, unwrap(datamapAsFile)), delay(() => {
+                    return append((a.StaticHash === 0) ? ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49(a, true) : ((a.StaticHash !== hash_2) ? singleton(ARCtrl_ArcAssay__ArcAssay_ToUpdateContract(a)) : empty()), delay(() => {
+                        let dm_5;
                         a.StaticHash = (hash_2 | 0);
-                        return empty();
+                        const matchValue_2 = a.DataMap;
+                        let matchResult_1, dm_6, dm_7;
+                        if (matchValue_2 != null) {
+                            if (DataMap__get_StaticHash(matchValue_2) === 0) {
+                                matchResult_1 = 0;
+                                dm_6 = matchValue_2;
+                            }
+                            else if ((dm_5 = matchValue_2, DataMap__get_StaticHash(dm_5) !== safeHash(dm_5))) {
+                                matchResult_1 = 1;
+                                dm_7 = matchValue_2;
+                            }
+                            else {
+                                matchResult_1 = 2;
+                            }
+                        }
+                        else {
+                            matchResult_1 = 2;
+                        }
+                        switch (matchResult_1) {
+                            case 0:
+                                return append(singleton(ARCtrl_DataMap__DataMap_ToCreateContractForAssay_Z721C83C5(dm_6, a.Identifier)), delay(() => {
+                                    DataMap__set_StaticHash_Z524259A4(dm_6, safeHash(dm_6));
+                                    return empty();
+                                }));
+                            case 1:
+                                return append(singleton(ARCtrl_DataMap__DataMap_ToUpdateContractForAssay_Z721C83C5(dm_7, a.Identifier)), delay(() => {
+                                    DataMap__set_StaticHash_Z524259A4(dm_7, safeHash(dm_7));
+                                    return empty();
+                                }));
+                            default: {
+                                return empty();
+                            }
+                        }
                     }));
                 }, inv_2.Assays)));
             }));
@@ -373,14 +438,14 @@ export class ARC {
     }
     Copy() {
         const this$ = this;
-        const isaCopy = map_1((i) => i.Copy(), this$._isa);
+        const isaCopy = map_2((i) => i.Copy(), this$._isa);
         const fsCopy = this$._fs.Copy();
         return new ARC(unwrap(isaCopy), this$._cwl, fsCopy);
     }
     GetRegisteredPayload(IgnoreHidden) {
         let tree, paths, array_3;
         const this$ = this;
-        const registeredStudies = defaultArg(map_1((isa) => isa.Studies.slice(), map_1((i) => i.Copy(), this$._isa)), []);
+        const registeredStudies = defaultArg(map_2((isa) => isa.Studies.slice(), map_2((i) => i.Copy(), this$._isa)), []);
         const registeredAssays = concat(map((s) => s.RegisteredAssays.slice(), registeredStudies));
         const includeFiles = unionMany([ofSeq(["isa.investigation.xlsx", "README.md"], {
             Compare: comparePrimitives,

package/Contract/ArcAssay.js

@@ -1,14 +1,12 @@
 import { equalsWith, item } from "../fable_modules/fable-library-js.4.22.0/Array.js";
 import { getAssayFolderPath, combineMany } from "../FileSystem/Path.js";
-import { safeHash, defaultOf } from "../fable_modules/fable-library-js.4.22.0/Util.js";
-import { unwrap, value, defaultArg } from "../fable_modules/fable-library-js.4.22.0/Option.js";
+import { defaultOf } from "../fable_modules/fable-library-js.4.22.0/Util.js";
+import { unwrap, defaultArg } from "../fable_modules/fable-library-js.4.22.0/Option.js";
 import { Assay_fileNameFromIdentifier } from "../Core/Helper/Identifier.js";
-import { ARCtrl_ArcAssay__ArcAssay_fromFsWorkbook_Static_32154C9D, ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F } from "../Spreadsheet/ArcAssay.js";
 import { Contract } from "./Contract.js";
+import { ARCtrl_ArcAssay__ArcAssay_fromFsWorkbook_Static_32154C9D, ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F } from "../Spreadsheet/ArcAssay.js";
 import { empty, singleton, collect, append, delay, toArray } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { FileSystemTree } from "../FileSystem/FileSystemTree.js";
-import { DataMap__get_StaticHash, DataMap__set_StaticHash_Z524259A4 } from "../Core/DataMap.js";
-import { ARCtrl_DataMap__DataMap_ToUpdateContractForAssay_Z721C83C5, ARCtrl_DataMap__DataMap_ToCreateContractForAssay_Z721C83C5 } from "./Datamap.js";
 
 export function $007CAssayPath$007C_$007C(input) {
     let matchResult;
@@ -38,40 +36,19 @@ export function $007CAssayPath$007C_$007C(input) {
     }
 }
 
-export function ARCtrl_ArcAssay__ArcAssay_ToCreateContract_66CF920(this$, WithFolder, datamapAsFile) {
+export function ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49(this$, WithFolder) {
     const withFolder = defaultArg(WithFolder, false);
-    const dataMapAsFile = defaultArg(datamapAsFile, false);
     const path = Assay_fileNameFromIdentifier(this$.Identifier);
-    const dto = ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(this$, !dataMapAsFile);
-    const c = Contract.createCreate(path, "ISA_Assay", dto);
+    const c = Contract.createCreate(path, "ISA_Assay", ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(this$));
     return toArray(delay(() => {
         let folderFS;
-        return append(withFolder ? ((folderFS = FileSystemTree.createAssaysFolder([FileSystemTree.createAssayFolder(this$.Identifier)]), collect((p) => (((p !== path) && (p !== "assays/.gitkeep")) ? singleton(Contract.createCreate(p, "PlainText")) : empty()), folderFS.ToFilePaths(false)))) : empty(), delay(() => {
-            let matchValue, dm;
-            return append((matchValue = this$.DataMap, (matchValue != null) ? ((dm = matchValue, (DataMap__set_StaticHash_Z524259A4(dm, safeHash(dm)), dataMapAsFile ? singleton(ARCtrl_DataMap__DataMap_ToCreateContractForAssay_Z721C83C5(dm, this$.Identifier)) : empty()))) : (empty())), delay(() => singleton(c)));
-        }));
+        return append(withFolder ? ((folderFS = FileSystemTree.createAssaysFolder([FileSystemTree.createAssayFolder(this$.Identifier)]), collect((p) => (((p !== path) && (p !== "assays/.gitkeep")) ? singleton(Contract.createCreate(p, "PlainText")) : empty()), folderFS.ToFilePaths(false)))) : empty(), delay(() => singleton(c)));
     }));
 }
 
-export function ARCtrl_ArcAssay__ArcAssay_ToUpdateContract_6FCE9E49(this$, datamapAsFile) {
-    const datamapAsFile_1 = defaultArg(datamapAsFile, false);
+export function ARCtrl_ArcAssay__ArcAssay_ToUpdateContract(this$) {
     const path = Assay_fileNameFromIdentifier(this$.Identifier);
-    const hash = this$.GetLightHashCode() | 0;
-    let datamapHasChanged;
-    const matchValue = this$.DataMap;
-    if (matchValue != null) {
-        const dm = matchValue;
-        const hc = safeHash(dm) !== DataMap__get_StaticHash(dm);
-        DataMap__set_StaticHash_Z524259A4(dm, safeHash(dm));
-        datamapHasChanged = hc;
-    }
-    else {
-        datamapHasChanged = false;
-    }
-    return toArray(delay(() => {
-        let dto;
-        return append(((hash !== this$.StaticHash) ? true : (datamapHasChanged && !datamapAsFile_1)) ? singleton((dto = ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(this$, !datamapAsFile_1), Contract.createUpdate(path, "ISA_Assay", dto))) : empty(), delay(() => ((datamapHasChanged && datamapAsFile_1) ? singleton(ARCtrl_DataMap__DataMap_ToUpdateContractForAssay_Z721C83C5(value(this$.DataMap), this$.Identifier)) : empty())));
-    }));
+    return Contract.createUpdate(path, "ISA_Assay", ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(this$));
 }
 
 export function ARCtrl_ArcAssay__ArcAssay_ToDeleteContract(this$) {
@@ -84,11 +61,11 @@ export function ARCtrl_ArcAssay__ArcAssay_toDeleteContract_Static_1501C0F8(assay
 }
 
 export function ARCtrl_ArcAssay__ArcAssay_toCreateContract_Static_Z2508BE4F(assay, WithFolder) {
-    return ARCtrl_ArcAssay__ArcAssay_ToCreateContract_66CF920(assay, unwrap(WithFolder));
+    return ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49(assay, unwrap(WithFolder));
 }
 
 export function ARCtrl_ArcAssay__ArcAssay_toUpdateContract_Static_1501C0F8(assay) {
-    return ARCtrl_ArcAssay__ArcAssay_ToUpdateContract_6FCE9E49(assay);
+    return ARCtrl_ArcAssay__ArcAssay_ToUpdateContract(assay);
 }
 
 export function ARCtrl_ArcAssay__ArcAssay_tryFromReadContract_Static_7570923F(c) {

package/Contract/ArcStudy.js

@@ -1,14 +1,12 @@
 import { equalsWith, item } from "../fable_modules/fable-library-js.4.22.0/Array.js";
 import { getStudyFolderPath, combineMany } from "../FileSystem/Path.js";
-import { safeHash, defaultOf } from "../fable_modules/fable-library-js.4.22.0/Util.js";
-import { unwrap, value, defaultArg } from "../fable_modules/fable-library-js.4.22.0/Option.js";
+import { defaultOf } from "../fable_modules/fable-library-js.4.22.0/Util.js";
+import { unwrap, defaultArg } from "../fable_modules/fable-library-js.4.22.0/Option.js";
 import { Study_fileNameFromIdentifier } from "../Core/Helper/Identifier.js";
-import { ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D, ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522 } from "../Spreadsheet/ArcStudy.js";
 import { Contract } from "./Contract.js";
+import { ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D, ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522 } from "../Spreadsheet/ArcStudy.js";
 import { empty, singleton, collect, append, delay, toArray } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { FileSystemTree } from "../FileSystem/FileSystemTree.js";
-import { DataMap__get_StaticHash, DataMap__set_StaticHash_Z524259A4 } from "../Core/DataMap.js";
-import { ARCtrl_DataMap__DataMap_ToUpdateContractForStudy_Z721C83C5, ARCtrl_DataMap__DataMap_ToCreateContractForStudy_Z721C83C5 } from "./Datamap.js";
 
 export function $007CStudyPath$007C_$007C(input) {
     let matchResult;
@@ -38,40 +36,19 @@ export function $007CStudyPath$007C_$007C(input) {
     }
 }
 
-export function ARCtrl_ArcStudy__ArcStudy_ToCreateContract_66CF920(this$, WithFolder, datamapAsFile) {
+export function ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49(this$, WithFolder) {
     const withFolder = defaultArg(WithFolder, false);
-    const dataMapAsFile = defaultArg(datamapAsFile, false);
     const path = Study_fileNameFromIdentifier(this$.Identifier);
-    const dto = ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(this$, undefined, !dataMapAsFile);
-    const c = Contract.createCreate(path, "ISA_Study", dto);
+    const c = Contract.createCreate(path, "ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(this$));
     return toArray(delay(() => {
         let folderFS;
-        return append(withFolder ? ((folderFS = FileSystemTree.createStudiesFolder([FileSystemTree.createStudyFolder(this$.Identifier)]), collect((p) => (((p !== path) && (p !== "studies/.gitkeep")) ? singleton(Contract.createCreate(p, "PlainText")) : empty()), folderFS.ToFilePaths(false)))) : empty(), delay(() => {
-            let matchValue, dm;
-            return append((matchValue = this$.DataMap, (matchValue != null) ? ((dm = matchValue, (DataMap__set_StaticHash_Z524259A4(dm, safeHash(dm)), dataMapAsFile ? singleton(ARCtrl_DataMap__DataMap_ToCreateContractForStudy_Z721C83C5(dm, this$.Identifier)) : empty()))) : (empty())), delay(() => singleton(c)));
-        }));
+        return append(withFolder ? ((folderFS = FileSystemTree.createStudiesFolder([FileSystemTree.createStudyFolder(this$.Identifier)]), collect((p) => (((p !== path) && (p !== "studies/.gitkeep")) ? singleton(Contract.createCreate(p, "PlainText")) : empty()), folderFS.ToFilePaths(false)))) : empty(), delay(() => singleton(c)));
     }));
 }
 
-export function ARCtrl_ArcStudy__ArcStudy_ToUpdateContract_6FCE9E49(this$, datamapAsFile) {
-    const datamapAsFile_1 = defaultArg(datamapAsFile, false);
+export function ARCtrl_ArcStudy__ArcStudy_ToUpdateContract(this$) {
     const path = Study_fileNameFromIdentifier(this$.Identifier);
-    const hash = this$.GetLightHashCode() | 0;
-    let datamapHasChanged;
-    const matchValue = this$.DataMap;
-    if (matchValue != null) {
-        const dm = matchValue;
-        const hc = safeHash(dm) !== DataMap__get_StaticHash(dm);
-        DataMap__set_StaticHash_Z524259A4(dm, safeHash(dm));
-        datamapHasChanged = hc;
-    }
-    else {
-        datamapHasChanged = false;
-    }
-    return toArray(delay(() => {
-        let dto;
-        return append(((hash !== this$.StaticHash) ? true : (datamapHasChanged && !datamapAsFile_1)) ? singleton((dto = ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(this$, undefined, !datamapAsFile_1), Contract.createUpdate(path, "ISA_Study", dto))) : empty(), delay(() => ((datamapHasChanged && datamapAsFile_1) ? singleton(ARCtrl_DataMap__DataMap_ToUpdateContractForStudy_Z721C83C5(value(this$.DataMap), this$.Identifier)) : empty())));
-    }));
+    return Contract.createUpdate(path, "ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(this$));
 }
 
 export function ARCtrl_ArcStudy__ArcStudy_ToDeleteContract(this$) {
@@ -84,11 +61,11 @@ export function ARCtrl_ArcStudy__ArcStudy_toDeleteContract_Static_1680536E(study
 }
 
 export function ARCtrl_ArcStudy__ArcStudy_toCreateContract_Static_Z76BBA099(study, WithFolder) {
-    return ARCtrl_ArcStudy__ArcStudy_ToCreateContract_66CF920(study, unwrap(WithFolder));
+    return ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49(study, unwrap(WithFolder));
 }
 
 export function ARCtrl_ArcStudy__ArcStudy_toUpdateContract_Static_1680536E(study) {
-    return ARCtrl_ArcStudy__ArcStudy_ToUpdateContract_6FCE9E49(study);
+    return ARCtrl_ArcStudy__ArcStudy_ToUpdateContract(study);
 }
 
 export function ARCtrl_ArcStudy__ArcStudy_tryFromReadContract_Static_7570923F(c) {

package/Spreadsheet/ArcAssay.js

@@ -1,113 +1,136 @@
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.3.0-alpha.4/FsWorksheet.fs.js";
-import { iterate, isEmpty as isEmpty_1, tryPick, choose, tryFind, tryHead, head, exists, map, singleton, append, delay, iterateIndexed } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
-import { SparseRowModule_tryGetValueAt, SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
-import { fromRows as fromRows_1, toRows as toRows_1 } from "./Metadata/Assays.js";
-import { empty, isEmpty, ofSeq, singleton as singleton_1 } from "../fable_modules/fable-library-js.4.22.0/List.js";
-import { fromRows as fromRows_2, toRows as toRows_2 } from "./Metadata/Contacts.js";
-import { toConsole, printf, toFail } from "../fable_modules/fable-library-js.4.22.0/String.js";
+import { iterate, isEmpty as isEmpty_1, tryPick, choose, tryFind, map, iterateIndexed, singleton, append, delay, tryHead, head, exists } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { getEnumerator } from "../fable_modules/fable-library-js.4.22.0/Util.js";
+import { toRows, fromRows } from "./Metadata/Assays.js";
+import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/Contacts.js";
 import { ArcAssay } from "../Core/ArcTypes.js";
 import { createMissingIdentifier } from "../Core/Helper/Identifier.js";
 import { unwrap, toArray, defaultArg } from "../fable_modules/fable-library-js.4.22.0/Option.js";
+import { ofSeq, singleton as singleton_1, empty, isEmpty } from "../fable_modules/fable-library-js.4.22.0/List.js";
+import { SparseRowModule_fromAllValues, SparseRowModule_getAllValues, SparseRowModule_fromFsRow, SparseRowModule_writeToSheet, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt } from "./Metadata/SparseTable.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.3.0-alpha.4/FsWorksheet.fs.js";
+import { toConsole, printf, toFail } from "../fable_modules/fable-library-js.4.22.0/String.js";
 import { toFsWorksheet as toFsWorksheet_1, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
 import { toFsWorksheet, tryFromFsWorksheet as tryFromFsWorksheet_1 } from "./DataMapTable/DataMapTable.js";
 import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.3.0-alpha.4/FsWorkbook.fs.js";
 
-export function ArcAssay_toMetadataSheet(assay) {
-    let assay_1;
-    const sheet = new FsWorksheet("isa_assay");
-    iterateIndexed((rowI, r) => {
-        SparseRowModule_writeToSheet(rowI + 1, r, sheet);
-    }, (assay_1 = assay, delay(() => append(singleton(SparseRowModule_fromValues(["ASSAY"])), delay(() => append(toRows_1("Assay", singleton_1(assay_1)), delay(() => append(singleton(SparseRowModule_fromValues(["ASSAY PERFORMERS"])), delay(() => toRows_2("Assay Person", ofSeq(assay_1.Performers)))))))))));
-    return sheet;
-}
-
-export function ArcAssay_fromMetadataSheet(sheet) {
-    try {
-        const rows_1 = map(SparseRowModule_fromFsRow, sheet.Rows);
-        const patternInput = exists((row) => {
-            const s = head(row)[1];
-            return s.startsWith("Assay");
-        }, rows_1) ? ["Assay", "Assay Person"] : [undefined, undefined];
-        const en = getEnumerator(rows_1);
-        const loop = (lastLine_mut, assays_mut, contacts_mut, lineNumber_mut) => {
-            let k;
-            loop:
-            while (true) {
-                const lastLine = lastLine_mut, assays = assays_mut, contacts = contacts_mut, lineNumber = lineNumber_mut;
-                let matchResult, k_2, k_3, k_4;
-                if (lastLine != null) {
-                    if ((k = lastLine, (k === "ASSAY") ? true : (k === "ASSAY METADATA"))) {
-                        matchResult = 0;
-                        k_2 = lastLine;
-                    }
-                    else if (lastLine === "ASSAY PERFORMERS") {
-                        matchResult = 1;
-                        k_3 = lastLine;
-                    }
-                    else {
-                        matchResult = 2;
-                        k_4 = lastLine;
-                    }
+export function ArcAssay_fromRows(rows) {
+    const patternInput = exists((row) => {
+        const s = head(row)[1];
+        return s.startsWith("Assay");
+    }, rows) ? ["Assay", "Assay Person"] : [undefined, undefined];
+    const en = getEnumerator(rows);
+    const loop = (lastRow_mut, assays_mut, contacts_mut, rowNumber_mut) => {
+        let prefix;
+        loop:
+        while (true) {
+            const lastRow = lastRow_mut, assays = assays_mut, contacts = contacts_mut, rowNumber = rowNumber_mut;
+            let matchResult, prefix_2, prefix_3;
+            if (lastRow != null) {
+                if ((prefix = lastRow, (prefix === "ASSAY") ? true : (prefix === "ASSAY METADATA"))) {
+                    matchResult = 0;
+                    prefix_2 = lastRow;
+                }
+                else if (lastRow === "ASSAY PERFORMERS") {
+                    matchResult = 1;
+                    prefix_3 = lastRow;
                 }
                 else {
                     matchResult = 2;
-                    k_4 = lastLine;
                 }
-                switch (matchResult) {
-                    case 0: {
-                        const patternInput_1 = fromRows_1(patternInput[0], lineNumber + 1, en);
-                        lastLine_mut = patternInput_1[0];
-                        assays_mut = patternInput_1[3];
-                        contacts_mut = contacts;
-                        lineNumber_mut = patternInput_1[1];
-                        continue loop;
-                    }
-                    case 1: {
-                        const patternInput_2 = fromRows_2(patternInput[1], lineNumber + 1, en);
-                        lastLine_mut = patternInput_2[0];
-                        assays_mut = assays;
-                        contacts_mut = patternInput_2[3];
-                        lineNumber_mut = patternInput_2[1];
-                        continue loop;
-                    }
-                    default: {
-                        let matchResult_1, assays_2, contacts_2;
-                        if (isEmpty(assays)) {
-                            if (isEmpty(contacts)) {
-                                matchResult_1 = 0;
-                            }
-                            else {
-                                matchResult_1 = 1;
-                                assays_2 = assays;
-                                contacts_2 = contacts;
-                            }
+            }
+            else {
+                matchResult = 2;
+            }
+            switch (matchResult) {
+                case 0: {
+                    const patternInput_1 = fromRows(patternInput[0], rowNumber + 1, en);
+                    lastRow_mut = patternInput_1[0];
+                    assays_mut = patternInput_1[3];
+                    contacts_mut = contacts;
+                    rowNumber_mut = patternInput_1[1];
+                    continue loop;
+                }
+                case 1: {
+                    const patternInput_2 = fromRows_1(patternInput[1], rowNumber + 1, en);
+                    lastRow_mut = patternInput_2[0];
+                    assays_mut = assays;
+                    contacts_mut = patternInput_2[3];
+                    rowNumber_mut = patternInput_2[1];
+                    continue loop;
+                }
+                default: {
+                    let matchResult_1, assays_2, contacts_2;
+                    if (isEmpty(assays)) {
+                        if (isEmpty(contacts)) {
+                            matchResult_1 = 0;
                         }
                         else {
                             matchResult_1 = 1;
                             assays_2 = assays;
                             contacts_2 = contacts;
                         }
-                        switch (matchResult_1) {
-                            case 0:
-                                return ArcAssay.create(createMissingIdentifier());
-                            default: {
-                                const performers = Array.from(contacts_2);
-                                const assay = defaultArg(tryHead(assays_2), ArcAssay.create(createMissingIdentifier()));
-                                return ArcAssay.setPerformers(performers, assay);
-                            }
+                    }
+                    else {
+                        matchResult_1 = 1;
+                        assays_2 = assays;
+                        contacts_2 = contacts;
+                    }
+                    switch (matchResult_1) {
+                        case 0:
+                            return ArcAssay.create(createMissingIdentifier());
+                        default: {
+                            const performers = Array.from(contacts_2);
+                            const assay = defaultArg(tryHead(assays_2), ArcAssay.create(createMissingIdentifier()));
+                            return ArcAssay.setPerformers(performers, assay);
                         }
                     }
                 }
-                break;
             }
-        };
-        if (en["System.Collections.IEnumerator.MoveNext"]()) {
-            return loop(SparseRowModule_tryGetValueAt(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]()), empty(), empty(), 1);
-        }
-        else {
-            throw new Error("empty assay metadata sheet");
+            break;
         }
+    };
+    if (en["System.Collections.IEnumerator.MoveNext"]()) {
+        return loop(SparseRowModule_tryGetValueAt(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]()), empty(), empty(), 1);
+    }
+    else {
+        throw new Error("empty assay metadata sheet");
+    }
+}
+
+export function ArcAssay_toRows(assay) {
+    return delay(() => append(singleton(SparseRowModule_fromValues(["ASSAY"])), delay(() => append(toRows("Assay", singleton_1(assay)), delay(() => append(singleton(SparseRowModule_fromValues(["ASSAY PERFORMERS"])), delay(() => toRows_1("Assay Person", ofSeq(assay.Performers)))))))));
+}
+
+export function ArcAssay_toMetadataSheet(assay) {
+    const sheet = new FsWorksheet("isa_assay");
+    iterateIndexed((rowI, r) => {
+        SparseRowModule_writeToSheet(rowI + 1, r, sheet);
+    }, ArcAssay_toRows(assay));
+    return sheet;
+}
+
+export function ArcAssay_fromMetadataSheet(sheet) {
+    try {
+        const rows = map(SparseRowModule_fromFsRow, sheet.Rows);
+        const hasPrefix = exists((row) => {
+            const s = head(row)[1];
+            return s.startsWith("Assay");
+        }, rows);
+        return ArcAssay_fromRows(rows);
+    }
+    catch (err) {
+        const arg = err.message;
+        return toFail(printf("Failed while parsing metadatasheet: %s"))(arg);
+    }
+}
+
+export function ArcAssay_toMetadataCollection(assay) {
+    return map(SparseRowModule_getAllValues, ArcAssay_toRows(assay));
+}
+
+export function ArcAssay_fromMetadataCollection(collection) {
+    try {
+        return ArcAssay_fromRows(map(SparseRowModule_fromAllValues, collection));
     }
     catch (err) {
         const arg = err.message;

package/Spreadsheet/ArcInvestigation.js

@@ -3,7 +3,7 @@ import { record_type, list_type, string_type } from "../fable_modules/fable-libr
 import { Remark, Comment$_$reflection } from "../Core/Comment.js";
 import { head, tail, isEmpty, ofSeq, concat, unzip, append, reverse, cons, empty, map, ofArray } from "../fable_modules/fable-library-js.4.22.0/List.js";
 import { Remark_wrapRemark, Comment_toString, Comment_fromString } from "./Metadata/Comment.js";
-import { SparseRowModule_writeToSheet, SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt, SparseTable_ToRows_759CAFC1, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValueDefault_5BAE6133 } from "./Metadata/SparseTable.js";
+import { SparseRowModule_writeToSheet, SparseRowModule_fromFsRow, SparseRowModule_fromAllValues, SparseRowModule_getAllValues, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt, SparseTable_ToRows_759CAFC1, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValueDefault_5BAE6133 } from "./Metadata/SparseTable.js";
 import { addToDict } from "../fable_modules/fable-library-js.4.22.0/MapUtil.js";
 import { value as value_1, defaultArg } from "../fable_modules/fable-library-js.4.22.0/Option.js";
 import { Option_fromValueWithDefault, ResizeArray_iter } from "../Core/Helper/Collections.js";
@@ -14,7 +14,7 @@ import { toRows, fromRows } from "./Metadata/OntologySourceReference.js";
 import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/Publication.js";
 import { toRows as toRows_2, fromRows as fromRows_2 } from "./Metadata/Contacts.js";
 import { toRows as toRows_3, fromRows as fromRows_3 } from "./Metadata/Study.js";
-import { iterateIndexed, map as map_1, tryFind as tryFind_1, toList, collect, singleton, append as append_1, delay } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { iterateIndexed, tryFind as tryFind_1, map as map_1, toList, collect, singleton, append as append_1, delay } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { tryFind, ofList } from "../fable_modules/fable-library-js.4.22.0/Map.js";
 import { printf, toFail } from "../fable_modules/fable-library-js.4.22.0/String.js";
 import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.3.0-alpha.4/FsWorksheet.fs.js";
@@ -102,7 +102,7 @@ export function ArcInvestigation_fromRows(rows) {
         loop:
         while (true) {
             const lastLine = lastLine_mut, ontologySourceReferences = ontologySourceReferences_mut, investigationInfo = investigationInfo_mut, publications = publications_mut, contacts = contacts_mut, studies = studies_mut, remarks = remarks_mut, lineNumber = lineNumber_mut;
-            let matchResult, k_5, k_6, k_7, k_8, k_9, k_10;
+            let matchResult, k_5, k_6, k_7, k_8, k_9;
             if (lastLine != null) {
                 switch (lastLine) {
                     case "ONTOLOGY SOURCE REFERENCE": {
@@ -130,15 +130,12 @@ export function ArcInvestigation_fromRows(rows) {
                         k_9 = lastLine;
                         break;
                     }
-                    default: {
+                    default:
                         matchResult = 5;
-                        k_10 = lastLine;
-                    }
                 }
             }
             else {
                 matchResult = 5;
-                k_10 = lastLine;
             }
             switch (matchResult) {
                 case 0: {
@@ -283,6 +280,14 @@ export function ArcInvestigation_toRows(investigation) {
     })()));
 }
 
+export function ArcInvestigation_toMetadataCollection(investigation) {
+    return map_1(SparseRowModule_getAllValues, ArcInvestigation_toRows(investigation));
+}
+
+export function ArcInvestigation_fromMetadataCollection(collection) {
+    return ArcInvestigation_fromRows(map_1(SparseRowModule_fromAllValues, collection));
+}
+
 export function ArcInvestigation_isMetadataSheetName(name) {
     if (name === "isa_investigation") {
         return true;

package/Spreadsheet/ArcStudy.js

@@ -1,10 +1,10 @@
 import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.3.0-alpha.4/FsWorksheet.fs.js";
 import { iterate, tryPick, tryFind, map, append, iterateIndexed } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
-import { SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
-import { fromRows as fromRows_1, toRows } from "./Metadata/Study.js";
+import { SparseRowModule_fromAllValues, SparseRowModule_getAllValues, SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
+import { fromRows, toRows } from "./Metadata/Study.js";
+import { getEnumerator } from "../fable_modules/fable-library-js.4.22.0/Util.js";
 import { toConsole, printf, toFail } from "../fable_modules/fable-library-js.4.22.0/String.js";
 import { unwrap, toArray, defaultArg } from "../fable_modules/fable-library-js.4.22.0/Option.js";
-import { getEnumerator } from "../fable_modules/fable-library-js.4.22.0/Util.js";
 import { ArcStudy } from "../Core/ArcTypes.js";
 import { createMissingIdentifier } from "../Core/Helper/Identifier.js";
 import { empty } from "../fable_modules/fable-library-js.4.22.0/List.js";
@@ -22,10 +22,30 @@ export function ArcStudy_toMetadataSheet(study, assays) {
     return sheet;
 }
 
+export function ArcStudy_fromRows(rows) {
+    const en = getEnumerator(rows);
+    en["System.Collections.IEnumerator.MoveNext"]();
+    return fromRows(2, en)[3];
+}
+
 export function ArcStudy_fromMetadataSheet(sheet) {
-    let en;
     try {
-        return defaultArg((en = getEnumerator(map(SparseRowModule_fromFsRow, sheet.Rows)), (void en["System.Collections.IEnumerator.MoveNext"](), fromRows_1(2, en)[3])), [ArcStudy.create(createMissingIdentifier()), empty()]);
+        return defaultArg(ArcStudy_fromRows(map(SparseRowModule_fromFsRow, sheet.Rows)), [ArcStudy.create(createMissingIdentifier()), empty()]);
+    }
+    catch (err) {
+        const arg = err.message;
+        return toFail(printf("Failed while parsing metadatasheet: %s"))(arg);
+    }
+}
+
+export function ArcStudy_toMetadataCollection(study, assays) {
+    let source_1;
+    return map(SparseRowModule_getAllValues, (source_1 = toRows(study, assays), append([SparseRowModule_fromValues(["STUDY"])], source_1)));
+}
+
+export function ArcStudy_fromMetadataCollection(collection) {
+    try {
+        return defaultArg(ArcStudy_fromRows(map(SparseRowModule_fromAllValues, collection)), [ArcStudy.create(createMissingIdentifier()), empty()]);
     }
     catch (err) {
         const arg = err.message;

package/Spreadsheet/Template.js

@@ -4,7 +4,7 @@ import { ofSeq, append as append_1, reverse, map, empty, ofArray } from "../fabl
 import { toRows, fromRows, toSparseTable, fromSparseTable } from "./Metadata/OntologyAnnotation.js";
 import { Comment$_$reflection } from "../Core/Comment.js";
 import { Comment_fromString } from "./Metadata/Comment.js";
-import { SparseRowModule_fromFsRow, SparseRowModule_writeToSheet, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt, SparseTable_ToRows_759CAFC1, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValueDefault_5BAE6133 } from "./Metadata/SparseTable.js";
+import { SparseRowModule_fromAllValues, SparseRowModule_getAllValues, SparseRowModule_fromFsRow, SparseRowModule_writeToSheet, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt, SparseTable_ToRows_759CAFC1, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValueDefault_5BAE6133 } from "./Metadata/SparseTable.js";
 import { createMissingIdentifier } from "../Core/Helper/Identifier.js";
 import { addToDict } from "../fable_modules/fable-library-js.4.22.0/MapUtil.js";
 import { List_distinct } from "../fable_modules/fable-library-js.4.22.0/Seq2.js";
@@ -281,6 +281,14 @@ export function Template_fromMetadataSheet(sheet) {
     return Metadata_Template_fromRows(map_1(SparseRowModule_fromFsRow, sheet.Rows));
 }
 
+export function Template_toMetadataCollection(template) {
+    return map_1(SparseRowModule_getAllValues, Metadata_Template_toRows(template));
+}
+
+export function Template_fromMetadataCollection(collection) {
+    return Metadata_Template_fromRows(map_1(SparseRowModule_fromAllValues, collection));
+}
+
 /**
  * Reads an assay from a spreadsheet
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nfdi4plants/arctrl",
-  "version": "2.1.0-alpha.2",
+  "version": "2.1.0-alpha.3",
   "description": "Top level ARC DataModel and API function descriptions.",
   "type": "module",
   "main": "index.js",