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

package/Spreadsheet/AnnotationTable/CompositeCell.js

@@ -1,60 +1,55 @@
-import { singleton, ofArray, item, map } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { defaultArg, unwrap, map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { defaultArg, unwrap, map } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { item } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
 import { CompositeCell } from "../../Core/Table/CompositeCell.js";
-import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
 
-export function termFromFsCells(tsrCol, tanCol, cells) {
-    const cellValues = map((c) => c.ValueAsString(), cells);
-    const tan = map_1((i) => item(i, cellValues), tanCol);
-    const tsr = map_1((i_1) => item(i_1, cellValues), tsrCol);
+export function termFromStringCells(tsrCol, tanCol, cellValues) {
+    const tan = map((i) => item(i, cellValues), tanCol);
+    const tsr = map((i_1) => item(i_1, cellValues), tsrCol);
     return CompositeCell.createTermFromString(item(0, cellValues), unwrap(tsr), unwrap(tan));
 }
 
-export function unitizedFromFsCells(unitCol, tsrCol, tanCol, cells) {
-    const cellValues = map((c) => c.ValueAsString(), cells);
+export function unitizedFromStringCells(unitCol, tsrCol, tanCol, cellValues) {
     const unit = item(unitCol, cellValues);
-    const tan = map_1((i) => item(i, cellValues), tanCol);
-    const tsr = map_1((i_1) => item(i_1, cellValues), tsrCol);
+    const tan = map((i) => item(i, cellValues), tanCol);
+    const tsr = map((i_1) => item(i_1, cellValues), tsrCol);
     return CompositeCell.createUnitizedFromString(item(0, cellValues), unit, unwrap(tsr), unwrap(tan));
 }
 
-export function freeTextFromFsCells(cells) {
-    const cellValues = map((c) => c.ValueAsString(), cells);
+export function freeTextFromStringCells(cellValues) {
     return CompositeCell.createFreeText(item(0, cellValues));
 }
 
-export function dataFromFsCells(format, selectorFormat, cells) {
-    const cellValues = map((c) => c.ValueAsString(), cells);
-    const format_1 = map_1((i) => item(i, cellValues), format);
-    const selectorFormat_1 = map_1((i_1) => item(i_1, cellValues), selectorFormat);
+export function dataFromStringCells(format, selectorFormat, cellValues) {
+    const format_1 = map((i) => item(i, cellValues), format);
+    const selectorFormat_1 = map((i_1) => item(i_1, cellValues), selectorFormat);
     return CompositeCell.createDataFromString(item(0, cellValues), unwrap(format_1), unwrap(selectorFormat_1));
 }
 
-export function toFsCells(isTerm, hasUnit, cell) {
+export function toStringCells(isTerm, hasUnit, cell) {
     switch (cell.tag) {
         case 0:
             if (hasUnit) {
-                return ofArray([new FsCell(cell.fields[0].NameText), new FsCell(""), new FsCell(defaultArg(cell.fields[0].TermSourceREF, "")), new FsCell(cell.fields[0].TermAccessionOntobeeUrl)]);
+                return [cell.fields[0].NameText, "", defaultArg(cell.fields[0].TermSourceREF, ""), cell.fields[0].TermAccessionOntobeeUrl];
             }
             else {
-                return ofArray([new FsCell(cell.fields[0].NameText), new FsCell(defaultArg(cell.fields[0].TermSourceREF, "")), new FsCell(cell.fields[0].TermAccessionOntobeeUrl)]);
+                return [cell.fields[0].NameText, defaultArg(cell.fields[0].TermSourceREF, ""), cell.fields[0].TermAccessionOntobeeUrl];
             }
         case 2:
-            return ofArray([new FsCell(cell.fields[0]), new FsCell(cell.fields[1].NameText), new FsCell(defaultArg(cell.fields[1].TermSourceREF, "")), new FsCell(cell.fields[1].TermAccessionOntobeeUrl)]);
+            return [cell.fields[0], cell.fields[1].NameText, defaultArg(cell.fields[1].TermSourceREF, ""), cell.fields[1].TermAccessionOntobeeUrl];
         case 3: {
-            const format = new FsCell(defaultArg(cell.fields[0].Format, ""));
-            const selectorFormat = new FsCell(defaultArg(cell.fields[0].SelectorFormat, ""));
-            return ofArray([new FsCell(defaultArg(cell.fields[0].Name, "")), format, selectorFormat]);
+            const format = defaultArg(cell.fields[0].Format, "");
+            const selectorFormat = defaultArg(cell.fields[0].SelectorFormat, "");
+            return [defaultArg(cell.fields[0].Name, ""), format, selectorFormat];
         }
         default:
             if (hasUnit) {
-                return ofArray([new FsCell(cell.fields[0]), new FsCell(""), new FsCell(""), new FsCell("")]);
+                return [cell.fields[0], "", "", ""];
             }
             else if (isTerm) {
-                return ofArray([new FsCell(cell.fields[0]), new FsCell(""), new FsCell("")]);
+                return [cell.fields[0], "", ""];
             }
             else {
-                return singleton(new FsCell(cell.fields[0]));
+                return [cell.fields[0]];
             }
     }
 }

package/Spreadsheet/AnnotationTable/CompositeColumn.js

@@ -1,15 +1,13 @@
+import { map, setItem, item, skip } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
 import { CompositeHeader, IOType } from "../../Core/Table/CompositeHeader.js";
 import { toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
-import { toFsCells, fromFsCells } from "./CompositeHeader.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 { toStringCells, fromStringCells } from "./CompositeHeader.js";
 import { empty, singleton, append, toList, exists, 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 "./CompositeCell.js";
+import { toStringCells as toStringCells_1 } from "./CompositeCell.js";
+import { map as map_2, singleton as singleton_1, ofArray } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { FsCell } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCell.fs.js";
 
 /**
  * Checks if the column header is a deprecated IO Header. If so, fixes it.
@@ -18,48 +16,63 @@ import { toFsCells as toFsCells_1 } from "./CompositeCell.js";
  * 
  * 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).ValueAsString());
+export function fixDeprecatedIOHeader(stringCellCol) {
+    if (stringCellCol.length === 0) {
+        throw new Error("Can\'t fix IOHeader Invalid column, neither header nor values given");
+    }
+    const values = skip(1, stringCellCol);
+    const matchValue = IOType.ofString(item(0, stringCellCol));
     switch (matchValue.tag) {
         case 4:
-            return col;
+            return stringCellCol;
         case 0: {
-            col.Item(1).SetValueAs(toString(new CompositeHeader(11, [new IOType(0, [])])));
-            return col;
+            setItem(stringCellCol, 0, toString(new CompositeHeader(11, [new IOType(0, [])])));
+            return stringCellCol;
         }
         default: {
-            col.Item(1).SetValueAs(toString(new CompositeHeader(12, [matchValue])));
-            return col;
+            setItem(stringCellCol, 0, toString(new CompositeHeader(12, [matchValue])));
+            return stringCellCol;
         }
     }
 }
 
+export function fromStringCellColumns(columns) {
+    const patternInput = fromStringCells(map((c) => item(0, c), columns));
+    const l = item(0, columns).length | 0;
+    const cells = toArray(delay(() => map_1((i) => patternInput[1](map((c_1) => item(i, c_1), columns)), rangeDouble(1, 1, l - 1))));
+    return CompositeColumn.create(patternInput[0], cells);
+}
+
 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);
+    return fromStringCellColumns(map((c) => {
+        c.ToDenseColumn();
+        return map((c_1) => c_1.ValueAsString(), toArray(c.Cells));
+    }, columns));
 }
 
-export function toFsColumns(column) {
+export function toStringCellColumns(column) {
     const hasUnit = exists((c) => c.isUnitized, column.Cells);
     const isTerm = column.Header.IsTermColumn;
     const isData = column.Header.IsDataColumn;
-    const header = toFsCells(hasUnit, column.Header);
-    const cells = map_2((cell) => toFsCells_1(isTerm, hasUnit, cell), column.Cells);
+    const header = toStringCells(hasUnit, column.Header);
+    const cells = map((cell) => toStringCells_1(isTerm, hasUnit, cell), column.Cells);
     if (hasUnit) {
-        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)))))), toList(delay(() => append(singleton(item(3, header)), delay(() => map_1((i_3) => item(3, item_1(i_3, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))]);
+        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i) => item(0, item(i, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_1) => item(1, item(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(i_2, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(3, header)), delay(() => map_1((i_3) => item(3, item(i_3, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))]);
     }
     else if (isTerm) {
-        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_4) => item(0, item_1(i_4, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_5) => item(1, item_1(i_5, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_6) => item(2, item_1(i_6, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))]);
+        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_4) => item(0, item(i_4, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_5) => item(1, item(i_5, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_6) => item(2, item(i_6, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))]);
     }
     else if (isData) {
         const hasFormat = exists((c_1) => (c_1.AsData.Format != null), column.Cells);
         const hasSelectorFormat = exists((c_2) => (c_2.AsData.SelectorFormat != null), column.Cells);
-        return toList(delay(() => append(singleton(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => item(0, item_1(i_7, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))), delay(() => append(hasFormat ? singleton(toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_8) => item(1, item_1(i_8, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty(), delay(() => (hasSelectorFormat ? singleton(toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_9) => item(2, item_1(i_9, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty())))))));
+        return toList(delay(() => append(singleton(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => item(0, item(i_7, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))), delay(() => append(hasFormat ? singleton(toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_8) => item(1, item(i_8, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty(), delay(() => (hasSelectorFormat ? singleton(toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_9) => item(2, item(i_9, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty())))))));
     }
     else {
-        return singleton_1(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_10) => item(0, item_1(i_10, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))));
+        return singleton_1(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_10) => item(0, item(i_10, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))));
     }
 }
 
+export function toFsColumns(column) {
+    return map_2((c) => map_2((s) => (new FsCell(s)), c), toStringCellColumns(column));
+}
+