@nfdi4plants/arctrl 1.0.0-alpha9 → 1.0.0-beta.1

package/ISA/ISA.Spreadsheet/AnnotationTable/ArcTable.js

@@ -3,13 +3,13 @@ import { tryParseReferenceColumnHeader } from "../../ISA/Regex.js";
 import { map as map_1, toList, tryFind } from "../../../fable_modules/fable-library.4.1.4/Seq.js";
 import { toFsColumns, fixDeprecatedIOHeader, fromFsColumns } from "./CompositeColumn.js";
 import { ArcTable } from "../../ISA/ArcTypes/ArcTable.js";
-import { FsWorksheet } from "../../../fable_modules/FsSpreadsheet.4.1.0/FsWorksheet.fs.js";
+import { FsWorksheet } from "../../../fable_modules/FsSpreadsheet.5.0.0/FsWorksheet.fs.js";
 import { comparePrimitives } from "../../../fable_modules/fable-library.4.1.4/Util.js";
-import { FsRangeAddress_$ctor_7E77A4A0 } from "../../../fable_modules/FsSpreadsheet.4.1.0/Ranges/FsRangeAddress.fs.js";
-import { FsAddress_$ctor_Z37302880 } from "../../../fable_modules/FsSpreadsheet.4.1.0/FsAddress.fs.js";
-import { Dictionary_tryGet } from "../../../fable_modules/FsSpreadsheet.4.1.0/Cells/FsCellsCollection.fs.js";
+import { FsRangeAddress_$ctor_7E77A4A0 } from "../../../fable_modules/FsSpreadsheet.5.0.0/Ranges/FsRangeAddress.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../../../fable_modules/FsSpreadsheet.5.0.0/FsAddress.fs.js";
+import { Dictionary_tryGet } from "../../../fable_modules/FsSpreadsheet.5.0.0/Cells/FsCellsCollection.fs.js";
 import { addToDict } from "../../../fable_modules/fable-library.4.1.4/MapUtil.js";
