@nfdi4plants/arctrl 3.2.2 → 3.3.0

package/dist/ts/ts/Spreadsheet/Datamap.js

@@ -1,7 +1,6 @@
 import { toFail, printf } from '../../node_modules/@fable-org/fable-library-ts/String.js';
 import { tryPick, forAll } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { tryFromFsWorksheet, toFsWorksheet } from './DatamapTable/DatamapTable.js';
-import { value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { Datamap } from '../Core/Datamap.js';
 import { Exception } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
 import { FsWorkbook } from '../fable_modules/FsSpreadsheet.7.0.1/FsWorkbook.fs.js';
@@ -17,7 +16,7 @@ function fromFsWorkbook(doc) {
         throw new Exception("No DatamapTable was found in any of the sheets of the workbook");
       }
     } else {
-      return value(datamapTable);
+      return datamapTable;
     }
   } catch (err) {
     const arg = err.message;

package/dist/ts/ts/Spreadsheet/DatamapTable/DatamapColumn.js

@@ -4,7 +4,7 @@ import { FsCell } from '../../fable_modules/FsSpreadsheet.7.0.1/Cells/FsCell.fs.
 import { item } from '../../../node_modules/@fable-org/fable-library-ts/Array.js';
 import { toList, collect, map as map$1, delay, append, singleton as singleton$1, tryFind } from '../../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { distinct } from '../../../node_modules/@fable-org/fable-library-ts/Seq2.js';
-import { defaultArg, value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { stringHash } from '../../../node_modules/@fable-org/fable-library-ts/Util.js';
 
 function setFromFsColumns(dc, columns) {
@@ -24,7 +24,7 @@ function toFsColumns(dc) {
     if (oa == null) {
       return ofArray([new FsCell(""), new FsCell(""), new FsCell("")]);
     } else {
-      const oa_1 = value(oa);
+      const oa_1 = oa;
       return ofArray([new FsCell(defaultArg(oa_1.Name, "")), new FsCell(defaultArg(oa_1.TermSourceREF, "")), new FsCell(defaultArg(oa_1.TermAccessionNumber, ""))]);
     }
   };
@@ -35,7 +35,7 @@ function toFsColumns(dc) {
       let dc_2 = void 0;
       return append((dc_2 = dc_3, ofArray([new FsCell(defaultArg(dc_2.Name, "")), new FsCell(defaultArg(dc_2.Format, "")), new FsCell(defaultArg(dc_2.SelectorFormat, ""))])), delay(() => append(createTerm(dc_3.Explication), delay(() => append(createTerm(dc_3.Unit), delay(() => append(createTerm(dc_3.ObjectType), delay(() => append(createText(dc_3.Description), delay(() => append(createText(dc_3.GeneratedBy), delay(() => append(createText(dc_3.Label), delay(() => map((key) => {
         let option_9 = void 0, c_2 = void 0;
-        return new FsCell(defaultArg((option_9 = tryFind((c_1) => defaultArg(c_1.Name, "") === key, dc_3.Comments), option_9 != null ? (c_2 = value(option_9), c_2.Value) : void 0), ""));
+        return new FsCell(defaultArg((option_9 = tryFind((c_1) => defaultArg(c_1.Name, "") === key, dc_3.Comments), option_9 != null ? (c_2 = option_9, c_2.Value) : void 0), ""));
       }, commentKeys)))))))))))))));
     }));
   }, dc))))));

package/dist/ts/ts/Spreadsheet/DatamapTable/DatamapHeader.js

@@ -1,6 +1,6 @@
 import { map, item, isEmpty, head, tail, tryFindIndex } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
 import { FsCell } from '../../fable_modules/FsSpreadsheet.7.0.1/Cells/FsCell.fs.js';
