@nfdi4plants/arctrl 2.0.1 → 2.1.0-alpha.2

package/ARC.js

@@ -1,37 +1,37 @@
-import { append as append_1, contains as contains_1, concat, fold, map, exactlyOne, tryPick, choose } from "./fable_modules/fable-library-js.4.16.0/Array.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 { 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_ArcInvestigation__ArcInvestigation_ToUpdateContract, ARCtrl_ArcInvestigation__ArcInvestigation_tryFromReadContract_Static_7570923F } from "./Contract/ArcInvestigation.js";
-import { collect, empty, iterate, find, tryFind, map as map_1, singleton, append, delay, toList, contains, toArray } from "./fable_modules/fable-library-js.4.16.0/Seq.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 { FileSystemTree } from "./FileSystem/FileSystemTree.js";
 import { FileSystem } from "./FileSystem/FileSystem.js";
-import { bind, map as map_2, defaultArg, value as value_2, unwrap } from "./fable_modules/fable-library-js.4.16.0/Option.js";
-import { comparePrimitives, safeHash, stringHash } from "./fable_modules/fable-library-js.4.16.0/Util.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 { 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.16.0/String.js";
+import { printf, toText, replace } from "./fable_modules/fable-library-js.4.22.0/String.js";
 import { Contract } from "./Contract/Contract.js";
-import { ofArray } from "./fable_modules/fable-library-js.4.16.0/List.js";
+import { ofArray } from "./fable_modules/fable-library-js.4.22.0/List.js";
 import { tryISAReadContractFromPath } from "./Contract/ARC.js";
 import { ArcTables } from "./Core/Table/ArcTables.js";
-import { addToDict } from "./fable_modules/fable-library-js.4.16.0/MapUtil.js";
+import { addToDict } from "./fable_modules/fable-library-js.4.22.0/MapUtil.js";
 import { ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF } from "./Spreadsheet/ArcInvestigation.js";
 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__get_StaticHash, DataMap__set_StaticHash_Z524259A4 } from "./Core/DataMap.js";
