@nfdi4plants/arctrl 3.0.0-alpha.4 → 3.0.0-beta.2

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

@@ -1,8 +1,8 @@
-import { remove, toFail, printf, toText } from "@fable-org/fable-library-js/String.js";
+import { toFail, printf, toText } from "@fable-org/fable-library-js/String.js";
 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-org/fable-library-js/Seq.js";
 import { unwrap, value as value_10, map, defaultArg } from "@fable-org/fable-library-js/Option.js";
-import { Option_fromValueWithDefault, ResizeArray_filter } from "./Helper/Collections.js";
+import { ResizeArray_singleton, Option_fromValueWithDefault, ResizeArray_filter } from "./Helper/Collections.js";
 import { OntologyAnnotation } from "./OntologyAnnotation.js";
 import { Value_Name, Value as Value_2, Value_Ontology } from "./Value.js";
 import { CompositeCell_FreeText, CompositeCell_Unitized, CompositeCell_Term } from "./Table/CompositeCell.js";
@@ -20,7 +20,8 @@ import { ProcessOutput_getFactorValues_Z42C11600, ProcessOutput__isMaterial, Pro
 import { safeHash, equals, disposeSafe, getEnumerator, comparePrimitives, arrayHash, equalArrays, stringHash, int32ToString } from "@fable-org/fable-library-js/Util.js";
 import { ActivePatterns_$007CRegex$007C_$007C } from "./Helper/Regex.js";
 import { ARCtrl_Process_Component__Component_TryGetColumnIndex, ARCtrl_Process_ProtocolParameter__ProtocolParameter_TryGetColumnIndex, tryGetFactorColumnIndex, tryGetCharacteristicColumnIndex, tryGetComponentIndex, tryGetParameterColumnIndex, ARCtrl_OntologyAnnotation__OntologyAnnotation_setColumnIndex_Static, ARCtrl_OntologyAnnotation__OntologyAnnotation_SetColumnIndex_Z524259A4 } from "./Process/ColumnIndex.js";
-import { getItemFromDict } from "@fable-org/fable-library-js/MapUtil.js";
+import { Unchecked_alignByHeaders, getEmptyCellForHeader, Unchecked_tryGetCellAt } from "./Table/ArcTableAux.js";
+import { ArcTable } from "./Table/ArcTable.js";
 import { initialize, zip, append as append_1, sortBy, head, tryPick as tryPick_1, collect, mapIndexed, item, map as map_2, empty, length, ofArray, isEmpty, singleton, choose as choose_1 } from "@fable-org/fable-library-js/List.js";
 import { Source_create_Z5CA08497 } from "./Process/Source.js";
 import { Sample_create_62424AD2 } from "./Process/Sample.js";
@@ -29,10 +30,7 @@ import { Protocol_create_Z414665E7, Protocol_addComponent, Protocol_addParameter
 import { List_distinct, List_groupBy } from "@fable-org/fable-library-js/Seq2.js";
 import { createMissingIdentifier } from "./Helper/Identifier.js";
 import { boxHashSeq, boxHashOption } from "./Helper/HashCodes.js";
-import { ArcTable } from "./Table/ArcTable.js";
-import { singleton as singleton_2 } from "@fable-org/fable-library-js/Array.js";
 import { rangeDouble } from "@fable-org/fable-library-js/Range.js";
-import { Unchecked_alignByHeaders } from "./Table/ArcTableAux.js";
 import { ArcTables } from "./Table/ArcTables.js";
 export const Person_orcidKey = "ORCID";
 export const Person_AssayIdentifierPrefix = "performer (ARC:00000168)";
@@ -433,7 +431,11 @@ export function ProcessParsing_tryComponentGetter(generalI, valueI, valueHeader)
         const oa = valueHeader.fields[0];
         const newOA = oa.Copy();
         ARCtrl_OntologyAnnotation__OntologyAnnotation_SetColumnIndex_Z524259A4(newOA, valueI);
-        return (matrix) => ((i) => JsonTypes_composeComponent(CompositeHeader_Component(newOA), getItemFromDict(matrix, [generalI, i])));
+        const cat = CompositeHeader_Component(newOA);
+        return (table) => ((i) => {
+            let matchValue;
+            return JsonTypes_composeComponent(cat, (matchValue = Unchecked_tryGetCellAt(generalI, i, table.Values), (matchValue == null) ? getEmptyCellForHeader(cat, undefined) : value_10(matchValue)));
+        });
     }
     else {
         return undefined;
@@ -445,7 +447,10 @@ export function ProcessParsing_tryComponentGetter(generalI, valueI, valueHeader)
 export function ProcessParsing_tryParameterGetter(generalI, valueI, valueHeader) {
     if (valueHeader.tag === /* Parameter */ 3) {
         const cat = CompositeHeader_Parameter(ARCtrl_OntologyAnnotation__OntologyAnnotation_setColumnIndex_Static(valueI, valueHeader.fields[0]));
-        return (matrix) => ((i_1) => JsonTypes_composeParameterValue(cat, getItemFromDict(matrix, [generalI, i_1])));
+        return (table) => ((i_1) => {
+            let matchValue;
+            return JsonTypes_composeParameterValue(cat, (matchValue = Unchecked_tryGetCellAt(generalI, i_1, table.Values), (matchValue == null) ? getEmptyCellForHeader(cat, undefined) : value_10(matchValue)));
+        });
     }
     else {
         return undefined;
@@ -457,7 +462,10 @@ export function ProcessParsing_tryParameterGetter(generalI, valueI, valueHeader)
 export function ProcessParsing_tryFactorGetter(generalI, valueI, valueHeader) {
     if (valueHeader.tag === /* Factor */ 2) {
         const cat = CompositeHeader_Factor(ARCtrl_OntologyAnnotation__OntologyAnnotation_setColumnIndex_Static(valueI, valueHeader.fields[0]));
-        return (matrix) => ((i_1) => JsonTypes_composeFactorValue(cat, getItemFromDict(matrix, [generalI, i_1])));
+        return (table) => ((i_1) => {
+            let matchValue;
+            return JsonTypes_composeFactorValue(cat, (matchValue = Unchecked_tryGetCellAt(generalI, i_1, table.Values), (matchValue == null) ? getEmptyCellForHeader(cat, undefined) : value_10(matchValue)));
+        });
     }
     else {
         return undefined;
@@ -469,7 +477,10 @@ export function ProcessParsing_tryFactorGetter(generalI, valueI, valueHeader) {
 export function ProcessParsing_tryCharacteristicGetter(generalI, valueI, valueHeader) {
     if (valueHeader.tag === /* Characteristic */ 1) {
         const cat = CompositeHeader_Characteristic(ARCtrl_OntologyAnnotation__OntologyAnnotation_setColumnIndex_Static(valueI, valueHeader.fields[0]));
-        return (matrix) => ((i_1) => JsonTypes_composeCharacteristicValue(cat, getItemFromDict(matrix, [generalI, i_1])));
+        return (table) => ((i_1) => {
+            let matchValue;
+            return JsonTypes_composeCharacteristicValue(cat, (matchValue = Unchecked_tryGetCellAt(generalI, i_1, table.Values), (matchValue == null) ? getEmptyCellForHeader(cat, undefined) : value_10(matchValue)));
+        });
     }
     else {
         return undefined;
@@ -480,7 +491,16 @@ export function ProcessParsing_tryCharacteristicGetter(generalI, valueI, valueHe
  */
 export function ProcessParsing_tryGetProtocolTypeGetter(generalI, header) {
     if (header.tag === /* ProtocolType */ 4) {
-        return (matrix) => ((i) => getItemFromDict(matrix, [generalI, i]).AsTerm);
+        return (table) => ((i) => {
+            const matchValue = Unchecked_tryGetCellAt(generalI, i, table.Values);
+            if (matchValue == null) {
+                return new OntologyAnnotation();
+            }
+            else {
+                const cell = value_10(matchValue);
+                return cell.AsTerm;
+            }
+        });
     }
     else {
         return undefined;
@@ -491,7 +511,16 @@ export function ProcessParsing_tryGetProtocolTypeGetter(generalI, header) {
  */
 export function ProcessParsing_tryGetProtocolREFGetter(generalI, header) {
     if (header.tag === /* ProtocolREF */ 8) {
-        return (matrix) => ((i) => getItemFromDict(matrix, [generalI, i]).AsFreeText);
+        return (table) => ((i) => {
+            const matchValue = Unchecked_tryGetCellAt(generalI, i, table.Values);
+            if (matchValue == null) {
+                return "";
+            }
+            else {
+                const cell = value_10(matchValue);
+                return cell.AsFreeText;
+            }
+        });
     }
     else {
         return undefined;
@@ -502,7 +531,16 @@ export function ProcessParsing_tryGetProtocolREFGetter(generalI, header) {
  */
 export function ProcessParsing_tryGetProtocolDescriptionGetter(generalI, header) {
     if (header.tag === /* ProtocolDescription */ 5) {
-        return (matrix) => ((i) => getItemFromDict(matrix, [generalI, i]).AsFreeText);
+        return (table) => ((i) => {
+            const matchValue = Unchecked_tryGetCellAt(generalI, i, table.Values);
+            if (matchValue == null) {
+                return "";
+            }
+            else {
+                const cell = value_10(matchValue);
+                return cell.AsFreeText;
+            }
+        });
     }
     else {
         return undefined;
@@ -513,7 +551,16 @@ export function ProcessParsing_tryGetProtocolDescriptionGetter(generalI, header)
  */
 export function ProcessParsing_tryGetProtocolURIGetter(generalI, header) {
     if (header.tag === /* ProtocolUri */ 6) {
-        return (matrix) => ((i) => getItemFromDict(matrix, [generalI, i]).AsFreeText);
+        return (table) => ((i) => {
+            const matchValue = Unchecked_tryGetCellAt(generalI, i, table.Values);
+            if (matchValue == null) {
+                return "";
+            }
+            else {
+                const cell = value_10(matchValue);
+                return cell.AsFreeText;
+            }
+        });
     }
     else {
         return undefined;
@@ -524,7 +571,16 @@ export function ProcessParsing_tryGetProtocolURIGetter(generalI, header) {
  */
 export function ProcessParsing_tryGetProtocolVersionGetter(generalI, header) {
     if (header.tag === /* ProtocolVersion */ 7) {
-        return (matrix) => ((i) => getItemFromDict(matrix, [generalI, i]).AsFreeText);
+        return (table) => ((i) => {
+            const matchValue = Unchecked_tryGetCellAt(generalI, i, table.Values);
+            if (matchValue == null) {
+                return "";
+            }
+            else {
+                const cell = value_10(matchValue);
+                return cell.AsFreeText;
+            }
+        });
     }
     else {
         return undefined;
@@ -536,7 +592,10 @@ export function ProcessParsing_tryGetProtocolVersionGetter(generalI, header) {
 export function ProcessParsing_tryGetInputGetter(generalI, header) {
     if (header.tag === /* Input */ 11) {
         const io = header.fields[0];
-        return (matrix) => ((i) => JsonTypes_composeProcessInput(header, getItemFromDict(matrix, [generalI, i])));
+        return (table) => ((i) => {
+            let matchValue;
+            return JsonTypes_composeProcessInput(header, (matchValue = Unchecked_tryGetCellAt(generalI, i, table.Values), (matchValue == null) ? getEmptyCellForHeader(header, undefined) : value_10(matchValue)));
+        });
     }
     else {
         return undefined;
@@ -548,7 +607,10 @@ export function ProcessParsing_tryGetInputGetter(generalI, header) {
 export function ProcessParsing_tryGetOutputGetter(generalI, header) {
     if (header.tag === /* Output */ 12) {
         const io = header.fields[0];
-        return (matrix) => ((i) => JsonTypes_composeProcessOutput(header, getItemFromDict(matrix, [generalI, i])));
+        return (table) => ((i) => {
+            let matchValue;
+            return JsonTypes_composeProcessOutput(header, (matchValue = Unchecked_tryGetCellAt(generalI, i, table.Values), (matchValue == null) ? getEmptyCellForHeader(header, undefined) : value_10(matchValue)));
+        });
     }
     else {
         return undefined;
@@ -560,7 +622,16 @@ export function ProcessParsing_tryGetOutputGetter(generalI, header) {
 export function ProcessParsing_tryGetCommentGetter(generalI, header) {
     if (header.tag === /* Comment */ 14) {
         const c = header.fields[0];
-        return (matrix) => ((i) => (new Comment$(c, getItemFromDict(matrix, [generalI, i]).AsFreeText)));
+        return (table) => ((i) => {
+            const matchValue = Unchecked_tryGetCellAt(generalI, i, table.Values);
+            if (matchValue == null) {
+                return new Comment$(c);
+            }
+            else {
+                const cell = value_10(matchValue);
+                return new Comment$(c, cell.AsFreeText);
+            }
+        });
     }
     else {
         return undefined;
@@ -597,36 +668,36 @@ export function ProcessParsing_getProcessGetter(processNameRoot, headers) {
     let inputGetter_1;
     const matchValue = tryPick((tupledArg_10) => ProcessParsing_tryGetInputGetter(tupledArg_10[0], tupledArg_10[1]), headers_1);
     if (matchValue == null) {
-        inputGetter_1 = ((matrix_1) => ((i_1) => singleton(ProcessInput_Source(Source_create_Z5CA08497(undefined, `${processNameRoot}_Input_${i_1}`, toList(map_1((f_1) => f_1(matrix_1)(i_1), charGetters)))))));
+        inputGetter_1 = ((table_1) => ((i_1) => singleton(ProcessInput_Source(Source_create_Z5CA08497(undefined, `${processNameRoot}_Input_${i_1}`, toList(map_1((f_1) => f_1(table_1)(i_1), charGetters)))))));
     }
     else {
         const inputGetter = value_10(matchValue);
-        inputGetter_1 = ((matrix) => ((i) => {
-            const chars = toList(map_1((f) => f(matrix)(i), charGetters));
-            const input = inputGetter(matrix)(i);
+        inputGetter_1 = ((table) => ((i) => {
+            const chars = toList(map_1((f) => f(table)(i), charGetters));
+            const input = inputGetter(table)(i);
             return (!(ProcessInput__isSample(input) ? true : ProcessInput__isSource(input)) && !isEmpty(chars)) ? ofArray([input, ProcessInput_createSample_Z598187B7(ProcessInput__get_Name(input), chars)]) : singleton((length(chars) > 0) ? ProcessInput_setCharacteristicValues(chars, input) : input);
         }));
     }
     let outputGetter_1;
     const matchValue_1 = tryPick((tupledArg_11) => ProcessParsing_tryGetOutputGetter(tupledArg_11[0], tupledArg_11[1]), headers_1);
     if (matchValue_1 == null) {
-        outputGetter_1 = ((matrix_3) => ((i_3) => singleton(ProcessOutput_Sample(Sample_create_62424AD2(undefined, `${processNameRoot}_Output_${i_3}`, undefined, toList(map_1((f_3) => f_3(matrix_3)(i_3), factorValueGetters)))))));
+        outputGetter_1 = ((table_3) => ((i_3) => singleton(ProcessOutput_Sample(Sample_create_62424AD2(undefined, `${processNameRoot}_Output_${i_3}`, undefined, toList(map_1((f_3) => f_3(table_3)(i_3), factorValueGetters)))))));
     }
     else {
         const outputGetter = value_10(matchValue_1);
-        outputGetter_1 = ((matrix_2) => ((i_2) => {
-            const factors = toList(map_1((f_2) => f_2(matrix_2)(i_2), factorValueGetters));
-            const output = outputGetter(matrix_2)(i_2);
+        outputGetter_1 = ((table_2) => ((i_2) => {
+            const factors = toList(map_1((f_2) => f_2(table_2)(i_2), factorValueGetters));
+            const output = outputGetter(table_2)(i_2);
             return (!ProcessOutput__isSample(output) && !isEmpty(factors)) ? ofArray([output, ProcessOutput_createSample_Z598187B7(ProcessOutput__get_Name(output), undefined, factors)]) : singleton((length(factors) > 0) ? ProcessOutput_setFactorValues(factors, output) : output);
         }));
     }
-    return (matrix_4) => ((i_4) => {
+    return (table_4) => ((i_4) => {
         const pn = map((p) => Process_composeName(p, i_4), Option_fromValueWithDefault("", processNameRoot));
-        const paramvalues = Option_fromValueWithDefault(empty(), map_2((f_4) => f_4(matrix_4)(i_4), parameterValueGetters));
+        const paramvalues = Option_fromValueWithDefault(empty(), map_2((f_4) => f_4(table_4)(i_4), parameterValueGetters));
         const parameters = map((list_5) => map_2((pv) => value_10(pv.Category), list_5), paramvalues);
-        const comments = Option_fromValueWithDefault(empty(), map_2((f_5) => f_5(matrix_4)(i_4), commentGetters));
+        const comments = Option_fromValueWithDefault(empty(), map_2((f_5) => f_5(table_4)(i_4), commentGetters));
         let protocol;
-        const p_1 = Protocol_make(undefined, map((f_6) => f_6(matrix_4)(i_4), protocolREFGetter), map((f_7) => f_7(matrix_4)(i_4), protocolTypeGetter), map((f_8) => f_8(matrix_4)(i_4), protocolDescriptionGetter), map((f_9) => f_9(matrix_4)(i_4), protocolURIGetter), map((f_10) => f_10(matrix_4)(i_4), protocolVersionGetter), parameters, Option_fromValueWithDefault(empty(), map_2((f_11) => f_11(matrix_4)(i_4), componentGetters)), undefined);
+        const p_1 = Protocol_make(undefined, map((f_6) => f_6(table_4)(i_4), protocolREFGetter), map((f_7) => f_7(table_4)(i_4), protocolTypeGetter), map((f_8) => f_8(table_4)(i_4), protocolDescriptionGetter), map((f_9) => f_9(table_4)(i_4), protocolURIGetter), map((f_10) => f_10(table_4)(i_4), protocolVersionGetter), parameters, Option_fromValueWithDefault(empty(), map_2((f_11) => f_11(table_4)(i_4), componentGetters)), undefined);
         let matchResult;
         if (p_1.Name == null) {
             if (p_1.ProtocolType == null) {
@@ -668,8 +739,8 @@ export function ProcessParsing_getProcessGetter(processNameRoot, headers) {
                 protocol = p_1;
         }
         let patternInput;
-        const inputs = inputGetter_1(matrix_4)(i_4);
-        const outputs = outputGetter_1(matrix_4)(i_4);
+        const inputs = inputGetter_1(table_4)(i_4);
+        const outputs = outputGetter_1(table_4)(i_4);
         patternInput = (((length(inputs) === 1) && (length(outputs) === 2)) ? [ofArray([item(0, inputs), item(0, inputs)]), outputs] : (((length(inputs) === 2) && (length(outputs) === 1)) ? [inputs, ofArray([item(0, outputs), item(0, outputs)])] : [inputs, outputs]));
         return Process_make(undefined, pn, protocol, paramvalues, undefined, undefined, undefined, undefined, patternInput[0], patternInput[1], comments);
     });
@@ -689,10 +760,6 @@ export function ProcessParsing_groupProcesses(ps) {
         else if ((x.ExecutesProtocol != null) && (value_10(x.ExecutesProtocol).Name != null)) {
             return value_10(value_10(x.ExecutesProtocol).Name);
         }
-        else if ((x.Name != null) && (value_10(x.Name).indexOf("_") >= 0)) {
-            const lastUnderScoreIndex = value_10(x.Name).lastIndexOf("_") | 0;
-            return remove(value_10(x.Name), lastUnderScoreIndex);
-        }
         else if (x.Name != null) {
             return value_10(x.Name);
         }
@@ -963,7 +1030,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_Z6986DF18(arg, unwrap(c.ComponentUnit))), c.ComponentValue);
+            const v_1 = map((arg) => ResizeArray_singleton(ARCtrl_CompositeCell__CompositeCell_fromValue_Static_Z6986DF18(arg, unwrap(c.ComponentUnit))), c.ComponentValue);
             t.AddColumn(CompositeHeader_Parameter(value_10(c.ComponentType)), unwrap(v_1), unwrap(ARCtrl_Process_Component__Component_TryGetColumnIndex(c)));
         }
     }
@@ -971,19 +1038,19 @@ export function ARCtrl_ArcTable__ArcTable_fromProtocol_Static_3BF20962(p) {
         disposeSafe(enumerator_1);
     }
     map((d) => {
-        t.AddProtocolDescriptionColumn([d]);
+        t.AddProtocolDescriptionColumn(ResizeArray_singleton(d));
     }, p.Description);
     map((d_1) => {
-        t.AddProtocolVersionColumn([d_1]);
+        t.AddProtocolVersionColumn(ResizeArray_singleton(d_1));
     }, p.Version);
     map((d_2) => {
-        t.AddProtocolTypeColumn([d_2]);
+        t.AddProtocolTypeColumn(ResizeArray_singleton(d_2));
     }, p.ProtocolType);
     map((d_3) => {
-        t.AddProtocolUriColumn([d_3]);
+        t.AddProtocolUriColumn(ResizeArray_singleton(d_3));
     }, p.Uri);
     map((d_4) => {
-        t.AddProtocolNameColumn([d_4]);
+        t.AddProtocolNameColumn(ResizeArray_singleton(d_4));
     }, p.Name);
     return t;
 }
@@ -1042,7 +1109,7 @@ export function ARCtrl_ArcTable__ArcTable_GetProcesses(this$) {
             const clo_1 = clo(arg);
             return clo_1;
         });
-        return ProcessParsing_mergeIdenticalProcesses(toList(delay(() => map_1((i) => getter(this$.Values)(i), rangeDouble(0, 1, this$.RowCount - 1)))));
+        return ProcessParsing_mergeIdenticalProcesses(toList(delay(() => map_1((i) => getter(this$)(i), rangeDouble(0, 1, this$.RowCount - 1)))));
     }
 }
 /**
@@ -1054,7 +1121,7 @@ export function ARCtrl_ArcTable__ArcTable_GetProcesses(this$) {
  */
 export function ARCtrl_ArcTable__ArcTable_fromProcesses_Static(name, ps) {
     const tupledArg = Unchecked_alignByHeaders(true, collect(ProcessParsing_processToRows, ps));
-    return ArcTable.create(name, tupledArg[0], tupledArg[1]);
+    return ArcTable.fromArcTableValues(name, tupledArg[0], tupledArg[1]);
 }
 /**
  * Return a list of all the processes in all the tables.
@@ -1073,6 +1140,6 @@ export function ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(ps) {
     let collection;
     return new ArcTables((collection = map_2((tupledArg) => {
         const tupledArg_1 = Unchecked_alignByHeaders(true, collect(ProcessParsing_processToRows, tupledArg[1]));
-        return ArcTable.create(tupledArg[0], tupledArg_1[0], tupledArg_1[1]);
+        return ArcTable.fromArcTableValues(tupledArg[0], tupledArg_1[0], tupledArg_1[1]);
     }, ProcessParsing_groupProcesses(ps)), Array.from(collection)));
 }

package/dist/ts/esm/ts/Core/Data.js

@@ -1,4 +1,4 @@
-import { trimStart, trim, printf, toText } from "@fable-org/fable-library-js/String.js";
+import { substring, trimStart as trimStart_1, trim, printf, toText } from "@fable-org/fable-library-js/String.js";
 import { item } from "@fable-org/fable-library-js/Array.js";
 import { defaultArg, value as value_1, unwrap } from "@fable-org/fable-library-js/Option.js";
 import { DataFile__get_AsString } from "./DataFile.js";
@@ -132,19 +132,21 @@ export class Data {
             throw new Error("Data does not have a file path");
         }
         else {
-            const p_2 = value_1(matchValue);
-            return ((checkExistenceFromRoot_1(p_2) ? true : ((p = p_2, ((p.startsWith("assays/") ? true : p.startsWith("studies/")) ? true : p.startsWith("workflows/")) ? true : p.startsWith("runs/")))) ? true : ((p_1 = p_2, p_1.startsWith("http:") ? true : p_1.startsWith("https:")))) ? p_2 : f(p_2);
+            let p_3;
+            const s = trimStart_1(value_1(matchValue), "/");
+            p_3 = (s.startsWith("./") ? substring(s, "./".length) : s);
+            return ((checkExistenceFromRoot_1(p_3) ? true : ((p = p_3, ((p.startsWith("assays/") ? true : p.startsWith("studies/")) ? true : p.startsWith("workflows/")) ? true : p.startsWith("runs/")))) ? true : ((p_1 = p_3, p_1.startsWith("http:") ? true : p_1.startsWith("https:")))) ? p_3 : f(p_3);
         }
     }
     GetAbsolutePathForAssay(assayIdentifier, checkExistenceFromRoot) {
         const this$ = this;
         const folderPath = `assays/${assayIdentifier}/dataset/`;
-        return this$.GetAbsolutePathBy((p) => (folderPath + trimStart(p, "/")), unwrap(checkExistenceFromRoot));
+        return this$.GetAbsolutePathBy((p) => (folderPath + trimStart_1(p, "/")), unwrap(checkExistenceFromRoot));
     }
     GetAbsolutePathForStudy(studyIdentifier, checkExistenceFromRoot) {
         const this$ = this;
         const folderPath = `studies/${studyIdentifier}/resources/`;
-        return this$.GetAbsolutePathBy((p) => (folderPath + trimStart(p, "/")), unwrap(checkExistenceFromRoot));
+        return this$.GetAbsolutePathBy((p) => (folderPath + trimStart_1(p, "/")), unwrap(checkExistenceFromRoot));
     }
     Copy() {
         const this$ = this;

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

@@ -5,9 +5,10 @@ import { empty, singleton, append, head, tail, isEmpty as isEmpty_1 } from "@fab
 import { tryGetValue, addToDict } from "@fable-org/fable-library-js/MapUtil.js";
 import { Dictionary } from "@fable-org/fable-library-js/MutableMap.js";
 import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
+import { min } from "@fable-org/fable-library-js/Double.js";
 import { contains } from "@fable-org/fable-library-js/Array.js";
+import { rangeDouble } from "@fable-org/fable-library-js/Range.js";
 import { groupBy } from "@fable-org/fable-library-js/Seq2.js";
-import { min } from "@fable-org/fable-library-js/Double.js";
 /**
  * If the value matches the default, a None is returned, else a Some is returned
  */
@@ -135,6 +136,9 @@ export function Dictionary_items(dict) {
 export function StringDictionary_ofSeq(s) {
     return new Map(s);
 }
+export function IntDictionary_ofSeq(s) {
+    return new Map(s);
+}
 export function ResizeArray_create(i, v) {
     const a = [];
     if (i > 0) {
@@ -163,6 +167,21 @@ export function ResizeArray_map(f, a) {
     }
     return b;
 }
+export function ResizeArray_mapi(f, a) {
+    const b = [];
+    for (let i = 0; i <= (a.length - 1); i++) {
+        void (b.push(f(i, a[i])));
+    }
+    return b;
+}
+export function ResizeArray_map2(f, a, b) {
+    const c = [];
+    const n = min(a.length, b.length) | 0;
+    for (let i = 0; i <= (n - 1); i++) {
+        void (c.push(f(a[i], b[i])));
+    }
+    return c;
+}
 export function ResizeArray_choose(f, a) {
     const b = [];
     let enumerator = getEnumerator(a);
@@ -237,6 +256,18 @@ export function ResizeArray_iter(f, a) {
         disposeSafe(enumerator);
     }
 }
+export function ResizeArray_iteri(f, a) {
+    for (let i = 0; i <= (a.length - 1); i++) {
+        f(i, a[i]);
+    }
+}
+export function ResizeArray_init(n, f) {
+    const a = [];
+    for (let i = 0; i <= (n - 1); i++) {
+        void (a.push(f(i)));
+    }
+    return a;
+}
 export function ResizeArray_reduce(f, a) {
     switch (a.length) {
         case 0:
@@ -342,6 +373,35 @@ export function ResizeArray_appendSingleton(b, a) {
     void (c.push(b));
     return c;
 }
+export function ResizeArray_indexed(a) {
+    const b = [];
+    for (let i = 0; i <= (a.length - 1); i++) {
+        void (b.push([i, a[i]]));
+    }
+    return b;
+}
+export function ResizeArray_rev(a) {
+    const b = [];
+    const enumerator = getEnumerator(rangeDouble(a.length - 1, -1, 0));
+    try {
+        while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
+            const i = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]() | 0;
+            void (b.push(a[i]));
+        }
+    }
+    finally {
+        disposeSafe(enumerator);
+    }
+    return b;
+}
+export function ResizeArray_take(n, a) {
+    const b = [];
+    const n_1 = min(n, a.length) | 0;
+    for (let i = 0; i <= (n_1 - 1); i++) {
+        void (b.push(a[i]));
+    }
+    return b;
+}
 export function ResizeArray_groupBy(f, a) {
     const collection = map((tupledArg) => [tupledArg[0], Array.from(tupledArg[1])], groupBy(f, a, {
         Equals: equals,

package/dist/ts/esm/ts/Core/OntologyAnnotation.js

@@ -1,13 +1,13 @@
 import { value as value_4, defaultArg, unwrap } from "@fable-org/fable-library-js/Option.js";
-import { Pattern_TermAnnotationShortPattern, ActivePatterns_$007CRegex$007C_$007C, tryParseTermAnnotation } from "./Helper/Regex.js";
 import { createOAUri } from "./Helper/Url.js";
+import { Pattern_TermAnnotationShortPattern, ActivePatterns_$007CRegex$007C_$007C, tryParseTermAnnotation } from "./Helper/Regex.js";
 import { StringBuilder__Append_Z721C83C5, StringBuilder_$ctor } from "@fable-org/fable-library-js/System.Text.js";
 import { printf, toText, join } from "@fable-org/fable-library-js/String.js";
-import { toArray, empty, singleton, append, delay, toList } from "@fable-org/fable-library-js/Seq.js";
+import { empty, singleton, append, delay, toList } from "@fable-org/fable-library-js/Seq.js";
 import { toString } from "@fable-org/fable-library-js/Types.js";
-import { hash as hash_1, boxHashOption, boxHashArray } from "./Helper/HashCodes.js";
+import { hash as hash_1, mergeHashes } from "./Helper/HashCodes.js";
+import { safeHash, stringHash } from "@fable-org/fable-library-js/Util.js";
 import { ResizeArray_map } from "./Helper/Collections.js";
-import { safeHash } from "@fable-org/fable-library-js/Util.js";
 import { class_type } from "@fable-org/fable-library-js/Reflection.js";
 export class OntologyAnnotation {
     constructor(name, tsr, tan, comments) {
@@ -15,6 +15,7 @@ export class OntologyAnnotation {
         this._termSourceREF = ((tsr == null) ? undefined : ((value_4(tsr) === "") ? undefined : tsr));
         this._termAccessionNumber = ((tan == null) ? undefined : ((value_4(tan) === "") ? undefined : ((value_4(tan) === ":") ? undefined : tan)));
         this._comments = defaultArg(comments, []);
+        this._tanInfo = OntologyAnnotation.computeTanInfo(unwrap(this._termAccessionNumber), unwrap(this._termSourceREF));
     }
     get Name() {
         const this$ = this;
@@ -31,6 +32,7 @@ export class OntologyAnnotation {
     set TermSourceREF(tsr) {
         const this$ = this;
         this$._termSourceREF = tsr;
+        this$.recomputeTanInfo();
     }
     get TermAccessionNumber() {
         const this$ = this;
@@ -39,6 +41,7 @@ export class OntologyAnnotation {
     set TermAccessionNumber(tan) {
         const this$ = this;
         this$._termAccessionNumber = tan;
+        this$.recomputeTanInfo();
     }
     get Comments() {
         const this$ = this;
@@ -56,12 +59,8 @@ export class OntologyAnnotation {
         return OntologyAnnotation.make(name, tsr, tan, comments_1);
     }
     get TANInfo() {
-        let matchValue, tan, matchValue_1, matchValue_2, tsr;
         const this$ = this;
-        return unwrap((matchValue = this$.TermAccessionNumber, (matchValue == null) ? undefined : ((tan = value_4(matchValue), (matchValue_1 = tryParseTermAnnotation(tan), (matchValue_1 == null) ? ((matchValue_2 = this$.TermSourceREF, (matchValue_2 == null) ? undefined : ((value_4(matchValue_2) === "") ? undefined : ((tsr = value_4(matchValue_2), {
-            IDSpace: tsr,
-            LocalID: tan,
-        }))))) : value_4(matchValue_1))))));
+        return unwrap(this$._tanInfo);
     }
     get NameText() {
         const this$ = this;
@@ -150,23 +149,9 @@ export class OntologyAnnotation {
         return (((this$.Name == null) && (this$.TermSourceREF == null)) && (this$.TermAccessionNumber == null)) && (this$.Comments.length === 0);
     }
     GetHashCode() {
+        let matchValue, matchValue_1, matchValue_2, tsr_1, matchValue_4, tan, taninfo_1, tsr, taninfo;
         const this$ = this;
-        return boxHashArray(toArray(delay(() => append(singleton(boxHashOption(this$.Name)), delay(() => {
-            let tsr_1, taninfo_1, tsr;
-            const matchValue = this$.TermSourceREF;
-            const matchValue_1 = this$.TANInfo;
-            if (matchValue != null) {
-                return (matchValue_1 == null) ? ((tsr_1 = value_4(matchValue), singleton(boxHashArray([tsr_1, defaultArg(this$.TermAccessionNumber, "")])))) : ((taninfo_1 = value_4(matchValue_1), (tsr = value_4(matchValue), singleton(boxHashArray([tsr, (taninfo_1.IDSpace + ":") + taninfo_1.LocalID])))));
-            }
-            else if (matchValue_1 == null) {
-                const tan_1 = defaultArg(this$.TermAccessionNumber, "");
-                return singleton(boxHashArray([defaultArg(this$.TermAccessionNumber, ""), tan_1]));
-            }
-            else {
-                const taninfo = value_4(matchValue_1);
-                return singleton(boxHashArray([taninfo.IDSpace, (taninfo.IDSpace + ":") + taninfo.LocalID]));
-            }
-        }))))) | 0;
+        return mergeHashes((matchValue = this$.Name, (matchValue == null) ? 0 : stringHash(value_4(matchValue))), (matchValue_1 = this$.TermSourceREF, (matchValue_2 = this$.TANInfo, (matchValue_1 != null) ? ((matchValue_2 == null) ? ((tsr_1 = value_4(matchValue_1), (matchValue_4 = this$.TermAccessionNumber, (matchValue_4 == null) ? stringHash(tsr_1) : ((tan = value_4(matchValue_4), mergeHashes(stringHash(tsr_1), stringHash(tan))))))) : ((taninfo_1 = value_4(matchValue_2), (tsr = value_4(matchValue_1), mergeHashes(stringHash(tsr), stringHash(taninfo_1.LocalID)))))) : ((matchValue_2 == null) ? 0 : ((taninfo = value_4(matchValue_2), mergeHashes(stringHash(taninfo.IDSpace), stringHash(taninfo.LocalID)))))))) | 0;
     }
     Equals(obj) {
         const this$ = this;
@@ -180,6 +165,20 @@ export class OntologyAnnotation {
         const tan = this$.TermAccessionNumber;
         return OntologyAnnotation.make(name, tsr, tan, nextComments);
     }
+    static computeTanInfo(tan, tsr) {
+        let tsr_1;
+        if (tan == null) {
+            return undefined;
+        }
+        else {
+            const tan_1 = value_4(tan);
+            const matchValue = tryParseTermAnnotation(tan_1);
+            return (matchValue == null) ? ((tsr == null) ? undefined : ((value_4(tsr) === "") ? undefined : ((tsr_1 = value_4(tsr), {
+                IDSpace: tsr_1,
+                LocalID: tan_1,
+            })))) : value_4(matchValue);
+        }
+    }
     Print() {
         const this$ = this;
         return toString(this$);
@@ -200,6 +199,11 @@ export class OntologyAnnotation {
             return 1;
         }
     }
+    recomputeTanInfo() {
+        const this$ = this;
+        const newTanInfo = OntologyAnnotation.computeTanInfo(unwrap(this$._termAccessionNumber), unwrap(this$._termSourceREF));
+        this$._tanInfo = newTanInfo;
+    }
 }
 export function OntologyAnnotation_$reflection() {
     return class_type("ARCtrl.OntologyAnnotation", undefined, OntologyAnnotation);