@nfdi4plants/arctrl 3.0.0-alpha.3 → 3.0.0-alpha.4

package/dist/ts/esm/ts/Conversion.js

@@ -767,7 +767,7 @@ export function ProcessConversion_tryGetPerformerGetter(generalI, header) {
 /**
  * Given the header sequence of an ArcTable, returns a function for parsing each row of the table to a process
  */
-export function ProcessConversion_getProcessGetter(processNameRoot, headers) {
+export function ProcessConversion_getProcessGetter(assayName, studyName, processNameRoot, headers) {
     const headers_1 = indexed(headers);
     const valueHeaders = toList(indexed(filter((arg) => arg[1].IsCvParamColumn, headers_1)));
     const charGetters = choose((tupledArg) => {
@@ -846,6 +846,7 @@ export function ProcessConversion_getProcessGetter(processNameRoot, headers) {
         const paramvalues = map((collection_4) => Array.from(collection_4), Option_fromValueWithDefault(empty(), map_2((f_4) => f_4(matrix_6)(i_6), parameterValueGetters)));
         const comments = map((collection_5) => Array.from(collection_5), Option_fromValueWithDefault(empty(), map_2((f_5) => f_5(matrix_6)(i_6), commentGetters)));
         const components = map((collection_6) => Array.from(collection_6), Option_fromValueWithDefault(empty(), map_2((f_6) => f_6(matrix_6)(i_6), componentGetters)));
+        const id = LDLabProcess.genId(processNameRoot, unwrap(assayName), unwrap(studyName)) + (`_${i_6}`);
         let protocol;
         const name = map((f_7) => f_7(matrix_6)(i_6), protocolREFGetter);
         const protocolId = LDLabProtocol.genId(unwrap(name), processNameRoot);
@@ -853,7 +854,7 @@ export function ProcessConversion_getProcessGetter(processNameRoot, headers) {
         const matchValue_2 = inputGetter_1(matrix_6)(i_6);
         const matchValue_3 = outputGetter_1(matrix_6)(i_6);
         const agent = map((f_12) => f_12(matrix_6)(i_6), performerGetter);
-        return LDLabProcess.create(pn, matchValue_2, matchValue_3, undefined, unwrap(agent), unwrap(protocol), unwrap(paramvalues), undefined, unwrap(comments));
+        return LDLabProcess.create(pn, matchValue_2, matchValue_3, id, unwrap(agent), unwrap(protocol), unwrap(paramvalues), undefined, unwrap(comments));
     });
 }
 /**
@@ -1179,12 +1180,12 @@ export function ARCtrl_ArcTable__ArcTable_GetProtocols(this$) {
 /**
  * Returns the list of processes specidified in this ArcTable
  */
-export function ARCtrl_ArcTable__ArcTable_GetProcesses(this$) {
+export function ARCtrl_ArcTable__ArcTable_GetProcesses_40457300(this$, assayName, studyName) {
     if (this$.RowCount === 0) {
         return singleton_2(LDLabProcess.create(this$.Name));
     }
     else {
-        const getter = ProcessConversion_getProcessGetter(this$.Name, this$.Headers);
+        const getter = ProcessConversion_getProcessGetter(assayName, studyName, this$.Name, this$.Headers);
         return toList(delay(() => map_1((i) => getter(this$.Values)(i), rangeDouble(0, 1, this$.RowCount - 1))));
     }
 }
@@ -1202,8 +1203,8 @@ export function ARCtrl_ArcTable__ArcTable_fromProcesses_Static_Z3575FB5F(name, p
 /**
  * Return a list of all the processes in all the tables.
  */
-export function ARCtrl_ArcTables__ArcTables_GetProcesses(this$) {
-    return collect(ARCtrl_ArcTable__ArcTable_GetProcesses, toList(this$.Tables));
+export function ARCtrl_ArcTables__ArcTables_GetProcesses_40457300(this$, assayName, studyName) {
+    return collect((t) => ARCtrl_ArcTable__ArcTable_GetProcesses_40457300(t, unwrap(assayName), unwrap(studyName)), toList(this$.Tables));
 }
 /**
  * Create a collection of tables from a list of processes.
@@ -1453,7 +1454,7 @@ export function AssayConversion_composeAssay_1501C0F8(assay) {
     const measurementTechnique = map(BaseTypes_composeDefinedTerm_ZDED3A0F, assay.TechnologyPlatform);
     const variableMeasured = map(BaseTypes_composePropertyValueFromOA_ZDED3A0F, assay.MeasurementType);
     const creators = Option_fromSeq(ResizeArray_map(PersonConversion_composePerson_Z64D846DC, assay.Performers));
-    const processSequence = Option_fromSeq((collection = ARCtrl_ArcTables__ArcTables_GetProcesses(new ArcTables(assay.Tables)), Array.from(collection)));
+    const processSequence = Option_fromSeq((collection = ARCtrl_ArcTables__ArcTables_GetProcesses_40457300(new ArcTables(assay.Tables), assay.Identifier), Array.from(collection)));
     const fragmentDescriptors = map(DatamapConversion_composeFragmentDescriptors_Z8923FA3, assay.DataMap);
     const dataFiles = map((ps) => AssayConversion_getDataFilesFromProcesses_6BABD1B0(ps, unwrap(fragmentDescriptors)), processSequence);
     const variableMeasureds = (variableMeasured == null) ? ((fragmentDescriptors == null) ? undefined : ((fds_1 = value_4(fragmentDescriptors), fds_1))) : ((fragmentDescriptors == null) ? ((vm_1 = value_4(variableMeasured), ResizeArray_singleton(vm_1))) : ((fds = value_4(fragmentDescriptors), (vm = value_4(variableMeasured), ResizeArray_appendSingleton(vm, fds)))));
@@ -1486,7 +1487,7 @@ export function StudyConversion_composeStudy_1680536E(study) {
     const dateModified = now();
     const publications = Option_fromSeq(ResizeArray_map(ScholarlyArticleConversion_composeScholarlyArticle_D324A6D, study.Publications));
     const creators = Option_fromSeq(ResizeArray_map(PersonConversion_composePerson_Z64D846DC, study.Contacts));
-    const processSequence = Option_fromSeq((collection = ARCtrl_ArcTables__ArcTables_GetProcesses(new ArcTables(study.Tables)), Array.from(collection)));
+    const processSequence = Option_fromSeq((collection = ARCtrl_ArcTables__ArcTables_GetProcesses_40457300(new ArcTables(study.Tables), undefined, study.Identifier), Array.from(collection)));
     const fragmentDescriptors = map(DatamapConversion_composeFragmentDescriptors_Z8923FA3, study.DataMap);
     const dataFiles = map((ps) => AssayConversion_getDataFilesFromProcesses_6BABD1B0(ps, unwrap(fragmentDescriptors)), processSequence);
     const comments = Option_fromSeq(ResizeArray_map(BaseTypes_composeComment_Z13201A7E, study.Comments));

package/dist/ts/esm/ts/Core/Helper/Collections.js

@@ -123,6 +123,18 @@ export function Dictionary_ofSeqWithMerge(merge, s) {
     }, s);
     return dict;
 }
+export function Dictionary_init() {
+    return new Dictionary([], {
+        Equals: equals,
+        GetHashCode: structuralHash,
+    });
+}
+export function Dictionary_items(dict) {
+    return dict;
+}
+export function StringDictionary_ofSeq(s) {
+    return new Map(s);
+}
 export function ResizeArray_create(i, v) {
     const a = [];
     if (i > 0) {

package/dist/ts/esm/ts/Core/Table/ArcTableAux.js

@@ -1,20 +1,48 @@
 import { op_UnaryNegation_Int32 } from "@fable-org/fable-library-js/Int32.js";
-import { toList, head as head_1, toArray, filter, tryFindIndex, maxBy } from "@fable-org/fable-library-js/Seq.js";
-import { arrayHash, equalArrays, numberHash, disposeSafe, getEnumerator, compare, equals, safeHash, comparePrimitives } from "@fable-org/fable-library-js/Util.js";
+import { getItemFromDict, tryGetValue, addToDict } from "@fable-org/fable-library-js/MapUtil.js";
 import { CompositeCell } from "./CompositeCell.js";
-import { addToDict, getItemFromDict } from "@fable-org/fable-library-js/MapUtil.js";
+import { numberHash, disposeSafe, getEnumerator, compare, equals, safeHash, comparePrimitives, defaultOf, arrayHash, equalArrays } from "@fable-org/fable-library-js/Util.js";
+import { Dictionary } from "@fable-org/fable-library-js/MutableMap.js";
+import { toString, FSharpRef } from "@fable-org/fable-library-js/Types.js";
 import { value as value_2 } from "@fable-org/fable-library-js/Option.js";
+import { toList, head as head_1, toArray, filter, tryFindIndex, maxBy } from "@fable-org/fable-library-js/Seq.js";
 import { mapIndexed, pick, exists, ofSeq, empty, head, tail as tail_1, isEmpty, cons } from "@fable-org/fable-library-js/List.js";
 import { printf, toConsole } from "@fable-org/fable-library-js/String.js";
-import { List_tryPickAndRemove, Dictionary_tryFind } from "../Helper/Collections.js";
 import { max } from "@fable-org/fable-library-js/Double.js";
 import { setItem, item, map, iterateIndexed } from "@fable-org/fable-library-js/Array.js";
 import { tryFind, ofArray } from "@fable-org/fable-library-js/Map.js";
 import { Array_groupBy } from "@fable-org/fable-library-js/Seq2.js";
 import { FSharpSet__Contains, ofArray as ofArray_1 } from "@fable-org/fable-library-js/Set.js";
-import { toString } from "@fable-org/fable-library-js/Types.js";
 import { rangeDouble } from "@fable-org/fable-library-js/Range.js";
-import { Dictionary } from "@fable-org/fable-library-js/MutableMap.js";
+import { List_tryPickAndRemove } from "../Helper/Collections.js";
+export function CellDictionary_addOrUpdate(key_, key__1, value, dict) {
+    const key = [key_, key__1];
+    if (dict.has(key)) {
+        dict.set(key, value);
+    }
+    else {
+        addToDict(dict, key, value);
+    }
+}
+export function CellDictionary_ofSeq(s) {
+    return new Dictionary(s, {
+        Equals: equalArrays,
+        GetHashCode: arrayHash,
+    });
+}
+export function CellDictionary_tryFind(key_, key__1, dict) {
+    let patternInput;
+    let outArg = defaultOf();
+    patternInput = [tryGetValue(dict, [key_, key__1], new FSharpRef(() => outArg, (v) => {
+            outArg = v;
+        })), outArg];
+    if (patternInput[0]) {
+        return patternInput[1];
+    }
+    else {
+        return undefined;
+    }
+}
 export function getColumnCount(headers) {
     return headers.length;
 }
@@ -176,7 +204,7 @@ export function SanityChecks_validate(headers, values, raiseException) {
     return isValid;
 }
 export function Unchecked_tryGetCellAt(column, row, cells) {
-    return Dictionary_tryFind([column, row], cells);
+    return CellDictionary_tryFind(column, row, cells);
 }
 /**
  * Add or update a cell in the dictionary.
@@ -191,7 +219,7 @@ export function Unchecked_addCellAt(columnIndex, rowIndex, c, cells) {
     addToDict(cells, [columnIndex, rowIndex], c);
 }
 export function Unchecked_moveCellTo(fromCol, fromRow, toCol, toRow, cells) {
-    const matchValue = Dictionary_tryFind([fromCol, fromRow], cells);
+    const matchValue = CellDictionary_tryFind(fromCol, fromRow, cells);
     if (matchValue == null) {
     }
     else {

package/dist/ts/esm/ts/Json/StringTable.js

@@ -1,9 +1,10 @@
 import { item, map, setItem, fill } from "@fable-org/fable-library-js/Array.js";
 import { iterate } from "@fable-org/fable-library-js/Seq.js";
+import { defaultOf } from "@fable-org/fable-library-js/Util.js";
 import { int, string, array as array_2 } from "../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
-import { Dictionary_tryFind } from "../Core/Helper/Collections.js";
 import { value as value_2 } from "@fable-org/fable-library-js/Option.js";
-import { addToDict } from "@fable-org/fable-library-js/MapUtil.js";
+import { addToDict, tryGetValue } from "@fable-org/fable-library-js/MapUtil.js";
+import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
 import { FSharpResult$2_Ok, FSharpResult$2_Error } from "@fable-org/fable-library-js/Result.js";
 export function arrayFromMap(otm) {
     const a = fill(new Array(otm.size), 0, otm.size, "");
@@ -27,7 +28,13 @@ export function encoder(ot) {
 }
 export const decoder = array_2(string);
 export function encodeString(otm, s) {
-    const matchValue = Dictionary_tryFind(s, otm);
+    let matchValue;
+    let patternInput;
+    let outArg = defaultOf();
+    patternInput = [tryGetValue(otm, s, new FSharpRef(() => outArg, (v) => {
+            outArg = (v | 0);
+        })), outArg];
+    matchValue = (patternInput[0] ? patternInput[1] : undefined);
     if (matchValue == null) {
         const i_1 = otm.size | 0;
         addToDict(otm, s, i_1);

package/dist/ts/esm/ts/Json/Table/CellTable.js

@@ -1,13 +1,13 @@
 import { sortBy, map, toArray } from "@fable-org/fable-library-js/Seq.js";
+import { Dictionary_tryFind, Dictionary_items } from "../../Core/Helper/Collections.js";
 import { comparePrimitives } from "@fable-org/fable-library-js/Util.js";
 import { item, map as map_1 } from "@fable-org/fable-library-js/Array.js";
 import { decoderCompressed, encoderCompressed } from "./CompositeCell.js";
 import { int, object, array as array_2 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
-import { Dictionary_tryFind } from "../../Core/Helper/Collections.js";
 import { value as value_2 } from "@fable-org/fable-library-js/Option.js";
 import { addToDict } from "@fable-org/fable-library-js/MapUtil.js";
 export function arrayFromMap(otm) {
-    return toArray(map((kv_1) => kv_1[0], sortBy((kv) => kv[1], otm, {
+    return toArray(map((kv_1) => kv_1[0], sortBy((kv) => kv[1], Dictionary_items(otm), {
         Compare: comparePrimitives,
     })));
 }

package/dist/ts/esm/ts/Json/Table/OATable.js

@@ -1,13 +1,13 @@
 import { sortBy, map, toArray } from "@fable-org/fable-library-js/Seq.js";
+import { Dictionary_tryFind, Dictionary_items } from "../../Core/Helper/Collections.js";
 import { comparePrimitives } from "@fable-org/fable-library-js/Util.js";
 import { item, map as map_1 } from "@fable-org/fable-library-js/Array.js";
 import { OntologyAnnotation_compressedDecoder, OntologyAnnotation_compressedEncoder } from "../OntologyAnnotation.js";
 import { int, object, array as array_2 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
-import { Dictionary_tryFind } from "../../Core/Helper/Collections.js";
 import { value as value_2 } from "@fable-org/fable-library-js/Option.js";
 import { addToDict } from "@fable-org/fable-library-js/MapUtil.js";
 export function arrayFromMap(otm) {
-    return toArray(map((kv_1) => kv_1[0], sortBy((kv) => kv[1], otm, {
+    return toArray(map((kv_1) => kv_1[0], sortBy((kv) => kv[1], Dictionary_items(otm), {
         Compare: comparePrimitives,
     })));
 }

package/dist/ts/esm/ts/JsonIO/Table/Compression.js

@@ -1,5 +1,4 @@
-import { safeHash, equals } from "@fable-org/fable-library-js/Util.js";
-import { Dictionary } from "@fable-org/fable-library-js/MutableMap.js";
+import { Dictionary_init } from "../../Core/Helper/Collections.js";
 import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.3.0/Encode.fs.js";
 import { decoder as decoder_3, arrayFromMap, encoder as encoder_1 } from "../../Json/Table/CellTable.js";
 import { decoder as decoder_2, arrayFromMap as arrayFromMap_1, encoder as encoder_2 } from "../../Json/Table/OATable.js";
@@ -7,15 +6,9 @@ import { decoder as decoder_1, arrayFromMap as arrayFromMap_2, encoder as encode
 import { map } from "@fable-org/fable-library-js/Seq.js";
 import { object as object_1 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 export function encode(encoder, obj) {
-    const stringTable = new Map([]);
-    const oaTable = new Dictionary([], {
-        Equals: equals,
-        GetHashCode: safeHash,
-    });
-    const cellTable = new Dictionary([], {
-        Equals: equals,
-        GetHashCode: safeHash,
-    });
+    const stringTable = Dictionary_init();
+    const oaTable = Dictionary_init();
+    const cellTable = Dictionary_init();
     const object = encoder(stringTable, oaTable, cellTable, obj);
     toString(0, object);
     const values = [["cellTable", encoder_1(stringTable, oaTable, arrayFromMap(cellTable))], ["oaTable", encoder_2(stringTable, arrayFromMap_1(oaTable))], ["stringTable", encoder_3(arrayFromMap_2(stringTable))], ["object", object]];

package/dist/ts/esm/ts/ROCrate/Generic/LabProcess.js

@@ -212,7 +212,7 @@ export class LDLabProcess {
     }
     static genId(name, assayName, studyName) {
         let study_1, assay_1, assay, study;
-        return clean((assayName == null) ? ((studyName != null) ? ((study_1 = value(studyName), `#Process_${study_1}_${name}`)) : (`#Process_${name}`)) : ((studyName == null) ? ((assay_1 = value(assayName), `#Process_${assay_1}_${name}`)) : ((assay = value(assayName), (study = value(studyName), `#Process_${study}_${assay}_${name}`)))));
+        return clean((assayName == null) ? ((studyName != null) ? ((study_1 = value(studyName), `#Process_S_${study_1}_${name}`)) : (`#Process_${name}`)) : ((studyName == null) ? ((assay_1 = value(assayName), `#Process_A_${assay_1}_${name}`)) : ((assay = value(assayName), (study = value(studyName), `#Process_S_${study}_A_${assay}_${name}`)))));
     }
     static create(name, objects, results, id, agent, executesLabProtocol, parameterValues, endTime, disambiguatingDescriptions, context) {
         const id_1 = (id == null) ? LDLabProcess.genId(name) : value(id);

package/dist/ts/esm/ts/ROCrate/LDContext.js

@@ -1,42 +1,18 @@
-import { Dictionary } from "@fable-org/fable-library-js/MutableMap.js";
-import { stringHash, comparePrimitives, safeHash, disposeSafe, getEnumerator, defaultOf, structuralHash, equals } from "@fable-org/fable-library-js/Util.js";
-import { tryPick, sort, map, reduce, iterate } from "@fable-org/fable-library-js/Seq.js";
-import { getItemFromDict, tryGetValue, addToDict } from "@fable-org/fable-library-js/MapUtil.js";
-import { toString, FSharpRef } from "@fable-org/fable-library-js/Types.js";
-import { defaultArg, unwrap, value as value_1, some } from "@fable-org/fable-library-js/Option.js";
 import { ActivePatterns_$007CRegex$007C_$007C } from "../Core/Helper/Regex.js";
+import { defaultArg, unwrap, value as value_5 } from "@fable-org/fable-library-js/Option.js";
+import { FSharpRef, toString } from "@fable-org/fable-library-js/Types.js";
 import { Uri } from "@fable-org/fable-library-js/Uri.js";
-import { Dictionary_addOrUpdate } from "../Core/Helper/Collections.js";
+import { defaultOf, stringHash, comparePrimitives, safeHash, disposeSafe, getEnumerator } from "@fable-org/fable-library-js/Util.js";
+import { tryGetValue, getItemFromDict, addToDict } from "@fable-org/fable-library-js/MapUtil.js";
+import { tryPick, sort, map, reduce } from "@fable-org/fable-library-js/Seq.js";
+import { StringDictionary_ofSeq } from "../Core/Helper/Collections.js";
 import { hash as hash_2, mergeHashes, boxHashSeq } from "../Core/Helper/HashCodes.js";
 import { class_type } from "@fable-org/fable-library-js/Reflection.js";
-export function Dictionary_ofSeq(s) {
-    const dict = new Dictionary([], {
-        Equals: equals,
-        GetHashCode: structuralHash,
-    });
-    iterate((tupledArg) => {
-        addToDict(dict, tupledArg[0], tupledArg[1]);
-    }, s);
-    return dict;
-}
-export function Dictionary_tryFind(key, dict) {
-    let patternInput;
-    let outArg = defaultOf();
-    patternInput = [tryGetValue(dict, key, new FSharpRef(() => outArg, (v) => {
-            outArg = v;
-        })), outArg];
-    if (patternInput[0]) {
-        return some(patternInput[1]);
-    }
-    else {
-        return undefined;
-    }
-}
 export const IRIHelper_compactIRIRegex = "(?<prefix>.*):(?<suffix>[^\\/][^\\/].*)";
 export function IRIHelper_$007CCompactIri$007C_$007C(termDefition) {
     const activePatternResult = ActivePatterns_$007CRegex$007C_$007C(IRIHelper_compactIRIRegex, termDefition);
     if (activePatternResult != null) {
-        const result = value_1(activePatternResult);
+        const result = value_5(activePatternResult);
         return [(result.groups && result.groups.prefix) || "", (result.groups && result.groups.suffix) || ""];
     }
     else {
@@ -54,7 +30,7 @@ export function IRIHelper_combine(baseIRI, relative) {
 export function IRIHelper_combineOptional(baseIRI, relative) {
     if (baseIRI == null) {
         if (relative != null) {
-            const r_1 = value_1(relative);
+            const r_1 = value_5(relative);
             return r_1;
         }
         else {
@@ -62,23 +38,23 @@ export function IRIHelper_combineOptional(baseIRI, relative) {
         }
     }
     else if (relative == null) {
-        const b_1 = value_1(baseIRI);
+        const b_1 = value_5(baseIRI);
         return b_1;
     }
     else {
-        const b = value_1(baseIRI);
-        const r = value_1(relative);
+        const b = value_5(baseIRI);
+        const r = value_5(relative);
         return IRIHelper_combine(b, r);
     }
 }
 export class LDContext {
     constructor(mappings, baseContexts) {
-        this["baseContexts@54"] = defaultArg(baseContexts, []);
+        this["baseContexts@41"] = defaultArg(baseContexts, []);
         this.name = undefined;
-        this["mappings@58"] = ((mappings == null) ? (new Map([])) : value_1(mappings));
+        this["mappings@45"] = ((mappings == null) ? (new Map([])) : value_5(mappings));
         this.reverseMappings = (new Map([]));
         this.compactReverseMappings = (new Map([]));
-        let enumerator = getEnumerator(this["mappings@58"]);
+        let enumerator = getEnumerator(this["mappings@45"]);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kvp = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -91,15 +67,15 @@ export class LDContext {
     }
     get Mappings() {
         const this$ = this;
-        return this$["mappings@58"];
+        return this$["mappings@45"];
     }
     get BaseContexts() {
         const this$ = this;
-        return this$["baseContexts@54"];
+        return this$["baseContexts@41"];
     }
     set BaseContexts(value) {
         const this$ = this;
-        this$["baseContexts@54"] = value;
+        this$["baseContexts@41"] = value;
     }
     get Name() {
         const this$ = this;
@@ -111,7 +87,15 @@ export class LDContext {
     }
     AddMapping(term, definition) {
         const this$ = this;
-        Dictionary_addOrUpdate(term, definition, this$["mappings@58"]);
+        const key = term;
+        const value = definition;
+        const dict = this$["mappings@45"];
+        if (dict.has(key)) {
+            dict.set(key, value);
+        }
+        else {
+            addToDict(dict, key, value);
+        }
         this$.addReverseMapping(term, definition);
     }
     TryResolveTerm(term) {
@@ -131,11 +115,11 @@ export class LDContext {
         else {
             const p1Def = this$.TryResolveTerm(p1);
             const p2Def = this$.TryResolveTerm(p2);
-            return (p1Def == null) ? ((p2Def != null) && ((p2Def_2 = value_1(p2Def), p1 === p2Def_2))) : ((p2Def == null) ? ((p1Def_2 = value_1(p1Def), p1Def_2 === p2)) : ((p1Def_1 = value_1(p1Def), (p2Def_1 = value_1(p2Def), p1Def_1 === p2Def_1))));
+            return (p1Def == null) ? ((p2Def != null) && ((p2Def_2 = value_5(p2Def), p1 === p2Def_2))) : ((p2Def == null) ? ((p1Def_2 = value_5(p1Def), p1Def_2 === p2)) : ((p1Def_1 = value_5(p1Def), (p2Def_1 = value_5(p2Def), p1Def_1 === p2Def_1))));
         }
     }
     static fromMappingSeq(mappings) {
-        return new LDContext(Dictionary_ofSeq(mappings));
+        return new LDContext(StringDictionary_ofSeq(mappings));
     }
     static combine_InPlace(baseContext, specificContext) {
         void (specificContext.BaseContexts.push(baseContext));
@@ -146,12 +130,12 @@ export class LDContext {
     }
     static tryCombineOptional(baseContext, specificContext) {
         let s_1, f_1, f, s;
-        return (baseContext == null) ? ((specificContext != null) ? ((s_1 = value_1(specificContext), s_1)) : undefined) : ((specificContext == null) ? ((f_1 = value_1(baseContext), f_1)) : ((f = value_1(baseContext), (s = value_1(specificContext), LDContext.combine(f, s)))));
+        return (baseContext == null) ? ((specificContext != null) ? ((s_1 = value_5(specificContext), s_1)) : undefined) : ((specificContext == null) ? ((f_1 = value_5(baseContext), f_1)) : ((f = value_5(baseContext), (s = value_5(specificContext), LDContext.combine(f, s)))));
     }
     ShallowCopy() {
         const this$ = this;
         const newMappings = new Map([]);
-        let enumerator = getEnumerator(this$["mappings@58"]);
+        let enumerator = getEnumerator(this$["mappings@45"]);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kvp = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -161,12 +145,12 @@ export class LDContext {
         finally {
             disposeSafe(enumerator);
         }
-        return new LDContext(newMappings, this$["baseContexts@54"]);
+        return new LDContext(newMappings, this$["baseContexts@41"]);
     }
     DeepCopy() {
         const this$ = this;
         const newMappings = new Map([]);
-        let enumerator = getEnumerator(this$["mappings@58"]);
+        let enumerator = getEnumerator(this$["mappings@45"]);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kvp = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -177,7 +161,7 @@ export class LDContext {
             disposeSafe(enumerator);
         }
         const newBaseContexts = [];
-        let enumerator_1 = getEnumerator(this$["baseContexts@54"]);
+        let enumerator_1 = getEnumerator(this$["baseContexts@41"]);
         try {
             while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
                 const ctx = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -209,8 +193,8 @@ export class LDContext {
         }))) | 0;
         let nameHash;
         const matchValue = this$.Name;
-        nameHash = ((matchValue == null) ? 0 : stringHash(value_1(matchValue)));
-        const baseContextsHash = ((this$["baseContexts@54"].length === 0) ? 0 : reduce(mergeHashes, map(safeHash, this$["baseContexts@54"]))) | 0;
+        nameHash = ((matchValue == null) ? 0 : stringHash(value_5(matchValue)));
+        const baseContextsHash = ((this$["baseContexts@41"].length === 0) ? 0 : reduce(mergeHashes, map(safeHash, this$["baseContexts@41"]))) | 0;
         return mergeHashes(mergeHashes(mappingsHash, nameHash), baseContextsHash) | 0;
     }
     "System.ICloneable.Clone"() {
@@ -219,26 +203,70 @@ export class LDContext {
     }
     addReverseMapping(key, value) {
         const this$ = this;
-        Dictionary_addOrUpdate(value, key, this$.reverseMappings);
+        const key_1 = value;
+        const value_1 = key;
+        const dict = this$.reverseMappings;
+        if (dict.has(key_1)) {
+            dict.set(key_1, value_1);
+        }
+        else {
+            addToDict(dict, key_1, value_1);
+        }
         const activePatternResult = IRIHelper_$007CCompactIri$007C_$007C(value);
         if (activePatternResult != null) {
-            const prefix = value_1(activePatternResult)[0];
-            const suffix = value_1(activePatternResult)[1];
-            Dictionary_addOrUpdate(prefix, [suffix, key], this$.compactReverseMappings);
-            const matchValue = Dictionary_tryFind(prefix, this$["mappings@58"]);
+            const prefix = value_5(activePatternResult)[0];
+            const suffix = value_5(activePatternResult)[1];
+            const key_2 = prefix;
+            const value_2 = [suffix, key];
+            const dict_1 = this$.compactReverseMappings;
+            if (dict_1.has(key_2)) {
+                dict_1.set(key_2, value_2);
+            }
+            else {
+                addToDict(dict_1, key_2, value_2);
+            }
+            let matchValue;
+            let patternInput;
+            let outArg = defaultOf();
+            patternInput = [tryGetValue(this$["mappings@45"], prefix, new FSharpRef(() => outArg, (v) => {
+                    outArg = v;
+                })), outArg];
+            matchValue = (patternInput[0] ? patternInput[1] : undefined);
             if (matchValue == null) {
             }
             else {
-                Dictionary_addOrUpdate(IRIHelper_combine(value_1(matchValue), suffix), key, this$.reverseMappings);
+                const key_4 = IRIHelper_combine(value_5(matchValue), suffix);
+                const value_3 = key;
+                const dict_3 = this$.reverseMappings;
+                if (dict_3.has(key_4)) {
+                    dict_3.set(key_4, value_3);
+                }
+                else {
+                    addToDict(dict_3, key_4, value_3);
+                }
             }
         }
         else {
-            const matchValue_1 = Dictionary_tryFind(key, this$.compactReverseMappings);
+            let matchValue_1;
+            let patternInput_1;
+            let outArg_1 = defaultOf();
+            patternInput_1 = [tryGetValue(this$.compactReverseMappings, key, new FSharpRef(() => outArg_1, (v_2) => {
+                    outArg_1 = v_2;
+                })), outArg_1];
+            matchValue_1 = (patternInput_1[0] ? patternInput_1[1] : undefined);
             if (matchValue_1 == null) {
             }
             else {
-                const term = value_1(matchValue_1)[1];
-                Dictionary_addOrUpdate(IRIHelper_combine(value, value_1(matchValue_1)[0]), term, this$.reverseMappings);
+                const term = value_5(matchValue_1)[1];
+                const key_6 = IRIHelper_combine(value, value_5(matchValue_1)[0]);
+                const value_4 = term;
+                const dict_5 = this$.reverseMappings;
+                if (dict_5.has(key_6)) {
+                    dict_5.set(key_6, value_4);
+                }
+                else {
+                    addToDict(dict_5, key_6, value_4);
+                }
             }
         }
     }
@@ -246,20 +274,32 @@ export class LDContext {
         let prefix, suffix, d;
         const this$ = this;
         let definition;
-        const matchValue = Dictionary_tryFind(term, this$["mappings@58"]);
-        definition = ((matchValue == null) ? tryPick((ctx) => ctx.TryResolveTerm(term), this$["baseContexts@54"]) : value_1(matchValue));
+        let matchValue;
+        let patternInput;
+        let outArg = defaultOf();
+        patternInput = [tryGetValue(this$["mappings@45"], term, new FSharpRef(() => outArg, (v) => {
+                outArg = v;
+            })), outArg];
+        matchValue = (patternInput[0] ? patternInput[1] : undefined);
+        definition = ((matchValue == null) ? tryPick((ctx) => ctx.TryResolveTerm(term), this$["baseContexts@41"]) : value_5(matchValue));
         if (definition == null) {
             return undefined;
         }
         else {
-            const activePatternResult = IRIHelper_$007CCompactIri$007C_$007C(value_1(definition));
-            return (activePatternResult != null) ? ((prefix = value_1(activePatternResult)[0], (suffix = value_1(activePatternResult)[1], IRIHelper_combine((prefix === term) ? prefix : defaultArg(this$.tryFindTerm(prefix), prefix), (suffix === term) ? suffix : defaultArg(this$.tryFindTerm(suffix), suffix))))) : ((d = value_1(definition), d));
+            const activePatternResult = IRIHelper_$007CCompactIri$007C_$007C(value_5(definition));
+            return (activePatternResult != null) ? ((prefix = value_5(activePatternResult)[0], (suffix = value_5(activePatternResult)[1], IRIHelper_combine((prefix === term) ? prefix : defaultArg(this$.tryFindTerm(prefix), prefix), (suffix === term) ? suffix : defaultArg(this$.tryFindTerm(suffix), suffix))))) : ((d = value_5(definition), d));
         }
     }
     tryFindIri(iri) {
         const this$ = this;
-        const matchValue = Dictionary_tryFind(iri, this$.reverseMappings);
-        return (matchValue == null) ? tryPick((ctx) => ctx.TryGetTerm(iri), this$["baseContexts@54"]) : value_1(matchValue);
+        let matchValue;
+        let patternInput;
+        let outArg = defaultOf();
+        patternInput = [tryGetValue(this$.reverseMappings, iri, new FSharpRef(() => outArg, (v) => {
+                outArg = v;
+            })), outArg];
+        matchValue = (patternInput[0] ? patternInput[1] : undefined);
+        return (matchValue == null) ? tryPick((ctx) => ctx.TryGetTerm(iri), this$["baseContexts@41"]) : value_5(matchValue);
     }
     tryCompactIRI(iri) {
         throw new Error("TryCompactIRI is Not implemented yet");

package/dist/ts/types/ts/Conversion.d.ts

@@ -172,7 +172,7 @@ export declare function ProcessConversion_tryGetPerformerGetter(generalI: int32,
 /**
  * Given the header sequence of an ArcTable, returns a function for parsing each row of the table to a process
  */
-export declare function ProcessConversion_getProcessGetter(processNameRoot: string, headers: Iterable<CompositeHeader_$union>): ((arg0: IMap<[int32, int32], CompositeCell_$union>) => ((arg0: int32) => LDNode));
+export declare function ProcessConversion_getProcessGetter(assayName: Option<string>, studyName: Option<string>, processNameRoot: string, headers: Iterable<CompositeHeader_$union>): ((arg0: IMap<[int32, int32], CompositeCell_$union>) => ((arg0: int32) => LDNode));
 /**
  * Groups processes by their name, or by the name of the protocol they execute
  *
@@ -199,7 +199,7 @@ export declare function ARCtrl_ArcTable__ArcTable_GetProtocols(this$: ArcTable):
 /**
  * Returns the list of processes specidified in this ArcTable
  */
-export declare function ARCtrl_ArcTable__ArcTable_GetProcesses(this$: ArcTable): FSharpList<LDNode>;
+export declare function ARCtrl_ArcTable__ArcTable_GetProcesses_40457300(this$: ArcTable, assayName: Option<string>, studyName: Option<string>): FSharpList<LDNode>;
 /**
  * Create a new table from a list of processes
  *
@@ -211,7 +211,7 @@ export declare function ARCtrl_ArcTable__ArcTable_fromProcesses_Static_Z3575FB5F
 /**
  * Return a list of all the processes in all the tables.
  */
-export declare function ARCtrl_ArcTables__ArcTables_GetProcesses(this$: ArcTables): FSharpList<LDNode>;
+export declare function ARCtrl_ArcTables__ArcTables_GetProcesses_40457300(this$: ArcTables, assayName: Option<string>, studyName: Option<string>): FSharpList<LDNode>;
 /**
  * Create a collection of tables from a list of processes.
  *