+import { 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.2.0/Cells/FsCellsCollection.fs.js";
+import { Dictionary_tryGet } from "./fable_modules/FsSpreadsheet.6.3.0-alpha.4/Cells/FsCellsCollection.fs.js";
 import { Clone_createCloneContract_5000466F, Init_createAddRemoteContract_Z721C83C5, gitignoreContract, gitattributesContract, Init_createInitContract_6DFDD678 } from "./Contract/Git.js";
-import { FSharpSet__Contains, ofSeq, unionMany } from "./fable_modules/fable-library-js.4.16.0/Set.js";
-import { ofSeq as ofSeq_1 } from "./fable_modules/fable-library-js.4.16.0/Map.js";
-import { fromString } from "./fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
-import { encoder, decoder as decoder_1 } from "./Json/ARC.js";
-import { toString } from "./fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
+import { FSharpSet__Contains, ofSeq, unionMany } from "./fable_modules/fable-library-js.4.22.0/Set.js";
+import { ofSeq as ofSeq_1 } from "./fable_modules/fable-library-js.4.22.0/Map.js";
+import { fromString } from "./fable_modules/Thoth.Json.JavaScript.0.3.0/Decode.fs.js";
+import { encoder, decoder as decoder_1 } from "./JsonIO/ARC.js";
+import { toString } from "./fable_modules/Thoth.Json.JavaScript.0.3.0/Encode.fs.js";
 import { defaultSpaces } from "./Json/Encode.js";
 import { ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_tryFromReadContract_Static_7570923F, ValidationPackagesConfigHelper_ReadContract, ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toDeleteContract_Static_724DAE55, ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toCreateContract_Static_724DAE55, ValidationPackagesConfigHelper_ConfigFilePath } from "./Contract/ValidationPackagesConfig.js";
-import { class_type } from "./fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { class_type } from "./fable_modules/fable-library-js.4.22.0/Reflection.js";
 
 export function ARCAux_getArcAssaysFromContracts(contracts) {
     return choose(ARCtrl_ArcAssay__ArcAssay_tryFromReadContract_Static_7570923F, contracts);
@@ -141,9 +141,9 @@ export class ARC {
         isa.RemoveAssay(assayIdentifier);
         const paths = this$.FileSystem.Tree.ToFilePaths();
         const assayFolderPath = getAssayFolderPath(assayIdentifier);
-        const filteredPaths = paths.filter((p) => !(p.indexOf(assayFolderPath) === 0));
+        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(() => map_1(ARCtrl_ArcStudy__ArcStudy_ToUpdateContract, studies)))))));
+        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)))))));
         return Array.from(collection);
     }
     RenameAssay(oldAssayIdentifier, newAssayIdentifier) {
@@ -186,7 +186,7 @@ export class ARC {
         isa.RemoveStudy(studyIdentifier);
         const paths = this$.FileSystem.Tree.ToFilePaths();
         const studyFolderPath = getStudyFolderPath(studyIdentifier);
-        const filteredPaths = paths.filter((p) => !(p.indexOf(studyFolderPath) === 0));
+        const filteredPaths = paths.filter((p) => !p.startsWith(studyFolderPath));
         this$.SetFilePaths(filteredPaths);
         const collection = ofArray([Contract.createDelete(studyFolderPath), ARCtrl_ArcInvestigation__ArcInvestigation_ToUpdateContract(isa)]);
         return Array.from(collection);
@@ -219,7 +219,7 @@ export class ARC {
         return Array.from(collection);
     }
     static fromFilePaths(filePaths) {
-        return new ARC(void 0, void 0, FileSystem.fromFilePaths(filePaths));
+        return new ARC(undefined, undefined, FileSystem.fromFilePaths(filePaths));
     }
     SetFilePaths(filePaths) {
         const this$ = this;
@@ -297,8 +297,9 @@ export class ARC {
         newFS = ARCAux_updateFSByCWL(this$._cwl, fs);
         this$._fs = newFS;
     }
-    GetWriteContracts() {
+    GetWriteContracts(datamapAsFile) {
         const this$ = this;
+        const datamapAsFile_1 = defaultArg(datamapAsFile, false);
         const workbooks = new Map([]);
         const matchValue = this$.ISA;
         if (matchValue == null) {
@@ -310,8 +311,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)]);
-                if (s.DataMap != null) {
+                addToDict(workbooks, Study_fileNameFromIdentifier(s.Identifier), ["ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(s, undefined, !datamapAsFile_1)]);
+                if ((s.DataMap != null) && datamapAsFile_1) {
                     const dm = value_2(s.DataMap);
                     DataMap__set_StaticHash_Z524259A4(dm, safeHash(dm));
                     addToDict(workbooks, Study_datamapFileNameFromIdentifier(s.Identifier), ["ISA_Datamap", toFsWorkbook(dm)]);
@@ -319,8 +320,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)]);
-                if (a.DataMap != null) {
+                addToDict(workbooks, Assay_fileNameFromIdentifier(a.Identifier), ["ISA_Assay", ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(a, !datamapAsFile_1)]);
+                if ((a.DataMap != null) && datamapAsFile_1) {
                     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)]);
@@ -339,7 +340,7 @@ export class ARC {
             }
         }, this$._fs.Tree.ToFilePaths(true));
     }
-    GetUpdateContracts() {
+    GetUpdateContracts(datamapAsFile) {
         let inv, inv_1, inv_2;
         const this$ = this;
         const matchValue = this$.ISA;
@@ -349,81 +350,15 @@ 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_6FCE9E49(s, true) : ((s.StaticHash !== hash_1) ? singleton(ARCtrl_ArcStudy__ArcStudy_ToUpdateContract(s)) : empty()), delay(() => {
-                        let dm_1;
+                    return append((s.StaticHash === 0) ? ARCtrl_ArcStudy__ArcStudy_ToCreateContract_66CF920(s, true, unwrap(datamapAsFile)) : ARCtrl_ArcStudy__ArcStudy_ToUpdateContract_6FCE9E49(s, unwrap(datamapAsFile)), delay(() => {
                         s.StaticHash = (hash_1 | 0);
-                        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();
-                            }
-                        }
+                        return empty();
                     }));
                 }, inv_2.Studies), delay(() => collect((a) => {
                     const hash_2 = a.GetLightHashCode() | 0;
-                    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;
+                    return append((a.StaticHash === 0) ? ARCtrl_ArcAssay__ArcAssay_ToCreateContract_66CF920(a, true, unwrap(datamapAsFile)) : ARCtrl_ArcAssay__ArcAssay_ToUpdateContract_6FCE9E49(a, unwrap(datamapAsFile)), delay(() => {
                         a.StaticHash = (hash_2 | 0);
-                        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();
-                            }
-                        }
+                        return empty();
                     }));
                 }, inv_2.Assays)));
             }));
