@nfdi4plants/arctrl 2.0.0-beta.2 → 2.0.0-beta.8

package/ARC.js

@@ -18,10 +18,10 @@ import { addToDict } from "./fable_modules/fable-library-js.4.16.0/MapUtil.js";
 import { toFsWorkbook } 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_353D0DB7 } from "./Spreadsheet/ArcStudy.js";
-import { DataMap__get_StaticHash, DataMap__set_StaticHash_Z524259A4 } from "./Core/Table/DataMap.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 { toFsWorkbook as toFsWorkbook_1 } from "./Spreadsheet/DataMap.js";
-import { toFsWorkbook as toFsWorkbook_2 } from "./Spreadsheet/ArcAssay.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 { 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";
@@ -256,7 +256,9 @@ export class ARC {
                 registeredStudy.UpdateReferenceByStudyFile(study, true);
             }
             const datamap = ARCAux_getAssayDataMapFromContracts(study.Identifier, contracts);
-            study.DataMap = datamap;
+            if (study.DataMap == null) {
+                study.DataMap = datamap;
+            }
             study.StaticHash = (study.GetLightHashCode() | 0);
         });
         assays.forEach((assay) => {
@@ -273,7 +275,9 @@ export class ARC {
             const array_6 = assay_1.StudiesRegisteredIn;
             updatedTables = fold((tables, study_1) => ArcTables.updateReferenceTablesBySheets(new ArcTables(study_1.Tables), tables, false), new ArcTables(assay_1.Tables), array_6);
             const datamap_1 = ARCAux_getAssayDataMapFromContracts(assay_1.Identifier, contracts);
-            assay_1.DataMap = datamap_1;
+            if (assay_1.DataMap == null) {
+                assay_1.DataMap = datamap_1;
+            }
             assay_1.Tables = updatedTables.Tables;
         });
         iterate((a_3) => {
@@ -305,7 +309,7 @@ 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_353D0DB7(s)]);
+                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));
@@ -314,7 +318,7 @@ export class ARC {
             }, inv.Studies);
             iterate((a) => {
                 a.StaticHash = (a.GetLightHashCode() | 0);
-                addToDict(workbooks, Assay_fileNameFromIdentifier(a.Identifier), ["ISA_Assay", toFsWorkbook_2(a)]);
+                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));

package/Contract/ArcAssay.js

@@ -4,7 +4,7 @@ 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 { Assay_fileNameFromIdentifier } from "../Core/Helper/Identifier.js";
 import { Contract } from "./Contract.js";
-import { fromFsWorkbook, toFsWorkbook } from "../Spreadsheet/ArcAssay.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 { FileSystemTree } from "../FileSystem/FileSystemTree.js";
 
