@nfdi4plants/arctrl 2.0.0-alpha.2 → 2.0.0-alpha.4

package/Spreadsheet/DataMap.js

@@ -0,0 +1,31 @@
+import { printf, toFail } from "../fable_modules/fable-library-js.4.16.0/String.js";
+import { tryPick } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { toFsWorksheet, tryFromFsWorksheet } from "./DataMapTable/DataMapTable.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+
+/**
+ * Reads an assay from a spreadsheet
+ */
+export function fromFsWorkbook(doc) {
+    try {
+        const dataMapTable = tryPick(tryFromFsWorksheet, doc.GetWorksheets());
+        if (dataMapTable == null) {
+            throw new Error("No DataMapTable found in workbook");
+        }
+        else {
+            return dataMapTable;
+        }
+    }
+    catch (err) {
+        const arg = err.message;
+        return toFail(printf("Could not parse datamap: \n%s"))(arg);
+    }
+}
+
+export function toFsWorkbook(dataMap) {
+    const doc = new FsWorkbook();
+    const sheet = toFsWorksheet(dataMap);
+    doc.AddWorksheet(sheet);
+    return doc;
+}
+

package/Spreadsheet/DataMapTable/DataMapColumn.js

@@ -0,0 +1,36 @@
+import { toFsCells, fromFsCells } from "./DataMapHeader.js";
+import { singleton as singleton_1, ofArray, item, map } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { FsAddress__get_RowNumber } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
+import { FsRangeAddress__get_LastAddress } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
+import { FsRangeBase__get_RangeAddress } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeBase.fs.js";
+import { empty, exists, singleton, append, toList, map as map_1, delay, toArray } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.js";
+import { CompositeColumn } from "../../Core/Table/CompositeColumn.js";
+import { item as item_1, map as map_2 } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
+import { toFsCells as toFsCells_1 } from "../AnnotationTable/CompositeCell.js";
+
+export function fromFsColumns(columns) {
+    const patternInput = fromFsCells(map((c) => c.Item(1), columns));
+    const l = FsAddress__get_RowNumber(FsRangeAddress__get_LastAddress(FsRangeBase__get_RangeAddress(item(0, columns)))) | 0;
+    const cells_1 = toArray(delay(() => map_1((i) => patternInput[1](map((c_1) => c_1.Item(i), columns)), rangeDouble(2, 1, l))));
+    return CompositeColumn.create(patternInput[0], cells_1);
+}
+
+export function toFsColumns(column) {
+    const isTerm = column.Header.IsTermColumn;
+    const isData = column.Header.IsDataColumn;
+    const header = toFsCells(column.Header);
+    const cells = map_2((cell) => toFsCells_1(isTerm, false, cell), column.Cells);
+    if (isTerm) {
+        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i) => item(0, item_1(i, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_1) => item(1, item_1(i_1, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_2) => item(2, item_1(i_2, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))]);
+    }
+    else if (isData) {
+        const hasFormat = exists((c) => (c.AsData.Format != null), column.Cells);
+        const hasSelectorFormat = exists((c_1) => (c_1.AsData.SelectorFormat != null), column.Cells);
+        return toList(delay(() => append(singleton(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_3) => item(0, item_1(i_3, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))), delay(() => append(hasFormat ? singleton(toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_4) => item(1, item_1(i_4, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty(), delay(() => (hasSelectorFormat ? singleton(toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_5) => item(2, item_1(i_5, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty())))))));
+    }
+    else {
+        return singleton_1(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_6) => item(0, item_1(i_6, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))));
+    }
+}
+

package/Spreadsheet/DataMapTable/DataMapHeader.js