@@ -438,14 +373,14 @@ export class ARC {
     }
     Copy() {
         const this$ = this;
-        const isaCopy = map_2((i) => i.Copy(), this$._isa);
+        const isaCopy = map_1((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_2((isa) => isa.Studies.slice(), map_2((i) => i.Copy(), this$._isa)), []);
+        const registeredStudies = defaultArg(map_1((isa) => isa.Studies.slice(), map_1((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,
@@ -476,19 +411,19 @@ export class ARC {
         const fsCopy = this$._fs.Copy();
         return defaultArg(bind((tree_1) => {
             if (ignoreHidden) {
-                return FileSystemTree.filterFolders((n_1) => !(n_1.indexOf(".") === 0))(tree_1);
+                return FileSystemTree.filterFolders((n_1) => !n_1.startsWith("."))(tree_1);
             }
             else {
                 return tree_1;
             }
         }, (tree = ((paths = ((array_3 = FileSystemTree.toFilePaths()(fsCopy.Tree), array_3.filter((p) => {
-            if ((p.indexOf("workflows") === 0) ? true : (p.indexOf("runs") === 0)) {
+            if (p.startsWith("workflows") ? true : p.startsWith("runs")) {
                 return true;
             }
             else {
                 return FSharpSet__Contains(includeFiles, p);
             }
-        }))), FileSystemTree.fromFilePaths(paths))), ignoreHidden ? FileSystemTree.filterFiles((n) => !(n.indexOf(".") === 0))(tree) : tree)), FileSystemTree.fromFilePaths([]));
+        }))), FileSystemTree.fromFilePaths(paths))), ignoreHidden ? FileSystemTree.filterFiles((n) => !n.startsWith("."))(tree) : tree)), FileSystemTree.fromFilePaths([]));
     }
     GetAdditionalPayload(IgnoreHidden) {
         let tree, paths, array;
@@ -499,12 +434,12 @@ export class ARC {
         });
         return defaultArg(bind((tree_1) => {
             if (ignoreHidden) {
-                return FileSystemTree.filterFolders((n_1) => !(n_1.indexOf(".") === 0))(tree_1);
+                return FileSystemTree.filterFolders((n_1) => !n_1.startsWith("."))(tree_1);
             }
             else {
                 return tree_1;
             }
-        }, (tree = ((paths = ((array = FileSystemTree.toFilePaths()(this$._fs.Copy().Tree), array.filter((p) => !FSharpSet__Contains(registeredPayload, p)))), FileSystemTree.fromFilePaths(paths))), ignoreHidden ? FileSystemTree.filterFiles((n) => !(n.indexOf(".") === 0))(tree) : tree)), FileSystemTree.fromFilePaths([]));
+        }, (tree = ((paths = ((array = FileSystemTree.toFilePaths()(this$._fs.Copy().Tree), array.filter((p) => !FSharpSet__Contains(registeredPayload, p)))), FileSystemTree.fromFilePaths(paths))), ignoreHidden ? FileSystemTree.filterFiles((n) => !n.startsWith("."))(tree) : tree)), FileSystemTree.fromFilePaths([]));
     }
     static get DefaultContracts() {
         return ofSeq_1([[".gitignore", gitignoreContract], [".gitattributes", gitattributesContract]], {
@@ -513,9 +448,9 @@ export class ARC {
     }
     static fromROCrateJsonString(s) {
         let matchValue;
-        return new ARC((matchValue = fromString(decoder_1, s), (matchValue.tag === 1) ? (() => {
+        return new ARC(unwrap((matchValue = fromString(decoder_1, s), (matchValue.tag === 1) ? (() => {
             throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-        })() : matchValue.fields[0]));
+        })() : matchValue.fields[0])));
     }
     ToROCrateJsonString(spaces) {
         const this$ = this;
@@ -558,7 +493,7 @@ export class ARC {
 }
 
 export function ARC_$reflection() {
-    return class_type("ARCtrl.ARC", void 0, ARC);
+    return class_type("ARCtrl.ARC", undefined, ARC);
 }
 
 export function ARC_$ctor_79978BA1(isa, cwl, fs) {

package/Contract/ARC.js

@@ -34,7 +34,7 @@ export function tryISAReadContractFromPath(path) {
                     return Contract.createRead(p_3, "ISA_Datamap");
                 }
                 else {
-                    return void 0;
+                    return undefined;
                 }
             }
         }

package/Contract/ArcAssay.js

@@ -1,12 +1,14 @@
-import { equalsWith, item } from "../fable_modules/fable-library-js.4.16.0/Array.js";
+import { equalsWith, item } from "../fable_modules/fable-library-js.4.22.0/Array.js";
 import { getAssayFolderPath, combineMany } from "../FileSystem/Path.js";
-import { defaultOf } from "../fable_modules/fable-library-js.4.16.0/Util.js";
-import { unwrap, defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.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 { Assay_fileNameFromIdentifier } from "../Core/Helper/Identifier.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.16.0/Seq.js";
+import { Contract } from "./Contract.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;
@@ -32,23 +34,44 @@ export function $007CAssayPath$007C_$007C(input) {
             return combineMany(input);
         }
         default:
-            return void 0;
+            return undefined;
     }
 }
 
-export function ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49(this$, WithFolder) {
+export function ARCtrl_ArcAssay__ArcAssay_ToCreateContract_66CF920(this$, WithFolder, datamapAsFile) {
     const withFolder = defaultArg(WithFolder, false);
+    const dataMapAsFile = defaultArg(datamapAsFile, false);
     const path = Assay_fileNameFromIdentifier(this$.Identifier);
-    const c = Contract.createCreate(path, "ISA_Assay", ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(this$));
+    const dto = ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(this$, !dataMapAsFile);
+    const c = Contract.createCreate(path, "ISA_Assay", dto);
     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(() => 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(() => {
+            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)));
+        }));
     }));
 }
 