-import { value, unwrap } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { unwrap, value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { OntologyAnnotation } from '../../Core/OntologyAnnotation.js';
 import { Data } from '../../Core/Data.js';
 import { Option_fromValueWithDefault } from '../../Core/Helper/Collections.js';
@@ -13,10 +13,10 @@ function ActivePattern_ontologyAnnotationFromFsCells(tsrCol, tanCol, cells) {
   const cellValues = map((c) => c.ValueAsString(), cells);
   let tsr;
   const option = tsrCol;
-  tsr = option != null ? item(value(option), cellValues) : void 0;
+  tsr = option != null ? item(option, cellValues) : void 0;
   let tan;
   const option_1 = tanCol;
-  tan = option_1 != null ? item(value(option_1), cellValues) : void 0;
+  tan = option_1 != null ? item(option_1, cellValues) : void 0;
   return new OntologyAnnotation(item(0, cellValues), unwrap(tsr), unwrap(tan));
 }
 function ActivePattern_freeTextFromFsCells(cells) {
@@ -26,10 +26,10 @@ function ActivePattern_dataFromFsCells(format, selectorFormat, cells) {
   const cellValues = map((c) => c.ValueAsString(), cells);
   let format_1;
   const option = format;
-  format_1 = option != null ? item(value(option), cellValues) : void 0;
+  format_1 = option != null ? item(option, cellValues) : void 0;
   let selectorFormat_1;
   const option_1 = selectorFormat;
-  selectorFormat_1 = option_1 != null ? item(value(option_1), cellValues) : void 0;
+  selectorFormat_1 = option_1 != null ? item(option_1, cellValues) : void 0;
   return new Data(void 0, item(0, cellValues), void 0, unwrap(format_1), unwrap(selectorFormat_1));
 }
 function ActivePattern_$007CTerm$007C_$007C(categoryString, cells) {
@@ -61,7 +61,7 @@ function ActivePattern_$007CTerm$007C_$007C(categoryString, cells) {
     if (activePatternResult != null) {
       if (isEmpty(tail(cellValues))) {
         matchResult = 0;
-        header = value(activePatternResult);
+        header = activePatternResult;
       } else {
         matchResult = 1;
       }
@@ -85,7 +85,7 @@ function ActivePattern_$007CTerm$007C_$007C(categoryString, cells) {
                 if ($007CTANColumnHeaderRaw$007C_$007C(head(tail(tail(cellValues)))) != null) {
                   if (isEmpty(tail(tail(tail(cellValues))))) {
                     matchResult_1 = 0;
-                    header_1 = value(activePatternResult_1);
+                    header_1 = activePatternResult_1;
                   } else {
                     matchResult_1 = 1;
                   }
@@ -121,7 +121,7 @@ function ActivePattern_$007CTerm$007C_$007C(categoryString, cells) {
                     if ($007CTSRColumnHeaderRaw$007C_$007C(head(tail(tail(cellValues)))) != null) {
                       if (isEmpty(tail(tail(tail(cellValues))))) {
                         matchResult_2 = 0;
-                        header_2 = value(activePatternResult_4);
+                        header_2 = activePatternResult_4;
                       } else {
                         matchResult_2 = 1;
                       }
@@ -285,7 +285,7 @@ function ActivePattern_$007CData$007C_$007C(cells) {
     case 0:
       return (dc) => (cells_1) => {
         let option_1 = void 0, option_3 = void 0;
-        const d = ActivePattern_dataFromFsCells((option_1 = tryFindIndex((s) => s.startsWith("Data Format"), cols), option_1 != null ? 1 + value(option_1) : void 0), (option_3 = tryFindIndex((s_1) => s_1.startsWith("Data Selector Format"), cols), option_3 != null ? 1 + value(option_3) : void 0), cells_1);
+        const d = ActivePattern_dataFromFsCells((option_1 = tryFindIndex((s) => s.startsWith("Data Format"), cols), option_1 != null ? 1 + option_1 : void 0), (option_3 = tryFindIndex((s_1) => s_1.startsWith("Data Selector Format"), cols), option_3 != null ? 1 + option_3 : void 0), cells_1);
         dc.FilePath = d.FilePath;
         dc.Selector = d.Selector;
         dc.Format = d.Format;
@@ -304,7 +304,7 @@ function ActivePattern_$007CComment$007C_$007C(cells) {
     if (activePatternResult != null) {
       if (isEmpty(tail(cellValues))) {
         matchResult = 0;
-        key = value(activePatternResult);
+        key = activePatternResult;
       } else {
         matchResult = 1;
       }

package/dist/ts/ts/Spreadsheet/DatamapTable/DatamapTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DatamapTable.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/DatamapTable/DatamapTable.ts"],"names":[],"mappings":"AACA,OAAO,EAAiD,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEzH,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAElF,OAAO,EAAE,OAAO,EAAE,MAAM,8DAA8D,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,2DAA2D,CAAC;AACxF,OAAO,EAAoB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAQhD,eAAO,MAAM,mBAAmB,EAAE,UAAU,CAAC,MAAM,CAAgG,CAAC;AAEpJ,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAKpG;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAEnE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,WAAW,EAAE,CAOzE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAgBtE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,WAAW,CAqCzD"}
+{"version":3,"file":"DatamapTable.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/DatamapTable/DatamapTable.ts"],"names":[],"mappings":"AACA,OAAO,EAAiE,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEzI,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAElF,OAAO,EAAE,OAAO,EAAE,MAAM,8DAA8D,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,2DAA2D,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAQhD,eAAO,MAAM,mBAAmB,EAAE,UAAU,CAAC,MAAM,CAAgG,CAAC;AAEpJ,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAKpG;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAEnE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,WAAW,EAAE,CAOzE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAgBtE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,WAAW,CAqCzD"}

package/dist/ts/ts/Spreadsheet/DatamapTable/DatamapTable.js

@@ -1,8 +1,7 @@
-import { ofArray, exists, iterate, length, head, iterateIndexed } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
+import { ofArray, exists, iterate, length, FSharpList__get_Head, iterateIndexed } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
 import { Aux_List_groupWhen } from '../AnnotationTable/ArcTable.js';
 import { tryFind, item, toArray, delay, map, toList } from '../../../node_modules/@fable-org/fable-library-ts/Seq.js';
 import { FsWorksheet } from '../../fable_modules/FsSpreadsheet.7.0.1/FsWorksheet.fs.js';
-import { value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { DataContext } from '../../Core/DataContext.js';
 import { rangeDouble } from '../../../node_modules/@fable-org/fable-library-ts/Range.js';
 import { setFromFsColumns, toFsColumns } from './DatamapColumn.js';
@@ -37,7 +36,7 @@ function tryFromFsWorksheet(sheet) {
     if (matchValue == null) {
       return void 0;
     } else {
-      const t = value(matchValue);
+      const t = matchValue;
       return new Datamap(composeColumns(t.GetColumns(sheet.CellCollection)));
     }
   } catch (err) {
@@ -53,28 +52,28 @@ function toFsWorksheet(table) {
     return ws;
   } else {
     const columns = toFsColumns(table.DataContexts);
-    const maxRow = length(head(columns)) | 0;
+    const maxRow = length(FSharpList__get_Head(columns)) | 0;
     const maxCol = length(columns) | 0;
     const fsTable = ws.Table("datamapTable", new FsRangeAddress(new FsAddress(1, 1), new FsAddress(maxRow, maxCol)));
     iterateIndexed((colI, col) => {
       iterateIndexed((rowI, cell) => {
-        let value$1;
+        let value;
         const v = cell.ValueAsString();
         if (rowI === 0) {
           const matchValue = Dictionary_tryGet(v, stringCount);
           if (matchValue == null) {
             addToDict(stringCount, cell.ValueAsString(), "");
-            value$1 = v;
+            value = v;
           } else {
-            const spaces = value(matchValue);
+            const spaces = matchValue;
             stringCount.set(v, spaces + " ");
-            value$1 = v + " " + spaces;
+            value = v + " " + spaces;
           }
         } else {
-          value$1 = v;
+          value = v;
         }
         const address = new FsAddress(rowI + 1, colI + 1);
-        fsTable.Cell(address, ws.CellCollection).SetValueAs(value$1);
+        fsTable.Cell(address, ws.CellCollection).SetValueAs(value);
       }, col);
     }, columns);
     ws.RescanRows();

package/dist/ts/ts/Spreadsheet/Metadata/Assays.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Assays.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Assays.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEpJ,OAAO,EAAc,MAAM,EAA4B,MAAM,uCAAuC,CAAC;AAIrG,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAAwR,CAAC;AAE/T,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,4BAA4B,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,kCAAkC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,iCAAiC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAsB1c;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,CAazE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,WAAW,CAmCvE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAGnL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAEhH"}
+{"version":3,"file":"Assays.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Assays.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEpJ,OAAO,EAAc,MAAM,EAAU,MAAM,uCAAuC,CAAC;AAInF,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAAwR,CAAC;AAE/T,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,4BAA4B,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,kCAAkC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,iCAAiC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAsB1c;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,CAazE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,WAAW,CAiCvE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAGnL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAEhH"}

package/dist/ts/ts/Spreadsheet/Metadata/Assays.js

@@ -1,12 +1,12 @@
 import { ofArray, length, singleton, initialize, map, empty, iterateIndexed, cons, reverse } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
 import { OntologyAnnotation } from '../../Core/OntologyAnnotation.js';
-import { unwrap, value, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { unwrap, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { createMissingIdentifier, Assay_tryIdentifierFromFileName, removeMissingIdentifier, Assay_fileNameFromIdentifier } from '../../Core/Helper/Identifier.js';
 import { Option_fromValueWithDefault, ResizeArray_iter } from '../../Core/Helper/Collections.js';
 import { JsonTypes_decomposeTechnologyPlatform, JsonTypes_composeTechnologyPlatform } from '../../Core/Conversion.js';
 import { ArcAssay } from '../../Core/ArcTypes.js';
 import { SparseTable_GetEmptyComments_3ECCA699, SparseTable__TryGetValueDefault_5BAE6133, SparseTable__TryGetValue_11FD62A8, SparseTable_Create_Z2192E64B, SparseTable, SparseTable_FromRows_Z5579EC29, SparseTable_ToRows_759CAFC1 } from './SparseTable.js';
-import { Comment_fromString, Comment_toString } from './Comment.js';
+import { Comment_fromString, Comment_addToMatrix } from './Comment.js';
 import { addToDict } from '../../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
 import { List_distinct } from '../../../node_modules/@fable-org/fable-library-ts/Seq2.js';
 import { stringHash } from '../../../node_modules/@fable-org/fable-library-ts/Util.js';
@@ -20,17 +20,17 @@ function fromString(identifier, title, description, measurementType, measurement
     if (fileName == null) {
       identifier_4 = createMissingIdentifier();
     } else {
-      const matchValue = Assay_tryIdentifierFromFileName(value(fileName));
-      identifier_4 = matchValue != null ? value(matchValue) : createMissingIdentifier();
+      const matchValue = Assay_tryIdentifierFromFileName(fileName);
+      identifier_4 = matchValue != null ? matchValue : createMissingIdentifier();
     }
   } else {
-    identifier_4 = value(identifier);
+    identifier_4 = identifier;
   }
   const measurementType_2 = Option_fromValueWithDefault(new OntologyAnnotation(), measurementType_1);
   const technologyType_2 = Option_fromValueWithDefault(new OntologyAnnotation(), technologyType_1);
   let technologyPlatform_1;
   const option_1 = technologyPlatform;
-  technologyPlatform_1 = option_1 != null ? JsonTypes_decomposeTechnologyPlatform(value(option_1)) : void 0;
+  technologyPlatform_1 = option_1 != null ? JsonTypes_decomposeTechnologyPlatform(option_1) : void 0;
   return ArcAssay.make(identifier_4, title, description, measurementType_2, technologyType_2, technologyPlatform_1, [], void 0, [], comments);
 }
 function fromSparseTable(matrix) {
@@ -68,13 +68,11 @@ function toSparseTable(assays) {
     addToDict(matrix.Matrix, ["Technology Type", i_1], tt_1.TermName);
     addToDict(matrix.Matrix, ["Technology Type Term Accession Number", i_1], tt_1.TermAccessionNumber);
     addToDict(matrix.Matrix, ["Technology Type Term Source REF", i_1], tt_1.TermSourceREF);
-    addToDict(matrix.Matrix, ["Technology Platform", i_1], defaultArg((option_1 = a.TechnologyPlatform, option_1 != null ? JsonTypes_composeTechnologyPlatform(value(option_1)) : void 0), ""));
+    addToDict(matrix.Matrix, ["Technology Platform", i_1], defaultArg((option_1 = a.TechnologyPlatform, option_1 != null ? JsonTypes_composeTechnologyPlatform(option_1) : void 0), ""));
     addToDict(matrix.Matrix, ["File Name", i_1], processedFileName);
     ResizeArray_iter((comment) => {
-      const patternInput = Comment_toString(comment);
-      const n = patternInput[0];
+      const n = Comment_addToMatrix(i_1, comment, matrix.Matrix);
       commentKeys = cons(n, commentKeys);
-      addToDict(matrix.Matrix, [n, i_1], patternInput[1]);
     }, a.Comments);
   }, assays);
   return new SparseTable(matrix.Matrix, matrix.Keys, reverse(List_distinct(commentKeys, {

package/dist/ts/ts/Spreadsheet/Metadata/Comment.d.ts

@@ -1,5 +1,7 @@
 import { Option } from '@fable-org/fable-library-ts/Option.ts';
 import { Comment$ } from '../../Core/Comment.ts';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { IMap } from '@fable-org/fable-library-ts/Util.ts';
 export declare const Comment_commentValueKey = "commentValue";
 export declare const Comment_commentPattern: string;
 export declare const Comment_commentPatternNoAngleBrackets: string;
@@ -7,6 +9,12 @@ export declare function Comment_$007CComment$007C_$007C(key: string): Option<str
 export declare function Comment_wrapCommentKey(k: string): string;
 export declare function Comment_fromString(k: string, v: string): Comment$;
 export declare function Comment_toString(c: Comment$): [string, string];
+/**
+ * Adds the comment to the sparse matrix at the given column and returns its name.
+ *
+ * Fails if a comment with the same name was already added for this column, as ISA-XLSX does not allow duplicate comment names.
+ */
+export declare function Comment_addToMatrix(i: int32, c: Comment$, matrix: IMap<[string, int32], string>): string;
 export declare const Remark_remarkValueKey = "remarkValue";
 export declare const Remark_remarkPattern: string;
 export declare function Remark_$007CRemark$007C_$007C(key: Option<string>): Option<string>;

package/dist/ts/ts/Spreadsheet/Metadata/Comment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Comment.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Comment.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE7F,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AAEtD,eAAO,MAAM,sBAAsB,EAAE,MAA0E,CAAC;AAEhH,eAAO,MAAM,qCAAqC,EAAE,MAAwE,CAAC;AAE7H,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAsB3E;AAED,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ,CAIjE;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAE9D;AAED,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD,eAAO,MAAM,oBAAoB,EAAE,MAAsD,CAAC;AAE1F,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAgBjF;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEnD"}
+{"version":3,"file":"Comment.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Comment.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE3E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAE7D,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAE3D,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AAEtD,eAAO,MAAM,sBAAsB,EAAE,MAA0E,CAAC;AAEhH,eAAO,MAAM,qCAAqC,EAAE,MAAwE,CAAC;AAE7H,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAsB3E;AAED,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ,CAIjE;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAE9D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,CASxG;AAED,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD,eAAO,MAAM,oBAAoB,EAAE,MAAsD,CAAC;AAE1F,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAgBjF;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEnD"}

package/dist/ts/ts/Spreadsheet/Metadata/Comment.js

@@ -1,8 +1,9 @@
-import { concat, toText, printf } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
+import { concat, toText, printf, toFail } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
 import { ActivePatterns_$007CRegex$007C_$007C } from '../../Core/Helper/Regex.js';
-import { value, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { Option_fromValueWithDefault } from './Conversions.js';
 import { Comment$ } from '../../Core/Comment.js';
+import { addToDict } from '../../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
 
 const Comment_commentValueKey = "commentValue";
 const Comment_commentPattern = concat("Comment\\s*\\[<(?<", Comment_commentValueKey, ">.+)>\\]");
@@ -10,12 +11,12 @@ const Comment_commentPatternNoAngleBrackets = concat("Comment\\s*\\[(?<", Commen
 function Comment_$007CComment$007C_$007C(key) {
   const activePatternResult = ActivePatterns_$007CRegex$007C_$007C(Comment_commentPattern, key);
   if (activePatternResult != null) {
-    const r = value(activePatternResult);
+    const r = activePatternResult;
     return r.groups && r.groups[Comment_commentValueKey] || "";
   } else {
     const activePatternResult_1 = ActivePatterns_$007CRegex$007C_$007C(Comment_commentPatternNoAngleBrackets, key);
     if (activePatternResult_1 != null) {
-      const r_1 = value(activePatternResult_1);
+      const r_1 = activePatternResult_1;
       const v = r_1.groups && r_1.groups[Comment_commentValueKey] || "";
       if (v === "<>") {
         return void 0;
@@ -38,15 +39,25 @@ function Comment_fromString(k, v) {
 function Comment_toString(c) {
   return [defaultArg(c.Name, ""), defaultArg(c.Value, "")];
 }
+function Comment_addToMatrix(i, c, matrix) {
+  const patternInput = Comment_toString(c);
+  const n = patternInput[0];
+  if (matrix.has([n, i])) {
+    const arg = Comment_wrapCommentKey(n);
+    toFail(printf("%s is used more than once. ISA-XLSX does not allow multiple comments with the same name."))(arg);
+  }
+  addToDict(matrix, [n, i], patternInput[1]);
+  return n;
+}
 const Remark_remarkValueKey = "remarkValue";
 const Remark_remarkPattern = concat("#(?<", Remark_remarkValueKey, ">.+)");
 function Remark_$007CRemark$007C_$007C(key) {
   const option_1 = key;
   if (option_1 != null) {
-    const k = value(option_1);
+    const k = option_1;
     const activePatternResult = ActivePatterns_$007CRegex$007C_$007C(Remark_remarkPattern, k);
     if (activePatternResult != null) {
-      const r = value(activePatternResult);
+      const r = activePatternResult;
       return r.groups && r.groups[Remark_remarkValueKey] || "";
     } else {
       return void 0;
@@ -59,4 +70,4 @@ function Remark_wrapRemark(r) {
   return toText(printf("#%s"))(r);
 }
 
-export { Comment_$007CComment$007C_$007C, Comment_commentPattern, Comment_commentPatternNoAngleBrackets, Comment_commentValueKey, Comment_fromString, Comment_toString, Comment_wrapCommentKey, Remark_$007CRemark$007C_$007C, Remark_remarkPattern, Remark_remarkValueKey, Remark_wrapRemark };
+export { Comment_$007CComment$007C_$007C, Comment_addToMatrix, Comment_commentPattern, Comment_commentPatternNoAngleBrackets, Comment_commentValueKey, Comment_fromString, Comment_toString, Comment_wrapCommentKey, Remark_$007CRemark$007C_$007C, Remark_remarkPattern, Remark_remarkValueKey, Remark_wrapRemark };

package/dist/ts/ts/Spreadsheet/Metadata/Contacts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Contacts.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Contacts.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAGpJ,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EAAwC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACrG,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAI7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,eAAO,MAAM,cAAc,eAAe,CAAC;AAE3C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,eAAO,MAAM,QAAQ,QAAQ,CAAC;AAE9B,eAAO,MAAM,YAAY,YAAY,CAAC;AAEtC,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAE9C,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,eAAO,MAAM,6BAA6B,gCAAgC,CAAC;AAE3E,eAAO,MAAM,uBAAuB,0BAA0B,CAAC;AAE/D,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAAoM,CAAC;AAE3O,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,wBAAwB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAG9U;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAcvE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,WAAW,CA4BtE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAGjL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQ/G"}
+{"version":3,"file":"Contacts.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Contacts.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAGpJ,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EAAsB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAI7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,eAAO,MAAM,cAAc,eAAe,CAAC;AAE3C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,eAAO,MAAM,QAAQ,QAAQ,CAAC;AAE9B,eAAO,MAAM,YAAY,YAAY,CAAC;AAEtC,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAE9C,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,eAAO,MAAM,6BAA6B,gCAAgC,CAAC;AAE3E,eAAO,MAAM,uBAAuB,0BAA0B,CAAC;AAE/D,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAAoM,CAAC;AAE3O,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,wBAAwB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAG9U;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAcvE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,WAAW,CA0BtE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAGjL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQ/G"}

package/dist/ts/ts/Spreadsheet/Metadata/Contacts.js

@@ -2,9 +2,9 @@ import { ofArray, length, singleton, initialize, map, empty, iterateIndexed, con
 import { Person_setOrcidFromComments, Person_setCommentFromORCID } from '../../Core/Conversion.js';
 import { OntologyAnnotation_fromAggregatedStrings, OntologyAnnotation_toAggregatedStrings } from './Conversions.js';
 import { Person } from '../../Core/Person.js';
-import { defaultArg, unwrap, value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { defaultArg, unwrap } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { SparseTable_GetEmptyComments_3ECCA699, SparseTable__TryGetValueDefault_5BAE6133, SparseTable__TryGetValue_11FD62A8, SparseTable_Create_Z2192E64B, SparseTable, SparseTable_FromRows_Z5579EC29, SparseTable_ToRows_759CAFC1 } from './SparseTable.js';
-import { Comment_fromString, Comment_toString } from './Comment.js';
+import { Comment_fromString, Comment_addToMatrix } from './Comment.js';
 import { addToDict } from '../../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
 import { ResizeArray_iter } from '../../Core/Helper/Collections.js';
 import { List_distinct } from '../../../node_modules/@fable-org/fable-library-ts/Seq2.js';
@@ -58,10 +58,8 @@ function toSparseTable(persons) {
     addToDict(matrix.Matrix, [rolesTermAccessionNumberLabel, i_1], rAgg.TermAccessionNumberAgg);
     addToDict(matrix.Matrix, [rolesTermSourceREFLabel, i_1], rAgg.TermSourceREFAgg);
     ResizeArray_iter((comment) => {
-      const patternInput = Comment_toString(comment);
-      const n = patternInput[0];
+      const n = Comment_addToMatrix(i_1, comment, matrix.Matrix);
       commentKeys = cons(n, commentKeys);
-      addToDict(matrix.Matrix, [n, i_1], patternInput[1]);
     }, p.Comments);
   }, map(Person_setCommentFromORCID, persons));
   return new SparseTable(matrix.Matrix, matrix.Keys, reverse(List_distinct(commentKeys, {
@@ -78,7 +76,7 @@ function toRows(prefix, persons) {
   if (prefix == null) {
     return SparseTable_ToRows_759CAFC1(m);
   } else {
-    return SparseTable_ToRows_759CAFC1(m, value(prefix));
+    return SparseTable_ToRows_759CAFC1(m, prefix);
   }
 }
 

package/dist/ts/ts/Spreadsheet/Metadata/Factors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Factors.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Factors.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEpJ,OAAO,EAAgC,MAAM,EAAU,MAAM,uCAAuC,CAAC;AAErG,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,eAAe,SAAS,CAAC;AAEtC,eAAO,MAAM,4BAA4B,+BAA+B,CAAC;AAEzE,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAA+F,CAAC;AAEtI,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAKrL;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAavE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,WAAW,CA0BtE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAGjL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQ/G"}
+{"version":3,"file":"Factors.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Factors.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEpJ,OAAO,EAAc,MAAM,EAAU,MAAM,uCAAuC,CAAC;AAEnF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,eAAe,SAAS,CAAC;AAEtC,eAAO,MAAM,4BAA4B,+BAA+B,CAAC;AAEzE,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAA+F,CAAC;AAEtI,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAKrL;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAavE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,WAAW,CAwBtE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAGjL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQ/G"}

package/dist/ts/ts/Spreadsheet/Metadata/Factors.js

@@ -1,10 +1,10 @@
 import { ofArray, length, singleton, initialize, map, empty, iterateIndexed, cons, reverse } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
 import { OntologyAnnotation } from '../../Core/OntologyAnnotation.js';
-import { unwrap, defaultArg, value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { unwrap, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { Option_fromValueWithDefault, ResizeArray_iter } from '../../Core/Helper/Collections.js';
 import { Factor } from '../../Core/Process/Factor.js';
 import { SparseTable_GetEmptyComments_3ECCA699, SparseTable__TryGetValueDefault_5BAE6133, SparseTable__TryGetValue_11FD62A8, SparseTable_Create_Z2192E64B, SparseTable, SparseTable_FromRows_Z5579EC29, SparseTable_ToRows_759CAFC1 } from './SparseTable.js';
-import { Comment_fromString, Comment_toString } from './Comment.js';
+import { Comment_fromString, Comment_addToMatrix } from './Comment.js';
 import { addToDict } from '../../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
 import { List_distinct } from '../../../node_modules/@fable-org/fable-library-ts/Seq2.js';
 import { stringHash } from '../../../node_modules/@fable-org/fable-library-ts/Util.js';
@@ -48,11 +48,9 @@ function toSparseTable(factors) {
     const matchValue = f.Comments;
     if (matchValue != null) {
       ResizeArray_iter((comment) => {
-        const patternInput = Comment_toString(comment);
-        const n = patternInput[0];
+        const n = Comment_addToMatrix(i_1, comment, matrix.Matrix);
         commentKeys = cons(n, commentKeys);
-        addToDict(matrix.Matrix, [n, i_1], patternInput[1]);
-      }, value(matchValue));
+      }, matchValue);
     }
   }, factors);
   return new SparseTable(matrix.Matrix, matrix.Keys, reverse(List_distinct(commentKeys, {
@@ -61,7 +59,7 @@ function toSparseTable(factors) {
   })), matrix.ColumnCount);
 }
 function fromRows(prefix, lineNumber, rows) {
-  const tupledArg = prefix == null ? SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber) : SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber, value(prefix));
+  const tupledArg = prefix == null ? SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber) : SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber, prefix);
   return [tupledArg[0], tupledArg[1], tupledArg[2], fromSparseTable(tupledArg[3])];
 }
 function toRows(prefix, factors) {
@@ -69,7 +67,7 @@ function toRows(prefix, factors) {
   if (prefix == null) {
     return SparseTable_ToRows_759CAFC1(m);
   } else {
-    return SparseTable_ToRows_759CAFC1(m, value(prefix));
+    return SparseTable_ToRows_759CAFC1(m, prefix);
   }
 }
 

package/dist/ts/ts/Spreadsheet/Metadata/OntologyAnnotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OntologyAnnotation.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/OntologyAnnotation.ts"],"names":[],"mappings":"AACA,OAAO,EAAiD,UAAU,EAAsC,MAAM,qCAAqC,CAAC;AACpJ,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAC9P,OAAO,EAAE,MAAM,EAAY,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,MAAM,EAA4B,MAAM,uCAAuC,CAAC;AAIzF,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,kBAAkB,CAAC,CActI;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,WAAW,CAoBrI;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAIhP;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQ9K"}
+{"version":3,"file":"OntologyAnnotation.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/OntologyAnnotation.ts"],"names":[],"mappings":"AACA,OAAO,EAAiD,UAAU,EAAsC,MAAM,qCAAqC,CAAC;AACpJ,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAC9P,OAAO,EAAE,MAAM,EAAY,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAU,MAAM,uCAAuC,CAAC;AAIvE,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,kBAAkB,CAAC,CActI;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,WAAW,CAkBrI;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAIhP;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQ9K"}

package/dist/ts/ts/Spreadsheet/Metadata/OntologyAnnotation.js

@@ -1,8 +1,8 @@
 import { length, singleton, initialize, map, ofArray, empty, iterateIndexed, cons, reverse } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
 import { SparseTable_GetEmptyComments_3ECCA699, SparseTable__TryGetValueDefault_5BAE6133, SparseTable__TryGetValue_11FD62A8, SparseTable_Create_Z2192E64B, SparseTable, SparseTable_FromRows_Z5579EC29, SparseTable_ToRows_759CAFC1 } from './SparseTable.js';
 import { OntologyAnnotation } from '../../Core/OntologyAnnotation.js';
-import { Comment_fromString, Comment_toString } from './Comment.js';
-import { unwrap, value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { Comment_fromString, Comment_addToMatrix } from './Comment.js';
+import { unwrap } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { addToDict } from '../../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
 import { ResizeArray_iter } from '../../Core/Helper/Collections.js';
 import { List_distinct } from '../../../node_modules/@fable-org/fable-library-ts/Seq2.js';
@@ -32,10 +32,8 @@ function toSparseTable(label, labelTSR, labelTAN, designs) {
     addToDict(matrix.Matrix, [labelTAN, i_1], oa.TermAccessionNumber);
     addToDict(matrix.Matrix, [labelTSR, i_1], oa.TermSourceREF);
     ResizeArray_iter((comment) => {
-      const patternInput = Comment_toString(comment);
-      const n = patternInput[0];
+      const n = Comment_addToMatrix(i_1, comment, matrix.Matrix);
       commentKeys = cons(n, commentKeys);
-      addToDict(matrix.Matrix, [n, i_1], patternInput[1]);
     }, d.Comments);
   }, designs);
   return new SparseTable(matrix.Matrix, matrix.Keys, reverse(List_distinct(commentKeys, {
@@ -45,7 +43,7 @@ function toSparseTable(label, labelTSR, labelTAN, designs) {
 }
 function fromRows(prefix, label, labelTSR, labelTAN, lineNumber, rows) {
   const labels = ofArray([label, labelTAN, labelTSR]);
-  const tupledArg = prefix == null ? SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber) : SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber, value(prefix));
+  const tupledArg = prefix == null ? SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber) : SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber, prefix);
   return [tupledArg[0], tupledArg[1], tupledArg[2], fromSparseTable(label, labelTSR, labelTAN, tupledArg[3])];
 }
 function toRows(prefix, label, labelTSR, labelTAN, designs) {
@@ -53,7 +51,7 @@ function toRows(prefix, label, labelTSR, labelTAN, designs) {
   if (prefix == null) {
     return SparseTable_ToRows_759CAFC1(m);
   } else {
-    return SparseTable_ToRows_759CAFC1(m, value(prefix));
+    return SparseTable_ToRows_759CAFC1(m, prefix);
   }
 }
 

package/dist/ts/ts/Spreadsheet/Metadata/OntologySourceReference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OntologySourceReference.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/OntologySourceReference.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AACpJ,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAc,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAI7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,SAAS,qBAAqB,CAAC;AAE5C,eAAO,MAAM,SAAS,qBAAqB,CAAC;AAE5C,eAAO,MAAM,YAAY,wBAAwB,CAAC;AAElD,eAAO,MAAM,gBAAgB,4BAA4B,CAAC;AAE1D,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAAmE,CAAC;AAE1G,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,uBAAuB,CAE1K;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,uBAAuB,CAAC,CAcxF;AAED,wBAAgB,aAAa,CAAC,eAAe,EAAE,UAAU,CAAC,uBAAuB,CAAC,GAAG,WAAW,CAoB/F;AAED,wBAAgB,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAG1K;AAED,wBAAgB,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,uBAAuB,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAE5G"}
+{"version":3,"file":"OntologySourceReference.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/OntologySourceReference.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AACpJ,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAc,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAI7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,SAAS,qBAAqB,CAAC;AAE5C,eAAO,MAAM,SAAS,qBAAqB,CAAC;AAE5C,eAAO,MAAM,YAAY,wBAAwB,CAAC;AAElD,eAAO,MAAM,gBAAgB,4BAA4B,CAAC;AAE1D,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAAmE,CAAC;AAE1G,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,uBAAuB,CAE1K;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,uBAAuB,CAAC,CAcxF;AAED,wBAAgB,aAAa,CAAC,eAAe,EAAE,UAAU,CAAC,uBAAuB,CAAC,GAAG,WAAW,CAkB/F;AAED,wBAAgB,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAG1K;AAED,wBAAgB,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,uBAAuB,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAE5G"}

package/dist/ts/ts/Spreadsheet/Metadata/OntologySourceReference.js

@@ -2,7 +2,7 @@ import { ofArray, length, singleton, initialize, map, empty, iterateIndexed, con
 import { OntologySourceReference } from '../../Core/OntologySourceReference.js';
 import { defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { SparseTable_GetEmptyComments_3ECCA699, SparseTable__TryGetValueDefault_5BAE6133, SparseTable__TryGetValue_11FD62A8, SparseTable_Create_Z2192E64B, SparseTable, SparseTable_FromRows_Z5579EC29, SparseTable_ToRows_759CAFC1 } from './SparseTable.js';
-import { Comment_fromString, Comment_toString } from './Comment.js';
+import { Comment_fromString, Comment_addToMatrix } from './Comment.js';
 import { addToDict } from '../../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
 import { ResizeArray_iter } from '../../Core/Helper/Collections.js';
 import { List_distinct } from '../../../node_modules/@fable-org/fable-library-ts/Seq2.js';
@@ -40,10 +40,8 @@ function toSparseTable(ontologySources) {
     addToDict(matrix.Matrix, [versionLabel, i_1], defaultArg(o.Version, ""));
     addToDict(matrix.Matrix, [descriptionLabel, i_1], defaultArg(o.Description, ""));
     ResizeArray_iter((comment) => {
-      const patternInput = Comment_toString(comment);
-      const n = patternInput[0];
+      const n = Comment_addToMatrix(i_1, comment, matrix.Matrix);
       commentKeys = cons(n, commentKeys);
-      addToDict(matrix.Matrix, [n, i_1], patternInput[1]);
     }, o.Comments);
   }, ontologySources);
   return new SparseTable(matrix.Matrix, matrix.Keys, reverse(List_distinct(commentKeys, {

package/dist/ts/ts/Spreadsheet/Metadata/Protocols.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Protocols.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Protocols.ts"],"names":[],"mappings":"AACA,OAAO,EAA4F,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEpK,OAAO,EAAc,MAAM,EAA4B,MAAM,uCAAuC,CAAC;AAIrG,OAAO,EAA6B,QAAQ,EAAiB,MAAM,gCAAgC,CAAC;AAEpG,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,iBAAiB,SAAS,CAAC;AAExC,eAAO,MAAM,4BAA4B,+BAA+B,CAAC;AAEzE,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,QAAQ,CAAC;AAE9B,eAAO,MAAM,YAAY,YAAY,CAAC;AAEtC,eAAO,MAAM,mBAAmB,oBAAoB,CAAC;AAErD,eAAO,MAAM,kCAAkC,qCAAqC,CAAC;AAErF,eAAO,MAAM,4BAA4B,+BAA+B,CAAC;AAEzE,eAAO,MAAM,mBAAmB,oBAAoB,CAAC;AAErD,eAAO,MAAM,mBAAmB,oBAAoB,CAAC;AAErD,eAAO,MAAM,sCAAsC,0CAA0C,CAAC;AAE9F,eAAO,MAAM,gCAAgC,oCAAoC,CAAC;AAElF,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAAsV,CAAC;AAE7X,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,6BAA6B,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,iCAAiC,EAAE,MAAM,EAAE,2BAA2B,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAM9e;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,CAUzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,WAAW,CAsC1E;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAGnL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQnH"}
+{"version":3,"file":"Protocols.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Protocols.ts"],"names":[],"mappings":"AACA,OAAO,EAA4F,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEpK,OAAO,EAAc,MAAM,EAAU,MAAM,uCAAuC,CAAC;AAInF,OAAO,EAA6B,QAAQ,EAAiB,MAAM,gCAAgC,CAAC;AAEpG,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,iBAAiB,SAAS,CAAC;AAExC,eAAO,MAAM,4BAA4B,+BAA+B,CAAC;AAEzE,eAAO,MAAM,sBAAsB,yBAAyB,CAAC;AAE7D,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,QAAQ,CAAC;AAE9B,eAAO,MAAM,YAAY,YAAY,CAAC;AAEtC,eAAO,MAAM,mBAAmB,oBAAoB,CAAC;AAErD,eAAO,MAAM,kCAAkC,qCAAqC,CAAC;AAErF,eAAO,MAAM,4BAA4B,+BAA+B,CAAC;AAEzE,eAAO,MAAM,mBAAmB,oBAAoB,CAAC;AAErD,eAAO,MAAM,mBAAmB,oBAAoB,CAAC;AAErD,eAAO,MAAM,sCAAsC,0CAA0C,CAAC;AAE9F,eAAO,MAAM,gCAAgC,oCAAoC,CAAC;AAElF,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAAsV,CAAC;AAE7X,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,6BAA6B,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,iCAAiC,EAAE,MAAM,EAAE,2BAA2B,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAM9e;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,CAUzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,WAAW,CAoC1E;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAGnL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQnH"}

package/dist/ts/ts/Spreadsheet/Metadata/Protocols.js

@@ -1,11 +1,11 @@
 import { ofArray, ofSeq, empty, length, singleton, initialize, map, iterateIndexed, iterate, cons, reverse } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
 import { OntologyAnnotation } from '../../Core/OntologyAnnotation.js';
-import { unwrap, value, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { unwrap, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { ProtocolParameter_fromAggregatedStrings, Component_fromAggregatedStrings, Option_fromValueWithDefault, ProtocolParameter_toAggregatedStrings, Component_toAggregatedStrings } from './Conversions.js';
 import { Protocol_make, Protocol_create_Z414665E7 } from '../../Core/Process/Protocol.js';
 import { URIModule_fromString } from '../../Core/URI.js';
 import { SparseTable_GetEmptyComments_3ECCA699, SparseTable__TryGetValueDefault_5BAE6133, SparseTable__TryGetValue_11FD62A8, SparseTable_Create_Z2192E64B, SparseTable, SparseTable_FromRows_Z5579EC29, SparseTable_ToRows_759CAFC1 } from './SparseTable.js';
-import { Comment_fromString, Comment_toString } from './Comment.js';
+import { Comment_fromString, Comment_addToMatrix } from './Comment.js';
 import { addToDict } from '../../../node_modules/@fable-org/fable-library-ts/MapUtil.js';
 import { List_distinct } from '../../../node_modules/@fable-org/fable-library-ts/Seq2.js';
 import { stringHash } from '../../../node_modules/@fable-org/fable-library-ts/Util.js';
@@ -30,7 +30,7 @@ function fromString(name, protocolType, typeTermAccessionNumber, typeTermSourceR
   const protocolType_1 = OntologyAnnotation.create(unwrap(protocolType), unwrap(typeTermSourceREF), unwrap(typeTermAccessionNumber));
   const parameters = ofSeq(ProtocolParameter_fromAggregatedStrings(";", parametersName, parametersTermSourceREF, parametersTermAccessionNumber));
   const components = Component_fromAggregatedStrings(";", componentsName, componentsType, componentsTypeTermSourceREF, componentsTypeTermAccessionNumber);
-  return Protocol_make(void 0, (option_1 = name, option_1 != null ? URIModule_fromString(value(option_1)) : void 0), Option_fromValueWithDefault(new OntologyAnnotation(), protocolType_1), description, (option_3 = uri, option_3 != null ? URIModule_fromString(value(option_3)) : void 0), version, Option_fromValueWithDefault(empty(), parameters), Option_fromValueWithDefault(empty(), components), Option_fromValueWithDefault(empty(), comments));
+  return Protocol_make(void 0, (option_1 = name, option_1 != null ? URIModule_fromString(option_1) : void 0), Option_fromValueWithDefault(new OntologyAnnotation(), protocolType_1), description, (option_3 = uri, option_3 != null ? URIModule_fromString(option_3) : void 0), version, Option_fromValueWithDefault(empty(), parameters), Option_fromValueWithDefault(empty(), components), Option_fromValueWithDefault(empty(), comments));
 }
 function fromSparseTable(matrix) {
   if (matrix.ColumnCount === 0 && length(matrix.CommentKeys) !== 0) {
@@ -69,11 +69,9 @@ function toSparseTable(protocols) {
     const matchValue = p.Comments;
     if (matchValue != null) {
       iterate((comment) => {
-        const patternInput = Comment_toString(comment);
-        const n = patternInput[0];
+        const n = Comment_addToMatrix(i_1, comment, matrix.Matrix);
         commentKeys = cons(n, commentKeys);
-        addToDict(matrix.Matrix, [n, i_1], patternInput[1]);
-      }, value(matchValue));
+      }, matchValue);
     }
   }, protocols);
   return new SparseTable(matrix.Matrix, matrix.Keys, reverse(List_distinct(commentKeys, {
@@ -82,7 +80,7 @@ function toSparseTable(protocols) {
   })), matrix.ColumnCount);
 }
 function fromRows(prefix, lineNumber, rows) {
-  const tupledArg = prefix == null ? SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber) : SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber, value(prefix));
+  const tupledArg = prefix == null ? SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber) : SparseTable_FromRows_Z5579EC29(rows, labels, lineNumber, prefix);
   return [tupledArg[0], tupledArg[1], tupledArg[2], fromSparseTable(tupledArg[3])];
 }
 function toRows(prefix, protocols) {
@@ -90,7 +88,7 @@ function toRows(prefix, protocols) {
   if (prefix == null) {
     return SparseTable_ToRows_759CAFC1(m);
   } else {
-    return SparseTable_ToRows_759CAFC1(m, value(prefix));
+    return SparseTable_ToRows_759CAFC1(m, prefix);
   }
 }
 

package/dist/ts/ts/Spreadsheet/Metadata/Publication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Publication.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Publication.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEpJ,OAAO,EAAgC,MAAM,EAAU,MAAM,uCAAuC,CAAC;AAGrG,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,eAAO,MAAM,QAAQ,QAAQ,CAAC;AAE9B,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,8BAA8B,iCAAiC,CAAC;AAE7E,eAAO,MAAM,wBAAwB,2BAA2B,CAAC;AAEjE,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAA0I,CAAC;AAEjL,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,yBAAyB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,WAAW,CAOlQ;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,CAc5E;AAED,wBAAgB,aAAa,CAAC,YAAY,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,WAAW,CA0BhF;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,CAGtL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQzH"}
+{"version":3,"file":"Publication.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Spreadsheet/Metadata/Publication.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,UAAU,EAAW,MAAM,qCAAqC,CAAC;AAEpJ,OAAO,EAAc,MAAM,EAAU,MAAM,uCAAuC,CAAC;AAGnF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA6F,WAAW,EAAsH,MAAM,kBAAkB,CAAC;AAE9P,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAc,MAAM,qCAAqC,CAAC;AAE9E,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,eAAO,MAAM,QAAQ,QAAQ,CAAC;AAE9B,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,8BAA8B,iCAAiC,CAAC;AAE7E,eAAO,MAAM,wBAAwB,2BAA2B,CAAC;AAEjE,eAAO,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,CAA0I,CAAC;AAEjL,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,yBAAyB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,WAAW,CAOlQ;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,CAc5E;AAED,wBAAgB,aAAa,CAAC,YAAY,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,WAAW,CAwBhF;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,CAGtL;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAQzH"}