-import { FsRangeBase__Cell_Z3407A44B } from "../../../fable_modules/FsSpreadsheet.4.1.0/Ranges/FsRangeBase.fs.js";
+import { FsRangeBase__Cell_Z3407A44B } from "../../../fable_modules/FsSpreadsheet.5.0.0/Ranges/FsRangeBase.fs.js";
 
 /**
  * Iterates over elements of the input list and groups adjacent elements.
@@ -63,8 +63,9 @@ export function classifyColumnOrder(column) {
 
 export function groupColumnsByHeader(columns) {
     return Aux_List_groupWhen((c) => {
-        if (tryParseReferenceColumnHeader(c.Item(1).Value) == null) {
-            return !(c.Item(1).Value.indexOf("Unit") === 0);
+        const v = c.Item(1).ValueAsString();
+        if (tryParseReferenceColumnHeader(v) == null) {
+            return !(v.indexOf("Unit") === 0);
         }
         else {
             return false;
@@ -113,20 +114,21 @@ export function toFsWorksheet(table) {
     iterateIndexed((colI, col) => {
         iterateIndexed((rowI, cell) => {
             let value;
+            const v = cell.ValueAsString();
             if (rowI === 0) {
-                const matchValue = Dictionary_tryGet(cell.Value, stringCount);
+                const matchValue = Dictionary_tryGet(v, stringCount);
                 if (matchValue == null) {
-                    addToDict(stringCount, cell.Value, "");
-                    value = cell.Value;
+                    addToDict(stringCount, cell.ValueAsString(), "");
+                    value = v;
                 }
                 else {
                     const spaces = matchValue;
-                    stringCount.set(cell.Value, spaces + " ");
-                    value = ((cell.Value + " ") + spaces);
+                    stringCount.set(v, spaces + " ");
+                    value = ((v + " ") + spaces);
                 }
             }
             else {
-                value = cell.Value;
+                value = v;
             }
             const address = FsAddress_$ctor_Z37302880(rowI + 1, colI + 1);
             FsRangeBase__Cell_Z3407A44B(fsTable, address, ws.CellCollection).SetValueAs(value);

package/ISA/ISA.Spreadsheet/AnnotationTable/CompositeCell.js

@@ -1,10 +1,10 @@
 import { singleton, ofArray, head, tail, isEmpty, map } from "../../../fable_modules/fable-library.4.1.4/List.js";
 import { CompositeCell } from "../../ISA/ArcTypes/CompositeCell.js";
 import { printf, toFail } from "../../../fable_modules/fable-library.4.1.4/String.js";
-import { FsCell } from "../../../fable_modules/FsSpreadsheet.4.1.0/Cells/FsCell.fs.js";
+import { FsCell } from "../../../fable_modules/FsSpreadsheet.5.0.0/Cells/FsCell.fs.js";
 
 export function fromFsCells(cells) {
-    const cellValues = map((c) => c.Value, cells);
+    const cellValues = map((c) => c.ValueAsString(), cells);
     let matchResult, v, v1, v2, v3, v1_1, v2_1, v3_1, v4;
     if (!isEmpty(cellValues)) {
         if (!isEmpty(tail(cellValues))) {

package/ISA/ISA.Spreadsheet/AnnotationTable/CompositeColumn.js

@@ -2,9 +2,9 @@ import { CompositeHeader, IOType } from "../../ISA/ArcTypes/CompositeHeader.js";
 import { toString } from "../../../fable_modules/fable-library.4.1.4/Types.js";
 import { toFsCells, fromFsCells } from "./CompositeHeader.js";
 import { singleton as singleton_1, ofArray, item, map } from "../../../fable_modules/fable-library.4.1.4/List.js";
-import { FsAddress__get_RowNumber } from "../../../fable_modules/FsSpreadsheet.4.1.0/FsAddress.fs.js";
-import { FsRangeAddress__get_LastAddress } from "../../../fable_modules/FsSpreadsheet.4.1.0/Ranges/FsRangeAddress.fs.js";
-import { FsRangeBase__get_RangeAddress } from "../../../fable_modules/FsSpreadsheet.4.1.0/Ranges/FsRangeBase.fs.js";
+import { FsAddress__get_RowNumber } from "../../../fable_modules/FsSpreadsheet.5.0.0/FsAddress.fs.js";
+import { FsRangeAddress__get_LastAddress } from "../../../fable_modules/FsSpreadsheet.5.0.0/Ranges/FsRangeAddress.fs.js";
+import { FsRangeBase__get_RangeAddress } from "../../../fable_modules/FsSpreadsheet.5.0.0/Ranges/FsRangeBase.fs.js";
 import { singleton, append, toList, exists, map as map_1, delay, toArray } from "../../../fable_modules/fable-library.4.1.4/Seq.js";
 import { toFsCells as toFsCells_1, fromFsCells as fromFsCells_1 } from "./CompositeCell.js";
 import { rangeDouble } from "../../../fable_modules/fable-library.4.1.4/Range.js";
@@ -19,7 +19,7 @@ import { map as map_2 } from "../../../fable_modules/fable-library.4.1.4/Array.j
  * A "Source Name" column will now be mapped to the propper "Input [Source Name]", and all other IO types will be mapped to "Output [<IO Type>]".
  */
 export function fixDeprecatedIOHeader(col) {
-    const matchValue = IOType.ofString(col.Item(1).Value);
+    const matchValue = IOType.ofString(col.Item(1).ValueAsString());
     switch (matchValue.tag) {
         case 6:
             return col;

package/ISA/ISA.Spreadsheet/AnnotationTable/CompositeHeader.js

@@ -3,7 +3,7 @@ import { singleton, tail, head, isEmpty, map } from "../../../fable_modules/fabl
 import { OntologyAnnotation } from "../../ISA/JsonTypes/OntologyAnnotation.js";
 import { ActivePatterns_$007COutputColumnHeader$007C_$007C, ActivePatterns_$007CInputColumnHeader$007C_$007C, tryParseComponentColumnHeader, tryParseCharacteristicColumnHeader, tryParseFactorColumnHeader, tryParseParameterColumnHeader, ActivePatterns_$007CUnitColumnHeader$007C_$007C, ActivePatterns_$007CTANColumnHeader$007C_$007C, ActivePatterns_$007CTSRColumnHeader$007C_$007C } from "../../ISA/Regex.js";
 import { IOType, CompositeHeader } from "../../ISA/ArcTypes/CompositeHeader.js";
-import { FsCell } from "../../../fable_modules/FsSpreadsheet.4.1.0/Cells/FsCell.fs.js";
+import { FsCell } from "../../../fable_modules/FsSpreadsheet.5.0.0/Cells/FsCell.fs.js";
 import { toString } from "../../../fable_modules/fable-library.4.1.4/Types.js";
 import { empty, singleton as singleton_1, append, delay, toList } from "../../../fable_modules/fable-library.4.1.4/Seq.js";
 
@@ -22,7 +22,7 @@ export function ActivePattern_mergeIDInfo(idSpace1, localID1, idSpace2, localID2
 
 export function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cells) {
     const $007CAC$007C_$007C = categoryParser;
-    const cellValues = map((c) => c.Value, cells);
+    const cellValues = map((c) => c.ValueAsString(), cells);
     let matchResult, name;
     if (!isEmpty(cellValues)) {
         const activePatternResult = $007CAC$007C_$007C(head(cellValues));
@@ -234,7 +234,7 @@ export function ActivePattern_$007CComponent$007C_$007C(cells) {
 }
 
 export function ActivePattern_$007CInput$007C_$007C(cells) {
-    const cellValues = map((c) => c.Value, cells);
+    const cellValues = map((c) => c.ValueAsString(), cells);
     let matchResult, ioType;
     if (!isEmpty(cellValues)) {
         const activePatternResult = ActivePatterns_$007CInputColumnHeader$007C_$007C(head(cellValues));
@@ -263,7 +263,7 @@ export function ActivePattern_$007CInput$007C_$007C(cells) {
 }
 
 export function ActivePattern_$007COutput$007C_$007C(cells) {
-    const cellValues = map((c) => c.Value, cells);
+    const cellValues = map((c) => c.ValueAsString(), cells);
     let matchResult, ioType;
     if (!isEmpty(cellValues)) {
         const activePatternResult = ActivePatterns_$007COutputColumnHeader$007C_$007C(head(cellValues));
@@ -292,7 +292,7 @@ export function ActivePattern_$007COutput$007C_$007C(cells) {
 }
 
 export function ActivePattern_$007CProtocolHeader$007C_$007C(cells) {
-    const cellValues = map((c) => c.Value, cells);
+    const cellValues = map((c) => c.ValueAsString(), cells);
     let matchResult;
     if (!isEmpty(cellValues)) {
         switch (head(cellValues)) {
@@ -382,7 +382,7 @@ export function ActivePattern_$007CProtocolHeader$007C_$007C(cells) {
 }
 
 export function ActivePattern_$007CFreeText$007C_$007C(cells) {
-    const cellValues = map((c) => c.Value, cells);
+    const cellValues = map((c) => c.ValueAsString(), cells);
     let matchResult, text;
     if (!isEmpty(cellValues)) {
         if (isEmpty(tail(cellValues))) {

package/ISA/ISA.Spreadsheet/ArcAssay.js

@@ -1,4 +1,4 @@
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.4.1.0/FsWorksheet.fs.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.0.0/FsWorksheet.fs.js";
 import { iterate, isEmpty as isEmpty_1, choose, tryHead, head, exists, map, singleton, append, delay, iterateIndexed } from "../../fable_modules/fable-library.4.1.4/Seq.js";
 import { SparseRowModule_tryGetValueAt, SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows as toRows_1 } from "./Metadata/Assays.js";
@@ -10,7 +10,7 @@ import { createMissingIdentifier } from "../ISA/Identifier.js";
 import { defaultArg } from "../../fable_modules/fable-library.4.1.4/Option.js";
 import { printf, toConsole } from "../../fable_modules/fable-library.4.1.4/String.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
-import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.4.1.0/FsWorkbook.fs.js";
+import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.0.0/FsWorkbook.fs.js";
 
 export function toMetadataSheet(assay) {
     let assay_1;
@@ -127,14 +127,11 @@ export function fromFsWorkbook(doc) {
     else {
         assayMetaData = fromMetadataSheet(matchValue);
     }
-    const sheets = choose(tryFromFsWorksheet, doc.GetWorksheets());
-    if (isEmpty_1(sheets)) {
-        return assayMetaData;
-    }
-    else {
-        assayMetaData.Tables = Array.from(sheets);
-        return assayMetaData;
+    const tables = choose(tryFromFsWorksheet, doc.GetWorksheets());
+    if (!isEmpty_1(tables)) {
+        assayMetaData.Tables = Array.from(tables);
     }
+    return assayMetaData;
 }
 
 export function toFsWorkbook(assay) {

package/ISA/ISA.Spreadsheet/ArcInvestigation.js

@@ -1,7 +1,7 @@
 import { Record } from "../../fable_modules/fable-library.4.1.4/Types.js";
 import { record_type, list_type, string_type } from "../../fable_modules/fable-library.4.1.4/Reflection.js";
 import { Remark, Comment$_$reflection } from "../ISA/JsonTypes/Comment.js";
-import { head, tail, isEmpty, ofSeq, concat, unzip, append, toArray, reverse, cons, empty, map, ofArray } from "../../fable_modules/fable-library.4.1.4/List.js";
+import { ofSeq, head, tail, isEmpty, concat, unzip, append, toArray, reverse, cons, empty, map, ofArray } from "../../fable_modules/fable-library.4.1.4/List.js";
 import { Remark_wrapRemark, Comment_toString, Comment_fromString } from "./Metadata/Comment.js";
 import { SparseRowModule_writeToSheet, SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt, SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValueDefault_5BAE6133 } from "./Metadata/SparseTable.js";
 import { addToDict } from "../../fable_modules/fable-library.4.1.4/MapUtil.js";
@@ -17,8 +17,8 @@ import { toRows as toRows_4, fromRows as fromRows_4 } from "./Metadata/Study.js"
 import { iterateIndexed, map as map_1, toList, collect, singleton, append as append_1, delay } from "../../fable_modules/fable-library.4.1.4/Seq.js";
 import { tryFind, ofList } from "../../fable_modules/fable-library.4.1.4/Map.js";
 import { printf, toFail } from "../../fable_modules/fable-library.4.1.4/String.js";
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.4.1.0/FsWorksheet.fs.js";
-import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.4.1.0/FsWorkbook.fs.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.0.0/FsWorksheet.fs.js";
+import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.0.0/FsWorkbook.fs.js";
 
 export class InvestigationInfo extends Record {
     constructor(Identifier, Title, Description, SubmissionDate, PublicReleaseDate, Comments) {
@@ -244,7 +244,7 @@ export function fromRows(rows) {
 
 export function toRows(investigation) {
     let remarks, rows;
-    return (remarks = ofArray(investigation.Remarks), (rows = delay(() => append_1(singleton(SparseRowModule_fromValues(["ONTOLOGY SOURCE REFERENCE"])), delay(() => append_1(toRows_1(ofArray(investigation.OntologySourceReferences)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION"])), delay(() => append_1(InvestigationInfo_toRows_Z4D87C88C(investigation), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION PUBLICATIONS"])), delay(() => append_1(toRows_2("Investigation Publication", ofArray(investigation.Publications)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION CONTACTS"])), delay(() => append_1(toRows_3("Investigation Person", ofArray(investigation.Contacts)), delay(() => collect((study) => append_1(singleton(SparseRowModule_fromValues(["STUDY"])), delay(() => toRows_4(study, void 0))), ofSeq(investigation.Studies))))))))))))))))))), (() => {
+    return (remarks = ofArray(investigation.Remarks), (rows = delay(() => append_1(singleton(SparseRowModule_fromValues(["ONTOLOGY SOURCE REFERENCE"])), delay(() => append_1(toRows_1(ofArray(investigation.OntologySourceReferences)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION"])), delay(() => append_1(InvestigationInfo_toRows_Z4D87C88C(investigation), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION PUBLICATIONS"])), delay(() => append_1(toRows_2("Investigation Publication", ofArray(investigation.Publications)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION CONTACTS"])), delay(() => append_1(toRows_3("Investigation Person", ofArray(investigation.Contacts)), delay(() => collect((study) => append_1(singleton(SparseRowModule_fromValues(["STUDY"])), delay(() => toRows_4(study, void 0))), investigation.RegisteredStudies)))))))))))))))))), (() => {
         try {
             const rm = ofList(map((arg) => Remark.toTuple(arg), remarks), {
                 Compare: comparePrimitives,

package/ISA/ISA.Spreadsheet/ArcStudy.js

@@ -1,4 +1,4 @@
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.4.1.0/FsWorksheet.fs.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.0.0/FsWorksheet.fs.js";
 import { iterate, isEmpty, choose, map, append, iterateIndexed } from "../../fable_modules/fable-library.4.1.4/Seq.js";
 import { SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows } from "./Metadata/Study.js";
@@ -9,8 +9,8 @@ import { createMissingIdentifier } from "../ISA/Identifier.js";
 import { empty } from "../../fable_modules/fable-library.4.1.4/List.js";
 import { printf, toConsole } from "../../fable_modules/fable-library.4.1.4/String.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
-import { ArcTables__get_Tables, ArcTables_$ctor_Z18C2F36D, ArcTables_updateReferenceTablesBySheets_Z2EE88E97 } from "../ISA/ArcTypes/ArcTables.js";
-import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.4.1.0/FsWorkbook.fs.js";
+import { ArcTables } from "../ISA/ArcTypes/ArcTables.js";
+import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.0.0/FsWorkbook.fs.js";
 
 export function ArcStudy_toMetadataSheet(study, assays) {
     let source_1;
@@ -48,8 +48,8 @@ export function ARCtrl_ISA_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D(doc
     const studyMetadata = patternInput[0];
     const sheets = choose(tryFromFsWorksheet, doc.GetWorksheets());
     if (!isEmpty(sheets)) {
-        const updatedTables = ArcTables_updateReferenceTablesBySheets_Z2EE88E97(ArcTables_$ctor_Z18C2F36D(studyMetadata.Tables), ArcTables_$ctor_Z18C2F36D(Array.from(sheets)), true);
-        studyMetadata.Tables = ArcTables__get_Tables(updatedTables);
+        const updatedTables = ArcTables.updateReferenceTablesBySheets(new ArcTables(studyMetadata.Tables), new ArcTables(Array.from(sheets)), true);
+        studyMetadata.Tables = updatedTables.Tables;
     }
     return [studyMetadata, patternInput[1]];
 }

package/ISA/ISA.Spreadsheet/Metadata/SparseTable.js

@@ -2,12 +2,12 @@ import { append as append_1, delay, tryItem, length as length_1, isEmpty, iterat
 import { defaultArg, map as map_1 } from "../../../fable_modules/fable-library.4.1.4/Option.js";
 import { tryFind, ofSeq } from "../../../fable_modules/fable-library.4.1.4/Map.js";
 import { arrayHash, equalArrays, equals, comparePrimitives } from "../../../fable_modules/fable-library.4.1.4/Util.js";
-import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../../fable_modules/FsSpreadsheet.4.1.0/DSL/RowBuilder.fs.js";
-import { CellBuilder_$ctor, CellBuilder__AsCellElement_825BA8D } from "../../../fable_modules/FsSpreadsheet.4.1.0/DSL/CellBuilder.fs.js";
-import { Messages_format, SheetEntity$1_some_2B595 } from "../../../fable_modules/FsSpreadsheet.4.1.0/DSL/Types.fs.js";
-import { DataType } from "../../../fable_modules/FsSpreadsheet.4.1.0/Cells/FsCell.fs.js";
+import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../../fable_modules/FsSpreadsheet.5.0.0/DSL/RowBuilder.fs.js";
+import { CellBuilder_$ctor, CellBuilder__AsCellElement_6F87C2ED } from "../../../fable_modules/FsSpreadsheet.5.0.0/DSL/CellBuilder.fs.js";
+import { Messages_format, SheetEntity$1_some_2B595 } from "../../../fable_modules/FsSpreadsheet.5.0.0/DSL/Types.fs.js";
+import { DataType } from "../../../fable_modules/FsSpreadsheet.5.0.0/Cells/FsCell.fs.js";
 import { map as map_2, toArray, initialize as initialize_1, exists, find, cons, append, empty, singleton } from "../../../fable_modules/fable-library.4.1.4/List.js";
-import { ColumnIndex, RowElement } from "../../../fable_modules/FsSpreadsheet.4.1.0/DSL/Types.fs.js";
+import { ColumnIndex, RowElement } from "../../../fable_modules/FsSpreadsheet.5.0.0/DSL/Types.fs.js";
 import { Record } from "../../../fable_modules/fable-library.4.1.4/Types.js";
 import { record_type, list_type, class_type, tuple_type, int32_type, string_type } from "../../../fable_modules/fable-library.4.1.4/Reflection.js";
 import { Seq_trySkip, Dictionary_tryGetValue } from "../CollectionAux.js";
@@ -40,11 +40,11 @@ export function SparseRowModule_getAllValues(i) {
 
 export function SparseRowModule_fromFsRow(r) {
     return choose((c) => {
-        if (c.Value === "") {
+        if (equals(c.Value, "")) {
             return void 0;
         }
         else {
-            return [c.ColumnNumber - 1, c.Value];
+            return [c.ColumnNumber - 1, c.ValueAsString()];
         }
     }, r.Cells);
 }
@@ -67,7 +67,7 @@ export function SparseRowModule_toDSLRow(vs) {
         const v = _arg;
         if (v == null) {
             let c_1;
-            const this$_5 = CellBuilder__AsCellElement_825BA8D(CellBuilder_$ctor(), SheetEntity$1_some_2B595(singleton([new DataType(0, []), ""])));
+            const this$_5 = CellBuilder__AsCellElement_6F87C2ED(CellBuilder_$ctor(), SheetEntity$1_some_2B595(singleton([new DataType(0, []), ""])));
             let matchResult, errs_1, f_1, ms_2_1;
             switch (this$_5.tag) {
                 case 1: {
@@ -137,7 +137,7 @@ export function SparseRowModule_toDSLRow(vs) {
         else {
             const v_1 = v;
             let c;
-            const this$_2 = CellBuilder__AsCellElement_825BA8D(CellBuilder_$ctor(), SheetEntity$1_some_2B595(singleton([new DataType(0, []), v_1])));
+            const this$_2 = CellBuilder__AsCellElement_6F87C2ED(CellBuilder_$ctor(), SheetEntity$1_some_2B595(singleton([new DataType(0, []), v_1])));
             let matchResult_2, errs, f, ms_2;
             switch (this$_2.tag) {
                 case 1: {

package/README.md

@@ -1,6 +1,9 @@
 # ARCtrl
 Top level ARC DataModel and API function descriptions.
 
+![Nuget](https://img.shields.io/nuget/dt/ARCtrl?label=nuget&link=https%3A%2F%2Fwww.nuget.org%2Fpackages%2FARCtrl)
+![npm](https://img.shields.io/npm/dt/%40nfdi4plants%2Farctrl?label=npm&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40nfdi4plants%2Farctrl)
+
 - [ARCtrl](#arctrl)
   - [Jargon/Nomenclature](#jargonnomenclature)
   - [API Design](#api-design)

package/Templates/Template.Json.js

@@ -9,7 +9,7 @@ import { toString as toString_1, datetime, list as list_1, guid, object } from "
 import { ofArray, map } from "../fable_modules/fable-library.4.1.4/List.js";
 import { Process_decoder, Process_encoder } from "../ISA/ISA.Json/Process.js";
 import { map as map_1, delay, toList } from "../fable_modules/fable-library.4.1.4/Seq.js";
-import { ArcTables_fromProcesses_134EBDED, ArcTables__get_Item_Z524259A4 } from "../ISA/ISA/ArcTypes/ArcTables.js";
+import { ArcTables } from "../ISA/ISA/ArcTypes/ArcTables.js";
 import { printf, toFail } from "../fable_modules/fable-library.4.1.4/String.js";
 import { FSharpMap__get_Values } from "../fable_modules/fable-library.4.1.4/Map.js";
 import { defaultArg } from "../fable_modules/fable-library.4.1.4/Option.js";
@@ -37,7 +37,10 @@ export const Template_decode = (() => {
     const oaDecoder = OntologyAnnotation_decoder(ConverterOptions_$ctor());
     return (path_10) => ((v) => object_1((get$) => {
         let objectArg, arg_3, d, decoder, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, objectArg_7, objectArg_8, objectArg_9;
-        return Template.create((objectArg = get$.Required, objectArg.Field("id", guid_1)), (arg_3 = ((d = ((decoder = Process_decoder(ConverterOptions_$ctor()), (path_1) => ((value_1) => list_2(uncurry2(decoder), path_1, value_1)))), (path_2) => ((value_2) => map_2((ps) => ArcTables__get_Item_Z524259A4(ArcTables_fromProcesses_134EBDED(ps), 0), uncurry2(d), path_2, value_2)))), (objectArg_1 = get$.Required, objectArg_1.Field("table", uncurry2(arg_3)))), (objectArg_2 = get$.Required, objectArg_2.Field("name", string)), (objectArg_3 = get$.Required, objectArg_3.Field("description", string)), (objectArg_4 = get$.Required, objectArg_4.Field("organisation", uncurry2(Organisation_decode))), (objectArg_5 = get$.Required, objectArg_5.Field("version", string)), (objectArg_6 = get$.Required, objectArg_6.Field("authors", (path_6, value_6) => array_1(uncurry2(personDecoder), path_6, value_6))), (objectArg_7 = get$.Required, objectArg_7.Field("endpoint_repositories", (path_7, value_7) => array_1(uncurry2(oaDecoder), path_7, value_7))), (objectArg_8 = get$.Required, objectArg_8.Field("tags", (path_8, value_8) => array_1(uncurry2(oaDecoder), path_8, value_8))), (objectArg_9 = get$.Required, objectArg_9.Field("last_updated", datetimeUtc)));
+        return Template.create((objectArg = get$.Required, objectArg.Field("id", guid_1)), (arg_3 = ((d = ((decoder = Process_decoder(ConverterOptions_$ctor()), (path_1) => ((value_1) => list_2(uncurry2(decoder), path_1, value_1)))), (path_2) => ((value_2) => map_2((ps) => {
+            const arctbls = ArcTables.fromProcesses(ps);
+            return arctbls.Tables[0];
+        }, uncurry2(d), path_2, value_2)))), (objectArg_1 = get$.Required, objectArg_1.Field("table", uncurry2(arg_3)))), (objectArg_2 = get$.Required, objectArg_2.Field("name", string)), (objectArg_3 = get$.Required, objectArg_3.Field("description", string)), (objectArg_4 = get$.Required, objectArg_4.Field("organisation", uncurry2(Organisation_decode))), (objectArg_5 = get$.Required, objectArg_5.Field("version", string)), (objectArg_6 = get$.Required, objectArg_6.Field("authors", (path_6, value_6) => array_1(uncurry2(personDecoder), path_6, value_6))), (objectArg_7 = get$.Required, objectArg_7.Field("endpoint_repositories", (path_7, value_7) => array_1(uncurry2(oaDecoder), path_7, value_7))), (objectArg_8 = get$.Required, objectArg_8.Field("tags", (path_8, value_8) => array_1(uncurry2(oaDecoder), path_8, value_8))), (objectArg_9 = get$.Required, objectArg_9.Field("last_updated", datetimeUtc)));
     }, path_10, v));
 })();
 

package/Templates/Template.Spreadsheet.js

@@ -1,7 +1,7 @@
+import { toString, Record, FSharpException } from "../fable_modules/fable-library.4.1.4/Types.js";
+import { record_type, list_type, string_type, class_type } from "../fable_modules/fable-library.4.1.4/Reflection.js";
 import { toArray as toArray_1, append as append_1, reverse, map, empty, ofArray } from "../fable_modules/fable-library.4.1.4/List.js";
 import { toRows, fromRows, toSparseTable, fromSparseTable } from "../ISA/ISA.Spreadsheet/Metadata/OntologyAnnotation.js";
-import { toString, Record } from "../fable_modules/fable-library.4.1.4/Types.js";
-import { record_type, list_type, string_type } from "../fable_modules/fable-library.4.1.4/Reflection.js";
 import { Comment$_$reflection } from "../ISA/ISA/JsonTypes/Comment.js";
 import { Comment_fromString } from "../ISA/ISA.Spreadsheet/Metadata/Comment.js";
 import { SparseRowModule_fromFsRow, SparseRowModule_writeToSheet, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt, SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValueDefault_5BAE6133 } from "../ISA/ISA.Spreadsheet/Metadata/SparseTable.js";
@@ -15,11 +15,21 @@ import { toArray } from "../fable_modules/fable-library.4.1.4/Option.js";
 import { toRows as toRows_1, fromRows as fromRows_1 } from "../ISA/ISA.Spreadsheet/Metadata/Contacts.js";
 import { parse } from "../fable_modules/fable-library.4.1.4/Guid.js";
 import { Template, Organisation } from "./Template.js";
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.4.1.0/FsWorksheet.fs.js";
-import { printf, toFail } from "../fable_modules/fable-library.4.1.4/String.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.5.0.0/FsWorksheet.fs.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "../ISA/ISA.Spreadsheet/AnnotationTable/ArcTable.js";
 import { now } from "../fable_modules/fable-library.4.1.4/Date.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.4.1.0/FsWorkbook.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.5.0.0/FsWorkbook.fs.js";
+
+export class TemplateReadError extends FSharpException {
+    constructor(Data0) {
+        super();
+        this.Data0 = Data0;
+    }
+}
+
+export function TemplateReadError_$reflection() {
+    return class_type("ARCtrl.Template.Spreadsheet.TemplateReadError", void 0, TemplateReadError, class_type("System.Exception"));
+}
 
 export const Metadata_ER_labels = ofArray(["ER", "ER Term Accession Number", "ER Term Source REF"]);
 
@@ -275,7 +285,7 @@ export function Template_fromMetadataSheet(sheet) {
  * Reads an assay from a spreadsheet
  */
 export function Template_fromFsWorkbook(doc) {
-    let matchValue_2, matchValue_4, ws_3, matchValue_5, arg_1, ws_2, matchValue_3, arg;
+    let matchValue_2, matchValue_4, ws_3, matchValue_5, ws_2, matchValue_3;
     let patternInput;
     const matchValue = doc.TryGetWorksheetByName("isa_template");
     if (matchValue == null) {
@@ -301,7 +311,13 @@ export function Template_fromFsWorkbook(doc) {
         else {
             return void 0;
         }
-    }, sheets), (matchValue_4 == null) ? toFail(printf("No worksheet with name %s found"))(templateInfo.Table) : ((ws_3 = matchValue_4, (matchValue_5 = tryFromFsWorksheet(ws_3), (matchValue_5 == null) ? ((arg_1 = ws_3.Name, toFail(printf("Ws with name %s could not be converted to a table"))(arg_1))) : matchValue_5))))) : ((ws_2 = matchValue_2, (matchValue_3 = tryFromFsWorksheet(ws_2), (matchValue_3 == null) ? ((arg = ws_2.Name, toFail(printf("Ws with name %s could not be converted to a table"))(arg))) : matchValue_3)))), now());
+    }, sheets), (matchValue_4 == null) ? (() => {
+        throw new TemplateReadError(`No worksheet or table with name \`${templateInfo.Table}\` found`);
+    })() : ((ws_3 = matchValue_4, (matchValue_5 = tryFromFsWorksheet(ws_3), (matchValue_5 == null) ? (() => {
+        throw new TemplateReadError(`Ws with name \`${ws_3.Name}\` could not be converted to a table`);
+    })() : matchValue_5))))) : ((ws_2 = matchValue_2, (matchValue_3 = tryFromFsWorksheet(ws_2), (matchValue_3 == null) ? (() => {
+        throw new TemplateReadError(`Ws with name \`${ws_2.Name}\` could not be converted to a table`);
+    })() : matchValue_3)))), now());
 }
 
 export function Template_toFsWorkbook(template) {