@@ -39,7 +39,7 @@ export function $007CAssayPath$007C_$007C(input) {
 export function ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49(this$, WithFolder) {
     const withFolder = defaultArg(WithFolder, false);
     const path = Assay_fileNameFromIdentifier(this$.Identifier);
-    const c = Contract.createCreate(path, "ISA_Assay", toFsWorkbook(this$));
+    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(() => singleton(c)));
@@ -48,7 +48,7 @@ export function ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49(this$, WithF
 
 export function ARCtrl_ArcAssay__ArcAssay_ToUpdateContract(this$) {
     const path = Assay_fileNameFromIdentifier(this$.Identifier);
-    return Contract.createUpdate(path, "ISA_Assay", toFsWorkbook(this$));
+    return Contract.createUpdate(path, "ISA_Assay", ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(this$));
 }
 
 export function ARCtrl_ArcAssay__ArcAssay_ToDeleteContract(this$) {
@@ -94,7 +94,7 @@ export function ARCtrl_ArcAssay__ArcAssay_tryFromReadContract_Static_7570923F(c)
     }
     switch (matchResult) {
         case 0:
-            return fromFsWorkbook(fsworkbook);
+            return ARCtrl_ArcAssay__ArcAssay_fromFsWorkbook_Static_32154C9D(fsworkbook);
         default:
             return void 0;
     }

package/Contract/ArcStudy.js

@@ -4,7 +4,7 @@ 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 { Study_fileNameFromIdentifier } from "../Core/Helper/Identifier.js";
 import { Contract } from "./Contract.js";
-import { ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D, ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_353D0DB7 } from "../Spreadsheet/ArcStudy.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 { FileSystemTree } from "../FileSystem/FileSystemTree.js";
 
@@ -39,7 +39,7 @@ export function $007CStudyPath$007C_$007C(input) {
 export function ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49(this$, WithFolder) {
     const withFolder = defaultArg(WithFolder, false);
     const path = Study_fileNameFromIdentifier(this$.Identifier);
-    const c = Contract.createCreate(path, "ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_353D0DB7(this$));
+    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(() => singleton(c)));
@@ -48,7 +48,7 @@ export function ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49(this$, WithF
 
 export function ARCtrl_ArcStudy__ArcStudy_ToUpdateContract(this$) {
     const path = Study_fileNameFromIdentifier(this$.Identifier);
-    return Contract.createUpdate(path, "ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_353D0DB7(this$));
+    return Contract.createUpdate(path, "ISA_Study", ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(this$));
 }
 
 export function ARCtrl_ArcStudy__ArcStudy_ToDeleteContract(this$) {

package/Contract/Datamap.js

@@ -4,7 +4,7 @@ import { safeHash, defaultOf } from "../fable_modules/fable-library-js.4.16.0/Ut
 import { Study_datamapFileNameFromIdentifier, Assay_datamapFileNameFromIdentifier } from "../Core/Helper/Identifier.js";
 import { Contract } from "./Contract.js";
 import { fromFsWorkbook, toFsWorkbook } from "../Spreadsheet/DataMap.js";
-import { DataMap__set_StaticHash_Z524259A4 } from "../Core/Table/DataMap.js";
+import { DataMap__set_StaticHash_Z524259A4 } from "../Core/DataMap.js";
 
 export function $007CDatamapPath$007C_$007C(input) {
     let matchResult;

package/Contract/ValidationPackagesConfig.js

@@ -0,0 +1,95 @@
+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 { Contract } from "./Contract.js";
+import { ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_fromYamlString_Static_Z721C83C5, ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toYamlString_Static_71136F3F } from "../Yaml/ValidationPackagesConfig.js";
+
+export function $007CValidationPackagesYamlPath$007C_$007C(input) {
+    let matchResult;
+    if (!equalsWith((x, y) => (x === y), input, defaultOf()) && (input.length === 2)) {
+        if (item(0, input) === ".arc") {
+            if (item(1, input) === "validation_packages.yml") {
+                matchResult = 0;
+            }
+            else {
+                matchResult = 1;
+            }
+        }
+        else {
+            matchResult = 1;
+        }
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 0:
+            return combineMany(input);
+        default:
+            return void 0;
+    }
+}
+
+export const config_file_path = combineMany([".arc", "validation_packages.yml"]);
+
+export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToCreateContract(this$) {
+    return Contract.createCreate(config_file_path, "YAML", ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toYamlString_Static_71136F3F()(this$));
+}
+
+export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToUpdateContract(this$) {
+    return Contract.createUpdate(config_file_path, "YAML", ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toYamlString_Static_71136F3F()(this$));
+}
+
+export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToDeleteContract(this$) {
+    return Contract.createDelete(config_file_path);
+}
+
+export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toDeleteContract_Static_724DAE55(config) {
+    return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToDeleteContract(config);
+}
+
+export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toCreateContract_Static_724DAE55(config) {
+    return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToCreateContract(config);
+}
+
+export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toUpdateContract_Static_724DAE55(config) {
+    return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToUpdateContract(config);
+}
+
+export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_tryFromReadContract_Static_7570923F(c) {
+    let matchResult, yaml;
+    if (c.Operation === "READ") {
+        if (c.DTOType != null) {
+            if (c.DTOType === "YAML") {
+                if (c.DTO != null) {
+                    if (typeof c.DTO === "string") {
+                        matchResult = 0;
+                        yaml = c.DTO;
+                    }
+                    else {
+                        matchResult = 1;
+                    }
+                }
+                else {
+                    matchResult = 1;
+                }
+            }
+            else {
+                matchResult = 1;
+            }
+        }
+        else {
+            matchResult = 1;
+        }
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 0:
+            return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_fromYamlString_Static_Z721C83C5(yaml);
+        default:
+            return void 0;
+    }
+}
+

package/Core/ArcTypes.js

@@ -2,7 +2,7 @@ import { value as value_4, defaultArg, map, unwrap } from "../fable_modules/fabl
 import { collect, append as append_3, tryFind, removeAt, iterate, tryFindIndex, exists, choose, item, map as map_1, delay, toList, fold, length, forAll, contains, filter, toArray } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { defaultOf, safeHash, equals, disposeSafe, getEnumerator, stringHash } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { ResizeArray_choose, ResizeArray_filter, ResizeArray_map } from "./Helper/Collections.js";
-import { DataMap__Copy } from "./Table/DataMap.js";
+import { DataMap__Copy } from "./DataMap.js";
 import { addRangeInPlace, removeInPlace, contains as contains_1 } from "../fable_modules/fable-library-js.4.16.0/Array.js";
 import { printf, toText } from "../fable_modules/fable-library-js.4.16.0/String.js";
 import { rangeDouble } from "../fable_modules/fable-library-js.4.16.0/Range.js";
@@ -525,7 +525,7 @@ export class ArcAssay extends ArcTables {
         const arg_4 = this$.Tables;
         const arg_5 = this$.Performers;
         const arg_6 = this$.Comments;
-        return toText(printf("ArcAssay({\r\n    Identifier = \"%s\",\r\n    MeasurementType = %A,\r\n    TechnologyType = %A,\r\n    TechnologyPlatform = %A,\r\n    Tables = %A,\r\n    Performers = %A,\r\n    Comments = %A\r\n})"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6);
+        return toText(printf("ArcAssay({\n    Identifier = \"%s\",\n    MeasurementType = %A,\n    TechnologyType = %A,\n    TechnologyPlatform = %A,\n    Tables = %A,\n    Performers = %A,\n    Comments = %A\n})"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6);
     }
     AddToInvestigation(investigation) {
         const this$ = this;
@@ -1263,7 +1263,7 @@ export class ArcStudy extends ArcTables {
         const arg_8 = this$.Tables;
         const arg_9 = this$.RegisteredAssayIdentifiers;
         const arg_10 = this$.Comments;
-        return toText(printf("ArcStudy {\r\n    Identifier = %A,\r\n    Title = %A,\r\n    Description = %A,\r\n    SubmissionDate = %A,\r\n    PublicReleaseDate = %A,\r\n    Publications = %A,\r\n    Contacts = %A,\r\n    StudyDesignDescriptors = %A,\r\n    Tables = %A,\r\n    RegisteredAssayIdentifiers = %A,\r\n    Comments = %A,\r\n}"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6)(arg_7)(arg_8)(arg_9)(arg_10);
+        return toText(printf("ArcStudy {\n    Identifier = %A,\n    Title = %A,\n    Description = %A,\n    SubmissionDate = %A,\n    PublicReleaseDate = %A,\n    Publications = %A,\n    Contacts = %A,\n    StudyDesignDescriptors = %A,\n    Tables = %A,\n    RegisteredAssayIdentifiers = %A,\n    Comments = %A,\n}"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6)(arg_7)(arg_8)(arg_9)(arg_10);
     }
     Equals(other) {
         let s;
@@ -2236,7 +2236,7 @@ export class ArcInvestigation {
         const arg_10 = this$.RegisteredStudyIdentifiers;
         const arg_11 = this$.Comments;
         const arg_12 = this$.Remarks;
-        return toText(printf("ArcInvestigation {\r\n    Identifier = %A,\r\n    Title = %A,\r\n    Description = %A,\r\n    SubmissionDate = %A,\r\n    PublicReleaseDate = %A,\r\n    OntologySourceReferences = %A,\r\n    Publications = %A,\r\n    Contacts = %A,\r\n    Assays = %A,\r\n    Studies = %A,\r\n    RegisteredStudyIdentifiers = %A,\r\n    Comments = %A,\r\n    Remarks = %A,\r\n}"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6)(arg_7)(arg_8)(arg_9)(arg_10)(arg_11)(arg_12);
+        return toText(printf("ArcInvestigation {\n    Identifier = %A,\n    Title = %A,\n    Description = %A,\n    SubmissionDate = %A,\n    PublicReleaseDate = %A,\n    OntologySourceReferences = %A,\n    Publications = %A,\n    Contacts = %A,\n    Assays = %A,\n    Studies = %A,\n    RegisteredStudyIdentifiers = %A,\n    Comments = %A,\n    Remarks = %A,\n}"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6)(arg_7)(arg_8)(arg_9)(arg_10)(arg_11)(arg_12);
     }
     Equals(other) {
         let i;

package/Core/Conversion.js

@@ -3,14 +3,14 @@ import { Comment$ } from "./Comment.js";
 import { zip as zip_1, fold, empty as empty_1, singleton as singleton_1, append, delay, map as map_1, filter, toList, indexed, tryPick, choose } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { unwrap, value as value_10, map, defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
 import { Option_fromValueWithDefault, ResizeArray_filter } from "./Helper/Collections.js";
-import { Value as Value_2 } from "./Process/Value.js";
-import { Component_create_4208F9FC } from "./Process/Component.js";
+import { Value as Value_2 } from "./Value.js";
+import { Component_create_Z2F0B38C7 } from "./Process/Component.js";
 import { ProtocolParameter } from "./Process/ProtocolParameter.js";
 import { ProcessParameterValue } from "./Process/ProcessParameterValue.js";
-import { FactorValue_create_29259B2C } from "./Process/FactorValue.js";
+import { FactorValue_create_30BDC49 } from "./Process/FactorValue.js";
 import { Factor } from "./Process/Factor.js";
 import { toString } from "../fable_modules/fable-library-js.4.16.0/Types.js";
-import { MaterialAttributeValue_create_BE8DE56 } from "./Process/MaterialAttributeValue.js";
+import { MaterialAttributeValue_create_ZE1D108D } from "./Process/MaterialAttributeValue.js";
 import { MaterialAttribute_create_A220A8A } from "./Process/MaterialAttribute.js";
 import { ProcessInput_getCharacteristicValues_5B3D5BA9, ProcessInput__isMaterial, ProcessInput__isData, ProcessInput_setCharacteristicValues, ProcessInput__get_Name, ProcessInput__isSource, ProcessInput__isSample, ProcessInput, ProcessInput_createSource_Z5E00540E, ProcessInput_createRawData_Z721C83C5, ProcessInput_createMaterial_4452CB4C, ProcessInput_createSample_Z598187B7 } from "./Process/ProcessInput.js";
 import { ProcessOutput_getFactorValues_Z42C11600, ProcessOutput__isMaterial, ProcessOutput__isData, ProcessOutput_setFactorValues, ProcessOutput__get_Name, ProcessOutput__isSample, ProcessOutput, ProcessOutput_createRawData_Z721C83C5, ProcessOutput_createMaterial_4452CB4C, ProcessOutput_createSample_Z598187B7 } from "./Process/ProcessOutput.js";
@@ -143,7 +143,7 @@ export function JsonTypes_valueOfCell(value) {
  */
 export function JsonTypes_composeComponent(header, value) {
     const patternInput = JsonTypes_valueOfCell(value);
-    return Component_create_4208F9FC(unwrap(patternInput[0]), unwrap(patternInput[1]), header.ToTerm());
+    return Component_create_Z2F0B38C7(unwrap(patternInput[0]), unwrap(patternInput[1]), header.ToTerm());
 }
 
 /**
@@ -160,7 +160,7 @@ export function JsonTypes_composeParameterValue(header, value) {
  */
 export function JsonTypes_composeFactorValue(header, value) {
     const patternInput = JsonTypes_valueOfCell(value);
-    return FactorValue_create_29259B2C(void 0, Factor.create(toString(header), header.ToTerm()), unwrap(patternInput[0]), unwrap(patternInput[1]));
+    return FactorValue_create_30BDC49(void 0, Factor.create(toString(header), header.ToTerm()), unwrap(patternInput[0]), unwrap(patternInput[1]));
 }
 
 /**
@@ -168,7 +168,7 @@ export function JsonTypes_composeFactorValue(header, value) {
  */
 export function JsonTypes_composeCharacteristicValue(header, value) {
     const patternInput = JsonTypes_valueOfCell(value);
-    return MaterialAttributeValue_create_BE8DE56(void 0, MaterialAttribute_create_A220A8A(void 0, header.ToTerm()), unwrap(patternInput[0]), unwrap(patternInput[1]));
+    return MaterialAttributeValue_create_ZE1D108D(void 0, MaterialAttribute_create_A220A8A(void 0, header.ToTerm()), unwrap(patternInput[0]), unwrap(patternInput[1]));
 }
 
 export function JsonTypes_composeFreetextMaterialName(headerFT, name) {
@@ -854,7 +854,7 @@ export function ARCtrl_CompositeHeader__CompositeHeader_TryCharacteristic(this$)
 
 export function ARCtrl_CompositeHeader__CompositeHeader_TryComponent(this$) {
     if (this$.tag === 0) {
-        return Component_create_4208F9FC(void 0, void 0, this$.fields[0]);
+        return Component_create_Z2F0B38C7(void 0, void 0, this$.fields[0]);
     }
     else {
         return void 0;
@@ -864,7 +864,7 @@ export function ARCtrl_CompositeHeader__CompositeHeader_TryComponent(this$) {
 /**
  * This function is used to improve interoperability with ISA-JSON types. It is not recommended for default ARCtrl usage.
  */
-export function ARCtrl_CompositeCell__CompositeCell_fromValue_Static_6B24B5AD(value, unit) {
+export function ARCtrl_CompositeCell__CompositeCell_fromValue_Static_Z6986DF18(value, unit) {
     return JsonTypes_cellOfValue(value, unit);
 }
 
@@ -964,9 +964,9 @@ export function CompositeRow_toProtocol(tableName, row) {
             case 5:
                 return Protocol_addParameter(ProtocolParameter.create(void 0, oa_1), p);
             case 6:
-                return Protocol_addComponent(Component_create_4208F9FC(Value_2.fromString(v_4), unit, oa_2), p);
+                return Protocol_addComponent(Component_create_Z2F0B38C7(Value_2.fromString(v_4), unit, oa_2), p);
             case 7:
-                return Protocol_addComponent(Component_create_4208F9FC(new Value_2(0, [t]), void 0, oa_3), p);
+                return Protocol_addComponent(Component_create_Z2F0B38C7(new Value_2(0, [t]), void 0, oa_3), p);
             default:
                 return p;
         }
@@ -994,7 +994,7 @@ export function ARCtrl_ArcTable__ArcTable_fromProtocol_Static_3BF20962(p) {
     try {
         while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
             const c = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
-            const v_1 = map((arg) => singleton_2(ARCtrl_CompositeCell__CompositeCell_fromValue_Static_6B24B5AD(arg, unwrap(c.ComponentUnit))), c.ComponentValue);
+            const v_1 = map((arg) => singleton_2(ARCtrl_CompositeCell__CompositeCell_fromValue_Static_Z6986DF18(arg, unwrap(c.ComponentUnit))), c.ComponentValue);
             t.AddColumn(new CompositeHeader(3, [value_10(c.ComponentType)]), v_1, ARCtrl_Process_Component__Component_TryGetColumnIndex(c));
         }
     }
@@ -1040,7 +1040,7 @@ export function ARCtrl_ArcTable__ArcTable_GetProtocols(this$) {
                 case 3:
                     return Protocol_addParameter(ProtocolParameter.create(void 0, h.fields[0]), p);
                 case 0:
-                    return Protocol_addComponent(Component_create_4208F9FC(void 0, void 0, h.fields[0]), p);
+                    return Protocol_addComponent(Component_create_Z2F0B38C7(void 0, void 0, h.fields[0]), p);
                 default:
                     return p;
             }

package/Core/DataContext.js

@@ -1,33 +1,63 @@
 import { hash, boxHashSeq, boxHashOption, boxHashArray } from "./Helper/HashCodes.js";
+import { unwrap, map } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { Value as Value_1 } from "./Value.js";
 import { Data_$reflection, Data } from "./Data.js";
-import { unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
 import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { OntologyAnnotation } from "./OntologyAnnotation.js";
 
 export class DataContext extends Data {
-    constructor(id, name, dataType, format, selectorFormat, explication, unit, objectType, description, generatedBy, comments) {
+    constructor(id, name, dataType, format, selectorFormat, explication, unit, objectType, label, description, generatedBy, comments) {
         super(unwrap(id), unwrap(name), unwrap(dataType), unwrap(format), unwrap(selectorFormat), unwrap(comments));
         this._explication = explication;
         this._unit = unit;
         this._objectType = objectType;
+        this._label = label;
         this._description = description;
         this._generatedBy = generatedBy;
     }
     GetHashCode() {
         const this$ = this;
-        return boxHashArray([boxHashOption(this$.ID), boxHashOption(this$.Name), boxHashOption(this$.DataType), boxHashOption(this$.Format), boxHashOption(this$.SelectorFormat), boxHashSeq(this$.Comments), boxHashOption(DataContext__get_Explication(this$)), boxHashOption(DataContext__get_Unit(this$)), boxHashOption(DataContext__get_ObjectType(this$)), boxHashOption(DataContext__get_Description(this$)), boxHashOption(DataContext__get_GeneratedBy(this$))]) | 0;
+        return boxHashArray([boxHashOption(this$.ID), boxHashOption(this$.Name), boxHashOption(this$.DataType), boxHashOption(this$.Format), boxHashOption(this$.SelectorFormat), boxHashSeq(this$.Comments), boxHashOption(DataContext__get_Explication(this$)), boxHashOption(DataContext__get_Unit(this$)), boxHashOption(DataContext__get_ObjectType(this$)), boxHashOption(DataContext__get_Label(this$)), boxHashOption(DataContext__get_Description(this$)), boxHashOption(DataContext__get_GeneratedBy(this$))]) | 0;
     }
     Equals(obj) {
         const this$ = this;
         return hash(this$) === hash(obj);
     }
+    AlternateName() {
+        const this$ = this;
+        return DataContext__get_Label(this$);
+    }
+    MeasurementMethod() {
+        const this$ = this;
+        return DataContext__get_GeneratedBy(this$);
+    }
+    GetCategory() {
+        const this$ = this;
+        return DataContext__get_Explication(this$);
+    }
+    GetValue() {
+        const this$ = this;
+        return map((Item) => (new Value_1(0, [Item])), DataContext__get_ObjectType(this$));
+    }
+    GetUnit() {
+        const this$ = this;
+        return DataContext__get_Unit(this$);
+    }
+    GetAdditionalType() {
+        return "DataContext";
+    }
+    Description() {
+        const this$ = this;
+        return DataContext__get_Description(this$);
+    }
 }
 
 export function DataContext_$reflection() {
     return class_type("ARCtrl.DataContext", void 0, DataContext, Data_$reflection());
 }
 
-export function DataContext_$ctor_Z2FD70A12(id, name, dataType, format, selectorFormat, explication, unit, objectType, description, generatedBy, comments) {
-    return new DataContext(id, name, dataType, format, selectorFormat, explication, unit, objectType, description, generatedBy, comments);
+export function DataContext_$ctor_Z780A8A2A(id, name, dataType, format, selectorFormat, explication, unit, objectType, label, description, generatedBy, comments) {
+    return new DataContext(id, name, dataType, format, selectorFormat, explication, unit, objectType, label, description, generatedBy, comments);
 }
 
 export function DataContext__get_Explication(this$) {
@@ -54,6 +84,14 @@ export function DataContext__set_ObjectType_279AAFF2(this$, objectType) {
     this$._objectType = objectType;
 }
 
+export function DataContext__get_Label(this$) {
+    return this$._label;
+}
+
+export function DataContext__set_Label_6DFDD678(this$, label) {
+    this$._label = label;
+}
+
 export function DataContext__get_Description(this$) {
     return this$._description;
 }
@@ -74,8 +112,17 @@ export function DataContext__AsData(this$) {
     return new Data(unwrap(this$.ID), unwrap(this$.Name), unwrap(this$.DataType), unwrap(this$.Format), unwrap(this$.SelectorFormat), this$.Comments);
 }
 
+export function DataContext_fromData_Z7B4D7BF5(data, explication, unit, objectType, label, description, generatedBy) {
+    return DataContext_$ctor_Z780A8A2A(unwrap(data.ID), unwrap(data.Name), unwrap(data.DataType), unwrap(data.Format), unwrap(data.SelectorFormat), unwrap(explication), unwrap(unit), unwrap(objectType), unwrap(label), unwrap(description), unwrap(generatedBy), data.Comments);
+}
+
+export function DataContext_createAsPV(alternateName, measurementMethod, description, category, value, unit) {
+    let oa, v;
+    return DataContext_$ctor_Z780A8A2A(void 0, void 0, void 0, void 0, void 0, category, unit, (value == null) ? void 0 : ((value.tag === 0) ? ((oa = value.fields[0], oa)) : ((v = value, new OntologyAnnotation(v.Text)))), alternateName, description, measurementMethod);
+}
+
 export function DataContext__Copy(this$) {
-    const copy = DataContext_$ctor_Z2FD70A12();
+    const copy = DataContext_$ctor_Z780A8A2A();
     copy.ID = this$.ID;
     copy.Name = this$.Name;
     copy.DataType = this$.DataType;

package/Core/{Table/DataMap.js → DataMap.js}

@@ -1,11 +1,11 @@
-import { CompositeHeader, IOType } from "./CompositeHeader.js";
-import { OntologyAnnotation } from "../OntologyAnnotation.js";
-import { ofArray } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { iterateIndexed, map } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
-import { CompositeCell } from "./CompositeCell.js";
-import { boxHashSeq, hash } from "../Helper/HashCodes.js";
-import { class_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
-import { DataContext__Copy, DataContext__set_Description_6DFDD678, DataContext__get_Description, DataContext__set_ObjectType_279AAFF2, DataContext__get_ObjectType, DataContext__set_Unit_279AAFF2, DataContext__get_Unit, DataContext__set_Explication_279AAFF2, DataContext__get_Explication } from "../DataContext.js";
+import { CompositeHeader, IOType } from "./Table/CompositeHeader.js";
+import { OntologyAnnotation } from "./OntologyAnnotation.js";
+import { ofArray } from "../fable_modules/fable-library-js.4.16.0/List.js";
+import { iterateIndexed, map } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { CompositeCell } from "./Table/CompositeCell.js";
+import { boxHashSeq, hash } from "./Helper/HashCodes.js";
+import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { DataContext__Copy, DataContext__set_Description_6DFDD678, DataContext__get_Description, DataContext__set_ObjectType_279AAFF2, DataContext__get_ObjectType, DataContext__set_Unit_279AAFF2, DataContext__get_Unit, DataContext__set_Explication_279AAFF2, DataContext__get_Explication } from "./DataContext.js";
 
 export const DataMapAux_dataHeader = new CompositeHeader(11, [new IOType(2, [])]);
 
@@ -21,6 +21,8 @@ export const DataMapAux_objectType = new OntologyAnnotation("Data Type", "NCIT",
 
 export const DataMapAux_objectTypeHeader = new CompositeHeader(3, [DataMapAux_objectType]);
 
+export const DataMapAux_labelHeader = new CompositeHeader(13, ["Label"]);
+
 export const DataMapAux_descriptionHeader = new CompositeHeader(13, ["Description"]);
 
 export const DataMapAux_generatedByHeader = new CompositeHeader(13, ["Generated By"]);
@@ -87,7 +89,7 @@ export function DataMapAux_SanityChecks_lengthOfNewColumn(newColumn, dataContext
 export class DataMap {
     constructor(dataContexts) {
         this.staticHash = 0;
-        this["dataContexts@103"] = dataContexts;
+        this["dataContexts@108"] = dataContexts;
     }
     Equals(obj) {
         const this$ = this;
@@ -95,7 +97,7 @@ export class DataMap {
     }
     GetHashCode() {
         const this$ = this;
-        return boxHashSeq(this$["dataContexts@103"]) | 0;
+        return boxHashSeq(this$["dataContexts@108"]) | 0;
     }
 }
 
@@ -116,7 +118,7 @@ export function DataMap__set_StaticHash_Z524259A4(this$, value) {
 }
 
 export function DataMap__get_DataContexts(this$) {
-    return this$["dataContexts@103"];
+    return this$["dataContexts@108"];
 }
 
 export function DataMap_init() {
@@ -124,48 +126,58 @@ export function DataMap_init() {
 }
 
 export function DataMap__GetExplicationColumn(this$) {
-    return DataMapAux_getOntologyColumn(DataContext__get_Explication, this$["dataContexts@103"]);
+    return DataMapAux_getOntologyColumn(DataContext__get_Explication, this$["dataContexts@108"]);
 }
 
 export function DataMap__SetExplicationColumn_C98E589(this$, cells) {
     DataMapAux_setOntologyColumn((dc, oa) => {
         DataContext__set_Explication_279AAFF2(dc, oa);
-    }, cells, this$["dataContexts@103"]);
+    }, cells, this$["dataContexts@108"]);
 }
 
 export function DataMap__GetUnitColumn(this$) {
-    return DataMapAux_getOntologyColumn(DataContext__get_Unit, this$["dataContexts@103"]);
+    return DataMapAux_getOntologyColumn(DataContext__get_Unit, this$["dataContexts@108"]);
 }
 
 export function DataMap__SetUnitColumn_C98E589(this$, cells) {
     DataMapAux_setOntologyColumn((dc, oa) => {
         DataContext__set_Unit_279AAFF2(dc, oa);
-    }, cells, this$["dataContexts@103"]);
+    }, cells, this$["dataContexts@108"]);
 }
 
 export function DataMap__GetObjectTypeColumn(this$) {
-    return DataMapAux_getOntologyColumn(DataContext__get_ObjectType, this$["dataContexts@103"]);
+    return DataMapAux_getOntologyColumn(DataContext__get_ObjectType, this$["dataContexts@108"]);
 }
 
 export function DataMap__SetDataTypeColumn_C98E589(this$, cells) {
     DataMapAux_setOntologyColumn((dc, oa) => {
         DataContext__set_ObjectType_279AAFF2(dc, oa);
-    }, cells, this$["dataContexts@103"]);
+    }, cells, this$["dataContexts@108"]);
+}
+
+export function DataMap__GetLabelColumn(this$) {
+    return DataMapAux_getStringColumn((dc) => dc.Name, this$["dataContexts@108"]);
+}
+
+export function DataMap__SetLabelColumn_C98E589(this$, cells) {
+    DataMapAux_setStringColumn((dc, s) => {
+        dc.Name = s;
+    }, cells, this$["dataContexts@108"]);
 }
 
 export function DataMap__GetDescriptionColumn(this$) {
-    return DataMapAux_getStringColumn(DataContext__get_Description, this$["dataContexts@103"]);
+    return DataMapAux_getStringColumn(DataContext__get_Description, this$["dataContexts@108"]);
 }
 
 export function DataMap__SetDescriptionColumn_C98E589(this$, cells) {
     DataMapAux_setStringColumn((dc, s) => {
         DataContext__set_Description_6DFDD678(dc, s);
-    }, cells, this$["dataContexts@103"]);
+    }, cells, this$["dataContexts@108"]);
 }
 
 export function DataMap__GetDataContext_Z58338566(this$, row, SkipValidation) {
-    DataMapAux_SanityChecks_rowIndexInBoundaries(row, this$["dataContexts@103"]);
-    return this$["dataContexts@103"][row];
+    DataMapAux_SanityChecks_rowIndexInBoundaries(row, this$["dataContexts@108"]);
+    return this$["dataContexts@108"][row];
 }
 
 export function DataMap_getDataContext_Z58338566(row, SkipValidation) {
@@ -174,6 +186,6 @@ export function DataMap_getDataContext_Z58338566(row, SkipValidation) {
 
 export function DataMap__Copy(this$) {
     let collection;
-    return DataMap_$ctor_4E3220A7((collection = map(DataContext__Copy, this$["dataContexts@103"]), Array.from(collection)));
+    return DataMap_$ctor_4E3220A7((collection = map(DataContext__Copy, this$["dataContexts@108"]), Array.from(collection)));
 }
 

package/Core/Process/Component.js

@@ -1,5 +1,5 @@
 import { Record } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
-import { Value, Value_$reflection } from "./Value.js";
+import { Value, Value_$reflection } from "../Value.js";
 import { record_type, option_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { OntologyAnnotation, OntologyAnnotation_$reflection } from "../OntologyAnnotation.js";
 import { defaultArg, unwrap, map } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
@@ -14,6 +14,16 @@ export class Component extends Record {
         this.ComponentUnit = ComponentUnit;
         this.ComponentType = ComponentType;
     }
+    AlternateName() {
+        const this$ = this;
+        return Component__get_ComponentName(this$);
+    }
+    MeasurementMethod() {
+        return void 0;
+    }
+    Description() {
+        return void 0;
+    }
     GetCategory() {
         const this$ = this;
         return this$.ComponentType;
@@ -43,12 +53,12 @@ export function Component_make(value, unit, componentType) {
     return new Component(value, unit, componentType);
 }
 
-export function Component_create_4208F9FC(value, unit, componentType) {
+export function Component_create_Z2F0B38C7(value, unit, componentType) {
     return Component_make(value, unit, componentType);
 }
 
 export function Component_get_empty() {
-    return Component_create_4208F9FC();
+    return Component_create_Z2F0B38C7();
 }
 
 /**
@@ -182,7 +192,7 @@ export function Component__SetCategory_ZDED3A0F(this$, c) {
     return new Component(this$.ComponentValue, this$.ComponentUnit, c);
 }
 
-export function Component_createAsPV(category, value, unit) {
-    return Component_create_4208F9FC(unwrap(value), unwrap(unit), unwrap(category));
+export function Component_createAsPV(alternateName, measurementMethod, description, category, value, unit) {
+    return Component_create_Z2F0B38C7(unwrap(value), unwrap(unit), unwrap(category));
 }