@@ -0,0 +1,417 @@
+import { singleton, ofArray, tryFindIndex, tail, head, isEmpty, map } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { dataFromFsCells, freeTextFromFsCells, termFromFsCells } from "../AnnotationTable/CompositeCell.js";
+import { DataMapAux_generatedByHeader, DataMapAux_descriptionHeader, DataMapAux_objectTypeHeader, DataMapAux_unitHeader, DataMapAux_explicationHeader } from "../../Core/Table/DataMap.js";
+import { map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { CompositeHeader, IOType } from "../../Core/Table/CompositeHeader.js";
+import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
+import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { equals } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
+
+export function ActivePattern_$007CTerm$007C_$007C(categoryString, categoryHeader, cells) {
+    const $007CAC$007C_$007C = (s) => {
+        if (s === categoryString) {
+            return categoryHeader;
+        }
+        else {
+            return void 0;
+        }
+    };
+    const $007CTSRColumnHeaderRaw$007C_$007C = (s_1) => {
+        if (s_1.indexOf("Term Source REF") === 0) {
+            return s_1;
+        }
+        else {
+            return void 0;
+        }
+    };
+    const $007CTANColumnHeaderRaw$007C_$007C = (s_2) => {
+        if (s_2.indexOf("Term Accession Number") === 0) {
+            return s_2;
+        }
+        else {
+            return void 0;
+        }
+    };
+    const cellValues = map((c) => c.ValueAsString(), cells);
+    let matchResult, header;
+    if (!isEmpty(cellValues)) {
+        const activePatternResult = $007CAC$007C_$007C(head(cellValues));
+        if (activePatternResult != null) {
+            if (isEmpty(tail(cellValues))) {
+                matchResult = 0;
+                header = activePatternResult;
+            }
+            else {
+                matchResult = 1;
+            }
+        }
+        else {
+            matchResult = 1;
+        }
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 0:
+            return [header, (cells_1) => termFromFsCells(void 0, void 0, cells_1)];
+        default: {
+            let matchResult_1, header_1;
+            if (!isEmpty(cellValues)) {
+                const activePatternResult_1 = $007CAC$007C_$007C(head(cellValues));
+                if (activePatternResult_1 != null) {
+                    if (!isEmpty(tail(cellValues))) {
+                        if ($007CTSRColumnHeaderRaw$007C_$007C(head(tail(cellValues))) != null) {
+                            if (!isEmpty(tail(tail(cellValues)))) {
+                                if ($007CTANColumnHeaderRaw$007C_$007C(head(tail(tail(cellValues)))) != null) {
+                                    if (isEmpty(tail(tail(tail(cellValues))))) {
+                                        matchResult_1 = 0;
+                                        header_1 = activePatternResult_1;
+                                    }
+                                    else {
+                                        matchResult_1 = 1;
+                                    }
+                                }
+                                else {
+                                    matchResult_1 = 1;
+                                }
+                            }
+                            else {
+                                matchResult_1 = 1;
+                            }
+                        }
+                        else {
+                            matchResult_1 = 1;
+                        }
+                    }
+                    else {
+                        matchResult_1 = 1;
+                    }
+                }
+                else {
+                    matchResult_1 = 1;
+                }
+            }
+            else {
+                matchResult_1 = 1;
+            }
+            switch (matchResult_1) {
+                case 0:
+                    return [header_1, (cells_2) => termFromFsCells(1, 2, cells_2)];
+                default: {
+                    let matchResult_2, header_2;
+                    if (!isEmpty(cellValues)) {
+                        const activePatternResult_4 = $007CAC$007C_$007C(head(cellValues));
+                        if (activePatternResult_4 != null) {
+                            if (!isEmpty(tail(cellValues))) {
+                                if ($007CTANColumnHeaderRaw$007C_$007C(head(tail(cellValues))) != null) {
+                                    if (!isEmpty(tail(tail(cellValues)))) {
+                                        if ($007CTSRColumnHeaderRaw$007C_$007C(head(tail(tail(cellValues)))) != null) {
+                                            if (isEmpty(tail(tail(tail(cellValues))))) {
+                                                matchResult_2 = 0;
+                                                header_2 = activePatternResult_4;
+                                            }
+                                            else {
+                                                matchResult_2 = 1;
+                                            }
+                                        }
+                                        else {
+                                            matchResult_2 = 1;
+                                        }
+                                    }
+                                    else {
+                                        matchResult_2 = 1;
+                                    }
+                                }
+                                else {
+                                    matchResult_2 = 1;
+                                }
+                            }
+                            else {
+                                matchResult_2 = 1;
+                            }
+                        }
+                        else {
+                            matchResult_2 = 1;
+                        }
+                    }
+                    else {
+                        matchResult_2 = 1;
+                    }
+                    switch (matchResult_2) {
+                        case 0:
+                            return [header_2, (cells_3) => termFromFsCells(2, 1, cells_3)];
+                        default:
+                            return void 0;
+                    }
+                }
+            }
+        }
+    }
+}
+
+export function ActivePattern_$007CExplication$007C_$007C(cells) {
+    const activePatternResult = ActivePattern_$007CTerm$007C_$007C("Explication", DataMapAux_explicationHeader, cells);
+    if (activePatternResult != null) {
+        const r = activePatternResult;
+        return r;
+    }
+    else {
+        return void 0;
+    }
+}
+
+export function ActivePattern_$007CUnit$007C_$007C(cells) {
+    const activePatternResult = ActivePattern_$007CTerm$007C_$007C("Unit", DataMapAux_unitHeader, cells);
+    if (activePatternResult != null) {
+        const r = activePatternResult;
+        return r;
+    }
+    else {
+        return void 0;
+    }
+}
+
+export function ActivePattern_$007CObjectType$007C_$007C(cells) {
+    const activePatternResult = ActivePattern_$007CTerm$007C_$007C("Object Type", DataMapAux_objectTypeHeader, cells);
+    if (activePatternResult != null) {
+        const r = activePatternResult;
+        return r;
+    }
+    else {
+        return void 0;
+    }
+}
+
+export function ActivePattern_$007CDescription$007C_$007C(cells) {
+    const cellValues = map((c) => c.ValueAsString(), cells);
+    let matchResult;
+    if (!isEmpty(cellValues)) {
+        if (head(cellValues) === "Description") {
+            if (isEmpty(tail(cellValues))) {
+                matchResult = 0;
+            }
+            else {
+                matchResult = 1;
+            }
+        }
+        else {
+            matchResult = 1;
+        }
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 0:
+            return [DataMapAux_descriptionHeader, freeTextFromFsCells];
+        default:
+            return void 0;
+    }
+}
+
+export function ActivePattern_$007CGeneratedBy$007C_$007C(cells) {
+    const cellValues = map((c) => c.ValueAsString(), cells);
+    let matchResult;
+    if (!isEmpty(cellValues)) {
+        if (head(cellValues) === "Generated By") {
+            if (isEmpty(tail(cellValues))) {
+                matchResult = 0;
+            }
+            else {
+                matchResult = 1;
+            }
+        }
+        else {
+            matchResult = 1;
+        }
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 0:
+            return [DataMapAux_generatedByHeader, freeTextFromFsCells];
+        default:
+            return void 0;
+    }
+}
+
+export function ActivePattern_$007CData$007C_$007C(cells) {
+    const cellValues = map((c) => c.ValueAsString(), cells);
+    let matchResult, cols;
+    if (!isEmpty(cellValues)) {
+        if (head(cellValues) === "Data") {
+            matchResult = 0;
+            cols = tail(cellValues);
+        }
+        else {
+            matchResult = 1;
+        }
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 0: {
+            const format = map_1((y) => (1 + y), tryFindIndex((s) => (s.indexOf("Data Format") === 0), cols));
+            const selectorFormat = map_1((y_1) => (1 + y_1), tryFindIndex((s_1) => (s_1.indexOf("Data Selector Format") === 0), cols));
+            return [new CompositeHeader(11, [new IOType(2, [])]), (cells_1) => dataFromFsCells(format, selectorFormat, cells_1)];
+        }
+        default:
+            return void 0;
+    }
+}
+
+export function ActivePattern_$007CFreeText$007C_$007C(cells) {
+    const cellValues = map((c) => c.ValueAsString(), cells);
+    let matchResult, text;
+    if (!isEmpty(cellValues)) {
+        if (isEmpty(tail(cellValues))) {
+            matchResult = 0;
+            text = head(cellValues);
+        }
+        else {
+            matchResult = 1;
+        }
+    }
+    else {
+        matchResult = 1;
+    }
+    switch (matchResult) {
+        case 0:
+            return [new CompositeHeader(13, [text]), freeTextFromFsCells];
+        default:
+            return void 0;
+    }
+}
+
+export function fromFsCells(cells) {
+    const activePatternResult = ActivePattern_$007CData$007C_$007C(cells);
+    if (activePatternResult != null) {
+        const d = activePatternResult;
+        return d;
+    }
+    else {
+        const activePatternResult_1 = ActivePattern_$007CExplication$007C_$007C(cells);
+        if (activePatternResult_1 != null) {
+            const e = activePatternResult_1;
+            return e;
+        }
+        else {
+            const activePatternResult_2 = ActivePattern_$007CUnit$007C_$007C(cells);
+            if (activePatternResult_2 != null) {
+                const u = activePatternResult_2;
+                return u;
+            }
+            else {
+                const activePatternResult_3 = ActivePattern_$007CObjectType$007C_$007C(cells);
+                if (activePatternResult_3 != null) {
+                    const ot = activePatternResult_3;
+                    return ot;
+                }
+                else {
+                    const activePatternResult_4 = ActivePattern_$007CDescription$007C_$007C(cells);
+                    if (activePatternResult_4 != null) {
+                        const d_1 = activePatternResult_4;
+                        return d_1;
+                    }
+                    else {
+                        const activePatternResult_5 = ActivePattern_$007CGeneratedBy$007C_$007C(cells);
+                        if (activePatternResult_5 != null) {
+                            const gb = activePatternResult_5;
+                            return gb;
+                        }
+                        else {
+                            const activePatternResult_6 = ActivePattern_$007CFreeText$007C_$007C(cells);
+                            if (activePatternResult_6 != null) {
+                                const ft = activePatternResult_6;
+                                return ft;
+                            }
+                            else {
+                                return toFail(printf("Could not parse header group %O"))(cells);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+export function toFsCells(header) {
+    let matchResult, h_9, h_10, h_11, text;
+    switch (header.tag) {
+        case 11: {
+            if (header.fields[0].tag === 2) {
+                matchResult = 0;
+            }
+            else if (equals(header, DataMapAux_explicationHeader)) {
+                matchResult = 1;
+                h_9 = header;
+            }
+            else if (equals(header, DataMapAux_unitHeader)) {
+                matchResult = 2;
+                h_10 = header;
+            }
+            else if (equals(header, DataMapAux_objectTypeHeader)) {
+                matchResult = 3;
+                h_11 = header;
+            }
+            else {
+                matchResult = 5;
+            }
+            break;
+        }
+        case 13: {
+            if (equals(header, DataMapAux_explicationHeader)) {
+                matchResult = 1;
+                h_9 = header;
+            }
+            else if (equals(header, DataMapAux_unitHeader)) {
+                matchResult = 2;
+                h_10 = header;
+            }
+            else if (equals(header, DataMapAux_objectTypeHeader)) {
+                matchResult = 3;
+                h_11 = header;
+            }
+            else {
+                matchResult = 4;
+                text = header.fields[0];
+            }
+            break;
+        }
+        default:
+            if (equals(header, DataMapAux_explicationHeader)) {
+                matchResult = 1;
+                h_9 = header;
+            }
+            else if (equals(header, DataMapAux_unitHeader)) {
+                matchResult = 2;
+                h_10 = header;
+            }
+            else if (equals(header, DataMapAux_objectTypeHeader)) {
+                matchResult = 3;
+                h_11 = header;
+            }
+            else {
+                matchResult = 5;
+            }
+    }
+    switch (matchResult) {
+        case 0:
+            return ofArray([new FsCell("Data"), new FsCell("Data Format"), new FsCell("Data Selector Format")]);
+        case 1:
+            return ofArray([new FsCell("Explication"), new FsCell("Term Source REF"), new FsCell("Term Accession Number")]);
+        case 2:
+            return ofArray([new FsCell("Unit"), new FsCell("Term Source REF"), new FsCell("Term Accession Number")]);
+        case 3:
+            return ofArray([new FsCell("Object Type"), new FsCell("Term Source REF"), new FsCell("Term Accession Number")]);
+        case 4:
+            return singleton(new FsCell(text));
+        default:
+            return toFail(printf("Could not parse DataMap header %O."))(header);
+    }
+}
+

package/Spreadsheet/DataMapTable/DataMapTable.js

@@ -0,0 +1,98 @@
+import { iterateIndexed, head, length, sortBy, collect, map, toArray, exists, ofArray } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { classifyColumnOrder, Aux_List_groupWhen } from "../AnnotationTable/ArcTable.js";
+import { toList, tryFind } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { toFsColumns, fromFsColumns } from "./DataMapColumn.js";
+import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
+import { DataMap__get_Table, DataMap_init, DataMap_addColumns_6369C010 } from "../../Core/Table/DataMap.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
+import { comparePrimitives } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
+import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
+import { Dictionary_tryGet } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCellsCollection.fs.js";
+import { addToDict } from "../../fable_modules/fable-library-js.4.16.0/MapUtil.js";
+import { FsRangeBase__Cell_Z3407A44B } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeBase.fs.js";
+
+export const helperColumnStrings = ofArray(["Term Source REF", "Term Accession Number", "Data Format", "Data Selector Format"]);
+
+export function groupColumnsByHeader(columns) {
+    return Aux_List_groupWhen((c) => {
+        const v = c.Item(1).ValueAsString();
+        return !exists((s) => (v.indexOf(s) === 0), helperColumnStrings);
+    }, columns);
+}
+
+/**
+ * Returns the annotation table of the worksheet if it exists, else returns None
+ */
+export function tryDataMapTable(sheet) {
+    return tryFind((t) => (t.Name.indexOf("datamapTable") === 0), sheet.Tables);
+}
+
+/**
+ * Groups and parses a collection of single columns into the according ISA composite columns
+ */
+export function composeColumns(columns) {
+    return toArray(map(fromFsColumns, groupColumnsByHeader(toList(columns))));
+}
+
+/**
+ * Returns the protocol described by the headers and a function for parsing the values of the matrix to the processes of this protocol
+ */
+export function tryFromFsWorksheet(sheet) {
+    try {
+        const matchValue = tryDataMapTable(sheet);
+        if (matchValue == null) {
+            return void 0;
+        }
+        else {
+            const t = matchValue;
+            return DataMap_addColumns_6369C010(composeColumns(t.GetColumns(sheet.CellCollection)), true)(DataMap_init());
+        }
+    }
+    catch (err) {
+        const arg = sheet.Name;
+        const arg_1 = err.message;
+        return toFail(printf("Could not parse datamap table with name \"%s\":\n%s"))(arg)(arg_1);
+    }
+}
+
+export function toFsWorksheet(table) {
+    const stringCount = new Map([]);
+    const ws = new FsWorksheet("isa_datamap");
+    if (DataMap__get_Table(table).Columns.length === 0) {
+        return ws;
+    }
+    else {
+        const columns = collect(toFsColumns, sortBy(classifyColumnOrder, ofArray(DataMap__get_Table(table).Columns), {
+            Compare: comparePrimitives,
+        }));
+        const maxRow = length(head(columns)) | 0;
+        const maxCol = length(columns) | 0;
+        const fsTable = ws.Table("datamapTable", FsRangeAddress_$ctor_7E77A4A0(FsAddress_$ctor_Z37302880(1, 1), FsAddress_$ctor_Z37302880(maxRow, maxCol)));
+        iterateIndexed((colI, col) => {
+            iterateIndexed((rowI, cell) => {
+                let value;
+                const v = cell.ValueAsString();
+                if (rowI === 0) {
+                    const matchValue = Dictionary_tryGet(v, stringCount);
+                    if (matchValue == null) {
+                        addToDict(stringCount, cell.ValueAsString(), "");
+                        value = v;
+                    }
+                    else {
+                        const spaces = matchValue;
+                        stringCount.set(v, spaces + " ");
+                        value = ((v + " ") + spaces);
+                    }
+                }
+                else {
+                    value = v;
+                }
+                const address = FsAddress_$ctor_Z37302880(rowI + 1, colI + 1);
+                FsRangeBase__Cell_Z3407A44B(fsTable, address, ws.CellCollection).SetValueAs(value);
+            }, col);
+        }, columns);
+        return ws;
+    }
+}
+

package/Spreadsheet/Metadata/Assays.js

@@ -19,13 +19,13 @@ export function fromString(measurementType, measurementTypeTermSourceREF, measur
     const measurementType_2 = Option_fromValueWithDefault(new OntologyAnnotation(), measurementType_1);
     const technologyType_2 = Option_fromValueWithDefault(new OntologyAnnotation(), technologyType_1);
     const technologyPlatform_1 = map(JsonTypes_decomposeTechnologyPlatform, technologyPlatform);
-    return ArcAssay.make(fileName, measurementType_2, technologyType_2, technologyPlatform_1, [], [], comments);
+    return ArcAssay.make(fileName, measurementType_2, technologyType_2, technologyPlatform_1, [], void 0, [], comments);
 }
 
 export function fromSparseTable(matrix) {
     if ((matrix.ColumnCount === 0) && (length(matrix.CommentKeys) !== 0)) {
         const comments = SparseTable_GetEmptyComments_3ECCA699(matrix);
-        return singleton(ArcAssay.create(createMissingIdentifier(), void 0, void 0, void 0, void 0, void 0, comments));
+        return singleton(ArcAssay.create(createMissingIdentifier(), void 0, void 0, void 0, void 0, void 0, void 0, comments));
     }
     else {
         return initialize(matrix.ColumnCount, (i) => {

package/Spreadsheet/Metadata/SparseTable.js

@@ -2,14 +2,14 @@ import { append as append_1, delay, tryItem, length as length_1, isEmpty, iterat
 import { defaultArg, map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { tryFind, ofSeq } from "../../fable_modules/fable-library-js.4.16.0/Map.js";
 import { arrayHash, equalArrays, equals, comparePrimitives } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
-import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../fable_modules/FsSpreadsheet.5.1.3/DSL/RowBuilder.fs.js";
-import { CellBuilder_$ctor, CellBuilder__AsCellElement_6F87C2ED } from "../../fable_modules/FsSpreadsheet.5.1.3/DSL/CellBuilder.fs.js";
-import { Messages_format, SheetEntity$1_some_2B595 } from "../../fable_modules/FsSpreadsheet.5.1.3/DSL/Types.fs.js";
-import { DataType } from "../../fable_modules/FsSpreadsheet.5.1.3/Cells/FsCell.fs.js";
+import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/RowBuilder.fs.js";
+import { CellBuilder_$ctor, CellBuilder__AsCellElement_6F87C2ED } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/CellBuilder.fs.js";
+import { Messages_format, SheetEntity$1_some_2B595 } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/Types.fs.js";
+import { DataType } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
 import { map as map_2, initialize as initialize_1, exists, find, cons, append, empty, singleton } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { ColumnIndex, RowElement } from "../../fable_modules/FsSpreadsheet.5.1.3/DSL/Types.fs.js";
-import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.5.1.3/Ranges/FsRangeAddress.fs.js";
-import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.5.1.3/FsAddress.fs.js";
+import { ColumnIndex, RowElement } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/Types.fs.js";
+import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
 import { Record } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
 import { record_type, list_type, class_type, tuple_type, int32_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { Seq_trySkip, Dictionary_tryGetValue } from "../CollectionAux.js";

package/Spreadsheet/Metadata/Study.js

@@ -97,7 +97,7 @@ export function fromParts(studyInfo, designDescriptors, publications, factors, a
     const studyDesignDescriptors = Array.from(designDescriptors);
     const registeredAssayIdentifiers = Array.from(assayIdentifiers);
     const comments = Array.from(studyInfo.Comments);
-    arcstudy = ArcStudy.make(studyInfo.Identifier, title, description, submissionDate, publicReleaseDate, publications_1, contacts_1, studyDesignDescriptors, [], registeredAssayIdentifiers, comments);
+    arcstudy = ArcStudy.make(studyInfo.Identifier, title, description, submissionDate, publicReleaseDate, publications_1, contacts_1, studyDesignDescriptors, [], void 0, registeredAssayIdentifiers, comments);
     if (arcstudy.isEmpty && (arcstudy.Identifier === "")) {
         return void 0;
     }

package/Spreadsheet/Template.js

@@ -15,10 +15,10 @@ import { toArray } from "../fable_modules/fable-library-js.4.16.0/Option.js";
 import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/Contacts.js";
 import { parse } from "../fable_modules/fable-library-js.4.16.0/Guid.js";
 import { Template, Organisation } from "../Core/Template.js";
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.5.1.3/FsWorksheet.fs.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
 import { now } from "../fable_modules/fable-library-js.4.16.0/Date.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.5.1.3/FsWorkbook.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
 
 export class TemplateReadError extends FSharpException {
     constructor(Data0) {