-export function ARCtrl_ArcAssay__ArcAssay_ToUpdateContract(this$) {
+export function ARCtrl_ArcAssay__ArcAssay_ToUpdateContract_6FCE9E49(this$, datamapAsFile) {
+    const datamapAsFile_1 = defaultArg(datamapAsFile, false);
     const path = Assay_fileNameFromIdentifier(this$.Identifier);
-    return Contract.createUpdate(path, "ISA_Assay", ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(this$));
+    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())));
+    }));
 }
 
 export function ARCtrl_ArcAssay__ArcAssay_ToDeleteContract(this$) {
@@ -61,11 +84,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_6FCE9E49(assay, unwrap(WithFolder));
+    return ARCtrl_ArcAssay__ArcAssay_ToCreateContract_66CF920(assay, unwrap(WithFolder));
 }
 
 export function ARCtrl_ArcAssay__ArcAssay_toUpdateContract_Static_1501C0F8(assay) {
-    return ARCtrl_ArcAssay__ArcAssay_ToUpdateContract(assay);
+    return ARCtrl_ArcAssay__ArcAssay_ToUpdateContract_6FCE9E49(assay);
 }
 
 export function ARCtrl_ArcAssay__ArcAssay_tryFromReadContract_Static_7570923F(c) {
@@ -96,7 +119,7 @@ export function ARCtrl_ArcAssay__ArcAssay_tryFromReadContract_Static_7570923F(c)
         case 0:
             return ARCtrl_ArcAssay__ArcAssay_fromFsWorkbook_Static_32154C9D(fsworkbook);
         default:
-            return void 0;
+            return undefined;
     }
 }
 

package/Contract/ArcInvestigation.js

@@ -1,6 +1,6 @@
 import { combineMany } from "../FileSystem/Path.js";
-import { item, equalsWith } from "../fable_modules/fable-library-js.4.16.0/Array.js";
-import { defaultOf } from "../fable_modules/fable-library-js.4.16.0/Util.js";
+import { item, equalsWith } from "../fable_modules/fable-library-js.4.22.0/Array.js";
+import { defaultOf } from "../fable_modules/fable-library-js.4.22.0/Util.js";
 import { Contract } from "./Contract.js";
 import { ARCtrl_ArcInvestigation__ArcInvestigation_fromFsWorkbook_Static_32154C9D, ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF } from "../Spreadsheet/ArcInvestigation.js";
 
@@ -21,7 +21,7 @@ export function $007CInvestigationPath$007C_$007C(input) {
         case 0:
             return combineMany(input);
         default:
-            return void 0;
+            return undefined;
     }
 }
 
@@ -69,7 +69,7 @@ export function ARCtrl_ArcInvestigation__ArcInvestigation_tryFromReadContract_St
         case 0:
             return ARCtrl_ArcInvestigation__ArcInvestigation_fromFsWorkbook_Static_32154C9D(fsworkbook);
         default:
-            return void 0;
+            return undefined;
     }
 }
 

package/Contract/ArcStudy.js

@@ -1,12 +1,14 @@
-import { equalsWith, item } from "../fable_modules/fable-library-js.4.16.0/Array.js";
+import { equalsWith, item } from "../fable_modules/fable-library-js.4.22.0/Array.js";
 import { getStudyFolderPath, combineMany } from "../FileSystem/Path.js";
-import { defaultOf } from "../fable_modules/fable-library-js.4.16.0/Util.js";
-import { unwrap, defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.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 { Study_fileNameFromIdentifier } from "../Core/Helper/Identifier.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.16.0/Seq.js";
+import { Contract } from "./Contract.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;
@@ -32,23 +34,44 @@ export function $007CStudyPath$007C_$007C(input) {
             return combineMany(input);
         }
         default:
-            return void 0;
+            return undefined;
     }
 }
 
-export function ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49(this$, WithFolder) {
+export function ARCtrl_ArcStudy__ArcStudy_ToCreateContract_66CF920(this$, WithFolder, datamapAsFile) {
     const withFolder = defaultArg(WithFolder, false);
+    const dataMapAsFile = defaultArg(datamapAsFile, false);
     const path = Study_fileNameFromIdentifier(this$.Identifier);
-    const c = Contract.createCreate(path, "ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(this$));
+    const dto = ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(this$, undefined, !dataMapAsFile);
+    const c = Contract.createCreate(path, "ISA_Study", dto);
     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(() => 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(() => {
+            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)));
+        }));
     }));
 }
 
-export function ARCtrl_ArcStudy__ArcStudy_ToUpdateContract(this$) {
+export function ARCtrl_ArcStudy__ArcStudy_ToUpdateContract_6FCE9E49(this$, datamapAsFile) {
+    const datamapAsFile_1 = defaultArg(datamapAsFile, false);
     const path = Study_fileNameFromIdentifier(this$.Identifier);
-    return Contract.createUpdate(path, "ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(this$));
+    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())));
+    }));
 }
 
 export function ARCtrl_ArcStudy__ArcStudy_ToDeleteContract(this$) {
@@ -61,11 +84,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_6FCE9E49(study, unwrap(WithFolder));
+    return ARCtrl_ArcStudy__ArcStudy_ToCreateContract_66CF920(study, unwrap(WithFolder));
 }
 
 export function ARCtrl_ArcStudy__ArcStudy_toUpdateContract_Static_1680536E(study) {
-    return ARCtrl_ArcStudy__ArcStudy_ToUpdateContract(study);
+    return ARCtrl_ArcStudy__ArcStudy_ToUpdateContract_6FCE9E49(study);
 }
 
 export function ARCtrl_ArcStudy__ArcStudy_tryFromReadContract_Static_7570923F(c) {
@@ -96,7 +119,7 @@ export function ARCtrl_ArcStudy__ArcStudy_tryFromReadContract_Static_7570923F(c)
         case 0:
             return ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D(fsworkbook);
         default:
-            return void 0;
+            return undefined;
     }
 }
 

package/Contract/Contract.js

@@ -1,6 +1,6 @@
-import { Record } from "../fable_modules/fable-library-js.4.16.0/Types.js";
-import { class_type, option_type, record_type, array_type, string_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
-import { defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { Record } from "../fable_modules/fable-library-js.4.22.0/Types.js";
+import { class_type, option_type, record_type, array_type, string_type } from "../fable_modules/fable-library-js.4.22.0/Reflection.js";
+import { defaultArg } from "../fable_modules/fable-library-js.4.22.0/Option.js";
 
 export class CLITool extends Record {
     constructor(Name, Arguments) {
@@ -79,16 +79,16 @@ export class Contract extends Record {
         return new Contract("UPDATE", path, dtoType, dto);
     }
     static createDelete(path) {
-        return new Contract("DELETE", path, void 0, void 0);
+        return new Contract("DELETE", path, undefined, undefined);
     }
     static createRead(path, dtoType) {
-        return new Contract("READ", path, dtoType, void 0);
+        return new Contract("READ", path, dtoType, undefined);
     }
     static createExecute(dto, path) {
         return new Contract("EXECUTE", defaultArg(path, ""), "Cli", dto);
     }
     static createRename(oldPath, newPath) {
-        return new Contract("RENAME", oldPath, void 0, newPath);
+        return new Contract("RENAME", oldPath, undefined, newPath);
     }
 }
 

package/Contract/Datamap.js

@@ -1,6 +1,6 @@
-import { equalsWith, item } from "../fable_modules/fable-library-js.4.16.0/Array.js";
+import { equalsWith, item } from "../fable_modules/fable-library-js.4.22.0/Array.js";
 import { combineMany } from "../FileSystem/Path.js";
-import { safeHash, defaultOf } from "../fable_modules/fable-library-js.4.16.0/Util.js";
+import { safeHash, defaultOf } from "../fable_modules/fable-library-js.4.22.0/Util.js";
 import { Study_datamapFileNameFromIdentifier, Assay_datamapFileNameFromIdentifier } from "../Core/Helper/Identifier.js";
 import { Contract } from "./Contract.js";
 import { fromFsWorkbook, toFsWorkbook } from "../Spreadsheet/DataMap.js";
@@ -42,7 +42,7 @@ export function $007CDatamapPath$007C_$007C(input) {
             return combineMany(input);
         }
         default:
-            return void 0;
+            return undefined;
     }
 }
 
@@ -108,7 +108,7 @@ export function ARCtrl_DataMap__DataMap_tryFromReadContractForAssay_Static(assay
             return dm;
         }
         default:
-            return void 0;
+            return undefined;
     }
 }
 
@@ -174,7 +174,7 @@ export function ARCtrl_DataMap__DataMap_tryFromReadContractForStudy_Static(study
             return dm;
         }
         default:
-            return void 0;
+            return undefined;
     }
 }
 

package/Contract/Git.js

@@ -1,10 +1,10 @@
 import { Contract, CLITool } from "./Contract.js";
 import { dgi } from "../FileSystem/DefaultGitignore.js";
 import { dga } from "../FileSystem/DefaultGitattributes.js";
-import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
-import { value, defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
-import { replace } from "../fable_modules/fable-library-js.4.16.0/String.js";
-import { empty, singleton, append, delay, toArray } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { class_type } from "../fable_modules/fable-library-js.4.22.0/Reflection.js";
+import { value, defaultArg } from "../fable_modules/fable-library-js.4.22.0/Option.js";
+import { replace } from "../fable_modules/fable-library-js.4.22.0/String.js";
+import { empty, singleton, append, delay, toArray } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
 
 export function gitWithArgs(arguments$) {
     return CLITool.create("git", arguments$);
@@ -28,7 +28,7 @@ export class Init {
 }
 
 export function Init_$reflection() {
-    return class_type("ARCtrl.Contract.Git.Init", void 0, Init);
+    return class_type("ARCtrl.Contract.Git.Init", undefined, Init);
 }
 
 export class Clone {
@@ -37,7 +37,7 @@ export class Clone {
 }
 
 export function Clone_$reflection() {
-    return class_type("ARCtrl.Contract.Git.Clone", void 0, Clone);
+    return class_type("ARCtrl.Contract.Git.Clone", undefined, Clone);
 }
 
 export function Init_get_init() {